Fix bug in category class and use Jim's test as a test case

[jabaws.git] / webservices / compbio / ws / server / resource / DisemblWS.wsdl

diff --git a/webservices/compbio/ws/server/resource/DisemblWS.wsdl b/webservices/compbio/ws/server/resource/DisemblWS.wsdl
index 0938649..b104a79 100644 (file)
--- a/webservices/compbio/ws/server/resource/DisemblWS.wsdl
+++ b/webservices/compbio/ws/server/resource/DisemblWS.wsdl
@@ -6,15 +6,6 @@
       <xsd:import namespace="http://msa.data.compbio/01/12/2010/" schemaLocation="DisemblWS_schema1.xsd"/>
     </xsd:schema>
   </types>
-  <message name="getAnnotation">
-    <part name="parameters" element="tns:getAnnotation"/>
-  </message>
-  <message name="getAnnotationResponse">
-    <part name="parameters" element="tns:getAnnotationResponse"/>
-  </message>
-  <message name="ResultNotAvailableException">
-    <part name="fault" element="tns:ResultNotAvailableException"/>
-  </message>
   <message name="customAnalize">
     <part name="parameters" element="tns:customAnalize"/>
   </message>
@@ -45,11 +36,14 @@
   <message name="presetAnalizeResponse">
     <part name="parameters" element="tns:presetAnalizeResponse"/>
   </message>
-  <message name="cancelJob">
-    <part name="parameters" element="tns:cancelJob"/>
+  <message name="getAnnotation">
+    <part name="parameters" element="tns:getAnnotation"/>
   </message>
-  <message name="cancelJobResponse">
-    <part name="parameters" element="tns:cancelJobResponse"/>
+  <message name="getAnnotationResponse">
+    <part name="parameters" element="tns:getAnnotationResponse"/>
+  </message>
+  <message name="ResultNotAvailableException">
+    <part name="fault" element="tns:ResultNotAvailableException"/>
   </message>
   <message name="pullExecStatistics">
     <part name="parameters" element="tns:pullExecStatistics"/>
@@ -57,6 +51,12 @@
   <message name="pullExecStatisticsResponse">
     <part name="parameters" element="tns:pullExecStatisticsResponse"/>
   </message>
+  <message name="cancelJob">
+    <part name="parameters" element="tns:cancelJob"/>
+  </message>
+  <message name="cancelJobResponse">
+    <part name="parameters" element="tns:cancelJobResponse"/>
+  </message>
   <message name="getJobStatus">
     <part name="parameters" element="tns:getJobStatus"/>
   </message>
@@ -69,11 +69,11 @@
   <message name="getLimitResponse">
     <part name="parameters" element="tns:getLimitResponse"/>
   </message>
-  <message name="getLimits">
-    <part name="parameters" element="tns:getLimits"/>
+  <message name="getRunnerOptions">
+    <part name="parameters" element="tns:getRunnerOptions"/>
   </message>
-  <message name="getLimitsResponse">
-    <part name="parameters" element="tns:getLimitsResponse"/>
+  <message name="getRunnerOptionsResponse">
+    <part name="parameters" element="tns:getRunnerOptionsResponse"/>
   </message>
   <message name="getPresets">
     <part name="parameters" element="tns:getPresets"/>
@@ -81,18 +81,13 @@
   <message name="getPresetsResponse">
     <part name="parameters" element="tns:getPresetsResponse"/>
   </message>
-  <message name="getRunnerOptions">
-    <part name="parameters" element="tns:getRunnerOptions"/>
+  <message name="getLimits">
+    <part name="parameters" element="tns:getLimits"/>
   </message>
-  <message name="getRunnerOptionsResponse">
-    <part name="parameters" element="tns:getRunnerOptionsResponse"/>
+  <message name="getLimitsResponse">
+    <part name="parameters" element="tns:getLimitsResponse"/>
   </message>
   <portType name="SequenceAnnotation">
