Roll back JpredWS JABAWS namespace: from V3 to V2. V3 will be a Matrix

diff --git a/webservices/compbio/ws/client/Services.java b/webservices/compbio/ws/client/Services.java
index 1554f64..8a392d7 100644 (file)
--- a/webservices/compbio/ws/client/Services.java
+++ b/webservices/compbio/ws/client/Services.java
@@ -94,7 +94,6 @@ public enum Services {
        String getServiceNamespace() {\r
                switch (this) {\r
                        case JpredWS :\r
-                               return JABAService.V3_SERVICE_NAMESPACE;\r
                        case AAConWS :\r
                        case JronnWS :\r
                        case DisemblWS :\r

diff --git a/webservices/compbio/ws/server/JpredWS.java b/webservices/compbio/ws/server/JpredWS.java
index edf17a1..b0aa158 100644 (file)
--- a/webservices/compbio/ws/server/JpredWS.java
+++ b/webservices/compbio/ws/server/JpredWS.java
@@ -40,7 +40,7 @@ import compbio.metadata.UnsupportedRuntimeException;
 import compbio.metadata.WrongParameterException;\r
 import compbio.runner.predictors.Jpred;\r
 \r
-@WebService(endpointInterface = "compbio.data.msa.SequenceAnnotation", targetNamespace = JABAService.V3_SERVICE_NAMESPACE, serviceName = "JpredWS")\r
+@WebService(endpointInterface = "compbio.data.msa.SequenceAnnotation", targetNamespace = JABAService.V2_SERVICE_NAMESPACE, serviceName = "JpredWS")\r
 public class JpredWS extends SequenceAnnotationService<Jpred>\r
                implements SequenceAnnotation<Jpred> {\r
 \r

diff --git a/webservices/compbio/ws/server/resource/RegistryWS.wsdl b/webservices/compbio/ws/server/resource/RegistryWS.wsdl
index 44b3939..6405400 100644 (file)
--- a/webservices/compbio/ws/server/resource/RegistryWS.wsdl
+++ b/webservices/compbio/ws/server/resource/RegistryWS.wsdl
@@ -18,6 +18,12 @@
   <message name="getNonoperatedServicesResponse">
     <part name="parameters" element="tns:getNonoperatedServicesResponse"/>
   </message>
+  <message name="testAllServices">
+    <part name="parameters" element="tns:testAllServices"/>
+  </message>
+  <message name="testAllServicesResponse">
+    <part name="parameters" element="tns:testAllServicesResponse"/>
+  </message>
   <message name="getLastTested">
     <part name="parameters" element="tns:getLastTested"/>
   </message>
@@ -30,12 +36,6 @@
   <message name="getLastTestedOnResponse">
     <part name="parameters" element="tns:getLastTestedOnResponse"/>
   </message>
-  <message name="testAllServices">
-    <part name="parameters" element="tns:testAllServices"/>
-  </message>
-  <message name="testAllServicesResponse">
-    <part name="parameters" element="tns:testAllServicesResponse"/>
-  </message>
   <message name="testService">
     <part name="parameters" element="tns:testService"/>
   </message>
@@ -69,6 +69,10 @@
       <input wsam:Action="http://msa.data.compbio/01/12/2010/RegistryWS/getNonoperatedServicesRequest" message="tns:getNonoperatedServices"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/RegistryWS/getNonoperatedServicesResponse" message="tns:getNonoperatedServicesResponse"/>
     </operation>
+    <operation name="testAllServices">
+      <input wsam:Action="http://msa.data.compbio/01/12/2010/RegistryWS/testAllServicesRequest" message="tns:testAllServices"/>
+      <output wsam:Action="http://msa.data.compbio/01/12/2010/RegistryWS/testAllServicesResponse" message="tns:testAllServicesResponse"/>
+    </operation>
     <operation name="getLastTested">
       <input wsam:Action="http://msa.data.compbio/01/12/2010/RegistryWS/getLastTestedRequest" message="tns:getLastTested"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/RegistryWS/getLastTestedResponse" message="tns:getLastTestedResponse"/>
@@ -77,10 +81,6 @@
       <input wsam:Action="http://msa.data.compbio/01/12/2010/RegistryWS/getLastTestedOnRequest" message="tns:getLastTestedOn"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/RegistryWS/getLastTestedOnResponse" message="tns:getLastTestedOnResponse"/>
     </operation>
-    <operation name="testAllServices">
-      <input wsam:Action="http://msa.data.compbio/01/12/2010/RegistryWS/testAllServicesRequest" message="tns:testAllServices"/>
-      <output wsam:Action="http://msa.data.compbio/01/12/2010/RegistryWS/testAllServicesResponse" message="tns:testAllServicesResponse"/>
-    </operation>
     <operation name="testService">
       <input wsam:Action="http://msa.data.compbio/01/12/2010/RegistryWS/testServiceRequest" message="tns:testService"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/RegistryWS/testServiceResponse" message="tns:testServiceResponse"/>
@@ -118,7 +118,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLastTested">
+    <operation name="testAllServices">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -127,7 +127,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLastTestedOn">
+    <operation name="getLastTested">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -136,7 +136,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="testAllServices">
+    <operation name="getLastTestedOn">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>

diff --git a/wsbuild.log b/wsbuild.log
index 3303f31..af5c166 100644 (file)
--- a/wsbuild.log
+++ b/wsbuild.log
@@ -11,7 +11,6 @@ build-server:
    [delete] Deleting /home/asherstnev/Projects/Java.projects/jabaws/secure-git/develop/webservices/compbio/ws/server/resource/IUPredWS.wsdl
    [delete] Deleting /home/asherstnev/Projects/Java.projects/jabaws/secure-git/develop/webservices/compbio/ws/server/resource/IUPredWS_schema1.xsd
    [delete] Deleting /home/asherstnev/Projects/Java.projects/jabaws/secure-git/develop/webservices/compbio/ws/server/resource/JpredWS.wsdl
-   [delete] Deleting /home/asherstnev/Projects/Java.projects/jabaws/secure-git/develop/webservices/compbio/ws/server/resource/JpredWS_schema1.xsd
    [delete] Deleting /home/asherstnev/Projects/Java.projects/jabaws/secure-git/develop/webservices/compbio/ws/server/resource/JronnWS.wsdl
    [delete] Deleting /home/asherstnev/Projects/Java.projects/jabaws/secure-git/develop/webservices/compbio/ws/server/resource/JronnWS_schema1.xsd
    [delete] Deleting /home/asherstnev/Projects/Java.projects/jabaws/secure-git/develop/webservices/compbio/ws/server/resource/MafftWS.wsdl
@@ -20,6 +19,8 @@ build-server:
    [delete] Deleting /home/asherstnev/Projects/Java.projects/jabaws/secure-git/develop/webservices/compbio/ws/server/resource/MuscleWS_schema1.xsd
    [delete] Deleting /home/asherstnev/Projects/Java.projects/jabaws/secure-git/develop/webservices/compbio/ws/server/resource/RegistryWS.wsdl
    [delete] Deleting /home/asherstnev/Projects/Java.projects/jabaws/secure-git/develop/webservices/compbio/ws/server/resource/RegistryWS_schema1.xsd
+   [delete] Deleting /home/asherstnev/Projects/Java.projects/jabaws/secure-git/develop/webservices/compbio/ws/server/resource/SequenceAnnotation.wsdl
+   [delete] Deleting /home/asherstnev/Projects/Java.projects/jabaws/secure-git/develop/webservices/compbio/ws/server/resource/SequenceAnnotation_schema1.xsd
    [delete] Deleting /home/asherstnev/Projects/Java.projects/jabaws/secure-git/develop/webservices/compbio/ws/server/resource/TcoffeeWS.wsdl
    [delete] Deleting /home/asherstnev/Projects/Java.projects/jabaws/secure-git/develop/webservices/compbio/ws/server/resource/TcoffeeWS_schema1.xsd
     [wsgen] command line: wsgen -classpath /home/asherstnev/Projects/Java.projects/jabaws/secure-git/develop/WEB-INF/classes:/home/asherstnev/Projects/Java.projects/jabaws/secure-git/develop/WEB-INF/lib/commons-beanutils-1.7.0.jar:/home/asherstnev/Projects/Java.projects/jabaws/secure-git/develop/WEB-INF/lib/commons-collections-3.2.jar:/home/asherstnev/Projects/Java.projects/jabaws/secure-git/develop/WEB-INF/lib/commons-lang-2.3.jar:/home/asherstnev/Projects/Java.projects/jabaws/secure-git/develop/WEB-INF/lib/commons-logging-1.1.jar:/home/asherstnev/Projects/Java.projects/jabaws/secure-git/develop/WEB-INF/lib/compbio-annotations-1.0.jar:/home/asherstnev/Projects/Java.projects/jabaws/secure-git/develop/WEB-INF/lib/compbio-ga-1.1.jar:/home/asherstnev/Projects/Java.projects/jabaws/secure-git/develop/WEB-INF/lib/compbio-util-1.4.jar:/home/asherstnev/Projects/Java.projects/jabaws/secure-git/develop/WEB-INF/lib/derby-10.8.2.2.jar:/home/asherstnev/Projects/Java.projects/jabaws/secure-git/develop/WEB-INF/lib/displaytag-1.2.jar:/home/asherstnev/Projects/Java.projects/jabaws/secure-git/develop/WEB-INF/lib/displaytag-export-poi-1.2.jar:/home/asherstnev/Projects/Java.projects/jabaws/secure-git/develop/WEB-INF/lib/drmaa.jar:/home/asherstnev/Projects/Java.projects/jabaws/secure-git/develop/WEB-INF/lib/itext-1.4.7.jar:/home/asherstnev/Projects/Java.projects/jabaws/secure-git/develop/WEB-INF/lib/jstl-1.1.2.jar:/home/asherstnev/Projects/Java.projects/jabaws/secure-git/develop/WEB-INF/lib/log4j-1.2.15.jar:/home/asherstnev/Projects/Java.projects/jabaws/secure-git/develop/WEB-INF/lib/poi-3.2-FINAL-20081019.jar:/home/asherstnev/Projects/Java.projects/jabaws/secure-git/develop/WEB-INF/lib/standard-1.1.2.jar:/home/asherstnev/Projects/Java.projects/jabaws/secure-git/develop/WEB-INF/lib/webservices-api.jar:/home/asherstnev/Projects/Java.projects/jabaws/secure-git/develop/WEB-INF/lib/webservices-rt.jar:/home/asherstnev/Projects/Java.projects/jabaws/secure-git/develop/WEB-INF/lib/webservices-tools.jar -d /home/asherstnev/Projects/Java.projects/jabaws/secure-git/develop/WEB-INF/classes -Xendorsed -keep -wsdl -r /home/asherstnev/Projects/Java.projects/jabaws/secure-git/develop/webservices/compbio/ws/server/resource -s /home/asherstnev/Projects/Java.projects/jabaws/secure-git/develop/webservices -verbose compbio.ws.server.JpredWS
@@ -1142,6 +1143,13 @@ build-server:
     [wsgen] [WrapperGen - method: getSupportedServices()]
     [wsgen] [method.getDeclaringType(): compbio.data.msa.RegistryWS]
     [wsgen] [requestWrapper: compbio.data.msa.jaxws.GetSupportedServices]
+    [wsgen] [should process method: getNonoperatedServices hasWebMethods: false ]
+    [wsgen] [endpointReferencesInterface: true]
+    [wsgen] [declaring class has WebSevice: true]
+    [wsgen] [returning: true]
+    [wsgen] [WrapperGen - method: getNonoperatedServices()]
+    [wsgen] [method.getDeclaringType(): compbio.data.msa.RegistryWS]
+    [wsgen] [requestWrapper: compbio.data.msa.jaxws.GetNonoperatedServices]
     [wsgen] [should process method: getLastTested hasWebMethods: false ]
     [wsgen] [endpointReferencesInterface: true]
     [wsgen] [declaring class has WebSevice: true]
@@ -1196,6 +1204,8 @@ build-server:
     [wsgen] compbio/data/msa/jaxws/GetLastTestedOn.java
     [wsgen] compbio/data/msa/jaxws/GetLastTestedOnResponse.java
     [wsgen] compbio/data/msa/jaxws/GetLastTestedResponse.java
+    [wsgen] compbio/data/msa/jaxws/GetNonoperatedServices.java
+    [wsgen] compbio/data/msa/jaxws/GetNonoperatedServicesResponse.java
     [wsgen] compbio/data/msa/jaxws/GetServiceCategories.java
     [wsgen] compbio/data/msa/jaxws/GetServiceCategoriesResponse.java
     [wsgen] compbio/data/msa/jaxws/GetServiceDescription.java