git://source.jalview.org / jabaws.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a48ecc5)
Regenerate wsdl-s
authorSasha Sherstnev <a.sherstnev@dundee.ac.uk>
Fri, 6 Sep 2013 15:26:24 +0000 (16:26 +0100)
committerSasha Sherstnev <a.sherstnev@dundee.ac.uk>
Fri, 6 Sep 2013 15:26:24 +0000 (16:26 +0100)
22 files changed:
webservices/compbio/ws/server/resource/AAConWS.wsdl patch | blob | history
webservices/compbio/ws/server/resource/AAConWS_schema1.xsd patch | blob | history
webservices/compbio/ws/server/resource/ClustalWS.wsdl patch | blob | history
webservices/compbio/ws/server/resource/ClustalWS_schema1.xsd patch | blob | history
webservices/compbio/ws/server/resource/DisemblWS.wsdl patch | blob | history
webservices/compbio/ws/server/resource/DisemblWS_schema1.xsd patch | blob | history
webservices/compbio/ws/server/resource/GlobPlotWS.wsdl patch | blob | history
webservices/compbio/ws/server/resource/GlobPlotWS_schema1.xsd patch | blob | history
webservices/compbio/ws/server/resource/IUPredWS.wsdl patch | blob | history
webservices/compbio/ws/server/resource/IUPredWS_schema1.xsd patch | blob | history
webservices/compbio/ws/server/resource/JpredWS.wsdl patch | blob | history
webservices/compbio/ws/server/resource/JpredWS_schema1.xsd patch | blob | history
webservices/compbio/ws/server/resource/JronnWS.wsdl patch | blob | history
webservices/compbio/ws/server/resource/JronnWS_schema1.xsd patch | blob | history
webservices/compbio/ws/server/resource/MafftWS.wsdl patch | blob | history
webservices/compbio/ws/server/resource/MafftWS_schema1.xsd patch | blob | history
webservices/compbio/ws/server/resource/MuscleWS.wsdl patch | blob | history
webservices/compbio/ws/server/resource/MuscleWS_schema1.xsd patch | blob | history
webservices/compbio/ws/server/resource/TcoffeeWS.wsdl patch | blob | history
webservices/compbio/ws/server/resource/TcoffeeWS_schema1.xsd patch | blob | history
wsbuild.log patch | blob | history
wsbuild.xml patch | blob | history

diff --git a/webservices/compbio/ws/server/resource/AAConWS.wsdl b/webservices/compbio/ws/server/resource/AAConWS.wsdl
index c407a56..552c811 100644 (file)
--- a/webservices/compbio/ws/server/resource/AAConWS.wsdl
+++ b/webservices/compbio/ws/server/resource/AAConWS.wsdl
@@ -45,12 +45,6 @@
   <message name="presetAnalizeResponse">
     <part name="parameters" element="tns:presetAnalizeResponse"/>
   </message>
-  <message name="pullExecStatistics">
-    <part name="parameters" element="tns:pullExecStatistics"/>
-  </message>
-  <message name="pullExecStatisticsResponse">
-    <part name="parameters" element="tns:pullExecStatisticsResponse"/>
-  </message>
   <message name="cancelJob">
     <part name="parameters" element="tns:cancelJob"/>
   </message>
@@ -63,17 +57,11 @@
   <message name="getJobStatusResponse">
     <part name="parameters" element="tns:getJobStatusResponse"/>
   </message>
-  <message name="getLimit">
-    <part name="parameters" element="tns:getLimit"/>
-  </message>
-  <message name="getLimitResponse">
-    <part name="parameters" element="tns:getLimitResponse"/>
-  </message>
-  <message name="getRunnerOptions">
-    <part name="parameters" element="tns:getRunnerOptions"/>
+  <message name="pullExecStatistics">
+    <part name="parameters" element="tns:pullExecStatistics"/>
   </message>
-  <message name="getRunnerOptionsResponse">
-    <part name="parameters" element="tns:getRunnerOptionsResponse"/>
+  <message name="pullExecStatisticsResponse">
+    <part name="parameters" element="tns:pullExecStatisticsResponse"/>
   </message>
   <message name="getPresets">
     <part name="parameters" element="tns:getPresets"/>
@@ -87,6 +75,18 @@
   <message name="getLimitsResponse">
     <part name="parameters" element="tns:getLimitsResponse"/>
   </message>
+  <message name="getLimit">
+    <part name="parameters" element="tns:getLimit"/>
+  </message>
+  <message name="getLimitResponse">
+    <part name="parameters" element="tns:getLimitResponse"/>
+  </message>
+  <message name="getRunnerOptions">
+    <part name="parameters" element="tns:getRunnerOptions"/>
+  </message>
+  <message name="getRunnerOptionsResponse">
+    <part name="parameters" element="tns:getRunnerOptionsResponse"/>
+  </message>
   <portType name="SequenceAnnotation">
     <operation name="getAnnotation">
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationRequest" message="tns:getAnnotation"/>
@@ -116,10 +116,6 @@
       <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="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"/>
@@ -128,13 +124,9 @@
       <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"/>
     </operation>
-    <operation name="getLimit">
-      <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="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="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="getPresets">
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getPresetsRequest" message="tns:getPresets"/>
@@ -144,6 +136,14 @@
       <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>
+    <operation name="getLimit">
+      <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="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>
   </portType>
   <binding name="AAConWSPortBinding" type="tns:SequenceAnnotation">
     <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
@@ -219,7 +219,7 @@
         <soap:fault name="WrongParameterException" use="literal"/>
       </fault>
     </operation>
-    <operation name="pullExecStatistics">
+    <operation name="cancelJob">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -228,7 +228,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="cancelJob">
+    <operation name="getJobStatus">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -237,7 +237,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getJobStatus">
+    <operation name="pullExecStatistics">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -246,7 +246,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLimit">
+    <operation name="getPresets">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -255,7 +255,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getRunnerOptions">
+    <operation name="getLimits">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -264,7 +264,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getPresets">
+    <operation name="getLimit">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -273,7 +273,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLimits">
+    <operation name="getRunnerOptions">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
diff --git a/webservices/compbio/ws/server/resource/AAConWS_schema1.xsd b/webservices/compbio/ws/server/resource/AAConWS_schema1.xsd
index 99b9b4d..a9becf7 100644 (file)
--- a/webservices/compbio/ws/server/resource/AAConWS_schema1.xsd
+++ b/webservices/compbio/ws/server/resource/AAConWS_schema1.xsd
@@ -255,20 +255,15 @@
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getLimits">
-    <xs:sequence/>
-  </xs:complexType>
-
-  <xs:complexType name="getLimitsResponse">
+  <xs:complexType name="getLimit">
     <xs:sequence>
-      <xs:element name="return" type="tns:limitsManager" minOccurs="0"/>
+      <xs:element name="presetName" type="xs:string" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="limitsManager">
+  <xs:complexType name="getLimitResponse">
     <xs:sequence>
-      <xs:element name="runnerClassName" type="xs:string" minOccurs="0"/>
-      <xs:element name="limit" type="tns:limit" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="return" type="tns:limit" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
@@ -281,32 +276,37 @@
     <xs:attribute name="isDefault" type="xs:boolean" use="required"/>
   </xs:complexType>
 
-  <xs:complexType name="getPresets">
+  <xs:complexType name="getLimits">
     <xs:sequence/>
   </xs:complexType>
 
-  <xs:complexType name="getPresetsResponse">
+  <xs:complexType name="getLimitsResponse">
     <xs:sequence>
-      <xs:element name="return" type="tns:presetManager" minOccurs="0"/>
+      <xs:element name="return" type="tns:limitsManager" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="presetManager">
+  <xs:complexType name="limitsManager">
     <xs:sequence>
-      <xs:element name="runnerClassName" type="xs:string"/>
-      <xs:element name="preset" type="tns:preset" maxOccurs="unbounded"/>
+      <xs:element name="runnerClassName" type="xs:string" minOccurs="0"/>
+      <xs:element name="limit" type="tns:limit" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getLimit">
+  <xs:complexType name="getPresets">
+    <xs:sequence/>
+  </xs:complexType>
+
+  <xs:complexType name="getPresetsResponse">
     <xs:sequence>
-      <xs:element name="presetName" type="xs:string" minOccurs="0"/>
+      <xs:element name="return" type="tns:presetManager" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getLimitResponse">
+  <xs:complexType name="presetManager">
     <xs:sequence>
-      <xs:element name="return" type="tns:limit" minOccurs="0"/>
+      <xs:element name="runnerClassName" type="xs:string"/>
+      <xs:element name="preset" type="tns:preset" maxOccurs="unbounded"/>
     </xs:sequence>
   </xs:complexType>
 
diff --git a/webservices/compbio/ws/server/resource/ClustalWS.wsdl b/webservices/compbio/ws/server/resource/ClustalWS.wsdl
index 942caa5..3b7100d 100644 (file)
--- a/webservices/compbio/ws/server/resource/ClustalWS.wsdl
+++ b/webservices/compbio/ws/server/resource/ClustalWS.wsdl
@@ -6,15 +6,6 @@
       <xsd:import namespace="http://msa.data.compbio/01/01/2010/" schemaLocation="ClustalWS_schema1.xsd"/>
     </xsd:schema>
   </types>
-  <message name="getResult">
-    <part name="parameters" element="tns:getResult"/>
-  </message>
-  <message name="getResultResponse">
-    <part name="parameters" element="tns:getResultResponse"/>
-  </message>
-  <message name="ResultNotAvailableException">
-    <part name="fault" element="tns:ResultNotAvailableException"/>
-  </message>
   <message name="align">
     <part name="parameters" element="tns:align"/>
   </message>
@@ -45,11 +36,14 @@
   <message name="customAlignResponse">
     <part name="parameters" element="tns:customAlignResponse"/>
   </message>
-  <message name="pullExecStatistics">
-    <part name="parameters" element="tns:pullExecStatistics"/>
+  <message name="getResult">
+    <part name="parameters" element="tns:getResult"/>
   </message>
-  <message name="pullExecStatisticsResponse">
-    <part name="parameters" element="tns:pullExecStatisticsResponse"/>
+  <message name="getResultResponse">
+    <part name="parameters" element="tns:getResultResponse"/>
+  </message>
+  <message name="ResultNotAvailableException">
+    <part name="fault" element="tns:ResultNotAvailableException"/>
   </message>
   <message name="cancelJob">
     <part name="parameters" element="tns:cancelJob"/>
@@ -63,17 +57,11 @@
   <message name="getJobStatusResponse">
     <part name="parameters" element="tns:getJobStatusResponse"/>
   </message>
-  <message name="getLimit">
-    <part name="parameters" element="tns:getLimit"/>
-  </message>
-  <message name="getLimitResponse">
-    <part name="parameters" element="tns:getLimitResponse"/>
-  </message>
-  <message name="getRunnerOptions">
-    <part name="parameters" element="tns:getRunnerOptions"/>
+  <message name="pullExecStatistics">
+    <part name="parameters" element="tns:pullExecStatistics"/>
   </message>
-  <message name="getRunnerOptionsResponse">
-    <part name="parameters" element="tns:getRunnerOptionsResponse"/>
+  <message name="pullExecStatisticsResponse">
+    <part name="parameters" element="tns:pullExecStatisticsResponse"/>
   </message>
   <message name="getPresets">
     <part name="parameters" element="tns:getPresets"/>
@@ -87,12 +75,19 @@
   <message name="getLimitsResponse">
     <part name="parameters" element="tns:getLimitsResponse"/>
   </message>
+  <message name="getLimit">
+    <part name="parameters" element="tns:getLimit"/>
+  </message>
+  <message name="getLimitResponse">
+    <part name="parameters" element="tns:getLimitResponse"/>
+  </message>
+  <message name="getRunnerOptions">
+    <part name="parameters" element="tns:getRunnerOptions"/>
+  </message>
+  <message name="getRunnerOptionsResponse">
+    <part name="parameters" element="tns:getRunnerOptionsResponse"/>
+  </message>
   <portType name="MsaWS">
-    <operation name="getResult">
-      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getResultRequest" message="tns:getResult"/>
-      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getResultResponse" message="tns:getResultResponse"/>
-      <fault message="tns:ResultNotAvailableException" name="ResultNotAvailableException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getResult/Fault/ResultNotAvailableException"/>
-    </operation>
     <operation name="align">
       <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/alignRequest" message="tns:align"/>
       <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/alignResponse" message="tns:alignResponse"/>
@@ -116,9 +111,10 @@
       <fault message="tns:JobSubmissionException" name="JobSubmissionException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/customAlign/Fault/JobSubmissionException"/>
       <fault message="tns:WrongParameterException" name="WrongParameterException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/customAlign/Fault/WrongParameterException"/>
     </operation>
-    <operation name="pullExecStatistics">
-      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/pullExecStatisticsRequest" message="tns:pullExecStatistics"/>
-      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/pullExecStatisticsResponse" message="tns:pullExecStatisticsResponse"/>
+    <operation name="getResult">
+      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getResultRequest" message="tns:getResult"/>
+      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getResultResponse" message="tns:getResultResponse"/>
+      <fault message="tns:ResultNotAvailableException" name="ResultNotAvailableException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getResult/Fault/ResultNotAvailableException"/>
     </operation>
     <operation name="cancelJob">
       <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/cancelJobRequest" message="tns:cancelJob"/>
