[wsas-java-dev] svn commit r1862 - in trunk/wsas/java/modules:
admin/src/org/wso2/wsas/admin/service
core/src/org/wso2/wsas/feed/atom
core/src/org/wso2/wsas/feed/rss core/src/org/wso2/wsas/util
www/extensions/core/xslt
svn at wso2.org
svn at wso2.org
Tue Apr 17 07:02:50 PDT 2007
Author: azeez
Date: Tue Apr 17 07:02:32 2007
New Revision: 1862
Modified:
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServiceAdmin.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/feed/atom/AtomFeedBuilder.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/feed/rss/RSSFeedBuilder.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/util/ClusteringUtil.java
trunk/wsas/java/modules/www/extensions/core/xslt/list_services_info.xsl
Log:
1. Enable ?wsdl2
2. Remove ATOM & RSS System properties. These are causing problems while invoking Ant 1.7 programmatically.
3. Imprving code quality
Modified: trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServiceAdmin.java
==============================================================================
--- trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServiceAdmin.java (original)
+++ trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServiceAdmin.java Tue Apr 17 07:02:32 2007
@@ -375,14 +375,12 @@
}
// return all available service metadata (not counts)
- public Object[] getServiceInfo(String serviceId, String serviceVersion)
- throws AxisFault {
+ public Object[] getServiceInfo(String serviceId, String serviceVersion) throws AxisFault {
throw new AxisFault("Operation not yet implemented");
}
// return all accumulated data about this service
- public Object[] getServiceStatus(String serviceId, String serviceVersion)
- throws AxisFault {
+ public Object[] getServiceStatus(String serviceId, String serviceVersion) throws AxisFault {
throw new AxisFault("Operation not yet implemented");
}
@@ -613,8 +611,7 @@
return null;
}
- public OMElement getPolicy(String serviceId, String serviceVersion)
- throws AxisFault {
+ public OMElement getPolicy(String serviceId, String serviceVersion) throws AxisFault {
AxisService axisService = getAxisConfig().getService(serviceId);
if (axisService == null) {
@@ -631,8 +628,7 @@
return PolicyUtil.getPolicyAsOMElement(servicePolicy);
}
- public OMElement[] getPolicies(String serviceId, String serviceVersion)
- throws AxisFault {
+ public OMElement[] getPolicies(String serviceId, String serviceVersion) throws AxisFault {
AxisService axisService = getAxisConfig().getService(serviceId);
if (axisService == null) {
@@ -820,8 +816,7 @@
}
}
- public String[] getServiceUsers(String serviceName)
- throws AxisFault {
+ public String[] getServiceUsers(String serviceName) throws AxisFault {
AxisService axisService = getAxisConfig().getService(serviceName);
if (axisService == null) {
@@ -950,8 +945,8 @@
* @param serviceClasses
* @throws AxisFault
*/
- public void createAndDeployService(String archiveId, String[] serviceClasses)
- throws AxisFault {
+ public void createAndDeployService(String archiveId,
+ String[] serviceClasses) throws AxisFault {
String filePathFromArchiveId = getFilePathFromArchiveId(archiveId);
if (filePathFromArchiveId == null) {
@@ -1249,14 +1244,10 @@
return (FaultService[]) fsList.toArray(new FaultService[fsList.size()]);
}
- public int faultyServices() throws AxisFault {
- AxisConfiguration ac = getAxisConfig();
- Hashtable faultyServices = ac.getFaultyServices();
-
- return faultyServices.size();
+ public int getNumberOfFaultyServices() throws AxisFault {
+ return getAxisConfig().getFaultyServices().size();
}
-
public SpringBeansData getSpringBeanNames(String springContextId,
String springBeanId) throws AxisFault {
//Manipulation of springContext to ${RepositoryLocation}/spring
Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/feed/atom/AtomFeedBuilder.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/feed/atom/AtomFeedBuilder.java (original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/feed/atom/AtomFeedBuilder.java Tue Apr 17 07:02:32 2007
@@ -36,7 +36,7 @@
public AtomFeedBuilder(AxisConfiguration axisConfig) {
super(axisConfig);
AtomFeed rssFeed = new AtomFeed(axisConfig);
- System.getProperties().put(FeedConstants.ATOM_KEY, rssFeed);
+// System.getProperties().put(FeedConstants.ATOM_KEY, rssFeed);
}
public void addService(AxisService serviceDescription, String itemDefualtLink) {
Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/feed/rss/RSSFeedBuilder.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/feed/rss/RSSFeedBuilder.java (original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/feed/rss/RSSFeedBuilder.java Tue Apr 17 07:02:32 2007
@@ -33,7 +33,7 @@
public RSSFeedBuilder(AxisConfiguration axisConfig) {
super(axisConfig);
RSSFeed rssFeed = new RSSFeed(axisConfig);
- System.getProperties().put(FeedConstants.RSS_KEY, rssFeed);
+// System.getProperties().put(FeedConstants.RSS_KEY, rssFeed);
}
public void addService(AxisService serviceDescription, String itemDefaultLink) {
Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/util/ClusteringUtil.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/util/ClusteringUtil.java (original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/util/ClusteringUtil.java Tue Apr 17 07:02:32 2007
@@ -72,7 +72,7 @@
/*try {
adminSG.addToGroup(nodeManagerService);
} catch (Exception e) {
- throw new AxisFault(e);
+ throw AxisFault.makeFault(e);
}*/
axisConfig.addService(nodeManagerService);
} else {
Modified: trunk/wsas/java/modules/www/extensions/core/xslt/list_services_info.xsl
==============================================================================
--- trunk/wsas/java/modules/www/extensions/core/xslt/list_services_info.xsl (original)
+++ trunk/wsas/java/modules/www/extensions/core/xslt/list_services_info.xsl Tue Apr 17 07:02:32 2007
@@ -59,13 +59,13 @@
<xsl:text>WSDL 1.1</xsl:text>
</a>
<xsl:text>  </xsl:text>
- <!--<a>
+ <a>
<xsl:attribute name="href">#</xsl:attribute>
<xsl:attribute name="onClick">javascript:openWindowHTTP('<xsl:value-of select="."/>?wsdl2');return false;</xsl:attribute>
<xsl:attribute name="target">_blank</xsl:attribute>
<xsl:text>WSDL 2.0</xsl:text>
</a>
- <xsl:text>   </xsl:text>-->
+ <xsl:text>   </xsl:text>
<a>
<xsl:attribute name="href">#</xsl:attribute>
<xsl:attribute name="onClick">javascript:openWindowHTTP('<xsl:value-of select="."/>?xsd');return false;</xsl:attribute>
More information about the Wsas-java-dev
mailing list