git://source.jalview.org / jabaws.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3f5d52a)
Fix bug in category class and use Jim's test as a test case
authorpvtroshin <pvtroshin@e3abac25-378b-4346-85de-24260fe3988d>
Wed, 2 Nov 2011 11:39:06 +0000 (11:39 +0000)
committerpvtroshin <pvtroshin@e3abac25-378b-4346-85de-24260fe3988d>
Wed, 2 Nov 2011 11:39:06 +0000 (11:39 +0000)
git-svn-id: link to svn.lifesci.dundee.ac.uk/svn/barton/ptroshin/JABA2@4703 e3abac25-378b-4346-85de-24260fe3988d

20 files changed:
testsrc/compbio/data/msa/CategoryTester.java [new file with mode: 0644] patch | blob
webservices/compbio/data/msa/Category.java patch | blob | history
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/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

diff --git a/testsrc/compbio/data/msa/CategoryTester.java b/testsrc/compbio/data/msa/CategoryTester.java
new file mode 100644 (file)
index 0000000..24abf13
--- /dev/null
+++ b/testsrc/compbio/data/msa/CategoryTester.java
@@ -0,0 +1,64 @@
+package compbio.data.msa;\r
+\r
+import java.net.ConnectException;\r
+import java.util.Set;\r
+\r
+import javax.xml.ws.WebServiceException;\r
+\r
+import org.testng.Assert;\r
+import org.testng.annotations.BeforeTest;\r
+import org.testng.annotations.Test;\r
+\r
+import compbio.ws.client.Jws2Client;\r
+import compbio.ws.client.Services;\r
+\r
+public class CategoryTester {\r
+\r
+       // test category membership from string constants\r
+       compbio.data.msa.RegistryWS registry = null;\r
+\r
+       @BeforeTest\r
+       public void setupTest() {\r
+               try {\r
+                       /*\r
+                        * registry = Jws2Client .connectToRegistry(\r
+                        * "http://webserv1.cluster.lifesci.dundee.ac.uk:8089/jaba");\r
+                        */\r
+                       registry = Jws2Client\r
+                                       .connectToRegistry("http://localhost:8080/jabaws");\r
+               } catch (ConnectException e) {\r
+                       e.printStackTrace();\r
+                       Assert.fail(e.getMessage());\r
+               } catch (WebServiceException e) {\r
+                       e.printStackTrace();\r
+                       Assert.fail(e.getMessage());\r
+               }\r
+\r
+       }\r
+       @Test\r
+       public void categoryTest() {\r
+               Set<Category> servicecategories = registry.getServiceCategories();\r
+\r
+               boolean found = false;\r
+               for (Category svccategory : servicecategories) {\r
+\r
+                       Set<Services> catservices;\r
+\r
+                       for (String category : new String[]{Category.CATEGORY_ALIGNMENT,\r
+                                       Category.CATEGORY_CONSERVATION, Category.CATEGORY_DISORDER}) {\r
+                               if (category.equals(svccategory.name)) {\r
+                                       found = true;\r
+                                       catservices = svccategory.getServices();\r
+                                       System.out.println("Found " + catservices.size()\r
+                                                       + " services in category " + category\r
+                                                       + "(service category string " + svccategory + ")");\r
+                               }\r
+                       }\r
+               }\r
+               if (!found) {\r
+                       throw new Error(\r
+                                       "Could not match any category to one of the given category constants");\r
+               }\r
+       }\r
+\r
+}\r
diff --git a/webservices/compbio/data/msa/Category.java b/webservices/compbio/data/msa/Category.java
index db9bbfd..05e6873 100644 (file)
--- a/webservices/compbio/data/msa/Category.java
+++ b/webservices/compbio/data/msa/Category.java
@@ -66,14 +66,14 @@ public class Category {
                Category alignment = new Category(CATEGORY_ALIGNMENT, align_services);\r
 \r
                Set<Services> disorder_services = new HashSet<Services>();\r
-               align_services.add(Services.DisemblWS);\r
-               align_services.add(Services.GlobPlotWS);\r
-               align_services.add(Services.IUPredWS);\r
-               align_services.add(Services.JronnWS);\r
+               disorder_services.add(Services.DisemblWS);\r
+               disorder_services.add(Services.GlobPlotWS);\r
+               disorder_services.add(Services.IUPredWS);\r
+               disorder_services.add(Services.JronnWS);\r
 \r
                Category disorder = new Category(CATEGORY_DISORDER, disorder_services);\r
                Set<Services> conservation_services = new HashSet<Services>();\r
-               align_services.add(Services.AAConWS);\r
+               conservation_services.add(Services.AAConWS);\r
 \r
                Category conservation = new Category(CATEGORY_CONSERVATION,\r
                                conservation_services);\r
diff --git a/webservices/compbio/ws/server/resource/AAConWS.wsdl b/webservices/compbio/ws/server/resource/AAConWS.wsdl
index b02eaf9..8ff9829 100644 (file)
--- a/webservices/compbio/ws/server/resource/AAConWS.wsdl
+++ b/webservices/compbio/ws/server/resource/AAConWS.wsdl
@@ -6,15 +6,6 @@
       <xsd:import namespace="http://msa.data.compbio/01/12/2010/" schemaLocation="AAConWS_schema1.xsd"/>
     </xsd:schema>
   </types>
-  <message name="getAnnotation">
-    <part name="parameters" element="tns:getAnnotation"/>
-  </message>
-  <message name="getAnnotationResponse">
-    <part name="parameters" element="tns:getAnnotationResponse"/>
-  </message>
-  <message name="ResultNotAvailableException">
-    <part name="fault" element="tns:ResultNotAvailableException"/>
-  </message>
   <message name="analize">
     <part name="parameters" element="tns:analize"/>
   </message>
@@ -45,11 +36,14 @@
   <message name="presetAnalizeResponse">
     <part name="parameters" element="tns:presetAnalizeResponse"/>
   </message>
-  <message name="cancelJob">
-    <part name="parameters" element="tns:cancelJob"/>
+  <message name="getAnnotation">
+    <part name="parameters" element="tns:getAnnotation"/>
   </message>
-  <message name="cancelJobResponse">
-    <part name="parameters" element="tns:cancelJobResponse"/>
+  <message name="getAnnotationResponse">
+    <part name="parameters" element="tns:getAnnotationResponse"/>
+  </message>
+  <message name="ResultNotAvailableException">
+    <part name="fault" element="tns:ResultNotAvailableException"/>
   </message>
   <message name="pullExecStatistics">
     <part name="parameters" element="tns:pullExecStatistics"/>
@@ -57,6 +51,12 @@
   <message name="pullExecStatisticsResponse">
     <part name="parameters" element="tns:pullExecStatisticsResponse"/>
   </message>
+  <message name="cancelJob">
+    <part name="parameters" element="tns:cancelJob"/>
+  </message>
+  <message name="cancelJobResponse">
+    <part name="parameters" element="tns:cancelJobResponse"/>
+  </message>
   <message name="getJobStatus">
     <part name="parameters" element="tns:getJobStatus"/>
   </message>
@@ -69,11 +69,11 @@
   <message name="getLimitResponse">
     <part name="parameters" element="tns:getLimitResponse"/>
   </message>
-  <message name="getLimits">
-    <part name="parameters" element="tns:getLimits"/>
+  <message name="getRunnerOptions">
+    <part name="parameters" element="tns:getRunnerOptions"/>
   </message>
-  <message name="getLimitsResponse">
-    <part name="parameters" element="tns:getLimitsResponse"/>
+  <message name="getRunnerOptionsResponse">
+    <part name="parameters" element="tns:getRunnerOptionsResponse"/>
   </message>
   <message name="getPresets">
     <part name="parameters" element="tns:getPresets"/>
@@ -81,18 +81,13 @@
   <message name="getPresetsResponse">
     <part name="parameters" element="tns:getPresetsResponse"/>
   </message>
-  <message name="getRunnerOptions">
-    <part name="parameters" element="tns:getRunnerOptions"/>
+  <message name="getLimits">
+    <part name="parameters" element="tns:getLimits"/>
   </message>
-  <message name="getRunnerOptionsResponse">
-    <part name="parameters" element="tns:getRunnerOptionsResponse"/>
+  <message name="getLimitsResponse">
+    <part name="parameters" element="tns:getLimitsResponse"/>
   </message>
   <portType name="SequenceAnnotation">
-    <operation name="getAnnotation">
-      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationRequest" message="tns:getAnnotation"/>
-      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationResponse" message="tns:getAnnotationResponse"/>
-      <fault message="tns:ResultNotAvailableException" name="ResultNotAvailableException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotation/Fault/ResultNotAvailableException"/>
-    </operation>
     <operation name="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"/>
@@ -116,14 +111,19 @@
       <fault message="tns:JobSubmissionException" name="JobSubmissionException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/presetAnalize/Fault/JobSubmissionException"/>
       <fault message="tns:WrongParameterException" name="WrongParameterException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/presetAnalize/Fault/WrongParameterException"/>
     </operation>
-    <operation name="cancelJob">
-      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/cancelJobRequest" message="tns:cancelJob"/>
-      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/cancelJobResponse" message="tns:cancelJobResponse"/>
+    <operation name="getAnnotation">
+      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationRequest" message="tns:getAnnotation"/>
+      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationResponse" message="tns:getAnnotationResponse"/>
+      <fault message="tns:ResultNotAvailableException" name="ResultNotAvailableException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotation/Fault/ResultNotAvailableException"/>
     </operation>
     <operation name="pullExecStatistics">
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/pullExecStatisticsRequest" message="tns:pullExecStatistics"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/pullExecStatisticsResponse" message="tns:pullExecStatisticsResponse"/>
     </operation>
+    <operation name="cancelJob">
+      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/cancelJobRequest" message="tns:cancelJob"/>
+      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/cancelJobResponse" message="tns:cancelJobResponse"/>
+    </operation>
     <operation name="getJobStatus">
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getJobStatusRequest" message="tns:getJobStatus"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getJobStatusResponse" message="tns:getJobStatusResponse"/>
@@ -132,33 +132,21 @@
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitRequest" message="tns:getLimit"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitResponse" message="tns:getLimitResponse"/>
     </operation>
-    <operation name="getLimits">
-      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitsRequest" message="tns:getLimits"/>
-      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitsResponse" message="tns:getLimitsResponse"/>
+    <operation name="getRunnerOptions">
+      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getRunnerOptionsRequest" message="tns:getRunnerOptions"/>
+      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getRunnerOptionsResponse" message="tns:getRunnerOptionsResponse"/>
     </operation>
     <operation name="getPresets">
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getPresetsRequest" message="tns:getPresets"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getPresetsResponse" message="tns:getPresetsResponse"/>
     </operation>
-    <operation name="getRunnerOptions">
-      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getRunnerOptionsRequest" message="tns:getRunnerOptions"/>
-      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getRunnerOptionsResponse" message="tns:getRunnerOptionsResponse"/>
+    <operation name="getLimits">
+      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitsRequest" message="tns:getLimits"/>
+      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitsResponse" message="tns:getLimitsResponse"/>
     </operation>
   </portType>
   <binding name="AAConWSPortBinding" type="tns:SequenceAnnotation">
     <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
-    <operation name="getAnnotation">
-      <soap:operation soapAction=""/>
-      <input>
-        <soap:body use="literal"/>
-      </input>
-      <output>
-        <soap:body use="literal"/>
-      </output>
-      <fault name="ResultNotAvailableException">
-        <soap:fault name="ResultNotAvailableException" use="literal"/>
-      </fault>
-    </operation>
     <operation name="analize">
       <soap:operation soapAction=""/>
       <input>
@@ -219,7 +207,7 @@
         <soap:fault name="WrongParameterException" use="literal"/>
       </fault>
     </operation>
-    <operation name="cancelJob">
+    <operation name="getAnnotation">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -227,6 +215,9 @@
       <output>
         <soap:body use="literal"/>
       </output>
+      <fault name="ResultNotAvailableException">
+        <soap:fault name="ResultNotAvailableException" use="literal"/>
+      </fault>
     </operation>
     <operation name="pullExecStatistics">
       <soap:operation soapAction=""/>
@@ -237,6 +228,15 @@
         <soap:body use="literal"/>
       </output>
     </operation>
+    <operation name="cancelJob">
+      <soap:operation soapAction=""/>
+      <input>
+        <soap:body use="literal"/>
+      </input>
+      <output>
+        <soap:body use="literal"/>
+      </output>
+    </operation>
     <operation name="getJobStatus">
       <soap:operation soapAction=""/>
       <input>
@@ -255,7 +255,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLimits">
+    <operation name="getRunnerOptions">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -273,7 +273,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getRunnerOptions">
+    <operation name="getLimits">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
diff --git a/webservices/compbio/ws/server/resource/AAConWS_schema1.xsd b/webservices/compbio/ws/server/resource/AAConWS_schema1.xsd
index 6f34ece..99b9b4d 100644 (file)
--- a/webservices/compbio/ws/server/resource/AAConWS_schema1.xsd
+++ b/webservices/compbio/ws/server/resource/AAConWS_schema1.xsd
@@ -255,23 +255,6 @@
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getPresets">
-    <xs:sequence/>
-  </xs:complexType>
-
-  <xs:complexType name="getPresetsResponse">
-    <xs:sequence>
-      <xs:element name="return" type="tns:presetManager" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="presetManager">
-    <xs:sequence>
-      <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>
@@ -298,6 +281,23 @@
     <xs:attribute name="isDefault" type="xs:boolean" use="required"/>
   </xs:complexType>
 
+  <xs:complexType name="getPresets">
+    <xs:sequence/>
+  </xs:complexType>
+
+  <xs:complexType name="getPresetsResponse">
+    <xs:sequence>
+      <xs:element name="return" type="tns:presetManager" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="presetManager">
+    <xs:sequence>
+      <xs:element name="runnerClassName" type="xs:string"/>
+      <xs:element name="preset" type="tns:preset" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+
   <xs:complexType name="getLimit">
     <xs:sequence>
       <xs:element name="presetName" type="xs:string" minOccurs="0"/>
diff --git a/webservices/compbio/ws/server/resource/ClustalWS.wsdl b/webservices/compbio/ws/server/resource/ClustalWS.wsdl
index 61508ac..d317bac 100644 (file)
--- a/webservices/compbio/ws/server/resource/ClustalWS.wsdl
+++ b/webservices/compbio/ws/server/resource/ClustalWS.wsdl
@@ -15,11 +15,11 @@
   <message name="ResultNotAvailableException">
     <part name="fault" element="tns:ResultNotAvailableException"/>
   </message>
-  <message name="align">
-    <part name="parameters" element="tns:align"/>
+  <message name="presetAlign">
+    <part name="parameters" element="tns:presetAlign"/>
   </message>
-  <message name="alignResponse">
-    <part name="parameters" element="tns:alignResponse"/>
+  <message name="presetAlignResponse">
+    <part name="parameters" element="tns:presetAlignResponse"/>
   </message>
   <message name="UnsupportedRuntimeException">
     <part name="fault" element="tns:UnsupportedRuntimeException"/>
@@ -30,12 +30,6 @@
   <message name="JobSubmissionException">
     <part name="fault" element="tns:JobSubmissionException"/>
   </message>
-  <message name="presetAlign">
-    <part name="parameters" element="tns:presetAlign"/>
-  </message>
-  <message name="presetAlignResponse">
-    <part name="parameters" element="tns:presetAlignResponse"/>
-  </message>
   <message name="WrongParameterException">
     <part name="fault" element="tns:WrongParameterException"/>
   </message>
@@ -45,11 +39,11 @@
   <message name="customAlignResponse">
     <part name="parameters" element="tns:customAlignResponse"/>
   </message>
-  <message name="cancelJob">
-    <part name="parameters" element="tns:cancelJob"/>
+  <message name="align">
+    <part name="parameters" element="tns:align"/>
   </message>
-  <message name="cancelJobResponse">
-    <part name="parameters" element="tns:cancelJobResponse"/>
+  <message name="alignResponse">
+    <part name="parameters" element="tns:alignResponse"/>
   </message>
   <message name="pullExecStatistics">
     <part name="parameters" element="tns:pullExecStatistics"/>
@@ -57,6 +51,12 @@
   <message name="pullExecStatisticsResponse">
     <part name="parameters" element="tns:pullExecStatisticsResponse"/>
   </message>
+  <message name="cancelJob">
+    <part name="parameters" element="tns:cancelJob"/>
+  </message>
+  <message name="cancelJobResponse">
+    <part name="parameters" element="tns:cancelJobResponse"/>
+  </message>
   <message name="getJobStatus">
     <part name="parameters" element="tns:getJobStatus"/>
   </message>
@@ -69,11 +69,11 @@
   <message name="getLimitResponse">
     <part name="parameters" element="tns:getLimitResponse"/>
   </message>
-  <message name="getLimits">
-    <part name="parameters" element="tns:getLimits"/>
+  <message name="getRunnerOptions">
+    <part name="parameters" element="tns:getRunnerOptions"/>
   </message>
-  <message name="getLimitsResponse">
-    <part name="parameters" element="tns:getLimitsResponse"/>
+  <message name="getRunnerOptionsResponse">
+    <part name="parameters" element="tns:getRunnerOptionsResponse"/>
   </message>
   <message name="getPresets">
     <part name="parameters" element="tns:getPresets"/>
@@ -81,11 +81,11 @@
   <message name="getPresetsResponse">
     <part name="parameters" element="tns:getPresetsResponse"/>
   </message>
-  <message name="getRunnerOptions">
-    <part name="parameters" element="tns:getRunnerOptions"/>
+  <message name="getLimits">
+    <part name="parameters" element="tns:getLimits"/>
   </message>
-  <message name="getRunnerOptionsResponse">
-    <part name="parameters" element="tns:getRunnerOptionsResponse"/>
+  <message name="getLimitsResponse">
+    <part name="parameters" element="tns:getLimitsResponse"/>
   </message>
   <portType name="MsaWS">
     <operation name="getResult">
@@ -93,13 +93,6 @@
       <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"/>
-      <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="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"/>
@@ -116,14 +109,21 @@
       <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="cancelJob">
-      <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 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="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="cancelJob">
+      <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/01/2010/MsaWS/getJobStatusRequest" message="tns:getJobStatus"/>
       <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getJobStatusResponse" message="tns:getJobStatusResponse"/>
@@ -132,17 +132,17 @@
       <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="getLimits">
-      <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 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>
     <operation name="getPresets">
       <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="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="getLimits">
+      <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>
   </portType>
   <binding name="ClustalWSPortBinding" type="tns:MsaWS">
@@ -159,7 +159,7 @@
         <soap:fault name="ResultNotAvailableException" use="literal"/>
       </fault>
     </operation>
-    <operation name="align">
+    <operation name="presetAlign">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -176,8 +176,11 @@
       <fault name="JobSubmissionException">
         <soap:fault name="JobSubmissionException" use="literal"/>
       </fault>
+      <fault name="WrongParameterException">
+        <soap:fault name="WrongParameterException" use="literal"/>
+      </fault>
     </operation>
-    <operation name="presetAlign">
+    <operation name="customAlign">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -198,7 +201,7 @@
         <soap:fault name="WrongParameterException" use="literal"/>
       </fault>
     </operation>
-    <operation name="customAlign">
+    <operation name="align">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -215,11 +218,8 @@
       <fault name="JobSubmissionException">
         <soap:fault name="JobSubmissionException" use="literal"/>
       </fault>
-      <fault name="WrongParameterException">
-        <soap:fault name="WrongParameterException" use="literal"/>
-      </fault>
     </operation>
-    <operation name="cancelJob">
+    <operation name="pullExecStatistics">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -228,7 +228,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="pullExecStatistics">
+    <operation name="cancelJob">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -255,7 +255,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLimits">
+    <operation name="getRunnerOptions">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -273,7 +273,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getRunnerOptions">
+    <operation name="getLimits">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
diff --git a/webservices/compbio/ws/server/resource/ClustalWS_schema1.xsd b/webservices/compbio/ws/server/resource/ClustalWS_schema1.xsd
index c432550..05f2a89 100644 (file)
--- a/webservices/compbio/ws/server/resource/ClustalWS_schema1.xsd
+++ b/webservices/compbio/ws/server/resource/ClustalWS_schema1.xsd
@@ -161,6 +161,32 @@
     </xs:sequence>
   </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="limit">
+    <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:sequence>
+    <xs:attribute name="isDefault" type="xs:boolean" use="required"/>
+  </xs:complexType>
+
   <xs:complexType name="getPresets">
     <xs:sequence/>
   </xs:complexType>
@@ -192,32 +218,6 @@
     </xs:sequence>
   </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="limit">
-    <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:sequence>
-    <xs:attribute name="isDefault" type="xs:boolean" use="required"/>
-  </xs:complexType>
-
   <xs:complexType name="getLimit">
     <xs:sequence>
       <xs:element name="presetName" type="xs:string" minOccurs="0"/>
diff --git a/webservices/compbio/ws/server/resource/DisemblWS.wsdl b/webservices/compbio/ws/server/resource/DisemblWS.wsdl
index 0938649..b104a79 100644 (file)
--- a/webservices/compbio/ws/server/resource/DisemblWS.wsdl
+++ b/webservices/compbio/ws/server/resource/DisemblWS.wsdl
@@ -6,15 +6,6 @@
       <xsd:import namespace="http://msa.data.compbio/01/12/2010/" schemaLocation="DisemblWS_schema1.xsd"/>
     </xsd:schema>
   </types>
-  <message name="getAnnotation">
-    <part name="parameters" element="tns:getAnnotation"/>
-  </message>
-  <message name="getAnnotationResponse">
-    <part name="parameters" element="tns:getAnnotationResponse"/>
-  </message>
-  <message name="ResultNotAvailableException">
-    <part name="fault" element="tns:ResultNotAvailableException"/>
-  </message>
   <message name="customAnalize">
     <part name="parameters" element="tns:customAnalize"/>
   </message>
@@ -45,11 +36,14 @@
   <message name="presetAnalizeResponse">
     <part name="parameters" element="tns:presetAnalizeResponse"/>
   </message>
-  <message name="cancelJob">
-    <part name="parameters" element="tns:cancelJob"/>
+  <message name="getAnnotation">
+    <part name="parameters" element="tns:getAnnotation"/>
   </message>
-  <message name="cancelJobResponse">
-    <part name="parameters" element="tns:cancelJobResponse"/>
+  <message name="getAnnotationResponse">
+    <part name="parameters" element="tns:getAnnotationResponse"/>
+  </message>
+  <message name="ResultNotAvailableException">
+    <part name="fault" element="tns:ResultNotAvailableException"/>
   </message>
   <message name="pullExecStatistics">
     <part name="parameters" element="tns:pullExecStatistics"/>
@@ -57,6 +51,12 @@
   <message name="pullExecStatisticsResponse">
     <part name="parameters" element="tns:pullExecStatisticsResponse"/>
   </message>
+  <message name="cancelJob">
+    <part name="parameters" element="tns:cancelJob"/>
+  </message>
+  <message name="cancelJobResponse">
+    <part name="parameters" element="tns:cancelJobResponse"/>
+  </message>
   <message name="getJobStatus">
     <part name="parameters" element="tns:getJobStatus"/>
   </message>
@@ -69,11 +69,11 @@
   <message name="getLimitResponse">
     <part name="parameters" element="tns:getLimitResponse"/>
   </message>
-  <message name="getLimits">
-    <part name="parameters" element="tns:getLimits"/>
+  <message name="getRunnerOptions">
+    <part name="parameters" element="tns:getRunnerOptions"/>
   </message>
-  <message name="getLimitsResponse">
-    <part name="parameters" element="tns:getLimitsResponse"/>
+  <message name="getRunnerOptionsResponse">
+    <part name="parameters" element="tns:getRunnerOptionsResponse"/>
   </message>
   <message name="getPresets">
     <part name="parameters" element="tns:getPresets"/>
@@ -81,18 +81,13 @@
   <message name="getPresetsResponse">
     <part name="parameters" element="tns:getPresetsResponse"/>
   </message>
-  <message name="getRunnerOptions">
-    <part name="parameters" element="tns:getRunnerOptions"/>
+  <message name="getLimits">
+    <part name="parameters" element="tns:getLimits"/>
   </message>
-  <message name="getRunnerOptionsResponse">
-    <part name="parameters" element="tns:getRunnerOptionsResponse"/>
+  <message name="getLimitsResponse">
+    <part name="parameters" element="tns:getLimitsResponse"/>
   </message>
   <portType name="SequenceAnnotation">
-    <operation name="getAnnotation">
-      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationRequest" message="tns:getAnnotation"/>
-      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationResponse" message="tns:getAnnotationResponse"/>
-      <fault message="tns:ResultNotAvailableException" name="ResultNotAvailableException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotation/Fault/ResultNotAvailableException"/>
-    </operation>
     <operation name="customAnalize">
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/customAnalizeRequest" message="tns:customAnalize"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/customAnalizeResponse" message="tns:customAnalizeResponse"/>
@@ -116,14 +111,19 @@
       <fault message="tns:JobSubmissionException" name="JobSubmissionException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/presetAnalize/Fault/JobSubmissionException"/>
       <fault message="tns:WrongParameterException" name="WrongParameterException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/presetAnalize/Fault/WrongParameterException"/>
     </operation>
-    <operation name="cancelJob">
-      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/cancelJobRequest" message="tns:cancelJob"/>
-      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/cancelJobResponse" message="tns:cancelJobResponse"/>
+    <operation name="getAnnotation">
+      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationRequest" message="tns:getAnnotation"/>
+      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationResponse" message="tns:getAnnotationResponse"/>
+      <fault message="tns:ResultNotAvailableException" name="ResultNotAvailableException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotation/Fault/ResultNotAvailableException"/>
     </operation>
     <operation name="pullExecStatistics">
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/pullExecStatisticsRequest" message="tns:pullExecStatistics"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/pullExecStatisticsResponse" message="tns:pullExecStatisticsResponse"/>
     </operation>
+    <operation name="cancelJob">
+      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/cancelJobRequest" message="tns:cancelJob"/>
+      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/cancelJobResponse" message="tns:cancelJobResponse"/>
+    </operation>
     <operation name="getJobStatus">
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getJobStatusRequest" message="tns:getJobStatus"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getJobStatusResponse" message="tns:getJobStatusResponse"/>
@@ -132,33 +132,21 @@
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitRequest" message="tns:getLimit"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitResponse" message="tns:getLimitResponse"/>
     </operation>
-    <operation name="getLimits">
-      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitsRequest" message="tns:getLimits"/>
-      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitsResponse" message="tns:getLimitsResponse"/>
+    <operation name="getRunnerOptions">
+      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getRunnerOptionsRequest" message="tns:getRunnerOptions"/>
+      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getRunnerOptionsResponse" message="tns:getRunnerOptionsResponse"/>
     </operation>
     <operation name="getPresets">
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getPresetsRequest" message="tns:getPresets"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getPresetsResponse" message="tns:getPresetsResponse"/>
     </operation>
-    <operation name="getRunnerOptions">
-      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getRunnerOptionsRequest" message="tns:getRunnerOptions"/>
-      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getRunnerOptionsResponse" message="tns:getRunnerOptionsResponse"/>
+    <operation name="getLimits">
+      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitsRequest" message="tns:getLimits"/>
+      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitsResponse" message="tns:getLimitsResponse"/>
     </operation>
   </portType>
   <binding name="DisemblWSPortBinding" type="tns:SequenceAnnotation">
     <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
-    <operation name="getAnnotation">
-      <soap:operation soapAction=""/>
-      <input>
-        <soap:body use="literal"/>
-      </input>
-      <output>
-        <soap:body use="literal"/>
-      </output>
-      <fault name="ResultNotAvailableException">
-        <soap:fault name="ResultNotAvailableException" use="literal"/>
-      </fault>
-    </operation>
     <operation name="customAnalize">
       <soap:operation soapAction=""/>
       <input>
@@ -219,7 +207,7 @@
         <soap:fault name="WrongParameterException" use="literal"/>
       </fault>
     </operation>
-    <operation name="cancelJob">
+    <operation name="getAnnotation">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -227,6 +215,9 @@
       <output>
         <soap:body use="literal"/>
       </output>
+      <fault name="ResultNotAvailableException">
+        <soap:fault name="ResultNotAvailableException" use="literal"/>
+      </fault>
     </operation>
     <operation name="pullExecStatistics">
       <soap:operation soapAction=""/>
@@ -237,6 +228,15 @@
         <soap:body use="literal"/>
       </output>
     </operation>
+    <operation name="cancelJob">
+      <soap:operation soapAction=""/>
+      <input>
+        <soap:body use="literal"/>
+      </input>
+      <output>
+        <soap:body use="literal"/>
+      </output>
+    </operation>
     <operation name="getJobStatus">
       <soap:operation soapAction=""/>
       <input>
@@ -255,7 +255,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLimits">
+    <operation name="getRunnerOptions">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -273,7 +273,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getRunnerOptions">
+    <operation name="getLimits">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
diff --git a/webservices/compbio/ws/server/resource/DisemblWS_schema1.xsd b/webservices/compbio/ws/server/resource/DisemblWS_schema1.xsd
index a03987f..84505eb 100644 (file)
--- a/webservices/compbio/ws/server/resource/DisemblWS_schema1.xsd
+++ b/webservices/compbio/ws/server/resource/DisemblWS_schema1.xsd
@@ -262,23 +262,6 @@
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getPresets">
-    <xs:sequence/>
-  </xs:complexType>
-
-  <xs:complexType name="getPresetsResponse">
-    <xs:sequence>
-      <xs:element name="return" type="tns:presetManager" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="presetManager">
-    <xs:sequence>
-      <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>
@@ -305,6 +288,23 @@
     <xs:attribute name="isDefault" type="xs:boolean" use="required"/>
   </xs:complexType>
 
+  <xs:complexType name="getPresets">
+    <xs:sequence/>
+  </xs:complexType>
+
+  <xs:complexType name="getPresetsResponse">
+    <xs:sequence>
+      <xs:element name="return" type="tns:presetManager" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="presetManager">
+    <xs:sequence>
+      <xs:element name="runnerClassName" type="xs:string"/>
+      <xs:element name="preset" type="tns:preset" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+
   <xs:complexType name="getLimit">
     <xs:sequence>
       <xs:element name="presetName" type="xs:string" minOccurs="0"/>
diff --git a/webservices/compbio/ws/server/resource/GlobPlotWS.wsdl b/webservices/compbio/ws/server/resource/GlobPlotWS.wsdl
index c85f5ae..dcdb4c3 100644 (file)
--- a/webservices/compbio/ws/server/resource/GlobPlotWS.wsdl
+++ b/webservices/compbio/ws/server/resource/GlobPlotWS.wsdl
@@ -6,15 +6,6 @@
       <xsd:import namespace="http://msa.data.compbio/01/12/2010/" schemaLocation="GlobPlotWS_schema1.xsd"/>
     </xsd:schema>
   </types>
-  <message name="getAnnotation">
-    <part name="parameters" element="tns:getAnnotation"/>
-  </message>
-  <message name="getAnnotationResponse">
-    <part name="parameters" element="tns:getAnnotationResponse"/>
-  </message>
-  <message name="ResultNotAvailableException">
-    <part name="fault" element="tns:ResultNotAvailableException"/>
-  </message>
   <message name="customAnalize">
     <part name="parameters" element="tns:customAnalize"/>
   </message>
@@ -45,11 +36,14 @@
   <message name="presetAnalizeResponse">
     <part name="parameters" element="tns:presetAnalizeResponse"/>
   </message>
-  <message name="cancelJob">
-    <part name="parameters" element="tns:cancelJob"/>
+  <message name="getAnnotation">
+    <part name="parameters" element="tns:getAnnotation"/>
   </message>
-  <message name="cancelJobResponse">
-    <part name="parameters" element="tns:cancelJobResponse"/>
+  <message name="getAnnotationResponse">
+    <part name="parameters" element="tns:getAnnotationResponse"/>
+  </message>
+  <message name="ResultNotAvailableException">
+    <part name="fault" element="tns:ResultNotAvailableException"/>
   </message>
   <message name="pullExecStatistics">
     <part name="parameters" element="tns:pullExecStatistics"/>
@@ -57,6 +51,12 @@
   <message name="pullExecStatisticsResponse">
     <part name="parameters" element="tns:pullExecStatisticsResponse"/>
   </message>
+  <message name="cancelJob">
+    <part name="parameters" element="tns:cancelJob"/>
+  </message>
+  <message name="cancelJobResponse">
+    <part name="parameters" element="tns:cancelJobResponse"/>
+  </message>
   <message name="getJobStatus">
     <part name="parameters" element="tns:getJobStatus"/>
   </message>
@@ -69,11 +69,11 @@
   <message name="getLimitResponse">
     <part name="parameters" element="tns:getLimitResponse"/>
   </message>
-  <message name="getLimits">
-    <part name="parameters" element="tns:getLimits"/>
+  <message name="getRunnerOptions">
+    <part name="parameters" element="tns:getRunnerOptions"/>
   </message>
-  <message name="getLimitsResponse">
-    <part name="parameters" element="tns:getLimitsResponse"/>
+  <message name="getRunnerOptionsResponse">
+    <part name="parameters" element="tns:getRunnerOptionsResponse"/>
   </message>
   <message name="getPresets">
     <part name="parameters" element="tns:getPresets"/>
@@ -81,18 +81,13 @@
   <message name="getPresetsResponse">
     <part name="parameters" element="tns:getPresetsResponse"/>
   </message>
-  <message name="getRunnerOptions">
-    <part name="parameters" element="tns:getRunnerOptions"/>
+  <message name="getLimits">
+    <part name="parameters" element="tns:getLimits"/>
   </message>
-  <message name="getRunnerOptionsResponse">
-    <part name="parameters" element="tns:getRunnerOptionsResponse"/>
+  <message name="getLimitsResponse">
+    <part name="parameters" element="tns:getLimitsResponse"/>
   </message>
   <portType name="SequenceAnnotation">
-    <operation name="getAnnotation">
-      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationRequest" message="tns:getAnnotation"/>
-      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationResponse" message="tns:getAnnotationResponse"/>
-      <fault message="tns:ResultNotAvailableException" name="ResultNotAvailableException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotation/Fault/ResultNotAvailableException"/>
-    </operation>
     <operation name="customAnalize">
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/customAnalizeRequest" message="tns:customAnalize"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/customAnalizeResponse" message="tns:customAnalizeResponse"/>
@@ -116,14 +111,19 @@
       <fault message="tns:JobSubmissionException" name="JobSubmissionException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/presetAnalize/Fault/JobSubmissionException"/>
       <fault message="tns:WrongParameterException" name="WrongParameterException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/presetAnalize/Fault/WrongParameterException"/>
     </operation>
-    <operation name="cancelJob">
-      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/cancelJobRequest" message="tns:cancelJob"/>
-      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/cancelJobResponse" message="tns:cancelJobResponse"/>
+    <operation name="getAnnotation">
+      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationRequest" message="tns:getAnnotation"/>
+      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationResponse" message="tns:getAnnotationResponse"/>
+      <fault message="tns:ResultNotAvailableException" name="ResultNotAvailableException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotation/Fault/ResultNotAvailableException"/>
     </operation>
     <operation name="pullExecStatistics">
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/pullExecStatisticsRequest" message="tns:pullExecStatistics"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/pullExecStatisticsResponse" message="tns:pullExecStatisticsResponse"/>
     </operation>
+    <operation name="cancelJob">
+      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/cancelJobRequest" message="tns:cancelJob"/>
+      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/cancelJobResponse" message="tns:cancelJobResponse"/>
+    </operation>
     <operation name="getJobStatus">
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getJobStatusRequest" message="tns:getJobStatus"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getJobStatusResponse" message="tns:getJobStatusResponse"/>
@@ -132,33 +132,21 @@
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitRequest" message="tns:getLimit"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitResponse" message="tns:getLimitResponse"/>
     </operation>
-    <operation name="getLimits">
-      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitsRequest" message="tns:getLimits"/>
-      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitsResponse" message="tns:getLimitsResponse"/>
+    <operation name="getRunnerOptions">
+      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getRunnerOptionsRequest" message="tns:getRunnerOptions"/>
+      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getRunnerOptionsResponse" message="tns:getRunnerOptionsResponse"/>
     </operation>
     <operation name="getPresets">
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getPresetsRequest" message="tns:getPresets"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getPresetsResponse" message="tns:getPresetsResponse"/>
     </operation>
-    <operation name="getRunnerOptions">
-      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getRunnerOptionsRequest" message="tns:getRunnerOptions"/>
-      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getRunnerOptionsResponse" message="tns:getRunnerOptionsResponse"/>
+    <operation name="getLimits">
+      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitsRequest" message="tns:getLimits"/>
+      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitsResponse" message="tns:getLimitsResponse"/>
     </operation>
   </portType>
   <binding name="GlobPlotWSPortBinding" type="tns:SequenceAnnotation">
     <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
-    <operation name="getAnnotation">
-      <soap:operation soapAction=""/>
-      <input>
-        <soap:body use="literal"/>
-      </input>
-      <output>
-        <soap:body use="literal"/>
-      </output>
-      <fault name="ResultNotAvailableException">
-        <soap:fault name="ResultNotAvailableException" use="literal"/>
-      </fault>
-    </operation>
     <operation name="customAnalize">
       <soap:operation soapAction=""/>
       <input>
@@ -219,7 +207,7 @@
         <soap:fault name="WrongParameterException" use="literal"/>
       </fault>
     </operation>
-    <operation name="cancelJob">
+    <operation name="getAnnotation">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -227,6 +215,9 @@
       <output>
         <soap:body use="literal"/>
       </output>
+      <fault name="ResultNotAvailableException">
+        <soap:fault name="ResultNotAvailableException" use="literal"/>
+      </fault>
     </operation>
     <operation name="pullExecStatistics">
       <soap:operation soapAction=""/>
@@ -237,6 +228,15 @@
         <soap:body use="literal"/>
       </output>
     </operation>
+    <operation name="cancelJob">
+      <soap:operation soapAction=""/>
+      <input>
+        <soap:body use="literal"/>
+      </input>
+      <output>
+        <soap:body use="literal"/>
+      </output>
+    </operation>
     <operation name="getJobStatus">
       <soap:operation soapAction=""/>
       <input>
@@ -255,7 +255,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLimits">
+    <operation name="getRunnerOptions">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -273,7 +273,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getRunnerOptions">
+    <operation name="getLimits">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
diff --git a/webservices/compbio/ws/server/resource/GlobPlotWS_schema1.xsd b/webservices/compbio/ws/server/resource/GlobPlotWS_schema1.xsd
index d44ec86..4d1dc27 100644 (file)
--- a/webservices/compbio/ws/server/resource/GlobPlotWS_schema1.xsd
+++ b/webservices/compbio/ws/server/resource/GlobPlotWS_schema1.xsd
@@ -275,23 +275,6 @@
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getPresets">
-    <xs:sequence/>
-  </xs:complexType>
-
-  <xs:complexType name="getPresetsResponse">
-    <xs:sequence>
-      <xs:element name="return" type="tns:presetManager" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="presetManager">
-    <xs:sequence>
-      <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>
@@ -318,6 +301,23 @@
     <xs:attribute name="isDefault" type="xs:boolean" use="required"/>
   </xs:complexType>
 
+  <xs:complexType name="getPresets">
+    <xs:sequence/>
+  </xs:complexType>
+
+  <xs:complexType name="getPresetsResponse">
+    <xs:sequence>
+      <xs:element name="return" type="tns:presetManager" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="presetManager">
+    <xs:sequence>
+      <xs:element name="runnerClassName" type="xs:string"/>
+      <xs:element name="preset" type="tns:preset" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+
   <xs:complexType name="getLimit">
     <xs:sequence>
       <xs:element name="presetName" type="xs:string" minOccurs="0"/>
diff --git a/webservices/compbio/ws/server/resource/IUPredWS.wsdl b/webservices/compbio/ws/server/resource/IUPredWS.wsdl
index ddfde64..6e4b788 100644 (file)
--- a/webservices/compbio/ws/server/resource/IUPredWS.wsdl
+++ b/webservices/compbio/ws/server/resource/IUPredWS.wsdl
@@ -6,15 +6,6 @@
       <xsd:import namespace="http://msa.data.compbio/01/12/2010/" schemaLocation="IUPredWS_schema1.xsd"/>
     </xsd:schema>
   </types>
-  <message name="getAnnotation">
-    <part name="parameters" element="tns:getAnnotation"/>
-  </message>
-  <message name="getAnnotationResponse">
-    <part name="parameters" element="tns:getAnnotationResponse"/>
-  </message>
-  <message name="ResultNotAvailableException">
-    <part name="fault" element="tns:ResultNotAvailableException"/>
-  </message>
   <message name="customAnalize">
     <part name="parameters" element="tns:customAnalize"/>
   </message>
@@ -45,11 +36,14 @@
   <message name="presetAnalizeResponse">
     <part name="parameters" element="tns:presetAnalizeResponse"/>
   </message>
-  <message name="cancelJob">
-    <part name="parameters" element="tns:cancelJob"/>
+  <message name="getAnnotation">
+    <part name="parameters" element="tns:getAnnotation"/>
   </message>
-  <message name="cancelJobResponse">
-    <part name="parameters" element="tns:cancelJobResponse"/>
+  <message name="getAnnotationResponse">
+    <part name="parameters" element="tns:getAnnotationResponse"/>
+  </message>
+  <message name="ResultNotAvailableException">
+    <part name="fault" element="tns:ResultNotAvailableException"/>
   </message>
   <message name="pullExecStatistics">
     <part name="parameters" element="tns:pullExecStatistics"/>
@@ -57,6 +51,12 @@
   <message name="pullExecStatisticsResponse">
     <part name="parameters" element="tns:pullExecStatisticsResponse"/>
   </message>
+  <message name="cancelJob">
+    <part name="parameters" element="tns:cancelJob"/>
+  </message>
+  <message name="cancelJobResponse">
+    <part name="parameters" element="tns:cancelJobResponse"/>
+  </message>
   <message name="getJobStatus">
     <part name="parameters" element="tns:getJobStatus"/>
   </message>
@@ -69,11 +69,11 @@
   <message name="getLimitResponse">
     <part name="parameters" element="tns:getLimitResponse"/>
   </message>
-  <message name="getLimits">
-    <part name="parameters" element="tns:getLimits"/>
+  <message name="getRunnerOptions">
+    <part name="parameters" element="tns:getRunnerOptions"/>
   </message>
-  <message name="getLimitsResponse">
-    <part name="parameters" element="tns:getLimitsResponse"/>
+  <message name="getRunnerOptionsResponse">
+    <part name="parameters" element="tns:getRunnerOptionsResponse"/>
   </message>
   <message name="getPresets">
     <part name="parameters" element="tns:getPresets"/>
@@ -81,18 +81,13 @@
   <message name="getPresetsResponse">
     <part name="parameters" element="tns:getPresetsResponse"/>
   </message>
-  <message name="getRunnerOptions">
-    <part name="parameters" element="tns:getRunnerOptions"/>
+  <message name="getLimits">
+    <part name="parameters" element="tns:getLimits"/>
   </message>
-  <message name="getRunnerOptionsResponse">
-    <part name="parameters" element="tns:getRunnerOptionsResponse"/>
+  <message name="getLimitsResponse">
+    <part name="parameters" element="tns:getLimitsResponse"/>
   </message>
   <portType name="SequenceAnnotation">
-    <operation name="getAnnotation">
-      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationRequest" message="tns:getAnnotation"/>
-      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationResponse" message="tns:getAnnotationResponse"/>
-      <fault message="tns:ResultNotAvailableException" name="ResultNotAvailableException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotation/Fault/ResultNotAvailableException"/>
-    </operation>
     <operation name="customAnalize">
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/customAnalizeRequest" message="tns:customAnalize"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/customAnalizeResponse" message="tns:customAnalizeResponse"/>
@@ -116,14 +111,19 @@
       <fault message="tns:JobSubmissionException" name="JobSubmissionException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/presetAnalize/Fault/JobSubmissionException"/>
       <fault message="tns:WrongParameterException" name="WrongParameterException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/presetAnalize/Fault/WrongParameterException"/>
     </operation>
-    <operation name="cancelJob">
-      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/cancelJobRequest" message="tns:cancelJob"/>
-      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/cancelJobResponse" message="tns:cancelJobResponse"/>
+    <operation name="getAnnotation">
+      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationRequest" message="tns:getAnnotation"/>
+      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationResponse" message="tns:getAnnotationResponse"/>
+      <fault message="tns:ResultNotAvailableException" name="ResultNotAvailableException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotation/Fault/ResultNotAvailableException"/>
     </operation>
     <operation name="pullExecStatistics">
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/pullExecStatisticsRequest" message="tns:pullExecStatistics"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/pullExecStatisticsResponse" message="tns:pullExecStatisticsResponse"/>
     </operation>
+    <operation name="cancelJob">
+      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/cancelJobRequest" message="tns:cancelJob"/>
+      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/cancelJobResponse" message="tns:cancelJobResponse"/>
+    </operation>
     <operation name="getJobStatus">
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getJobStatusRequest" message="tns:getJobStatus"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getJobStatusResponse" message="tns:getJobStatusResponse"/>
@@ -132,33 +132,21 @@
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitRequest" message="tns:getLimit"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitResponse" message="tns:getLimitResponse"/>
     </operation>
-    <operation name="getLimits">
-      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitsRequest" message="tns:getLimits"/>
-      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitsResponse" message="tns:getLimitsResponse"/>
+    <operation name="getRunnerOptions">
+      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getRunnerOptionsRequest" message="tns:getRunnerOptions"/>
+      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getRunnerOptionsResponse" message="tns:getRunnerOptionsResponse"/>
     </operation>
     <operation name="getPresets">
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getPresetsRequest" message="tns:getPresets"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getPresetsResponse" message="tns:getPresetsResponse"/>
     </operation>
-    <operation name="getRunnerOptions">
-      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getRunnerOptionsRequest" message="tns:getRunnerOptions"/>
-      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getRunnerOptionsResponse" message="tns:getRunnerOptionsResponse"/>
+    <operation name="getLimits">
+      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitsRequest" message="tns:getLimits"/>
+      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitsResponse" message="tns:getLimitsResponse"/>
     </operation>
   </portType>
   <binding name="IUPredWSPortBinding" type="tns:SequenceAnnotation">
     <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
-    <operation name="getAnnotation">
-      <soap:operation soapAction=""/>
-      <input>
-        <soap:body use="literal"/>
-      </input>
-      <output>
-        <soap:body use="literal"/>
-      </output>
-      <fault name="ResultNotAvailableException">
-        <soap:fault name="ResultNotAvailableException" use="literal"/>
-      </fault>
-    </operation>
     <operation name="customAnalize">
       <soap:operation soapAction=""/>
       <input>
@@ -219,7 +207,7 @@
         <soap:fault name="WrongParameterException" use="literal"/>
       </fault>
     </operation>
-    <operation name="cancelJob">
+    <operation name="getAnnotation">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -227,6 +215,9 @@
       <output>
         <soap:body use="literal"/>
       </output>
+      <fault name="ResultNotAvailableException">
+        <soap:fault name="ResultNotAvailableException" use="literal"/>
+      </fault>
     </operation>
     <operation name="pullExecStatistics">
       <soap:operation soapAction=""/>
@@ -237,6 +228,15 @@
         <soap:body use="literal"/>
       </output>
     </operation>
+    <operation name="cancelJob">
+      <soap:operation soapAction=""/>
+      <input>
+        <soap:body use="literal"/>
+      </input>
+      <output>
+        <soap:body use="literal"/>
+      </output>
+    </operation>
     <operation name="getJobStatus">
       <soap:operation soapAction=""/>
       <input>
@@ -255,7 +255,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLimits">
+    <operation name="getRunnerOptions">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -273,7 +273,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getRunnerOptions">
+    <operation name="getLimits">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
diff --git a/webservices/compbio/ws/server/resource/IUPredWS_schema1.xsd b/webservices/compbio/ws/server/resource/IUPredWS_schema1.xsd
index 73e9d98..9acf0a6 100644 (file)
--- a/webservices/compbio/ws/server/resource/IUPredWS_schema1.xsd
+++ b/webservices/compbio/ws/server/resource/IUPredWS_schema1.xsd
@@ -248,6 +248,32 @@
     </xs:sequence>
   </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="limit">
+    <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:sequence>
+    <xs:attribute name="isDefault" type="xs:boolean" use="required"/>
+  </xs:complexType>
+
   <xs:complexType name="getPresets">
     <xs:sequence/>
   </xs:complexType>
@@ -279,32 +305,6 @@
     </xs:sequence>
   </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="limit">
-    <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:sequence>
-    <xs:attribute name="isDefault" type="xs:boolean" use="required"/>
-  </xs:complexType>
-
   <xs:complexType name="getLimit">
     <xs:sequence>
       <xs:element name="presetName" type="xs:string" minOccurs="0"/>
diff --git a/webservices/compbio/ws/server/resource/JronnWS.wsdl b/webservices/compbio/ws/server/resource/JronnWS.wsdl
index b56cf06..19b70e5 100644 (file)
--- a/webservices/compbio/ws/server/resource/JronnWS.wsdl
+++ b/webservices/compbio/ws/server/resource/JronnWS.wsdl
@@ -6,15 +6,6 @@
       <xsd:import namespace="http://msa.data.compbio/01/12/2010/" schemaLocation="JronnWS_schema1.xsd"/>
     </xsd:schema>
   </types>
-  <message name="getAnnotation">
-    <part name="parameters" element="tns:getAnnotation"/>
-  </message>
-  <message name="getAnnotationResponse">
-    <part name="parameters" element="tns:getAnnotationResponse"/>
-  </message>
-  <message name="ResultNotAvailableException">
-    <part name="fault" element="tns:ResultNotAvailableException"/>
-  </message>
   <message name="customAnalize">
     <part name="parameters" element="tns:customAnalize"/>
   </message>
@@ -45,11 +36,14 @@
   <message name="presetAnalizeResponse">
     <part name="parameters" element="tns:presetAnalizeResponse"/>
   </message>
-  <message name="cancelJob">
-    <part name="parameters" element="tns:cancelJob"/>
+  <message name="getAnnotation">
+    <part name="parameters" element="tns:getAnnotation"/>
   </message>
-  <message name="cancelJobResponse">
-    <part name="parameters" element="tns:cancelJobResponse"/>
+  <message name="getAnnotationResponse">
+    <part name="parameters" element="tns:getAnnotationResponse"/>
+  </message>
+  <message name="ResultNotAvailableException">
+    <part name="fault" element="tns:ResultNotAvailableException"/>
   </message>
   <message name="pullExecStatistics">
     <part name="parameters" element="tns:pullExecStatistics"/>
@@ -57,6 +51,12 @@
   <message name="pullExecStatisticsResponse">
     <part name="parameters" element="tns:pullExecStatisticsResponse"/>
   </message>
+  <message name="cancelJob">
+    <part name="parameters" element="tns:cancelJob"/>
+  </message>
+  <message name="cancelJobResponse">
+    <part name="parameters" element="tns:cancelJobResponse"/>
+  </message>
   <message name="getJobStatus">
     <part name="parameters" element="tns:getJobStatus"/>
   </message>
@@ -69,11 +69,11 @@
   <message name="getLimitResponse">
     <part name="parameters" element="tns:getLimitResponse"/>
   </message>
-  <message name="getLimits">
-    <part name="parameters" element="tns:getLimits"/>
+  <message name="getRunnerOptions">
+    <part name="parameters" element="tns:getRunnerOptions"/>
   </message>
-  <message name="getLimitsResponse">
-    <part name="parameters" element="tns:getLimitsResponse"/>
+  <message name="getRunnerOptionsResponse">
+    <part name="parameters" element="tns:getRunnerOptionsResponse"/>
   </message>
   <message name="getPresets">
     <part name="parameters" element="tns:getPresets"/>
@@ -81,18 +81,13 @@
   <message name="getPresetsResponse">
     <part name="parameters" element="tns:getPresetsResponse"/>
   </message>
-  <message name="getRunnerOptions">
-    <part name="parameters" element="tns:getRunnerOptions"/>
+  <message name="getLimits">
+    <part name="parameters" element="tns:getLimits"/>
   </message>
-  <message name="getRunnerOptionsResponse">
-    <part name="parameters" element="tns:getRunnerOptionsResponse"/>
+  <message name="getLimitsResponse">
+    <part name="parameters" element="tns:getLimitsResponse"/>
   </message>
   <portType name="SequenceAnnotation">
-    <operation name="getAnnotation">
-      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationRequest" message="tns:getAnnotation"/>
-      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationResponse" message="tns:getAnnotationResponse"/>
-      <fault message="tns:ResultNotAvailableException" name="ResultNotAvailableException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotation/Fault/ResultNotAvailableException"/>
-    </operation>
     <operation name="customAnalize">
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/customAnalizeRequest" message="tns:customAnalize"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/customAnalizeResponse" message="tns:customAnalizeResponse"/>
@@ -116,14 +111,19 @@
       <fault message="tns:JobSubmissionException" name="JobSubmissionException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/presetAnalize/Fault/JobSubmissionException"/>
       <fault message="tns:WrongParameterException" name="WrongParameterException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/presetAnalize/Fault/WrongParameterException"/>
     </operation>
-    <operation name="cancelJob">
-      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/cancelJobRequest" message="tns:cancelJob"/>
-      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/cancelJobResponse" message="tns:cancelJobResponse"/>
+    <operation name="getAnnotation">
+      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationRequest" message="tns:getAnnotation"/>
+      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationResponse" message="tns:getAnnotationResponse"/>
+      <fault message="tns:ResultNotAvailableException" name="ResultNotAvailableException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotation/Fault/ResultNotAvailableException"/>
     </operation>
     <operation name="pullExecStatistics">
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/pullExecStatisticsRequest" message="tns:pullExecStatistics"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/pullExecStatisticsResponse" message="tns:pullExecStatisticsResponse"/>
     </operation>
+    <operation name="cancelJob">
+      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/cancelJobRequest" message="tns:cancelJob"/>
+      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/cancelJobResponse" message="tns:cancelJobResponse"/>
+    </operation>
     <operation name="getJobStatus">
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getJobStatusRequest" message="tns:getJobStatus"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getJobStatusResponse" message="tns:getJobStatusResponse"/>
@@ -132,33 +132,21 @@
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitRequest" message="tns:getLimit"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitResponse" message="tns:getLimitResponse"/>
     </operation>
-    <operation name="getLimits">
-      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitsRequest" message="tns:getLimits"/>
-      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitsResponse" message="tns:getLimitsResponse"/>
+    <operation name="getRunnerOptions">
+      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getRunnerOptionsRequest" message="tns:getRunnerOptions"/>
+      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getRunnerOptionsResponse" message="tns:getRunnerOptionsResponse"/>
     </operation>
     <operation name="getPresets">
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getPresetsRequest" message="tns:getPresets"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getPresetsResponse" message="tns:getPresetsResponse"/>
     </operation>
-    <operation name="getRunnerOptions">
-      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getRunnerOptionsRequest" message="tns:getRunnerOptions"/>
-      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getRunnerOptionsResponse" message="tns:getRunnerOptionsResponse"/>
+    <operation name="getLimits">
+      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitsRequest" message="tns:getLimits"/>
+      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitsResponse" message="tns:getLimitsResponse"/>
     </operation>
   </portType>
   <binding name="JronnWSPortBinding" type="tns:SequenceAnnotation">
     <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
-    <operation name="getAnnotation">
-      <soap:operation soapAction=""/>
-      <input>
-        <soap:body use="literal"/>
-      </input>
-      <output>
-        <soap:body use="literal"/>
-      </output>
-      <fault name="ResultNotAvailableException">
-        <soap:fault name="ResultNotAvailableException" use="literal"/>
-      </fault>
-    </operation>
     <operation name="customAnalize">
       <soap:operation soapAction=""/>
       <input>
@@ -219,7 +207,7 @@
         <soap:fault name="WrongParameterException" use="literal"/>
       </fault>
     </operation>
-    <operation name="cancelJob">
+    <operation name="getAnnotation">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -227,6 +215,9 @@
       <output>
         <soap:body use="literal"/>
       </output>
+      <fault name="ResultNotAvailableException">
+        <soap:fault name="ResultNotAvailableException" use="literal"/>
+      </fault>
     </operation>
     <operation name="pullExecStatistics">
       <soap:operation soapAction=""/>
@@ -237,6 +228,15 @@
         <soap:body use="literal"/>
       </output>
     </operation>
+    <operation name="cancelJob">
+      <soap:operation soapAction=""/>
+      <input>
+        <soap:body use="literal"/>
+      </input>
+      <output>
+        <soap:body use="literal"/>
+      </output>
+    </operation>
     <operation name="getJobStatus">
       <soap:operation soapAction=""/>
       <input>
@@ -255,7 +255,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLimits">
+    <operation name="getRunnerOptions">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -273,7 +273,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getRunnerOptions">
+    <operation name="getLimits">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
diff --git a/webservices/compbio/ws/server/resource/JronnWS_schema1.xsd b/webservices/compbio/ws/server/resource/JronnWS_schema1.xsd
index 6f34ece..99b9b4d 100644 (file)
--- a/webservices/compbio/ws/server/resource/JronnWS_schema1.xsd
+++ b/webservices/compbio/ws/server/resource/JronnWS_schema1.xsd
@@ -255,23 +255,6 @@
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getPresets">
-    <xs:sequence/>
-  </xs:complexType>
-
-  <xs:complexType name="getPresetsResponse">
-    <xs:sequence>
-      <xs:element name="return" type="tns:presetManager" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="presetManager">
-    <xs:sequence>
-      <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>
@@ -298,6 +281,23 @@
     <xs:attribute name="isDefault" type="xs:boolean" use="required"/>
   </xs:complexType>
 
+  <xs:complexType name="getPresets">
+    <xs:sequence/>
+  </xs:complexType>
+
+  <xs:complexType name="getPresetsResponse">
+    <xs:sequence>
+      <xs:element name="return" type="tns:presetManager" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="presetManager">
+    <xs:sequence>
+      <xs:element name="runnerClassName" type="xs:string"/>
+      <xs:element name="preset" type="tns:preset" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+
   <xs:complexType name="getLimit">
     <xs:sequence>
       <xs:element name="presetName" type="xs:string" minOccurs="0"/>
diff --git a/webservices/compbio/ws/server/resource/MafftWS.wsdl b/webservices/compbio/ws/server/resource/MafftWS.wsdl
index bebc64b..c7bfe2e 100644 (file)
--- a/webservices/compbio/ws/server/resource/MafftWS.wsdl
+++ b/webservices/compbio/ws/server/resource/MafftWS.wsdl
@@ -15,11 +15,11 @@
   <message name="ResultNotAvailableException">
     <part name="fault" element="tns:ResultNotAvailableException"/>
   </message>
-  <message name="align">
-    <part name="parameters" element="tns:align"/>
+  <message name="presetAlign">
+    <part name="parameters" element="tns:presetAlign"/>
   </message>
-  <message name="alignResponse">
-    <part name="parameters" element="tns:alignResponse"/>
+  <message name="presetAlignResponse">
+    <part name="parameters" element="tns:presetAlignResponse"/>
   </message>
   <message name="UnsupportedRuntimeException">
     <part name="fault" element="tns:UnsupportedRuntimeException"/>
@@ -30,12 +30,6 @@
   <message name="JobSubmissionException">
     <part name="fault" element="tns:JobSubmissionException"/>
   </message>
-  <message name="presetAlign">
-    <part name="parameters" element="tns:presetAlign"/>
-  </message>
-  <message name="presetAlignResponse">
-    <part name="parameters" element="tns:presetAlignResponse"/>
-  </message>
   <message name="WrongParameterException">
     <part name="fault" element="tns:WrongParameterException"/>
   </message>
@@ -45,11 +39,11 @@
   <message name="customAlignResponse">
     <part name="parameters" element="tns:customAlignResponse"/>
   </message>
-  <message name="cancelJob">
-    <part name="parameters" element="tns:cancelJob"/>
+  <message name="align">
+    <part name="parameters" element="tns:align"/>
   </message>
-  <message name="cancelJobResponse">
-    <part name="parameters" element="tns:cancelJobResponse"/>
+  <message name="alignResponse">
+    <part name="parameters" element="tns:alignResponse"/>
   </message>
   <message name="pullExecStatistics">
     <part name="parameters" element="tns:pullExecStatistics"/>
@@ -57,6 +51,12 @@
   <message name="pullExecStatisticsResponse">
     <part name="parameters" element="tns:pullExecStatisticsResponse"/>
   </message>
+  <message name="cancelJob">
+    <part name="parameters" element="tns:cancelJob"/>
+  </message>
+  <message name="cancelJobResponse">
+    <part name="parameters" element="tns:cancelJobResponse"/>
+  </message>
   <message name="getJobStatus">
     <part name="parameters" element="tns:getJobStatus"/>
   </message>
@@ -69,11 +69,11 @@
   <message name="getLimitResponse">
     <part name="parameters" element="tns:getLimitResponse"/>
   </message>
-  <message name="getLimits">
-    <part name="parameters" element="tns:getLimits"/>
+  <message name="getRunnerOptions">
+    <part name="parameters" element="tns:getRunnerOptions"/>
   </message>
-  <message name="getLimitsResponse">
-    <part name="parameters" element="tns:getLimitsResponse"/>
+  <message name="getRunnerOptionsResponse">
+    <part name="parameters" element="tns:getRunnerOptionsResponse"/>
   </message>
   <message name="getPresets">
     <part name="parameters" element="tns:getPresets"/>
@@ -81,11 +81,11 @@
   <message name="getPresetsResponse">
     <part name="parameters" element="tns:getPresetsResponse"/>
   </message>
-  <message name="getRunnerOptions">
-    <part name="parameters" element="tns:getRunnerOptions"/>
+  <message name="getLimits">
+    <part name="parameters" element="tns:getLimits"/>
   </message>
-  <message name="getRunnerOptionsResponse">
-    <part name="parameters" element="tns:getRunnerOptionsResponse"/>
+  <message name="getLimitsResponse">
+    <part name="parameters" element="tns:getLimitsResponse"/>
   </message>
   <portType name="MsaWS">
     <operation name="getResult">
@@ -93,13 +93,6 @@
       <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"/>
-      <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="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"/>
@@ -116,14 +109,21 @@
       <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="cancelJob">
-      <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 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="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="cancelJob">
+      <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/01/2010/MsaWS/getJobStatusRequest" message="tns:getJobStatus"/>
       <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getJobStatusResponse" message="tns:getJobStatusResponse"/>
@@ -132,17 +132,17 @@
       <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="getLimits">
-      <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 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>
     <operation name="getPresets">
       <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="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="getLimits">
+      <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>
   </portType>
   <binding name="MafftWSPortBinding" type="tns:MsaWS">
@@ -159,7 +159,7 @@
         <soap:fault name="ResultNotAvailableException" use="literal"/>
       </fault>
     </operation>
-    <operation name="align">
+    <operation name="presetAlign">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -176,8 +176,11 @@
       <fault name="JobSubmissionException">
         <soap:fault name="JobSubmissionException" use="literal"/>
       </fault>
+      <fault name="WrongParameterException">
+        <soap:fault name="WrongParameterException" use="literal"/>
+      </fault>
     </operation>
-    <operation name="presetAlign">
+    <operation name="customAlign">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -198,7 +201,7 @@
         <soap:fault name="WrongParameterException" use="literal"/>
       </fault>
     </operation>
-    <operation name="customAlign">
+    <operation name="align">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -215,11 +218,8 @@
       <fault name="JobSubmissionException">
         <soap:fault name="JobSubmissionException" use="literal"/>
       </fault>
-      <fault name="WrongParameterException">
-        <soap:fault name="WrongParameterException" use="literal"/>
-      </fault>
     </operation>
-    <operation name="cancelJob">
+    <operation name="pullExecStatistics">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -228,7 +228,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="pullExecStatistics">
+    <operation name="cancelJob">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -255,7 +255,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLimits">
+    <operation name="getRunnerOptions">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -273,7 +273,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getRunnerOptions">
+    <operation name="getLimits">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
diff --git a/webservices/compbio/ws/server/resource/MafftWS_schema1.xsd b/webservices/compbio/ws/server/resource/MafftWS_schema1.xsd
index c432550..05f2a89 100644 (file)
--- a/webservices/compbio/ws/server/resource/MafftWS_schema1.xsd
+++ b/webservices/compbio/ws/server/resource/MafftWS_schema1.xsd
@@ -161,6 +161,32 @@
     </xs:sequence>
   </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="limit">
+    <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:sequence>
+    <xs:attribute name="isDefault" type="xs:boolean" use="required"/>
+  </xs:complexType>
+
   <xs:complexType name="getPresets">
     <xs:sequence/>
   </xs:complexType>
@@ -192,32 +218,6 @@
     </xs:sequence>
   </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="limit">
-    <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:sequence>
-    <xs:attribute name="isDefault" type="xs:boolean" use="required"/>
-  </xs:complexType>
-
   <xs:complexType name="getLimit">
     <xs:sequence>
       <xs:element name="presetName" type="xs:string" minOccurs="0"/>
diff --git a/webservices/compbio/ws/server/resource/MuscleWS.wsdl b/webservices/compbio/ws/server/resource/MuscleWS.wsdl
index 4f2af4f..867020c 100644 (file)
--- a/webservices/compbio/ws/server/resource/MuscleWS.wsdl
+++ b/webservices/compbio/ws/server/resource/MuscleWS.wsdl
@@ -15,11 +15,11 @@
   <message name="ResultNotAvailableException">
     <part name="fault" element="tns:ResultNotAvailableException"/>
   </message>
-  <message name="align">
-    <part name="parameters" element="tns:align"/>
+  <message name="presetAlign">
+    <part name="parameters" element="tns:presetAlign"/>
   </message>
-  <message name="alignResponse">
-    <part name="parameters" element="tns:alignResponse"/>
+  <message name="presetAlignResponse">
+    <part name="parameters" element="tns:presetAlignResponse"/>
   </message>
   <message name="UnsupportedRuntimeException">
     <part name="fault" element="tns:UnsupportedRuntimeException"/>
@@ -30,12 +30,6 @@
   <message name="JobSubmissionException">
     <part name="fault" element="tns:JobSubmissionException"/>
   </message>
-  <message name="presetAlign">
-    <part name="parameters" element="tns:presetAlign"/>
-  </message>
-  <message name="presetAlignResponse">
-    <part name="parameters" element="tns:presetAlignResponse"/>
-  </message>
   <message name="WrongParameterException">
     <part name="fault" element="tns:WrongParameterException"/>
   </message>
@@ -45,11 +39,11 @@
   <message name="customAlignResponse">
     <part name="parameters" element="tns:customAlignResponse"/>
   </message>
-  <message name="cancelJob">
-    <part name="parameters" element="tns:cancelJob"/>
+  <message name="align">
+    <part name="parameters" element="tns:align"/>
   </message>
-  <message name="cancelJobResponse">
-    <part name="parameters" element="tns:cancelJobResponse"/>
+  <message name="alignResponse">
+    <part name="parameters" element="tns:alignResponse"/>
   </message>
   <message name="pullExecStatistics">
     <part name="parameters" element="tns:pullExecStatistics"/>
@@ -57,6 +51,12 @@
   <message name="pullExecStatisticsResponse">
     <part name="parameters" element="tns:pullExecStatisticsResponse"/>
   </message>
+  <message name="cancelJob">
+    <part name="parameters" element="tns:cancelJob"/>
+  </message>
+  <message name="cancelJobResponse">
+    <part name="parameters" element="tns:cancelJobResponse"/>
+  </message>
   <message name="getJobStatus">
     <part name="parameters" element="tns:getJobStatus"/>
   </message>
@@ -69,11 +69,11 @@
   <message name="getLimitResponse">
     <part name="parameters" element="tns:getLimitResponse"/>
   </message>
-  <message name="getLimits">
-    <part name="parameters" element="tns:getLimits"/>
+  <message name="getRunnerOptions">
+    <part name="parameters" element="tns:getRunnerOptions"/>
   </message>
-  <message name="getLimitsResponse">
-    <part name="parameters" element="tns:getLimitsResponse"/>
+  <message name="getRunnerOptionsResponse">
+    <part name="parameters" element="tns:getRunnerOptionsResponse"/>
   </message>
   <message name="getPresets">
     <part name="parameters" element="tns:getPresets"/>
@@ -81,11 +81,11 @@
   <message name="getPresetsResponse">
     <part name="parameters" element="tns:getPresetsResponse"/>
   </message>
-  <message name="getRunnerOptions">
-    <part name="parameters" element="tns:getRunnerOptions"/>
+  <message name="getLimits">
+    <part name="parameters" element="tns:getLimits"/>
   </message>
-  <message name="getRunnerOptionsResponse">
-    <part name="parameters" element="tns:getRunnerOptionsResponse"/>
+  <message name="getLimitsResponse">
+    <part name="parameters" element="tns:getLimitsResponse"/>
   </message>
   <portType name="MsaWS">
     <operation name="getResult">
@@ -93,13 +93,6 @@
       <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"/>
-      <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="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"/>
@@ -116,14 +109,21 @@
       <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="cancelJob">
-      <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 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="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="cancelJob">
+      <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/01/2010/MsaWS/getJobStatusRequest" message="tns:getJobStatus"/>
       <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getJobStatusResponse" message="tns:getJobStatusResponse"/>
@@ -132,17 +132,17 @@
       <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="getLimits">
-      <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 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>
     <operation name="getPresets">
       <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="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="getLimits">
+      <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>
   </portType>
   <binding name="MuscleWSPortBinding" type="tns:MsaWS">
@@ -159,7 +159,7 @@
         <soap:fault name="ResultNotAvailableException" use="literal"/>
       </fault>
     </operation>
-    <operation name="align">
+    <operation name="presetAlign">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -176,8 +176,11 @@
       <fault name="JobSubmissionException">
         <soap:fault name="JobSubmissionException" use="literal"/>
       </fault>
+      <fault name="WrongParameterException">
+        <soap:fault name="WrongParameterException" use="literal"/>
+      </fault>
     </operation>
-    <operation name="presetAlign">
+    <operation name="customAlign">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -198,7 +201,7 @@
         <soap:fault name="WrongParameterException" use="literal"/>
       </fault>
     </operation>
-    <operation name="customAlign">
+    <operation name="align">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -215,11 +218,8 @@
       <fault name="JobSubmissionException">
         <soap:fault name="JobSubmissionException" use="literal"/>
       </fault>
-      <fault name="WrongParameterException">
-        <soap:fault name="WrongParameterException" use="literal"/>
-      </fault>
     </operation>
-    <operation name="cancelJob">
+    <operation name="pullExecStatistics">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -228,7 +228,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="pullExecStatistics">
+    <operation name="cancelJob">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -255,7 +255,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLimits">
+    <operation name="getRunnerOptions">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -273,7 +273,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getRunnerOptions">
+    <operation name="getLimits">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
diff --git a/webservices/compbio/ws/server/resource/MuscleWS_schema1.xsd b/webservices/compbio/ws/server/resource/MuscleWS_schema1.xsd
index 0895916..e6c3574 100644 (file)
--- a/webservices/compbio/ws/server/resource/MuscleWS_schema1.xsd
+++ b/webservices/compbio/ws/server/resource/MuscleWS_schema1.xsd
@@ -152,6 +152,32 @@
     </xs:sequence>
   </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="limit">
+    <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:sequence>
+    <xs:attribute name="isDefault" type="xs:boolean" use="required"/>
+  </xs:complexType>
+
   <xs:complexType name="getPresets">
     <xs:sequence/>
   </xs:complexType>
@@ -183,32 +209,6 @@
     </xs:sequence>
   </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="limit">
-    <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:sequence>
-    <xs:attribute name="isDefault" type="xs:boolean" use="required"/>
-  </xs:complexType>
-
   <xs:complexType name="getLimit">
     <xs:sequence>
       <xs:element name="presetName" type="xs:string" minOccurs="0"/>
diff --git a/webservices/compbio/ws/server/resource/TcoffeeWS.wsdl b/webservices/compbio/ws/server/resource/TcoffeeWS.wsdl
index 5129abb..415612b 100644 (file)
--- a/webservices/compbio/ws/server/resource/TcoffeeWS.wsdl
+++ b/webservices/compbio/ws/server/resource/TcoffeeWS.wsdl
@@ -15,11 +15,11 @@
   <message name="ResultNotAvailableException">
     <part name="fault" element="tns:ResultNotAvailableException"/>
   </message>
-  <message name="align">
-    <part name="parameters" element="tns:align"/>
+  <message name="presetAlign">
+    <part name="parameters" element="tns:presetAlign"/>
   </message>
-  <message name="alignResponse">
-    <part name="parameters" element="tns:alignResponse"/>
+  <message name="presetAlignResponse">
+    <part name="parameters" element="tns:presetAlignResponse"/>
   </message>
   <message name="UnsupportedRuntimeException">
     <part name="fault" element="tns:UnsupportedRuntimeException"/>
@@ -30,12 +30,6 @@
   <message name="JobSubmissionException">
     <part name="fault" element="tns:JobSubmissionException"/>
   </message>
-  <message name="presetAlign">
-    <part name="parameters" element="tns:presetAlign"/>
-  </message>
-  <message name="presetAlignResponse">
-    <part name="parameters" element="tns:presetAlignResponse"/>
-  </message>
   <message name="WrongParameterException">
     <part name="fault" element="tns:WrongParameterException"/>
   </message>
@@ -45,11 +39,11 @@
   <message name="customAlignResponse">
     <part name="parameters" element="tns:customAlignResponse"/>
   </message>
-  <message name="cancelJob">
-    <part name="parameters" element="tns:cancelJob"/>
+  <message name="align">
+    <part name="parameters" element="tns:align"/>
   </message>
-  <message name="cancelJobResponse">
-    <part name="parameters" element="tns:cancelJobResponse"/>
+  <message name="alignResponse">
+    <part name="parameters" element="tns:alignResponse"/>
   </message>
   <message name="pullExecStatistics">
     <part name="parameters" element="tns:pullExecStatistics"/>
@@ -57,6 +51,12 @@
   <message name="pullExecStatisticsResponse">
     <part name="parameters" element="tns:pullExecStatisticsResponse"/>
   </message>
+  <message name="cancelJob">
+    <part name="parameters" element="tns:cancelJob"/>
+  </message>
+  <message name="cancelJobResponse">
+    <part name="parameters" element="tns:cancelJobResponse"/>
+  </message>
   <message name="getJobStatus">
     <part name="parameters" element="tns:getJobStatus"/>
   </message>
@@ -69,11 +69,11 @@
   <message name="getLimitResponse">
     <part name="parameters" element="tns:getLimitResponse"/>
   </message>
-  <message name="getLimits">
-    <part name="parameters" element="tns:getLimits"/>
+  <message name="getRunnerOptions">
+    <part name="parameters" element="tns:getRunnerOptions"/>
   </message>
-  <message name="getLimitsResponse">
-    <part name="parameters" element="tns:getLimitsResponse"/>
+  <message name="getRunnerOptionsResponse">
+    <part name="parameters" element="tns:getRunnerOptionsResponse"/>
   </message>
   <message name="getPresets">
     <part name="parameters" element="tns:getPresets"/>
@@ -81,11 +81,11 @@
   <message name="getPresetsResponse">
     <part name="parameters" element="tns:getPresetsResponse"/>
   </message>
-  <message name="getRunnerOptions">
-    <part name="parameters" element="tns:getRunnerOptions"/>
+  <message name="getLimits">
+    <part name="parameters" element="tns:getLimits"/>
   </message>
-  <message name="getRunnerOptionsResponse">
-    <part name="parameters" element="tns:getRunnerOptionsResponse"/>
+  <message name="getLimitsResponse">
+    <part name="parameters" element="tns:getLimitsResponse"/>
   </message>
   <portType name="MsaWS">
     <operation name="getResult">
@@ -93,13 +93,6 @@
       <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"/>
-      <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="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"/>
@@ -116,14 +109,21 @@
       <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="cancelJob">
-      <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 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="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="cancelJob">
+      <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/01/2010/MsaWS/getJobStatusRequest" message="tns:getJobStatus"/>
       <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getJobStatusResponse" message="tns:getJobStatusResponse"/>
@@ -132,17 +132,17 @@
       <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="getLimits">
-      <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 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>
     <operation name="getPresets">
       <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="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="getLimits">
+      <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>
   </portType>
   <binding name="TcoffeeWSPortBinding" type="tns:MsaWS">
@@ -159,7 +159,7 @@
         <soap:fault name="ResultNotAvailableException" use="literal"/>
       </fault>
     </operation>
-    <operation name="align">
+    <operation name="presetAlign">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -176,8 +176,11 @@
       <fault name="JobSubmissionException">
         <soap:fault name="JobSubmissionException" use="literal"/>
       </fault>
+      <fault name="WrongParameterException">
+        <soap:fault name="WrongParameterException" use="literal"/>
+      </fault>
     </operation>
-    <operation name="presetAlign">
+    <operation name="customAlign">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -198,7 +201,7 @@
         <soap:fault name="WrongParameterException" use="literal"/>
       </fault>
     </operation>
-    <operation name="customAlign">
+    <operation name="align">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -215,11 +218,8 @@
       <fault name="JobSubmissionException">
         <soap:fault name="JobSubmissionException" use="literal"/>
       </fault>
-      <fault name="WrongParameterException">
-        <soap:fault name="WrongParameterException" use="literal"/>
-      </fault>
     </operation>
-    <operation name="cancelJob">
+    <operation name="pullExecStatistics">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -228,7 +228,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="pullExecStatistics">
+    <operation name="cancelJob">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -255,7 +255,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLimits">
+    <operation name="getRunnerOptions">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -273,7 +273,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getRunnerOptions">
+    <operation name="getLimits">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
diff --git a/webservices/compbio/ws/server/resource/TcoffeeWS_schema1.xsd b/webservices/compbio/ws/server/resource/TcoffeeWS_schema1.xsd
index 18262c9..9f5bbee 100644 (file)
--- a/webservices/compbio/ws/server/resource/TcoffeeWS_schema1.xsd
+++ b/webservices/compbio/ws/server/resource/TcoffeeWS_schema1.xsd
@@ -152,6 +152,32 @@
     </xs:sequence>
   </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="limit">
+    <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:sequence>
+    <xs:attribute name="isDefault" type="xs:boolean" use="required"/>
+  </xs:complexType>
+
   <xs:complexType name="getPresets">
     <xs:sequence/>
   </xs:complexType>
@@ -183,32 +209,6 @@
     </xs:sequence>
   </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="limit">
-    <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:sequence>
-    <xs:attribute name="isDefault" type="xs:boolean" use="required"/>
-  </xs:complexType>
-
   <xs:complexType name="getLimit">
     <xs:sequence>
       <xs:element name="presetName" type="xs:string" minOccurs="0"/>