@@ -128,13 +124,9 @@
       <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getJobStatusRequest" message="tns:getJobStatus"/>
       <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getJobStatusResponse" message="tns:getJobStatusResponse"/>
     </operation>
-    <operation name="getLimit">
-      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitRequest" message="tns:getLimit"/>
-      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitResponse" message="tns:getLimitResponse"/>
-    </operation>
-    <operation name="getRunnerOptions">
-      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getRunnerOptionsRequest" message="tns:getRunnerOptions"/>
-      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getRunnerOptionsResponse" message="tns:getRunnerOptionsResponse"/>
+    <operation name="pullExecStatistics">
+      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/pullExecStatisticsRequest" message="tns:pullExecStatistics"/>
+      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/pullExecStatisticsResponse" message="tns:pullExecStatisticsResponse"/>
     </operation>
     <operation name="getPresets">
       <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getPresetsRequest" message="tns:getPresets"/>
@@ -144,21 +136,17 @@
       <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitsRequest" message="tns:getLimits"/>
       <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitsResponse" message="tns:getLimitsResponse"/>
     </operation>
+    <operation name="getLimit">
+      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitRequest" message="tns:getLimit"/>
+      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitResponse" message="tns:getLimitResponse"/>
+    </operation>
+    <operation name="getRunnerOptions">
+      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getRunnerOptionsRequest" message="tns:getRunnerOptions"/>
+      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getRunnerOptionsResponse" message="tns:getRunnerOptionsResponse"/>
+    </operation>
   </portType>
   <binding name="ClustalWSPortBinding" type="tns:MsaWS">
     <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
-    <operation name="getResult">
-      <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="align">
       <soap:operation soapAction=""/>
       <input>
@@ -219,7 +207,7 @@
         <soap:fault name="WrongParameterException" use="literal"/>
       </fault>
     </operation>
-    <operation name="pullExecStatistics">
+    <operation name="getResult">
       <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="cancelJob">
       <soap:operation soapAction=""/>
@@ -246,7 +237,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLimit">
+    <operation name="pullExecStatistics">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -255,7 +246,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getRunnerOptions">
+    <operation name="getPresets">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -264,7 +255,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getPresets">
+    <operation name="getLimits">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -273,7 +264,16 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLimits">
+    <operation name="getLimit">
+      <soap:operation soapAction=""/>
+      <input>
+        <soap:body use="literal"/>
+      </input>
+      <output>
+        <soap:body use="literal"/>
+      </output>
+    </operation>
+    <operation name="getRunnerOptions">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
diff --git a/webservices/compbio/ws/server/resource/ClustalWS_schema1.xsd b/webservices/compbio/ws/server/resource/ClustalWS_schema1.xsd
index 7fb84b1..99e928a 100644 (file)
--- a/webservices/compbio/ws/server/resource/ClustalWS_schema1.xsd
+++ b/webservices/compbio/ws/server/resource/ClustalWS_schema1.xsd
@@ -134,7 +134,7 @@
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="alignment" final="extension restriction">
+  <xs:complexType name="alignment">
     <xs:sequence>
       <xs:element name="metadata" type="tns:alignmentMetadata" minOccurs="0"/>
       <xs:element name="sequences" type="tns:fastaSequence" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
@@ -161,20 +161,15 @@
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getLimits">
-    <xs:sequence/>
-  </xs:complexType>
-
-  <xs:complexType name="getLimitsResponse">
+  <xs:complexType name="getLimit">
     <xs:sequence>
-      <xs:element name="return" type="tns:limitsManager" minOccurs="0"/>
+      <xs:element name="presetName" type="xs:string" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="limitsManager">
+  <xs:complexType name="getLimitResponse">
     <xs:sequence>
-      <xs:element name="runnerClassName" type="xs:string" minOccurs="0"/>
-      <xs:element name="limit" type="tns:limit" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="return" type="tns:limit" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
@@ -187,6 +182,23 @@
     <xs:attribute name="isDefault" type="xs:boolean" use="required"/>
   </xs:complexType>
 
+  <xs:complexType name="getLimits">
+    <xs:sequence/>
+  </xs:complexType>
+
+  <xs:complexType name="getLimitsResponse">
+    <xs:sequence>
+      <xs:element name="return" type="tns:limitsManager" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="limitsManager">
+    <xs:sequence>
+      <xs:element name="runnerClassName" type="xs:string" minOccurs="0"/>
+      <xs:element name="limit" type="tns:limit" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+
   <xs:complexType name="getPresets">
     <xs:sequence/>
   </xs:complexType>
@@ -218,18 +230,6 @@
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getLimit">
-    <xs:sequence>
-      <xs:element name="presetName" type="xs:string" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="getLimitResponse">
-    <xs:sequence>
-      <xs:element name="return" type="tns:limit" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-
   <xs:complexType name="cancelJob">
     <xs:sequence>
       <xs:element name="jobId" type="xs:string" minOccurs="0"/>
diff --git a/webservices/compbio/ws/server/resource/DisemblWS.wsdl b/webservices/compbio/ws/server/resource/DisemblWS.wsdl
index 8e75e28..cb2fc9c 100644 (file)
--- a/webservices/compbio/ws/server/resource/DisemblWS.wsdl
+++ b/webservices/compbio/ws/server/resource/DisemblWS.wsdl
@@ -45,12 +45,6 @@
   <message name="presetAnalizeResponse">
     <part name="parameters" element="tns:presetAnalizeResponse"/>
   </message>
-  <message name="pullExecStatistics">
-    <part name="parameters" element="tns:pullExecStatistics"/>
-  </message>
-  <message name="pullExecStatisticsResponse">
-    <part name="parameters" element="tns:pullExecStatisticsResponse"/>
-  </message>
   <message name="cancelJob">
     <part name="parameters" element="tns:cancelJob"/>
   </message>
@@ -63,17 +57,11 @@
   <message name="getJobStatusResponse">
     <part name="parameters" element="tns:getJobStatusResponse"/>
   </message>
-  <message name="getLimit">
-    <part name="parameters" element="tns:getLimit"/>
-  </message>
-  <message name="getLimitResponse">
-    <part name="parameters" element="tns:getLimitResponse"/>
-  </message>
-  <message name="getRunnerOptions">
-    <part name="parameters" element="tns:getRunnerOptions"/>
+  <message name="pullExecStatistics">
+    <part name="parameters" element="tns:pullExecStatistics"/>
   </message>
-  <message name="getRunnerOptionsResponse">
-    <part name="parameters" element="tns:getRunnerOptionsResponse"/>
+  <message name="pullExecStatisticsResponse">
+    <part name="parameters" element="tns:pullExecStatisticsResponse"/>
   </message>
   <message name="getPresets">
     <part name="parameters" element="tns:getPresets"/>
@@ -87,6 +75,18 @@
   <message name="getLimitsResponse">
     <part name="parameters" element="tns:getLimitsResponse"/>
   </message>
+  <message name="getLimit">
+    <part name="parameters" element="tns:getLimit"/>
+  </message>
+  <message name="getLimitResponse">
+    <part name="parameters" element="tns:getLimitResponse"/>
+  </message>
+  <message name="getRunnerOptions">
+    <part name="parameters" element="tns:getRunnerOptions"/>
+  </message>
+  <message name="getRunnerOptionsResponse">
+    <part name="parameters" element="tns:getRunnerOptionsResponse"/>
+  </message>
   <portType name="SequenceAnnotation">
     <operation name="getAnnotation">
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationRequest" message="tns:getAnnotation"/>
@@ -116,10 +116,6 @@
       <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="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"/>
@@ -128,13 +124,9 @@
       <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"/>
     </operation>
-    <operation name="getLimit">
-      <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="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="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="getPresets">
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getPresetsRequest" message="tns:getPresets"/>
@@ -144,6 +136,14 @@
       <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>
+    <operation name="getLimit">
+      <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="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>
   </portType>
   <binding name="DisemblWSPortBinding" type="tns:SequenceAnnotation">
     <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
@@ -219,7 +219,7 @@
         <soap:fault name="WrongParameterException" use="literal"/>
       </fault>
     </operation>
-    <operation name="pullExecStatistics">
+    <operation name="cancelJob">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -228,7 +228,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="cancelJob">
+    <operation name="getJobStatus">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -237,7 +237,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getJobStatus">
+    <operation name="pullExecStatistics">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -246,7 +246,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLimit">
+    <operation name="getPresets">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -255,7 +255,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getRunnerOptions">
+    <operation name="getLimits">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -264,7 +264,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getPresets">
+    <operation name="getLimit">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -273,7 +273,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLimits">
+    <operation name="getRunnerOptions">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
diff --git a/webservices/compbio/ws/server/resource/DisemblWS_schema1.xsd b/webservices/compbio/ws/server/resource/DisemblWS_schema1.xsd
index 84505eb..d37dc1d 100644 (file)
--- a/webservices/compbio/ws/server/resource/DisemblWS_schema1.xsd
+++ b/webservices/compbio/ws/server/resource/DisemblWS_schema1.xsd
@@ -262,20 +262,15 @@
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getLimits">
-    <xs:sequence/>
-  </xs:complexType>
-
-  <xs:complexType name="getLimitsResponse">
+  <xs:complexType name="getLimit">
     <xs:sequence>
-      <xs:element name="return" type="tns:limitsManager" minOccurs="0"/>
+      <xs:element name="presetName" type="xs:string" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="limitsManager">
+  <xs:complexType name="getLimitResponse">
     <xs:sequence>
-      <xs:element name="runnerClassName" type="xs:string" minOccurs="0"/>
-      <xs:element name="limit" type="tns:limit" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="return" type="tns:limit" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
@@ -288,32 +283,37 @@
     <xs:attribute name="isDefault" type="xs:boolean" use="required"/>
   </xs:complexType>
 
-  <xs:complexType name="getPresets">
+  <xs:complexType name="getLimits">
     <xs:sequence/>
   </xs:complexType>
 
-  <xs:complexType name="getPresetsResponse">
+  <xs:complexType name="getLimitsResponse">
     <xs:sequence>
-      <xs:element name="return" type="tns:presetManager" minOccurs="0"/>
+      <xs:element name="return" type="tns:limitsManager" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="presetManager">
+  <xs:complexType name="limitsManager">
     <xs:sequence>
-      <xs:element name="runnerClassName" type="xs:string"/>
-      <xs:element name="preset" type="tns:preset" maxOccurs="unbounded"/>
+      <xs:element name="runnerClassName" type="xs:string" minOccurs="0"/>
+      <xs:element name="limit" type="tns:limit" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getLimit">
+  <xs:complexType name="getPresets">
+    <xs:sequence/>
+  </xs:complexType>
+
+  <xs:complexType name="getPresetsResponse">
     <xs:sequence>
-      <xs:element name="presetName" type="xs:string" minOccurs="0"/>
+      <xs:element name="return" type="tns:presetManager" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getLimitResponse">
+  <xs:complexType name="presetManager">
     <xs:sequence>
-      <xs:element name="return" type="tns:limit" minOccurs="0"/>
+      <xs:element name="runnerClassName" type="xs:string"/>
+      <xs:element name="preset" type="tns:preset" maxOccurs="unbounded"/>
     </xs:sequence>
   </xs:complexType>
 
diff --git a/webservices/compbio/ws/server/resource/GlobPlotWS.wsdl b/webservices/compbio/ws/server/resource/GlobPlotWS.wsdl
index 45241ab..7745a15 100644 (file)
--- a/webservices/compbio/ws/server/resource/GlobPlotWS.wsdl
+++ b/webservices/compbio/ws/server/resource/GlobPlotWS.wsdl
@@ -45,12 +45,6 @@
   <message name="presetAnalizeResponse">
     <part name="parameters" element="tns:presetAnalizeResponse"/>
   </message>
-  <message name="pullExecStatistics">
-    <part name="parameters" element="tns:pullExecStatistics"/>
-  </message>
-  <message name="pullExecStatisticsResponse">
-    <part name="parameters" element="tns:pullExecStatisticsResponse"/>
-  </message>
   <message name="cancelJob">
     <part name="parameters" element="tns:cancelJob"/>
   </message>
@@ -63,17 +57,11 @@
   <message name="getJobStatusResponse">
     <part name="parameters" element="tns:getJobStatusResponse"/>
   </message>
-  <message name="getLimit">
-    <part name="parameters" element="tns:getLimit"/>
-  </message>
-  <message name="getLimitResponse">
-    <part name="parameters" element="tns:getLimitResponse"/>
-  </message>
-  <message name="getRunnerOptions">
-    <part name="parameters" element="tns:getRunnerOptions"/>
+  <message name="pullExecStatistics">
+    <part name="parameters" element="tns:pullExecStatistics"/>
   </message>
-  <message name="getRunnerOptionsResponse">
-    <part name="parameters" element="tns:getRunnerOptionsResponse"/>
+  <message name="pullExecStatisticsResponse">
+    <part name="parameters" element="tns:pullExecStatisticsResponse"/>
   </message>
   <message name="getPresets">
     <part name="parameters" element="tns:getPresets"/>
