Roll back some changes in WSDL of RegistryWS for some time: restore back compatibility

diff --git a/webservices/compbio/data/msa/RegistryWS.java b/webservices/compbio/data/msa/RegistryWS.java
index e2ce9a4..39b51f4 100644 (file)
--- a/webservices/compbio/data/msa/RegistryWS.java
+++ b/webservices/compbio/data/msa/RegistryWS.java
@@ -54,7 +54,8 @@ public interface RegistryWS extends JABAService {
         * @return the Set of Services which are functioning on the server\r
         * @see #testAllServices()\r
         */\r
-       Set<Services> getNonoperatedServices(); /**\r
+       //Set<Services> getNonoperatedServices();       \r
+       /**\r
         * Number of seconds since the last test. Returns 0 if the service was not\r
         * tested or tested less then a one second ago.\r
         * \r

diff --git a/webservices/compbio/ws/server/RegistryWS.java b/webservices/compbio/ws/server/RegistryWS.java
index 1fd7d88..8be071e 100644 (file)
--- a/webservices/compbio/ws/server/RegistryWS.java
+++ b/webservices/compbio/ws/server/RegistryWS.java
@@ -69,13 +69,13 @@ public class RegistryWS implements compbio.data.msa.RegistryWS, JABAService {
                init();\r
                return operating.keySet();\r
        }\r
-\r
+/* FOR FUTURE RELEASES!!!\r
        @Override\r
        public Set<Services> getNonoperatedServices() {\r
                init();\r
                return nonoperating.keySet();\r
        }\r
-\r
+*/\r
        private void init() {\r
                // Do not allow tests to run concurrently\r
                if (timeToTest()) {\r

diff --git a/webservices/compbio/ws/server/resource/RegistryWS.wsdl b/webservices/compbio/ws/server/resource/RegistryWS.wsdl
index 44b3939..d6d2325 100644 (file)
--- a/webservices/compbio/ws/server/resource/RegistryWS.wsdl
+++ b/webservices/compbio/ws/server/resource/RegistryWS.wsdl
@@ -12,12 +12,6 @@
   <message name="getSupportedServicesResponse">
     <part name="parameters" element="tns:getSupportedServicesResponse"/>
   </message>
-  <message name="getNonoperatedServices">
-    <part name="parameters" element="tns:getNonoperatedServices"/>
-  </message>
-  <message name="getNonoperatedServicesResponse">
-    <part name="parameters" element="tns:getNonoperatedServicesResponse"/>
-  </message>
   <message name="getLastTested">
     <part name="parameters" element="tns:getLastTested"/>
   </message>
@@ -65,10 +59,6 @@
       <input wsam:Action="http://msa.data.compbio/01/12/2010/RegistryWS/getSupportedServicesRequest" message="tns:getSupportedServices"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/RegistryWS/getSupportedServicesResponse" message="tns:getSupportedServicesResponse"/>
     </operation>
-    <operation name="getNonoperatedServices">
-      <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="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"/>
@@ -109,15 +99,6 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getNonoperatedServices">
-      <soap:operation soapAction=""/>
-      <input>
-        <soap:body use="literal"/>
-      </input>
-      <output>
-        <soap:body use="literal"/>
-      </output>
-    </operation>
     <operation name="getLastTested">
       <soap:operation soapAction=""/>
       <input>

diff --git a/webservices/compbio/ws/server/resource/RegistryWS_schema1.xsd b/webservices/compbio/ws/server/resource/RegistryWS_schema1.xsd
index d3bda02..51f740f 100644 (file)
--- a/webservices/compbio/ws/server/resource/RegistryWS_schema1.xsd
+++ b/webservices/compbio/ws/server/resource/RegistryWS_schema1.xsd
@@ -9,10 +9,6 @@
 
   <xs:element name="getLastTestedResponse" type="tns:getLastTestedResponse"/>
 
-  <xs:element name="getNonoperatedServices" type="tns:getNonoperatedServices"/>
-
-  <xs:element name="getNonoperatedServicesResponse" type="tns:getNonoperatedServicesResponse"/>
-
   <xs:element name="getServiceCategories" type="tns:getServiceCategories"/>
 
   <xs:element name="getServiceCategoriesResponse" type="tns:getServiceCategoriesResponse"/>
@@ -81,16 +77,6 @@
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getNonoperatedServices">
-    <xs:sequence/>
-  </xs:complexType>
-
-  <xs:complexType name="getNonoperatedServicesResponse">
-    <xs:sequence>
-      <xs:element name="return" type="tns:services" minOccurs="0" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-
   <xs:complexType name="getServiceCategories">
     <xs:sequence/>
   </xs:complexType>