-    <operation name="getAnnotation">
-      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationRequest" message="tns:getAnnotation"/>
-      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationResponse" message="tns:getAnnotationResponse"/>
-      <fault message="tns:ResultNotAvailableException" name="ResultNotAvailableException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotation/Fault/ResultNotAvailableException"/>
-    </operation>
     <operation name="customAnalize">
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/customAnalizeRequest" message="tns:customAnalize"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/customAnalizeResponse" message="tns:customAnalizeResponse"/>
@@ -116,14 +111,19 @@
       <fault message="tns:JobSubmissionException" name="JobSubmissionException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/presetAnalize/Fault/JobSubmissionException"/>
       <fault message="tns:WrongParameterException" name="WrongParameterException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/presetAnalize/Fault/WrongParameterException"/>
     </operation>
-    <operation name="cancelJob">
-      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/cancelJobRequest" message="tns:cancelJob"/>
-      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/cancelJobResponse" message="tns:cancelJobResponse"/>
+    <operation name="getAnnotation">
+      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationRequest" message="tns:getAnnotation"/>
+      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationResponse" message="tns:getAnnotationResponse"/>
+      <fault message="tns:ResultNotAvailableException" name="ResultNotAvailableException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotation/Fault/ResultNotAvailableException"/>
     </operation>
     <operation name="pullExecStatistics">
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/pullExecStatisticsRequest" message="tns:pullExecStatistics"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/pullExecStatisticsResponse" message="tns:pullExecStatisticsResponse"/>
     </operation>
+    <operation name="cancelJob">
+      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/cancelJobRequest" message="tns:cancelJob"/>
+      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/cancelJobResponse" message="tns:cancelJobResponse"/>
+    </operation>
     <operation name="getJobStatus">
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getJobStatusRequest" message="tns:getJobStatus"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getJobStatusResponse" message="tns:getJobStatusResponse"/>
@@ -132,33 +132,21 @@
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitRequest" message="tns:getLimit"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitResponse" message="tns:getLimitResponse"/>
     </operation>
-    <operation name="getLimits">
-      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitsRequest" message="tns:getLimits"/>
-      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitsResponse" message="tns:getLimitsResponse"/>
+    <operation name="getRunnerOptions">
+      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getRunnerOptionsRequest" message="tns:getRunnerOptions"/>
+      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getRunnerOptionsResponse" message="tns:getRunnerOptionsResponse"/>
     </operation>
     <operation name="getPresets">
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getPresetsRequest" message="tns:getPresets"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getPresetsResponse" message="tns:getPresetsResponse"/>
     </operation>
-    <operation name="getRunnerOptions">
-      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getRunnerOptionsRequest" message="tns:getRunnerOptions"/>
-      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getRunnerOptionsResponse" message="tns:getRunnerOptionsResponse"/>
+    <operation name="getLimits">
+      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitsRequest" message="tns:getLimits"/>
+      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitsResponse" message="tns:getLimitsResponse"/>
     </operation>
   </portType>
   <binding name="DisemblWSPortBinding" type="tns:SequenceAnnotation">
     <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
-    <operation name="getAnnotation">
-      <soap:operation soapAction=""/>
-      <input>
-        <soap:body use="literal"/>
-      </input>
-      <output>
-        <soap:body use="literal"/>
-      </output>
-      <fault name="ResultNotAvailableException">
-        <soap:fault name="ResultNotAvailableException" use="literal"/>
-      </fault>
-    </operation>
     <operation name="customAnalize">
       <soap:operation soapAction=""/>
       <input>
@@ -219,7 +207,7 @@
         <soap:fault name="WrongParameterException" use="literal"/>
       </fault>
     </operation>
-    <operation name="cancelJob">
+    <operation name="getAnnotation">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -227,6 +215,9 @@
       <output>
         <soap:body use="literal"/>
       </output>
+      <fault name="ResultNotAvailableException">
+        <soap:fault name="ResultNotAvailableException" use="literal"/>
+      </fault>
     </operation>
     <operation name="pullExecStatistics">
       <soap:operation soapAction=""/>
@@ -237,6 +228,15 @@
         <soap:body use="literal"/>
       </output>
     </operation>
+    <operation name="cancelJob">
+      <soap:operation soapAction=""/>
+      <input>
+        <soap:body use="literal"/>
+      </input>
+      <output>
+        <soap:body use="literal"/>
+      </output>
+    </operation>
     <operation name="getJobStatus">
       <soap:operation soapAction=""/>
       <input>
@@ -255,7 +255,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLimits">
+    <operation name="getRunnerOptions">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -273,7 +273,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getRunnerOptions">
+    <operation name="getLimits">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>