@@ -87,6 +75,18 @@
   <message name="getLimitsResponse">
     <part name="parameters" element="tns:getLimitsResponse"/>
   </message>
+  <message name="getLimit">
+    <part name="parameters" element="tns:getLimit"/>
+  </message>
+  <message name="getLimitResponse">
+    <part name="parameters" element="tns:getLimitResponse"/>
+  </message>
+  <message name="getRunnerOptions">
+    <part name="parameters" element="tns:getRunnerOptions"/>
+  </message>
+  <message name="getRunnerOptionsResponse">
+    <part name="parameters" element="tns:getRunnerOptionsResponse"/>
+  </message>
   <portType name="SequenceAnnotation">
     <operation name="getAnnotation">
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationRequest" message="tns:getAnnotation"/>
@@ -116,10 +116,6 @@
       <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="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"/>
@@ -128,13 +124,9 @@
       <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"/>
     </operation>
-    <operation name="getLimit">
-      <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="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="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="getPresets">
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getPresetsRequest" message="tns:getPresets"/>
@@ -144,6 +136,14 @@
       <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>
+    <operation name="getLimit">
+      <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="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>
   </portType>
   <binding name="GlobPlotWSPortBinding" type="tns:SequenceAnnotation">
     <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
@@ -219,7 +219,7 @@
         <soap:fault name="WrongParameterException" use="literal"/>
       </fault>
     </operation>
-    <operation name="pullExecStatistics">
+    <operation name="cancelJob">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -228,7 +228,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="cancelJob">
+    <operation name="getJobStatus">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -237,7 +237,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getJobStatus">
+    <operation name="pullExecStatistics">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -246,7 +246,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLimit">
+    <operation name="getPresets">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -255,7 +255,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getRunnerOptions">
+    <operation name="getLimits">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -264,7 +264,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getPresets">
+    <operation name="getLimit">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -273,7 +273,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLimits">
+    <operation name="getRunnerOptions">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
diff --git a/webservices/compbio/ws/server/resource/GlobPlotWS_schema1.xsd b/webservices/compbio/ws/server/resource/GlobPlotWS_schema1.xsd
index 4d1dc27..ca07152 100644 (file)
--- a/webservices/compbio/ws/server/resource/GlobPlotWS_schema1.xsd
+++ b/webservices/compbio/ws/server/resource/GlobPlotWS_schema1.xsd
@@ -275,20 +275,15 @@
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getLimits">
-    <xs:sequence/>
-  </xs:complexType>
-
-  <xs:complexType name="getLimitsResponse">
+  <xs:complexType name="getLimit">
     <xs:sequence>
-      <xs:element name="return" type="tns:limitsManager" minOccurs="0"/>
+      <xs:element name="presetName" type="xs:string" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="limitsManager">
+  <xs:complexType name="getLimitResponse">
     <xs:sequence>
-      <xs:element name="runnerClassName" type="xs:string" minOccurs="0"/>
-      <xs:element name="limit" type="tns:limit" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="return" type="tns:limit" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
@@ -301,32 +296,37 @@
     <xs:attribute name="isDefault" type="xs:boolean" use="required"/>
   </xs:complexType>
 
-  <xs:complexType name="getPresets">
+  <xs:complexType name="getLimits">
     <xs:sequence/>
   </xs:complexType>
 
-  <xs:complexType name="getPresetsResponse">
+  <xs:complexType name="getLimitsResponse">
     <xs:sequence>
-      <xs:element name="return" type="tns:presetManager" minOccurs="0"/>
+      <xs:element name="return" type="tns:limitsManager" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="presetManager">
+  <xs:complexType name="limitsManager">
     <xs:sequence>
-      <xs:element name="runnerClassName" type="xs:string"/>
-      <xs:element name="preset" type="tns:preset" maxOccurs="unbounded"/>
+      <xs:element name="runnerClassName" type="xs:string" minOccurs="0"/>
+      <xs:element name="limit" type="tns:limit" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getLimit">
+  <xs:complexType name="getPresets">
+    <xs:sequence/>
+  </xs:complexType>
+
+  <xs:complexType name="getPresetsResponse">
     <xs:sequence>
-      <xs:element name="presetName" type="xs:string" minOccurs="0"/>
+      <xs:element name="return" type="tns:presetManager" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getLimitResponse">
+  <xs:complexType name="presetManager">
     <xs:sequence>
-      <xs:element name="return" type="tns:limit" minOccurs="0"/>
+      <xs:element name="runnerClassName" type="xs:string"/>
+      <xs:element name="preset" type="tns:preset" maxOccurs="unbounded"/>
     </xs:sequence>
   </xs:complexType>
 
diff --git a/webservices/compbio/ws/server/resource/IUPredWS.wsdl b/webservices/compbio/ws/server/resource/IUPredWS.wsdl
index 8916c41..e47e929 100644 (file)
--- a/webservices/compbio/ws/server/resource/IUPredWS.wsdl
+++ b/webservices/compbio/ws/server/resource/IUPredWS.wsdl
@@ -45,12 +45,6 @@
   <message name="presetAnalizeResponse">
     <part name="parameters" element="tns:presetAnalizeResponse"/>
   </message>
-  <message name="pullExecStatistics">
-    <part name="parameters" element="tns:pullExecStatistics"/>
-  </message>
-  <message name="pullExecStatisticsResponse">
-    <part name="parameters" element="tns:pullExecStatisticsResponse"/>
-  </message>
   <message name="cancelJob">
     <part name="parameters" element="tns:cancelJob"/>
   </message>
@@ -63,17 +57,11 @@
   <message name="getJobStatusResponse">
     <part name="parameters" element="tns:getJobStatusResponse"/>
   </message>
-  <message name="getLimit">
-    <part name="parameters" element="tns:getLimit"/>
-  </message>
-  <message name="getLimitResponse">
-    <part name="parameters" element="tns:getLimitResponse"/>
-  </message>
-  <message name="getRunnerOptions">
-    <part name="parameters" element="tns:getRunnerOptions"/>
+  <message name="pullExecStatistics">
+    <part name="parameters" element="tns:pullExecStatistics"/>
   </message>
-  <message name="getRunnerOptionsResponse">
-    <part name="parameters" element="tns:getRunnerOptionsResponse"/>
+  <message name="pullExecStatisticsResponse">
+    <part name="parameters" element="tns:pullExecStatisticsResponse"/>
   </message>
   <message name="getPresets">
     <part name="parameters" element="tns:getPresets"/>
@@ -87,6 +75,18 @@
   <message name="getLimitsResponse">
     <part name="parameters" element="tns:getLimitsResponse"/>
   </message>
+  <message name="getLimit">
+    <part name="parameters" element="tns:getLimit"/>
+  </message>
+  <message name="getLimitResponse">
+    <part name="parameters" element="tns:getLimitResponse"/>
+  </message>
+  <message name="getRunnerOptions">
+    <part name="parameters" element="tns:getRunnerOptions"/>
+  </message>
+  <message name="getRunnerOptionsResponse">
+    <part name="parameters" element="tns:getRunnerOptionsResponse"/>
+  </message>
   <portType name="SequenceAnnotation">
     <operation name="getAnnotation">
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationRequest" message="tns:getAnnotation"/>
@@ -116,10 +116,6 @@
       <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="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"/>
@@ -128,13 +124,9 @@
       <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"/>
     </operation>
-    <operation name="getLimit">
-      <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="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="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="getPresets">
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getPresetsRequest" message="tns:getPresets"/>
@@ -144,6 +136,14 @@
       <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>
+    <operation name="getLimit">
+      <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="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>
   </portType>
   <binding name="IUPredWSPortBinding" type="tns:SequenceAnnotation">
     <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
@@ -219,7 +219,7 @@
         <soap:fault name="WrongParameterException" use="literal"/>
       </fault>
     </operation>
-    <operation name="pullExecStatistics">
+    <operation name="cancelJob">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -228,7 +228,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="cancelJob">
+    <operation name="getJobStatus">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -237,7 +237,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getJobStatus">
+    <operation name="pullExecStatistics">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -246,7 +246,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLimit">
+    <operation name="getPresets">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -255,7 +255,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getRunnerOptions">
+    <operation name="getLimits">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -264,7 +264,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getPresets">
+    <operation name="getLimit">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -273,7 +273,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLimits">
+    <operation name="getRunnerOptions">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
diff --git a/webservices/compbio/ws/server/resource/IUPredWS_schema1.xsd b/webservices/compbio/ws/server/resource/IUPredWS_schema1.xsd
index 9acf0a6..e302e4b 100644 (file)
--- a/webservices/compbio/ws/server/resource/IUPredWS_schema1.xsd
+++ b/webservices/compbio/ws/server/resource/IUPredWS_schema1.xsd
@@ -248,20 +248,15 @@
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getLimits">
-    <xs:sequence/>
-  </xs:complexType>
-
-  <xs:complexType name="getLimitsResponse">
+  <xs:complexType name="getLimit">
     <xs:sequence>
-      <xs:element name="return" type="tns:limitsManager" minOccurs="0"/>
+      <xs:element name="presetName" type="xs:string" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="limitsManager">
+  <xs:complexType name="getLimitResponse">
     <xs:sequence>
-      <xs:element name="runnerClassName" type="xs:string" minOccurs="0"/>
-      <xs:element name="limit" type="tns:limit" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="return" type="tns:limit" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
@@ -274,6 +269,23 @@
     <xs:attribute name="isDefault" type="xs:boolean" use="required"/>
   </xs:complexType>
 
+  <xs:complexType name="getLimits">
+    <xs:sequence/>
+  </xs:complexType>
+
+  <xs:complexType name="getLimitsResponse">
+    <xs:sequence>
+      <xs:element name="return" type="tns:limitsManager" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="limitsManager">
+    <xs:sequence>
+      <xs:element name="runnerClassName" type="xs:string" minOccurs="0"/>
+      <xs:element name="limit" type="tns:limit" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+
   <xs:complexType name="getPresets">
     <xs:sequence/>
   </xs:complexType>
@@ -305,18 +317,6 @@
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getLimit">
-    <xs:sequence>
-      <xs:element name="presetName" type="xs:string" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="getLimitResponse">
-    <xs:sequence>
-      <xs:element name="return" type="tns:limit" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-
   <xs:complexType name="cancelJob">
     <xs:sequence>
       <xs:element name="jobId" type="xs:string" minOccurs="0"/>
diff --git a/webservices/compbio/ws/server/resource/JpredWS.wsdl b/webservices/compbio/ws/server/resource/JpredWS.wsdl
index 976aee1..c66ed79 100644 (file)
--- a/webservices/compbio/ws/server/resource/JpredWS.wsdl
+++ b/webservices/compbio/ws/server/resource/JpredWS.wsdl
@@ -1,25 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <!-- Generated by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is Metro/2.1 (branches/2.1-6728; 2011-02-03T14:14:58+0000) JAXWS-RI/2.2.3 JAXWS/2.2. -->
-<definitions targetNamespace="http://msa.data.compbio/01/12/2010/" name="JpredWS" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:wsp="http://www.w3.org/ns/ws-policy" xmlns:tns="http://msa.data.compbio/01/12/2010/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsp1_2="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">
+<definitions targetNamespace="http://msa.data.compbio/01/01/2010/" name="JpredWS" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:wsp="http://www.w3.org/ns/ws-policy" xmlns:tns="http://msa.data.compbio/01/01/2010/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsp1_2="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">
   <types>
     <xsd:schema>
-      <xsd:import namespace="http://msa.data.compbio/01/12/2010/" schemaLocation="JpredWS_schema1.xsd"/>
+      <xsd:import namespace="http://msa.data.compbio/01/01/2010/" schemaLocation="JpredWS_schema1.xsd"/>
     </xsd:schema>
   </types>
-  <message name="getAnnotation">
-    <part name="parameters" element="tns:getAnnotation"/>
+  <message name="align">
+    <part name="parameters" element="tns:align"/>
   </message>
-  <message name="getAnnotationResponse">
-    <part name="parameters" element="tns:getAnnotationResponse"/>
-  </message>
-  <message name="ResultNotAvailableException">
-    <part name="fault" element="tns:ResultNotAvailableException"/>
-  </message>
-  <message name="analize">
-    <part name="parameters" element="tns:analize"/>
-  </message>
-  <message name="analizeResponse">
-    <part name="parameters" element="tns:analizeResponse"/>
+  <message name="alignResponse">
+    <part name="parameters" element="tns:alignResponse"/>
   </message>
   <message name="UnsupportedRuntimeException">
     <part name="fault" element="tns:UnsupportedRuntimeException"/>
@@ -30,26 +21,29 @@
   <message name="JobSubmissionException">
     <part name="fault" element="tns:JobSubmissionException"/>
   </message>
-  <message name="customAnalize">
-    <part name="parameters" element="tns:customAnalize"/>
+  <message name="presetAlign">
+    <part name="parameters" element="tns:presetAlign"/>
   </message>
-  <message name="customAnalizeResponse">
-    <part name="parameters" element="tns:customAnalizeResponse"/>
+  <message name="presetAlignResponse">
+    <part name="parameters" element="tns:presetAlignResponse"/>
   </message>
   <message name="WrongParameterException">
     <part name="fault" element="tns:WrongParameterException"/>
   </message>
-  <message name="presetAnalize">
-    <part name="parameters" element="tns:presetAnalize"/>
+  <message name="customAlign">
+    <part name="parameters" element="tns:customAlign"/>
   </message>
-  <message name="presetAnalizeResponse">
-    <part name="parameters" element="tns:presetAnalizeResponse"/>
+  <message name="customAlignResponse">
+    <part name="parameters" element="tns:customAlignResponse"/>
   </message>
-  <message name="pullExecStatistics">
-    <part name="parameters" element="tns:pullExecStatistics"/>
+  <message name="getResult">
+    <part name="parameters" element="tns:getResult"/>
   </message>
-  <message name="pullExecStatisticsResponse">
-    <part name="parameters" element="tns:pullExecStatisticsResponse"/>
+  <message name="getResultResponse">
+    <part name="parameters" element="tns:getResultResponse"/>
+  </message>
+  <message name="ResultNotAvailableException">
+    <part name="fault" element="tns:ResultNotAvailableException"/>
   </message>
   <message name="cancelJob">
     <part name="parameters" element="tns:cancelJob"/>
@@ -63,17 +57,11 @@
   <message name="getJobStatusResponse">
     <part name="parameters" element="tns:getJobStatusResponse"/>
   </message>
-  <message name="getLimit">
-    <part name="parameters" element="tns:getLimit"/>
-  </message>
-  <message name="getLimitResponse">
-    <part name="parameters" element="tns:getLimitResponse"/>
-  </message>
-  <message name="getRunnerOptions">
-    <part name="parameters" element="tns:getRunnerOptions"/>
+  <message name="pullExecStatistics">
+    <part name="parameters" element="tns:pullExecStatistics"/>
   </message>
-  <message name="getRunnerOptionsResponse">
-    <part name="parameters" element="tns:getRunnerOptionsResponse"/>
+  <message name="pullExecStatisticsResponse">
+    <part name="parameters" element="tns:pullExecStatisticsResponse"/>
   </message>
   <message name="getPresets">
     <part name="parameters" element="tns:getPresets"/>
@@ -87,79 +75,79 @@
   <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="analize">
-      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/analizeRequest" message="tns:analize"/>
-      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/analizeResponse" message="tns:analizeResponse"/>
-      <fault message="tns:UnsupportedRuntimeException" name="UnsupportedRuntimeException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/analize/Fault/UnsupportedRuntimeException"/>
-      <fault message="tns:LimitExceededException" name="LimitExceededException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/analize/Fault/LimitExceededException"/>
-      <fault message="tns:JobSubmissionException" name="JobSubmissionException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/analize/Fault/JobSubmissionException"/>
+  <message name="getLimit">
+    <part name="parameters" element="tns:getLimit"/>
+  </message>
+  <message name="getLimitResponse">
+    <part name="parameters" element="tns:getLimitResponse"/>
+  </message>
+  <message name="getRunnerOptions">
+    <part name="parameters" element="tns:getRunnerOptions"/>
+  </message>
+  <message name="getRunnerOptionsResponse">
+    <part name="parameters" element="tns:getRunnerOptionsResponse"/>
+  </message>
+  <portType name="MsaWS">
+    <operation name="align">
+      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/alignRequest" message="tns:align"/>
+      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/alignResponse" message="tns:alignResponse"/>
+      <fault message="tns:UnsupportedRuntimeException" name="UnsupportedRuntimeException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/align/Fault/UnsupportedRuntimeException"/>
+      <fault message="tns:LimitExceededException" name="LimitExceededException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/align/Fault/LimitExceededException"/>
+      <fault message="tns:JobSubmissionException" name="JobSubmissionException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/align/Fault/JobSubmissionException"/>
     </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"/>
-      <fault message="tns:UnsupportedRuntimeException" name="UnsupportedRuntimeException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/customAnalize/Fault/UnsupportedRuntimeException"/>
-      <fault message="tns:LimitExceededException" name="LimitExceededException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/customAnalize/Fault/LimitExceededException"/>
-      <fault message="tns:JobSubmissionException" name="JobSubmissionException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/customAnalize/Fault/JobSubmissionException"/>
-      <fault message="tns:WrongParameterException" name="WrongParameterException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/customAnalize/Fault/WrongParameterException"/>
+    <operation name="presetAlign">
+      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/presetAlignRequest" message="tns:presetAlign"/>
+      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/presetAlignResponse" message="tns:presetAlignResponse"/>
+      <fault message="tns:UnsupportedRuntimeException" name="UnsupportedRuntimeException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/presetAlign/Fault/UnsupportedRuntimeException"/>
+      <fault message="tns:LimitExceededException" name="LimitExceededException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/presetAlign/Fault/LimitExceededException"/>
+      <fault message="tns:JobSubmissionException" name="JobSubmissionException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/presetAlign/Fault/JobSubmissionException"/>
+      <fault message="tns:WrongParameterException" name="WrongParameterException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/presetAlign/Fault/WrongParameterException"/>
     </operation>
-    <operation name="presetAnalize">
-      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/presetAnalizeRequest" message="tns:presetAnalize"/>
-      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/presetAnalizeResponse" message="tns:presetAnalizeResponse"/>
-      <fault message="tns:UnsupportedRuntimeException" name="UnsupportedRuntimeException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/presetAnalize/Fault/UnsupportedRuntimeException"/>
-      <fault message="tns:LimitExceededException" name="LimitExceededException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/presetAnalize/Fault/LimitExceededException"/>
-      <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 name="customAlign">
+      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/customAlignRequest" message="tns:customAlign"/>
+      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/customAlignResponse" message="tns:customAlignResponse"/>
+      <fault message="tns:UnsupportedRuntimeException" name="UnsupportedRuntimeException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/customAlign/Fault/UnsupportedRuntimeException"/>
+      <fault message="tns:LimitExceededException" name="LimitExceededException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/customAlign/Fault/LimitExceededException"/>
+      <fault message="tns:JobSubmissionException" name="JobSubmissionException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/customAlign/Fault/JobSubmissionException"/>
+      <fault message="tns:WrongParameterException" name="WrongParameterException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/customAlign/Fault/WrongParameterException"/>
     </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 name="getResult">
+      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getResultRequest" message="tns:getResult"/>
+      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getResultResponse" message="tns:getResultResponse"/>
+      <fault message="tns:ResultNotAvailableException" name="ResultNotAvailableException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getResult/Fault/ResultNotAvailableException"/>
     </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"/>
+      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/cancelJobRequest" message="tns:cancelJob"/>
+      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/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"/>
+      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getJobStatusRequest" message="tns:getJobStatus"/>
+      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getJobStatusResponse" message="tns:getJobStatusResponse"/>
     </operation>
-    <operation name="getLimit">
-      <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="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="pullExecStatistics">
+      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/pullExecStatisticsRequest" message="tns:pullExecStatistics"/>
+      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/pullExecStatisticsResponse" message="tns:pullExecStatisticsResponse"/>
     </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"/>
+      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getPresetsRequest" message="tns:getPresets"/>
+      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getPresetsResponse" message="tns:getPresetsResponse"/>
     </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"/>
+      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitsRequest" message="tns:getLimits"/>
+      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitsResponse" message="tns:getLimitsResponse"/>
+    </operation>
+    <operation name="getLimit">
+      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitRequest" message="tns:getLimit"/>
+      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitResponse" message="tns:getLimitResponse"/>
+    </operation>
+    <operation name="getRunnerOptions">
+      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getRunnerOptionsRequest" message="tns:getRunnerOptions"/>
+      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getRunnerOptionsResponse" message="tns:getRunnerOptionsResponse"/>
     </operation>
   </portType>
-  <binding name="JpredWSPortBinding" type="tns:SequenceAnnotation">
+  <binding name="JpredWSPortBinding" type="tns:MsaWS">
     <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="analize">
+    <operation name="align">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -177,7 +165,7 @@
         <soap:fault name="JobSubmissionException" use="literal"/>
       </fault>
     </operation>
-    <operation name="customAnalize">
+    <operation name="presetAlign">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -198,7 +186,7 @@
         <soap:fault name="WrongParameterException" use="literal"/>
       </fault>
     </operation>
-    <operation name="presetAnalize">
+    <operation name="customAlign">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -219,7 +207,7 @@
         <soap:fault name="WrongParameterException" use="literal"/>
       </fault>
     </operation>
-    <operation name="pullExecStatistics">
+    <operation name="getResult">
       <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="cancelJob">
       <soap:operation soapAction=""/>
@@ -246,7 +237,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLimit">
+    <operation name="pullExecStatistics">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -255,7 +246,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getRunnerOptions">
+    <operation name="getPresets">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -264,7 +255,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getPresets">
+    <operation name="getLimits">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -273,7 +264,16 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLimits">
+    <operation name="getLimit">
+      <soap:operation soapAction=""/>
+      <input>
+        <soap:body use="literal"/>
+      </input>
+      <output>
+        <soap:body use="literal"/>
+      </output>
+    </operation>
+    <operation name="getRunnerOptions">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
diff --git a/webservices/compbio/ws/server/resource/JpredWS_schema1.xsd b/webservices/compbio/ws/server/resource/JpredWS_schema1.xsd
index f62aefc..8a7c93f 100644 (file)
--- a/webservices/compbio/ws/server/resource/JpredWS_schema1.xsd
+++ b/webservices/compbio/ws/server/resource/JpredWS_schema1.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<xs:schema version="1.0" targetNamespace="http://msa.data.compbio/01/12/2010/" xmlns:tns="http://msa.data.compbio/01/12/2010/" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:schema version="1.0" targetNamespace="http://msa.data.compbio/01/01/2010/" xmlns:tns="http://msa.data.compbio/01/01/2010/" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
   <xs:element name="JobSubmissionException" type="tns:JobSubmissionException"/>
 
@@ -11,21 +11,17 @@
 
   <xs:element name="WrongParameterException" type="tns:WrongParameterException"/>
 
-  <xs:element name="analize" type="tns:analize"/>
+  <xs:element name="align" type="tns:align"/>
 
-  <xs:element name="analizeResponse" type="tns:analizeResponse"/>
+  <xs:element name="alignResponse" type="tns:alignResponse"/>
 
   <xs:element name="cancelJob" type="tns:cancelJob"/>
 
   <xs:element name="cancelJobResponse" type="tns:cancelJobResponse"/>
 
-  <xs:element name="customAnalize" type="tns:customAnalize"/>
+  <xs:element name="customAlign" type="tns:customAlign"/>
 
-  <xs:element name="customAnalizeResponse" type="tns:customAnalizeResponse"/>
-
-  <xs:element name="getAnnotation" type="tns:getAnnotation"/>
-
-  <xs:element name="getAnnotationResponse" type="tns:getAnnotationResponse"/>
+  <xs:element name="customAlignResponse" type="tns:customAlignResponse"/>
 
   <xs:element name="getJobStatus" type="tns:getJobStatus"/>
 
@@ -43,15 +39,19 @@
 
   <xs:element name="getPresetsResponse" type="tns:getPresetsResponse"/>
 
+  <xs:element name="getResult" type="tns:getResult"/>
+
+  <xs:element name="getResultResponse" type="tns:getResultResponse"/>
+
   <xs:element name="getRunnerOptions" type="tns:getRunnerOptions"/>
 
   <xs:element name="getRunnerOptionsResponse" type="tns:getRunnerOptionsResponse"/>
 
   <xs:element name="limits" type="tns:limitsManager"/>
 
-  <xs:element name="presetAnalize" type="tns:presetAnalize"/>
+  <xs:element name="presetAlign" type="tns:presetAlign"/>
 
-  <xs:element name="presetAnalizeResponse" type="tns:presetAnalizeResponse"/>
+  <xs:element name="presetAlignResponse" type="tns:presetAlignResponse"/>
 
   <xs:element name="presets" type="tns:presetManager"/>
 
@@ -61,10 +61,9 @@
 
   <xs:element name="runnerConfig" type="tns:runnerConfig"/>
 
-  <xs:complexType name="customAnalize">
+  <xs:complexType name="align">
     <xs:sequence>
       <xs:element name="fastaSequences" type="tns:fastaSequence" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="options" type="tns:option" minOccurs="0" maxOccurs="unbounded"/>
     </xs:sequence>
   </xs:complexType>
 
@@ -75,18 +74,7 @@
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="option">
-    <xs:sequence>
-      <xs:element name="description" type="xs:string"/>
-      <xs:element name="optionNames" type="xs:string" maxOccurs="unbounded"/>
-      <xs:element name="name" type="xs:string"/>
-      <xs:element name="furtherDetails" type="xs:anyURI" minOccurs="0"/>
-      <xs:element name="defaultValue" type="xs:string" minOccurs="0"/>
-    </xs:sequence>
-    <xs:attribute name="isRequired" type="xs:boolean" use="required"/>
-  </xs:complexType>
-
-  <xs:complexType name="customAnalizeResponse">
+  <xs:complexType name="alignResponse">
     <xs:sequence>
       <xs:element name="return" type="xs:string" minOccurs="0"/>
     </xs:sequence>
@@ -114,47 +102,33 @@
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="WrongParameterException">
+  <xs:complexType name="customAlign">
     <xs:sequence>
-      <xs:element name="message" type="xs:string" minOccurs="0"/>
+      <xs:element name="fastaSequences" type="tns:fastaSequence" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="options" type="tns:option" minOccurs="0" maxOccurs="unbounded"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getRunnerOptions">
-    <xs:sequence/>
-  </xs:complexType>
-
-  <xs:complexType name="getRunnerOptionsResponse">
+  <xs:complexType name="option">
     <xs:sequence>
-      <xs:element name="return" type="tns:runnerConfig" minOccurs="0"/>
+      <xs:element name="description" type="xs:string"/>
+      <xs:element name="optionNames" type="xs:string" maxOccurs="unbounded"/>
+      <xs:element name="name" type="xs:string"/>
+      <xs:element name="furtherDetails" type="xs:anyURI" minOccurs="0"/>
+      <xs:element name="defaultValue" type="xs:string" minOccurs="0"/>
     </xs:sequence>
+    <xs:attribute name="isRequired" type="xs:boolean" use="required"/>
   </xs:complexType>
 
-  <xs:complexType name="runnerConfig">
+  <xs:complexType name="customAlignResponse">
     <xs:sequence>
-      <xs:element name="options" type="tns:option" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="parameters" type="tns:parameter" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="prmSeparator" type="xs:string" minOccurs="0"/>
-      <xs:element name="runnerClassName" type="xs:string"/>
+      <xs:element name="return" type="xs:string" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="parameter">
-    <xs:complexContent>
-      <xs:extension base="tns:option">
-        <xs:sequence>
-          <xs:element name="possibleValues" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-          <xs:element name="validValue" type="tns:valueConstrain" minOccurs="0"/>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name="valueConstrain">
+  <xs:complexType name="WrongParameterException">
     <xs:sequence>
-      <xs:element name="type" type="tns:type"/>
-      <xs:element name="max" type="xs:string" minOccurs="0"/>
-      <xs:element name="min" type="xs:string" minOccurs="0"/>
+      <xs:element name="message" type="xs:string" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
@@ -178,19 +152,7 @@
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getJobStatus">
-    <xs:sequence>
-      <xs:element name="jobId" type="xs:string" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="getJobStatusResponse">
-    <xs:sequence>
-      <xs:element name="return" type="tns:jobStatus" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="presetAnalize">
+  <xs:complexType name="presetAlign">
     <xs:sequence>
       <xs:element name="fastaSequences" type="tns:fastaSequence" minOccurs="0" maxOccurs="unbounded"/>
       <xs:element name="preset" type="tns:preset" minOccurs="0"/>
@@ -211,134 +173,158 @@
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="presetAnalizeResponse">
+  <xs:complexType name="presetAlignResponse">
     <xs:sequence>
       <xs:element name="return" type="xs:string" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getAnnotation">
+  <xs:complexType name="getLimit">
     <xs:sequence>
-      <xs:element name="jobId" type="xs:string" minOccurs="0"/>
+      <xs:element name="presetName" type="xs:string" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getAnnotationResponse">
+  <xs:complexType name="getLimitResponse">
     <xs:sequence>
-      <xs:element name="return" type="tns:scoreManager" minOccurs="0"/>
+      <xs:element name="return" type="tns:limit" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="scoreManager">
+  <xs:complexType name="limit">
     <xs:sequence>
-      <xs:element name="seqScores" type="tns:scoreHolder" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="preset" type="xs:string" minOccurs="0"/>
+      <xs:element name="seqNumber" type="xs:int"/>
+      <xs:element name="seqLength" type="xs:int"/>
     </xs:sequence>
+    <xs:attribute name="isDefault" type="xs:boolean" use="required"/>
+  </xs:complexType>
+
+  <xs:complexType name="getLimits">
+    <xs:sequence/>
   </xs:complexType>
 
-  <xs:complexType name="scoreHolder">
+  <xs:complexType name="getLimitsResponse">
     <xs:sequence>
-      <xs:element name="id" type="xs:string" minOccurs="0"/>
-      <xs:element name="scores" type="tns:score" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="return" type="tns:limitsManager" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="score">
+  <xs:complexType name="limitsManager">
     <xs:sequence>
-      <xs:element name="method" type="xs:string" minOccurs="0"/>
-      <xs:element name="ranges" type="tns:range" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="scores" type="xs:float" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="runnerClassName" type="xs:string" minOccurs="0"/>
+      <xs:element name="limit" type="tns:limit" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="range">
+  <xs:complexType name="getPresets">
+    <xs:sequence/>
+  </xs:complexType>
+
+  <xs:complexType name="getPresetsResponse">
     <xs:sequence>
-      <xs:element name="from" type="xs:int"/>
-      <xs:element name="to" type="xs:int"/>
+      <xs:element name="return" type="tns:presetManager" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="ResultNotAvailableException">
+  <xs:complexType name="presetManager">
     <xs:sequence>
-      <xs:element name="message" type="xs:string" minOccurs="0"/>
+      <xs:element name="runnerClassName" type="xs:string"/>
+      <xs:element name="preset" type="tns:preset" maxOccurs="unbounded"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getLimits">
-    <xs:sequence/>
+  <xs:complexType name="cancelJob">
+    <xs:sequence>
+      <xs:element name="jobId" type="xs:string" minOccurs="0"/>
+    </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getLimitsResponse">
+  <xs:complexType name="cancelJobResponse">
     <xs:sequence>
-      <xs:element name="return" type="tns:limitsManager" minOccurs="0"/>
+      <xs:element name="return" type="xs:boolean"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="limitsManager">
+  <xs:complexType name="getRunnerOptions">
+    <xs:sequence/>
+  </xs:complexType>
+
+  <xs:complexType name="getRunnerOptionsResponse">
     <xs:sequence>
-      <xs:element name="runnerClassName" type="xs:string" minOccurs="0"/>
-      <xs:element name="limit" type="tns:limit" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="return" type="tns:runnerConfig" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="limit">
+  <xs:complexType name="runnerConfig">
     <xs:sequence>
-      <xs:element name="preset" type="xs:string" minOccurs="0"/>
-      <xs:element name="seqNumber" type="xs:int"/>
-      <xs:element name="seqLength" type="xs:int"/>
+      <xs:element name="options" type="tns:option" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="parameters" type="tns:parameter" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="prmSeparator" type="xs:string" minOccurs="0"/>
+      <xs:element name="runnerClassName" type="xs:string"/>
     </xs:sequence>
-    <xs:attribute name="isDefault" type="xs:boolean" use="required"/>
   </xs:complexType>
 
-  <xs:complexType name="getPresets">
-    <xs:sequence/>
+  <xs:complexType name="parameter">
+    <xs:complexContent>
+      <xs:extension base="tns:option">
+        <xs:sequence>
+          <xs:element name="possibleValues" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+          <xs:element name="validValue" type="tns:valueConstrain" minOccurs="0"/>
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
   </xs:complexType>
 
-  <xs:complexType name="getPresetsResponse">
+  <xs:complexType name="valueConstrain">
     <xs:sequence>
-      <xs:element name="return" type="tns:presetManager" minOccurs="0"/>
+      <xs:element name="type" type="tns:type"/>
+      <xs:element name="max" type="xs:string" minOccurs="0"/>
+      <xs:element name="min" type="xs:string" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="presetManager">
+  <xs:complexType name="getResult">
     <xs:sequence>
-      <xs:element name="runnerClassName" type="xs:string"/>
-      <xs:element name="preset" type="tns:preset" maxOccurs="unbounded"/>
+      <xs:element name="jobId" type="xs:string" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getLimit">
+  <xs:complexType name="getResultResponse">
     <xs:sequence>
-      <xs:element name="presetName" type="xs:string" minOccurs="0"/>
+      <xs:element name="return" type="tns:alignment" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getLimitResponse">
+  <xs:complexType name="alignment">
     <xs:sequence>
-      <xs:element name="return" type="tns:limit" minOccurs="0"/>
+      <xs:element name="metadata" type="tns:alignmentMetadata" minOccurs="0"/>
+      <xs:element name="sequences" type="tns:fastaSequence" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="cancelJob">
+  <xs:complexType name="alignmentMetadata">
     <xs:sequence>
-      <xs:element name="jobId" type="xs:string" minOccurs="0"/>
+      <xs:element name="program" type="tns:program" minOccurs="0"/>
+      <xs:element name="gapchar" type="xs:unsignedShort"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="cancelJobResponse">
+  <xs:complexType name="ResultNotAvailableException">
     <xs:sequence>
-      <xs:element name="return" type="xs:boolean"/>
+      <xs:element name="message" type="xs:string" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="analize">
+  <xs:complexType name="getJobStatus">
     <xs:sequence>
-      <xs:element name="fastaSequences" type="tns:fastaSequence" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="jobId" type="xs:string" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="analizeResponse">
+  <xs:complexType name="getJobStatusResponse">
     <xs:sequence>
-      <xs:element name="return" type="xs:string" minOccurs="0"/>
+      <xs:element name="return" type="tns:jobStatus" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
@@ -349,6 +335,17 @@
     </xs:restriction>
   </xs:simpleType>
 
+  <xs:simpleType name="program">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="CLUSTAL"/>
+      <xs:enumeration value="MAFFT"/>
+      <xs:enumeration value="MUSCLE"/>
+      <xs:enumeration value="Tcoffee"/>
+      <xs:enumeration value="Probcons"/>
+      <xs:enumeration value="Jpred"/>
+    </xs:restriction>
+  </xs:simpleType>
+
   <xs:simpleType name="jobStatus">
     <xs:restriction base="xs:string">
       <xs:enumeration value="PENDING"/>
diff --git a/webservices/compbio/ws/server/resource/JronnWS.wsdl b/webservices/compbio/ws/server/resource/JronnWS.wsdl
index 7e75453..b109393 100644 (file)
--- a/webservices/compbio/ws/server/resource/JronnWS.wsdl
+++ b/webservices/compbio/ws/server/resource/JronnWS.wsdl
@@ -45,12 +45,6 @@
   <message name="presetAnalizeResponse">
     <part name="parameters" element="tns:presetAnalizeResponse"/>
   </message>
-  <message name="pullExecStatistics">
-    <part name="parameters" element="tns:pullExecStatistics"/>
-  </message>
-  <message name="pullExecStatisticsResponse">
-    <part name="parameters" element="tns:pullExecStatisticsResponse"/>
-  </message>
   <message name="cancelJob">
     <part name="parameters" element="tns:cancelJob"/>
   </message>
@@ -63,17 +57,11 @@
   <message name="getJobStatusResponse">
     <part name="parameters" element="tns:getJobStatusResponse"/>
   </message>
-  <message name="getLimit">
-    <part name="parameters" element="tns:getLimit"/>
-  </message>
-  <message name="getLimitResponse">
-    <part name="parameters" element="tns:getLimitResponse"/>
-  </message>
-  <message name="getRunnerOptions">
-    <part name="parameters" element="tns:getRunnerOptions"/>
+  <message name="pullExecStatistics">
+    <part name="parameters" element="tns:pullExecStatistics"/>
   </message>
-  <message name="getRunnerOptionsResponse">
-    <part name="parameters" element="tns:getRunnerOptionsResponse"/>
+  <message name="pullExecStatisticsResponse">
+    <part name="parameters" element="tns:pullExecStatisticsResponse"/>
   </message>
   <message name="getPresets">
     <part name="parameters" element="tns:getPresets"/>
@@ -87,6 +75,18 @@
   <message name="getLimitsResponse">
     <part name="parameters" element="tns:getLimitsResponse"/>
   </message>
+  <message name="getLimit">
+    <part name="parameters" element="tns:getLimit"/>
+  </message>
+  <message name="getLimitResponse">
+    <part name="parameters" element="tns:getLimitResponse"/>
+  </message>
+  <message name="getRunnerOptions">
+    <part name="parameters" element="tns:getRunnerOptions"/>
+  </message>
+  <message name="getRunnerOptionsResponse">
+    <part name="parameters" element="tns:getRunnerOptionsResponse"/>
+  </message>
   <portType name="SequenceAnnotation">
     <operation name="getAnnotation">
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationRequest" message="tns:getAnnotation"/>
@@ -116,10 +116,6 @@
       <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="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"/>
@@ -128,13 +124,9 @@
       <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"/>
     </operation>
-    <operation name="getLimit">
-      <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="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="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="getPresets">
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getPresetsRequest" message="tns:getPresets"/>
@@ -144,6 +136,14 @@
       <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>
+    <operation name="getLimit">
+      <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="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>
   </portType>
   <binding name="JronnWSPortBinding" type="tns:SequenceAnnotation">
     <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
@@ -219,7 +219,7 @@
         <soap:fault name="WrongParameterException" use="literal"/>
       </fault>
     </operation>
-    <operation name="pullExecStatistics">
+    <operation name="cancelJob">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -228,7 +228,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="cancelJob">
+    <operation name="getJobStatus">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -237,7 +237,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getJobStatus">
+    <operation name="pullExecStatistics">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -246,7 +246,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLimit">
+    <operation name="getPresets">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -255,7 +255,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getRunnerOptions">
+    <operation name="getLimits">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -264,7 +264,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getPresets">
+    <operation name="getLimit">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -273,7 +273,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLimits">
+    <operation name="getRunnerOptions">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
diff --git a/webservices/compbio/ws/server/resource/JronnWS_schema1.xsd b/webservices/compbio/ws/server/resource/JronnWS_schema1.xsd
index 99b9b4d..a9becf7 100644 (file)
--- a/webservices/compbio/ws/server/resource/JronnWS_schema1.xsd
+++ b/webservices/compbio/ws/server/resource/JronnWS_schema1.xsd
@@ -255,20 +255,15 @@
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getLimits">
-    <xs:sequence/>
-  </xs:complexType>
-
-  <xs:complexType name="getLimitsResponse">
+  <xs:complexType name="getLimit">
     <xs:sequence>
-      <xs:element name="return" type="tns:limitsManager" minOccurs="0"/>
+      <xs:element name="presetName" type="xs:string" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="limitsManager">
+  <xs:complexType name="getLimitResponse">
     <xs:sequence>
-      <xs:element name="runnerClassName" type="xs:string" minOccurs="0"/>
-      <xs:element name="limit" type="tns:limit" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="return" type="tns:limit" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
@@ -281,32 +276,37 @@
     <xs:attribute name="isDefault" type="xs:boolean" use="required"/>
   </xs:complexType>
 
-  <xs:complexType name="getPresets">
+  <xs:complexType name="getLimits">
     <xs:sequence/>
   </xs:complexType>
 
-  <xs:complexType name="getPresetsResponse">
+  <xs:complexType name="getLimitsResponse">
     <xs:sequence>
-      <xs:element name="return" type="tns:presetManager" minOccurs="0"/>
+      <xs:element name="return" type="tns:limitsManager" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="presetManager">
+  <xs:complexType name="limitsManager">
     <xs:sequence>
-      <xs:element name="runnerClassName" type="xs:string"/>
-      <xs:element name="preset" type="tns:preset" maxOccurs="unbounded"/>
+      <xs:element name="runnerClassName" type="xs:string" minOccurs="0"/>
+      <xs:element name="limit" type="tns:limit" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getLimit">
+  <xs:complexType name="getPresets">
+    <xs:sequence/>
+  </xs:complexType>
+
+  <xs:complexType name="getPresetsResponse">
     <xs:sequence>
-      <xs:element name="presetName" type="xs:string" minOccurs="0"/>
+      <xs:element name="return" type="tns:presetManager" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getLimitResponse">
+  <xs:complexType name="presetManager">
     <xs:sequence>
-      <xs:element name="return" type="tns:limit" minOccurs="0"/>
+      <xs:element name="runnerClassName" type="xs:string"/>
+      <xs:element name="preset" type="tns:preset" maxOccurs="unbounded"/>
     </xs:sequence>
   </xs:complexType>
 
diff --git a/webservices/compbio/ws/server/resource/MafftWS.wsdl b/webservices/compbio/ws/server/resource/MafftWS.wsdl
index a642f71..0a9063c 100644 (file)
--- a/webservices/compbio/ws/server/resource/MafftWS.wsdl
+++ b/webservices/compbio/ws/server/resource/MafftWS.wsdl
@@ -6,15 +6,6 @@
       <xsd:import namespace="http://msa.data.compbio/01/01/2010/" schemaLocation="MafftWS_schema1.xsd"/>
     </xsd:schema>
   </types>
-  <message name="getResult">
-    <part name="parameters" element="tns:getResult"/>
-  </message>
-  <message name="getResultResponse">
-    <part name="parameters" element="tns:getResultResponse"/>
-  </message>
-  <message name="ResultNotAvailableException">
-    <part name="fault" element="tns:ResultNotAvailableException"/>
-  </message>
   <message name="align">
     <part name="parameters" element="tns:align"/>
   </message>
@@ -45,11 +36,14 @@
   <message name="customAlignResponse">
     <part name="parameters" element="tns:customAlignResponse"/>
   </message>
-  <message name="pullExecStatistics">
-    <part name="parameters" element="tns:pullExecStatistics"/>
+  <message name="getResult">
+    <part name="parameters" element="tns:getResult"/>
   </message>
-  <message name="pullExecStatisticsResponse">
-    <part name="parameters" element="tns:pullExecStatisticsResponse"/>
+  <message name="getResultResponse">
+    <part name="parameters" element="tns:getResultResponse"/>
+  </message>
+  <message name="ResultNotAvailableException">
+    <part name="fault" element="tns:ResultNotAvailableException"/>
   </message>
   <message name="cancelJob">
     <part name="parameters" element="tns:cancelJob"/>
@@ -63,17 +57,11 @@
   <message name="getJobStatusResponse">
     <part name="parameters" element="tns:getJobStatusResponse"/>
   </message>
-  <message name="getLimit">
-    <part name="parameters" element="tns:getLimit"/>
-  </message>
-  <message name="getLimitResponse">
-    <part name="parameters" element="tns:getLimitResponse"/>
-  </message>
-  <message name="getRunnerOptions">
-    <part name="parameters" element="tns:getRunnerOptions"/>
+  <message name="pullExecStatistics">
+    <part name="parameters" element="tns:pullExecStatistics"/>
   </message>
-  <message name="getRunnerOptionsResponse">
-    <part name="parameters" element="tns:getRunnerOptionsResponse"/>
+  <message name="pullExecStatisticsResponse">
+    <part name="parameters" element="tns:pullExecStatisticsResponse"/>
   </message>
   <message name="getPresets">
     <part name="parameters" element="tns:getPresets"/>
@@ -87,12 +75,19 @@
   <message name="getLimitsResponse">
     <part name="parameters" element="tns:getLimitsResponse"/>
   </message>
+  <message name="getLimit">
+    <part name="parameters" element="tns:getLimit"/>
+  </message>
+  <message name="getLimitResponse">
+    <part name="parameters" element="tns:getLimitResponse"/>
+  </message>
+  <message name="getRunnerOptions">
+    <part name="parameters" element="tns:getRunnerOptions"/>
+  </message>
+  <message name="getRunnerOptionsResponse">
+    <part name="parameters" element="tns:getRunnerOptionsResponse"/>
+  </message>
   <portType name="MsaWS">
-    <operation name="getResult">
-      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getResultRequest" message="tns:getResult"/>
-      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getResultResponse" message="tns:getResultResponse"/>
-      <fault message="tns:ResultNotAvailableException" name="ResultNotAvailableException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getResult/Fault/ResultNotAvailableException"/>
-    </operation>
     <operation name="align">
       <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/alignRequest" message="tns:align"/>
       <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/alignResponse" message="tns:alignResponse"/>
@@ -116,9 +111,10 @@
       <fault message="tns:JobSubmissionException" name="JobSubmissionException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/customAlign/Fault/JobSubmissionException"/>
       <fault message="tns:WrongParameterException" name="WrongParameterException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/customAlign/Fault/WrongParameterException"/>
     </operation>
-    <operation name="pullExecStatistics">
-      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/pullExecStatisticsRequest" message="tns:pullExecStatistics"/>
-      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/pullExecStatisticsResponse" message="tns:pullExecStatisticsResponse"/>
+    <operation name="getResult">
+      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getResultRequest" message="tns:getResult"/>
+      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getResultResponse" message="tns:getResultResponse"/>
+      <fault message="tns:ResultNotAvailableException" name="ResultNotAvailableException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getResult/Fault/ResultNotAvailableException"/>
     </operation>
     <operation name="cancelJob">
       <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/cancelJobRequest" message="tns:cancelJob"/>
@@ -128,13 +124,9 @@
       <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getJobStatusRequest" message="tns:getJobStatus"/>
       <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getJobStatusResponse" message="tns:getJobStatusResponse"/>
     </operation>
-    <operation name="getLimit">
-      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitRequest" message="tns:getLimit"/>
-      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitResponse" message="tns:getLimitResponse"/>
-    </operation>
-    <operation name="getRunnerOptions">
-      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getRunnerOptionsRequest" message="tns:getRunnerOptions"/>
-      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getRunnerOptionsResponse" message="tns:getRunnerOptionsResponse"/>
+    <operation name="pullExecStatistics">
+      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/pullExecStatisticsRequest" message="tns:pullExecStatistics"/>
+      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/pullExecStatisticsResponse" message="tns:pullExecStatisticsResponse"/>
     </operation>
     <operation name="getPresets">
       <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getPresetsRequest" message="tns:getPresets"/>
@@ -144,21 +136,17 @@
       <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitsRequest" message="tns:getLimits"/>
       <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitsResponse" message="tns:getLimitsResponse"/>
     </operation>
+    <operation name="getLimit">
+      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitRequest" message="tns:getLimit"/>
+      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitResponse" message="tns:getLimitResponse"/>
+    </operation>
+    <operation name="getRunnerOptions">
+      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getRunnerOptionsRequest" message="tns:getRunnerOptions"/>
+      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getRunnerOptionsResponse" message="tns:getRunnerOptionsResponse"/>
+    </operation>
   </portType>
   <binding name="MafftWSPortBinding" type="tns:MsaWS">
     <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
-    <operation name="getResult">
-      <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="align">
       <soap:operation soapAction=""/>
       <input>
@@ -219,7 +207,7 @@
         <soap:fault name="WrongParameterException" use="literal"/>
       </fault>
     </operation>
-    <operation name="pullExecStatistics">
+    <operation name="getResult">
       <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="cancelJob">
       <soap:operation soapAction=""/>
@@ -246,7 +237,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLimit">
+    <operation name="pullExecStatistics">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -255,7 +246,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getRunnerOptions">
+    <operation name="getPresets">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -264,7 +255,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getPresets">
+    <operation name="getLimits">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -273,7 +264,16 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLimits">
+    <operation name="getLimit">
+      <soap:operation soapAction=""/>
+      <input>
+        <soap:body use="literal"/>
+      </input>
+      <output>
+        <soap:body use="literal"/>
+      </output>
+    </operation>
+    <operation name="getRunnerOptions">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
diff --git a/webservices/compbio/ws/server/resource/MafftWS_schema1.xsd b/webservices/compbio/ws/server/resource/MafftWS_schema1.xsd
index 7fb84b1..99e928a 100644 (file)
--- a/webservices/compbio/ws/server/resource/MafftWS_schema1.xsd
+++ b/webservices/compbio/ws/server/resource/MafftWS_schema1.xsd
@@ -134,7 +134,7 @@
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="alignment" final="extension restriction">
+  <xs:complexType name="alignment">
     <xs:sequence>
       <xs:element name="metadata" type="tns:alignmentMetadata" minOccurs="0"/>
       <xs:element name="sequences" type="tns:fastaSequence" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
@@ -161,20 +161,15 @@
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getLimits">
-    <xs:sequence/>
-  </xs:complexType>
-
-  <xs:complexType name="getLimitsResponse">
+  <xs:complexType name="getLimit">
     <xs:sequence>
-      <xs:element name="return" type="tns:limitsManager" minOccurs="0"/>
+      <xs:element name="presetName" type="xs:string" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="limitsManager">
+  <xs:complexType name="getLimitResponse">
     <xs:sequence>
-      <xs:element name="runnerClassName" type="xs:string" minOccurs="0"/>
-      <xs:element name="limit" type="tns:limit" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="return" type="tns:limit" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
@@ -187,6 +182,23 @@
     <xs:attribute name="isDefault" type="xs:boolean" use="required"/>
   </xs:complexType>
 
+  <xs:complexType name="getLimits">
+    <xs:sequence/>
+  </xs:complexType>
+
+  <xs:complexType name="getLimitsResponse">
+    <xs:sequence>
+      <xs:element name="return" type="tns:limitsManager" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="limitsManager">
+    <xs:sequence>
+      <xs:element name="runnerClassName" type="xs:string" minOccurs="0"/>
+      <xs:element name="limit" type="tns:limit" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+
   <xs:complexType name="getPresets">
     <xs:sequence/>
   </xs:complexType>
@@ -218,18 +230,6 @@
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getLimit">
-    <xs:sequence>
-      <xs:element name="presetName" type="xs:string" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="getLimitResponse">
-    <xs:sequence>
-      <xs:element name="return" type="tns:limit" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-
   <xs:complexType name="cancelJob">
     <xs:sequence>
       <xs:element name="jobId" type="xs:string" minOccurs="0"/>
diff --git a/webservices/compbio/ws/server/resource/MuscleWS.wsdl b/webservices/compbio/ws/server/resource/MuscleWS.wsdl
index 274dfb7..a9f7bc7 100644 (file)
--- a/webservices/compbio/ws/server/resource/MuscleWS.wsdl
+++ b/webservices/compbio/ws/server/resource/MuscleWS.wsdl
@@ -6,15 +6,6 @@
       <xsd:import namespace="http://msa.data.compbio/01/01/2010/" schemaLocation="MuscleWS_schema1.xsd"/>
     </xsd:schema>
   </types>
-  <message name="getResult">
-    <part name="parameters" element="tns:getResult"/>
-  </message>
-  <message name="getResultResponse">
-    <part name="parameters" element="tns:getResultResponse"/>
-  </message>
-  <message name="ResultNotAvailableException">
-    <part name="fault" element="tns:ResultNotAvailableException"/>
-  </message>
   <message name="align">
     <part name="parameters" element="tns:align"/>
   </message>
@@ -45,11 +36,14 @@
   <message name="customAlignResponse">
     <part name="parameters" element="tns:customAlignResponse"/>
   </message>
-  <message name="pullExecStatistics">
-    <part name="parameters" element="tns:pullExecStatistics"/>
+  <message name="getResult">
+    <part name="parameters" element="tns:getResult"/>
   </message>
-  <message name="pullExecStatisticsResponse">
-    <part name="parameters" element="tns:pullExecStatisticsResponse"/>
+  <message name="getResultResponse">
+    <part name="parameters" element="tns:getResultResponse"/>
+  </message>
+  <message name="ResultNotAvailableException">
+    <part name="fault" element="tns:ResultNotAvailableException"/>
   </message>
   <message name="cancelJob">
     <part name="parameters" element="tns:cancelJob"/>
@@ -63,17 +57,11 @@
   <message name="getJobStatusResponse">
     <part name="parameters" element="tns:getJobStatusResponse"/>
   </message>
-  <message name="getLimit">
-    <part name="parameters" element="tns:getLimit"/>
-  </message>
-  <message name="getLimitResponse">
-    <part name="parameters" element="tns:getLimitResponse"/>
-  </message>
-  <message name="getRunnerOptions">
-    <part name="parameters" element="tns:getRunnerOptions"/>
+  <message name="pullExecStatistics">
+    <part name="parameters" element="tns:pullExecStatistics"/>
   </message>
-  <message name="getRunnerOptionsResponse">
-    <part name="parameters" element="tns:getRunnerOptionsResponse"/>
+  <message name="pullExecStatisticsResponse">
+    <part name="parameters" element="tns:pullExecStatisticsResponse"/>
   </message>
   <message name="getPresets">
     <part name="parameters" element="tns:getPresets"/>
@@ -87,12 +75,19 @@
   <message name="getLimitsResponse">
     <part name="parameters" element="tns:getLimitsResponse"/>
   </message>
+  <message name="getLimit">
+    <part name="parameters" element="tns:getLimit"/>
+  </message>
+  <message name="getLimitResponse">
+    <part name="parameters" element="tns:getLimitResponse"/>
+  </message>
+  <message name="getRunnerOptions">
+    <part name="parameters" element="tns:getRunnerOptions"/>
+  </message>
+  <message name="getRunnerOptionsResponse">
+    <part name="parameters" element="tns:getRunnerOptionsResponse"/>
+  </message>
   <portType name="MsaWS">
-    <operation name="getResult">
-      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getResultRequest" message="tns:getResult"/>
-      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getResultResponse" message="tns:getResultResponse"/>
-      <fault message="tns:ResultNotAvailableException" name="ResultNotAvailableException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getResult/Fault/ResultNotAvailableException"/>
-    </operation>
     <operation name="align">
       <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/alignRequest" message="tns:align"/>
       <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/alignResponse" message="tns:alignResponse"/>
@@ -116,9 +111,10 @@
       <fault message="tns:JobSubmissionException" name="JobSubmissionException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/customAlign/Fault/JobSubmissionException"/>
       <fault message="tns:WrongParameterException" name="WrongParameterException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/customAlign/Fault/WrongParameterException"/>
     </operation>
-    <operation name="pullExecStatistics">
-      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/pullExecStatisticsRequest" message="tns:pullExecStatistics"/>
-      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/pullExecStatisticsResponse" message="tns:pullExecStatisticsResponse"/>
+    <operation name="getResult">
+      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getResultRequest" message="tns:getResult"/>
+      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getResultResponse" message="tns:getResultResponse"/>
+      <fault message="tns:ResultNotAvailableException" name="ResultNotAvailableException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getResult/Fault/ResultNotAvailableException"/>
     </operation>
     <operation name="cancelJob">
       <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/cancelJobRequest" message="tns:cancelJob"/>
@@ -128,13 +124,9 @@
       <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getJobStatusRequest" message="tns:getJobStatus"/>
       <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getJobStatusResponse" message="tns:getJobStatusResponse"/>
     </operation>
-    <operation name="getLimit">
-      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitRequest" message="tns:getLimit"/>
-      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitResponse" message="tns:getLimitResponse"/>
-    </operation>
-    <operation name="getRunnerOptions">
-      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getRunnerOptionsRequest" message="tns:getRunnerOptions"/>
-      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getRunnerOptionsResponse" message="tns:getRunnerOptionsResponse"/>
+    <operation name="pullExecStatistics">
+      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/pullExecStatisticsRequest" message="tns:pullExecStatistics"/>
+      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/pullExecStatisticsResponse" message="tns:pullExecStatisticsResponse"/>
     </operation>
     <operation name="getPresets">
       <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getPresetsRequest" message="tns:getPresets"/>
@@ -144,21 +136,17 @@
       <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitsRequest" message="tns:getLimits"/>
       <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitsResponse" message="tns:getLimitsResponse"/>
     </operation>
+    <operation name="getLimit">
+      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitRequest" message="tns:getLimit"/>
+      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitResponse" message="tns:getLimitResponse"/>
+    </operation>
+    <operation name="getRunnerOptions">
+      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getRunnerOptionsRequest" message="tns:getRunnerOptions"/>
+      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getRunnerOptionsResponse" message="tns:getRunnerOptionsResponse"/>
+    </operation>
   </portType>
   <binding name="MuscleWSPortBinding" type="tns:MsaWS">
     <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
-    <operation name="getResult">
-      <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="align">
       <soap:operation soapAction=""/>
       <input>
@@ -219,7 +207,7 @@
         <soap:fault name="WrongParameterException" use="literal"/>
       </fault>
     </operation>
-    <operation name="pullExecStatistics">
+    <operation name="getResult">
       <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="cancelJob">
       <soap:operation soapAction=""/>
@@ -246,7 +237,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLimit">
+    <operation name="pullExecStatistics">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -255,7 +246,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getRunnerOptions">
+    <operation name="getPresets">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -264,7 +255,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getPresets">
+    <operation name="getLimits">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -273,7 +264,16 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLimits">
+    <operation name="getLimit">
+      <soap:operation soapAction=""/>
+      <input>
+        <soap:body use="literal"/>
+      </input>
+      <output>
+        <soap:body use="literal"/>
+      </output>
+    </operation>
+    <operation name="getRunnerOptions">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
diff --git a/webservices/compbio/ws/server/resource/MuscleWS_schema1.xsd b/webservices/compbio/ws/server/resource/MuscleWS_schema1.xsd
index 3df6d4e..c32281e 100644 (file)
--- a/webservices/compbio/ws/server/resource/MuscleWS_schema1.xsd
+++ b/webservices/compbio/ws/server/resource/MuscleWS_schema1.xsd
@@ -152,20 +152,15 @@
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getLimits">
-    <xs:sequence/>
-  </xs:complexType>
-
-  <xs:complexType name="getLimitsResponse">
+  <xs:complexType name="getLimit">
     <xs:sequence>
-      <xs:element name="return" type="tns:limitsManager" minOccurs="0"/>
+      <xs:element name="presetName" type="xs:string" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="limitsManager">
+  <xs:complexType name="getLimitResponse">
     <xs:sequence>
-      <xs:element name="runnerClassName" type="xs:string" minOccurs="0"/>
-      <xs:element name="limit" type="tns:limit" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="return" type="tns:limit" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
@@ -178,6 +173,23 @@
     <xs:attribute name="isDefault" type="xs:boolean" use="required"/>
   </xs:complexType>
 
+  <xs:complexType name="getLimits">
+    <xs:sequence/>
+  </xs:complexType>
+
+  <xs:complexType name="getLimitsResponse">
+    <xs:sequence>
+      <xs:element name="return" type="tns:limitsManager" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="limitsManager">
+    <xs:sequence>
+      <xs:element name="runnerClassName" type="xs:string" minOccurs="0"/>
+      <xs:element name="limit" type="tns:limit" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+
   <xs:complexType name="getPresets">
     <xs:sequence/>
   </xs:complexType>
@@ -209,18 +221,6 @@
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getLimit">
-    <xs:sequence>
-      <xs:element name="presetName" type="xs:string" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="getLimitResponse">
-    <xs:sequence>
-      <xs:element name="return" type="tns:limit" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-
   <xs:complexType name="cancelJob">
     <xs:sequence>
       <xs:element name="jobId" type="xs:string" minOccurs="0"/>
@@ -296,7 +296,7 @@
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="alignment" final="extension restriction">
+  <xs:complexType name="alignment">
     <xs:sequence>
       <xs:element name="metadata" type="tns:alignmentMetadata" minOccurs="0"/>
       <xs:element name="sequences" type="tns:fastaSequence" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
diff --git a/webservices/compbio/ws/server/resource/TcoffeeWS.wsdl b/webservices/compbio/ws/server/resource/TcoffeeWS.wsdl
index cfabcc6..00263ea 100644 (file)
--- a/webservices/compbio/ws/server/resource/TcoffeeWS.wsdl
+++ b/webservices/compbio/ws/server/resource/TcoffeeWS.wsdl
@@ -6,15 +6,6 @@
       <xsd:import namespace="http://msa.data.compbio/01/01/2010/" schemaLocation="TcoffeeWS_schema1.xsd"/>
     </xsd:schema>
   </types>
-  <message name="getResult">
-    <part name="parameters" element="tns:getResult"/>
-  </message>
-  <message name="getResultResponse">
-    <part name="parameters" element="tns:getResultResponse"/>
-  </message>
-  <message name="ResultNotAvailableException">
-    <part name="fault" element="tns:ResultNotAvailableException"/>
-  </message>
   <message name="align">
     <part name="parameters" element="tns:align"/>
   </message>
@@ -45,11 +36,14 @@
   <message name="customAlignResponse">
     <part name="parameters" element="tns:customAlignResponse"/>
   </message>
-  <message name="pullExecStatistics">
-    <part name="parameters" element="tns:pullExecStatistics"/>
+  <message name="getResult">
+    <part name="parameters" element="tns:getResult"/>
   </message>
-  <message name="pullExecStatisticsResponse">
-    <part name="parameters" element="tns:pullExecStatisticsResponse"/>
+  <message name="getResultResponse">
+    <part name="parameters" element="tns:getResultResponse"/>
+  </message>
+  <message name="ResultNotAvailableException">
+    <part name="fault" element="tns:ResultNotAvailableException"/>
   </message>
   <message name="cancelJob">
     <part name="parameters" element="tns:cancelJob"/>
@@ -63,17 +57,11 @@
   <message name="getJobStatusResponse">
     <part name="parameters" element="tns:getJobStatusResponse"/>
   </message>
-  <message name="getLimit">
-    <part name="parameters" element="tns:getLimit"/>
-  </message>
-  <message name="getLimitResponse">
-    <part name="parameters" element="tns:getLimitResponse"/>
-  </message>
-  <message name="getRunnerOptions">
-    <part name="parameters" element="tns:getRunnerOptions"/>
+  <message name="pullExecStatistics">
+    <part name="parameters" element="tns:pullExecStatistics"/>
   </message>
-  <message name="getRunnerOptionsResponse">
-    <part name="parameters" element="tns:getRunnerOptionsResponse"/>
+  <message name="pullExecStatisticsResponse">
+    <part name="parameters" element="tns:pullExecStatisticsResponse"/>
   </message>
   <message name="getPresets">
     <part name="parameters" element="tns:getPresets"/>
@@ -87,12 +75,19 @@
   <message name="getLimitsResponse">
     <part name="parameters" element="tns:getLimitsResponse"/>
   </message>
+  <message name="getLimit">
+    <part name="parameters" element="tns:getLimit"/>
+  </message>
+  <message name="getLimitResponse">
+    <part name="parameters" element="tns:getLimitResponse"/>
+  </message>
+  <message name="getRunnerOptions">
+    <part name="parameters" element="tns:getRunnerOptions"/>
+  </message>
+  <message name="getRunnerOptionsResponse">
+    <part name="parameters" element="tns:getRunnerOptionsResponse"/>
+  </message>
   <portType name="MsaWS">
-    <operation name="getResult">
-      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getResultRequest" message="tns:getResult"/>
-      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getResultResponse" message="tns:getResultResponse"/>
-      <fault message="tns:ResultNotAvailableException" name="ResultNotAvailableException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getResult/Fault/ResultNotAvailableException"/>
-    </operation>
     <operation name="align">
       <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/alignRequest" message="tns:align"/>
       <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/alignResponse" message="tns:alignResponse"/>
@@ -116,9 +111,10 @@
       <fault message="tns:JobSubmissionException" name="JobSubmissionException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/customAlign/Fault/JobSubmissionException"/>
       <fault message="tns:WrongParameterException" name="WrongParameterException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/customAlign/Fault/WrongParameterException"/>
     </operation>
-    <operation name="pullExecStatistics">
-      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/pullExecStatisticsRequest" message="tns:pullExecStatistics"/>
-      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/pullExecStatisticsResponse" message="tns:pullExecStatisticsResponse"/>
+    <operation name="getResult">
+      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getResultRequest" message="tns:getResult"/>
+      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getResultResponse" message="tns:getResultResponse"/>
+      <fault message="tns:ResultNotAvailableException" name="ResultNotAvailableException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getResult/Fault/ResultNotAvailableException"/>
     </operation>
     <operation name="cancelJob">
       <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/cancelJobRequest" message="tns:cancelJob"/>
@@ -128,13 +124,9 @@
       <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getJobStatusRequest" message="tns:getJobStatus"/>
       <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getJobStatusResponse" message="tns:getJobStatusResponse"/>
     </operation>
-    <operation name="getLimit">
-      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitRequest" message="tns:getLimit"/>
-      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitResponse" message="tns:getLimitResponse"/>
-    </operation>
-    <operation name="getRunnerOptions">
-      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getRunnerOptionsRequest" message="tns:getRunnerOptions"/>
-      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getRunnerOptionsResponse" message="tns:getRunnerOptionsResponse"/>
+    <operation name="pullExecStatistics">
+      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/pullExecStatisticsRequest" message="tns:pullExecStatistics"/>
+      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/pullExecStatisticsResponse" message="tns:pullExecStatisticsResponse"/>
     </operation>
     <operation name="getPresets">
       <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getPresetsRequest" message="tns:getPresets"/>
@@ -144,21 +136,17 @@
       <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitsRequest" message="tns:getLimits"/>
       <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitsResponse" message="tns:getLimitsResponse"/>
     </operation>
+    <operation name="getLimit">
+      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitRequest" message="tns:getLimit"/>
+      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitResponse" message="tns:getLimitResponse"/>
+    </operation>
+    <operation name="getRunnerOptions">
+      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getRunnerOptionsRequest" message="tns:getRunnerOptions"/>
+      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getRunnerOptionsResponse" message="tns:getRunnerOptionsResponse"/>
+    </operation>
   </portType>
   <binding name="TcoffeeWSPortBinding" type="tns:MsaWS">
     <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
-    <operation name="getResult">
-      <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="align">
       <soap:operation soapAction=""/>
       <input>
@@ -219,7 +207,7 @@
         <soap:fault name="WrongParameterException" use="literal"/>
       </fault>
     </operation>
-    <operation name="pullExecStatistics">
+    <operation name="getResult">
       <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="cancelJob">
       <soap:operation soapAction=""/>
@@ -246,7 +237,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLimit">
+    <operation name="pullExecStatistics">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -255,7 +246,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getRunnerOptions">
+    <operation name="getPresets">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -264,7 +255,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getPresets">
+    <operation name="getLimits">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -273,7 +264,16 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLimits">
+    <operation name="getLimit">
+      <soap:operation soapAction=""/>
+      <input>
+        <soap:body use="literal"/>
+      </input>
+      <output>
+        <soap:body use="literal"/>
+      </output>
+    </operation>
+    <operation name="getRunnerOptions">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
diff --git a/webservices/compbio/ws/server/resource/TcoffeeWS_schema1.xsd b/webservices/compbio/ws/server/resource/TcoffeeWS_schema1.xsd
index 0961427..b80961d 100644 (file)
--- a/webservices/compbio/ws/server/resource/TcoffeeWS_schema1.xsd
+++ b/webservices/compbio/ws/server/resource/TcoffeeWS_schema1.xsd
@@ -152,20 +152,15 @@
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getLimits">
-    <xs:sequence/>
-  </xs:complexType>
-
-  <xs:complexType name="getLimitsResponse">
+  <xs:complexType name="getLimit">
     <xs:sequence>
-      <xs:element name="return" type="tns:limitsManager" minOccurs="0"/>
+      <xs:element name="presetName" type="xs:string" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="limitsManager">
+  <xs:complexType name="getLimitResponse">
     <xs:sequence>
-      <xs:element name="runnerClassName" type="xs:string" minOccurs="0"/>
-      <xs:element name="limit" type="tns:limit" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="return" type="tns:limit" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
@@ -178,6 +173,23 @@
     <xs:attribute name="isDefault" type="xs:boolean" use="required"/>
   </xs:complexType>
 
+  <xs:complexType name="getLimits">
+    <xs:sequence/>
+  </xs:complexType>
+
+  <xs:complexType name="getLimitsResponse">
+    <xs:sequence>
+      <xs:element name="return" type="tns:limitsManager" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="limitsManager">
+    <xs:sequence>
+      <xs:element name="runnerClassName" type="xs:string" minOccurs="0"/>
+      <xs:element name="limit" type="tns:limit" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+
   <xs:complexType name="getPresets">
     <xs:sequence/>
   </xs:complexType>
@@ -209,18 +221,6 @@
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getLimit">
-    <xs:sequence>
-      <xs:element name="presetName" type="xs:string" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="getLimitResponse">
-    <xs:sequence>
-      <xs:element name="return" type="tns:limit" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-
   <xs:complexType name="cancelJob">
     <xs:sequence>
       <xs:element name="jobId" type="xs:string" minOccurs="0"/>
@@ -296,7 +296,7 @@
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="alignment" final="extension restriction">
+  <xs:complexType name="alignment">
     <xs:sequence>
       <xs:element name="metadata" type="tns:alignmentMetadata" minOccurs="0"/>
       <xs:element name="sequences" type="tns:fastaSequence" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
diff --git a/wsbuild.log b/wsbuild.log
index af5c166..485af8f 100644 (file)
--- a/wsbuild.log
+++ b/wsbuild.log
@@ -11,6 +11,7 @@ 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
@@ -19,41 +20,39 @@ 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
     [wsgen] Note:      ap round: 1
-    [wsgen] [ProcessedMethods Interface: compbio.data.msa.SequenceAnnotation<T>]
-    [wsgen] [should process method: analize hasWebMethods: false ]
+    [wsgen] [ProcessedMethods Interface: compbio.data.msa.MsaWS<T>]
+    [wsgen] [should process method: align hasWebMethods: false ]
     [wsgen] [endpointReferencesInterface: true]
     [wsgen] [declaring class has WebSevice: true]
     [wsgen] [returning: true]
-    [wsgen] [WrapperGen - method: analize(java.util.List<compbio.data.sequence.FastaSequence>)]
-    [wsgen] [method.getDeclaringType(): compbio.data.msa.SequenceAnnotation<T>]
-    [wsgen] [requestWrapper: compbio.data.msa.jaxws.Analize]
-    [wsgen] [should process method: customAnalize hasWebMethods: false ]
+    [wsgen] [WrapperGen - method: align(java.util.List<compbio.data.sequence.FastaSequence>)]
+    [wsgen] [method.getDeclaringType(): compbio.data.msa.MsaWS<T>]
+    [wsgen] [requestWrapper: compbio.data.msa.jaxws.Align]
+    [wsgen] [should process method: customAlign hasWebMethods: false ]
     [wsgen] [endpointReferencesInterface: true]
     [wsgen] [declaring class has WebSevice: true]
     [wsgen] [returning: true]
-    [wsgen] [WrapperGen - method: customAnalize(java.util.List<compbio.data.sequence.FastaSequence>,java.util.List<compbio.metadata.Option<T>>)]
-    [wsgen] [method.getDeclaringType(): compbio.data.msa.SequenceAnnotation<T>]
-    [wsgen] [requestWrapper: compbio.data.msa.jaxws.CustomAnalize]
-    [wsgen] [should process method: presetAnalize hasWebMethods: false ]
+    [wsgen] [WrapperGen - method: customAlign(java.util.List<compbio.data.sequence.FastaSequence>,java.util.List<compbio.metadata.Option<T>>)]
+    [wsgen] [method.getDeclaringType(): compbio.data.msa.MsaWS<T>]
+    [wsgen] [requestWrapper: compbio.data.msa.jaxws.CustomAlign]
+    [wsgen] [should process method: presetAlign hasWebMethods: false ]
     [wsgen] [endpointReferencesInterface: true]
     [wsgen] [declaring class has WebSevice: true]
     [wsgen] [returning: true]
-    [wsgen] [WrapperGen - method: presetAnalize(java.util.List<compbio.data.sequence.FastaSequence>,compbio.metadata.Preset<T>)]
-    [wsgen] [method.getDeclaringType(): compbio.data.msa.SequenceAnnotation<T>]
-    [wsgen] [requestWrapper: compbio.data.msa.jaxws.PresetAnalize]
-    [wsgen] [should process method: getAnnotation hasWebMethods: false ]
+    [wsgen] [WrapperGen - method: presetAlign(java.util.List<compbio.data.sequence.FastaSequence>,compbio.metadata.Preset<T>)]
+    [wsgen] [method.getDeclaringType(): compbio.data.msa.MsaWS<T>]
+    [wsgen] [requestWrapper: compbio.data.msa.jaxws.PresetAlign]
+    [wsgen] [should process method: getResult hasWebMethods: false ]
     [wsgen] [endpointReferencesInterface: true]
     [wsgen] [declaring class has WebSevice: true]
     [wsgen] [returning: true]
-    [wsgen] [WrapperGen - method: getAnnotation(java.lang.String)]
-    [wsgen] [method.getDeclaringType(): compbio.data.msa.SequenceAnnotation<T>]
-    [wsgen] [requestWrapper: compbio.data.msa.jaxws.GetAnnotation]
+    [wsgen] [WrapperGen - method: getResult(java.lang.String)]
+    [wsgen] [method.getDeclaringType(): compbio.data.msa.MsaWS<T>]
+    [wsgen] [requestWrapper: compbio.data.msa.jaxws.GetResult]
     [wsgen] [ProcessedMethods Interface: compbio.data.msa.JABAService]
     [wsgen] [ProcessedMethods Interface: compbio.data.msa.JManagement]
     [wsgen] [should process method: cancelJob hasWebMethods: false ]
@@ -106,14 +105,12 @@ build-server:
     [wsgen] [WrapperGen - method: getLimits()]
     [wsgen] [method.getDeclaringType(): compbio.data.msa.Metadata<T>]
     [wsgen] [requestWrapper: compbio.data.msa.jaxws.GetLimits]
-    [wsgen] compbio/data/msa/jaxws/Analize.java
-    [wsgen] compbio/data/msa/jaxws/AnalizeResponse.java
+    [wsgen] compbio/data/msa/jaxws/Align.java
+    [wsgen] compbio/data/msa/jaxws/AlignResponse.java
     [wsgen] compbio/data/msa/jaxws/CancelJob.java
     [wsgen] compbio/data/msa/jaxws/CancelJobResponse.java
-    [wsgen] compbio/data/msa/jaxws/CustomAnalize.java
-    [wsgen] compbio/data/msa/jaxws/CustomAnalizeResponse.java
-    [wsgen] compbio/data/msa/jaxws/GetAnnotation.java
-    [wsgen] compbio/data/msa/jaxws/GetAnnotationResponse.java
+    [wsgen] compbio/data/msa/jaxws/CustomAlign.java
+    [wsgen] compbio/data/msa/jaxws/CustomAlignResponse.java
     [wsgen] compbio/data/msa/jaxws/GetJobStatus.java
     [wsgen] compbio/data/msa/jaxws/GetJobStatusResponse.java
     [wsgen] compbio/data/msa/jaxws/GetLimit.java
@@ -122,12 +119,14 @@ build-server:
     [wsgen] compbio/data/msa/jaxws/GetLimitsResponse.java
     [wsgen] compbio/data/msa/jaxws/GetPresets.java
     [wsgen] compbio/data/msa/jaxws/GetPresetsResponse.java
+    [wsgen] compbio/data/msa/jaxws/GetResult.java
+    [wsgen] compbio/data/msa/jaxws/GetResultResponse.java
     [wsgen] compbio/data/msa/jaxws/GetRunnerOptions.java
     [wsgen] compbio/data/msa/jaxws/GetRunnerOptionsResponse.java
     [wsgen] compbio/data/msa/jaxws/JobSubmissionExceptionBean.java
     [wsgen] compbio/data/msa/jaxws/LimitExceededExceptionBean.java
-    [wsgen] compbio/data/msa/jaxws/PresetAnalize.java
-    [wsgen] compbio/data/msa/jaxws/PresetAnalizeResponse.java
+    [wsgen] compbio/data/msa/jaxws/PresetAlign.java
+    [wsgen] compbio/data/msa/jaxws/PresetAlignResponse.java
     [wsgen] compbio/data/msa/jaxws/PullExecStatistics.java
     [wsgen] compbio/data/msa/jaxws/PullExecStatisticsResponse.java
     [wsgen] compbio/data/msa/jaxws/ResultNotAvailableExceptionBean.java
diff --git a/wsbuild.xml b/wsbuild.xml
index 24f079c..485ad24 100644 (file)
--- a/wsbuild.xml
+++ b/wsbuild.xml
@@ -56,8 +56,8 @@
                                destdir="${classes}" \r
                                resourcedestdir="${wsdl.dir}" \r
                                keep="true" genwsdl="true" \r
-                               extension="false" \r
-                               xendorsed="true" \r
+                               extension="false"\r
+                               xendorsed="true"\r
                                verbose="true">\r
                                <classpath refid="classes.path" />\r
                                <classpath refid="project.classpath" />\r