From: Sasha Sherstnev <a.sherstnev@dundee.ac.uk>
Date: Tue, 10 Sep 2013 15:09:58 +0000 (+0100)
Subject: New version of wsdl and xsd files for all services
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=610dd023012fb0208a1340e5ef9bdc3bfc1c301b;p=jabaws.git

New version of wsdl and xsd files for all services
---

diff --git a/webservices/compbio/ws/server/resource/AAConWS.wsdl b/webservices/compbio/ws/server/resource/AAConWS.wsdl
index 552c811..788ad44 100644
--- a/webservices/compbio/ws/server/resource/AAConWS.wsdl
+++ b/webservices/compbio/ws/server/resource/AAConWS.wsdl
@@ -63,17 +63,11 @@
   <message name="pullExecStatisticsResponse">
     <part name="parameters" element="tns:pullExecStatisticsResponse"/>
   </message>
-  <message name="getPresets">
-    <part name="parameters" element="tns:getPresets"/>
-  </message>
-  <message name="getPresetsResponse">
-    <part name="parameters" element="tns:getPresetsResponse"/>
-  </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="getLimit">
     <part name="parameters" element="tns:getLimit"/>
@@ -81,11 +75,17 @@
   <message name="getLimitResponse">
     <part name="parameters" element="tns:getLimitResponse"/>
   </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>
+  <message name="getPresets">
+    <part name="parameters" element="tns:getPresets"/>
+  </message>
+  <message name="getPresetsResponse">
+    <part name="parameters" element="tns:getPresetsResponse"/>
   </message>
   <portType name="SequenceAnnotation">
     <operation name="getAnnotation">
@@ -128,21 +128,21 @@
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/pullExecStatisticsRequest" message="tns:pullExecStatistics"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/pullExecStatisticsResponse" message="tns:pullExecStatisticsResponse"/>
     </operation>
-    <operation name="getPresets">
-      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getPresetsRequest" message="tns:getPresets"/>
-      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getPresetsResponse" message="tns:getPresetsResponse"/>
-    </operation>
-    <operation name="getLimits">
-      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitsRequest" message="tns:getLimits"/>
-      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitsResponse" message="tns:getLimitsResponse"/>
+    <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="getLimit">
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitRequest" message="tns:getLimit"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitResponse" message="tns:getLimitResponse"/>
     </operation>
-    <operation name="getRunnerOptions">
-      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getRunnerOptionsRequest" message="tns:getRunnerOptions"/>
-      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getRunnerOptionsResponse" message="tns:getRunnerOptionsResponse"/>
+    <operation name="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>
+    <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>
   </portType>
   <binding name="AAConWSPortBinding" type="tns:SequenceAnnotation">
@@ -246,7 +246,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getPresets">
+    <operation name="getRunnerOptions">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -255,7 +255,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLimits">
+    <operation name="getLimit">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -264,7 +264,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLimit">
+    <operation name="getLimits">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -273,7 +273,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getRunnerOptions">
+    <operation name="getPresets">
       <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 a9becf7..47e1266 100644
--- a/webservices/compbio/ws/server/resource/AAConWS_schema1.xsd
+++ b/webservices/compbio/ws/server/resource/AAConWS_schema1.xsd
@@ -236,6 +236,14 @@
     </xs:sequence>
   </xs:complexType>
 
+  <xs:complexType name="rnaStructScoreManager">
+    <xs:complexContent>
+      <xs:extension base="tns:scoreManager">
+        <xs:sequence/>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
   <xs:complexType name="ResultNotAvailableException">
     <xs:sequence>
       <xs:element name="message" type="xs:string" minOccurs="0"/>
@@ -255,25 +263,21 @@
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getLimit">
-    <xs:sequence>
-      <xs:element name="presetName" type="xs:string" minOccurs="0"/>
-    </xs:sequence>
+  <xs:complexType name="getPresets">
+    <xs:sequence/>
   </xs:complexType>
 
-  <xs:complexType name="getLimitResponse">
+  <xs:complexType name="getPresetsResponse">
     <xs:sequence>
-      <xs:element name="return" type="tns:limit" minOccurs="0"/>
+      <xs:element name="return" type="tns:presetManager" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="limit">
+  <xs:complexType name="presetManager">
     <xs:sequence>
-      <xs:element name="preset" type="xs:string" minOccurs="0"/>
-      <xs:element name="seqNumber" type="xs:int"/>
-      <xs:element name="seqLength" type="xs:int"/>
+      <xs:element name="runnerClassName" type="xs:string"/>
+      <xs:element name="preset" type="tns:preset" maxOccurs="unbounded"/>
     </xs:sequence>
-    <xs:attribute name="isDefault" type="xs:boolean" use="required"/>
   </xs:complexType>
 
   <xs:complexType name="getLimits">
@@ -293,20 +297,24 @@
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getPresets">
-    <xs:sequence/>
+  <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="getPresetsResponse">
+  <xs:complexType name="getLimit">
     <xs:sequence>
-      <xs:element name="return" type="tns:presetManager" minOccurs="0"/>
+      <xs:element name="presetName" type="xs:string" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="presetManager">
+  <xs:complexType name="getLimitResponse">
     <xs:sequence>
-      <xs:element name="runnerClassName" type="xs:string"/>
-      <xs:element name="preset" type="tns:preset" maxOccurs="unbounded"/>
+      <xs:element name="return" type="tns:limit" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
diff --git a/webservices/compbio/ws/server/resource/ClustalWS.wsdl b/webservices/compbio/ws/server/resource/ClustalWS.wsdl
index 3b7100d..47389ba 100644
--- a/webservices/compbio/ws/server/resource/ClustalWS.wsdl
+++ b/webservices/compbio/ws/server/resource/ClustalWS.wsdl
@@ -63,17 +63,11 @@
   <message name="pullExecStatisticsResponse">
     <part name="parameters" element="tns:pullExecStatisticsResponse"/>
   </message>
-  <message name="getPresets">
-    <part name="parameters" element="tns:getPresets"/>
-  </message>
-  <message name="getPresetsResponse">
-    <part name="parameters" element="tns:getPresetsResponse"/>
-  </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="getLimit">
     <part name="parameters" element="tns:getLimit"/>
@@ -81,11 +75,17 @@
   <message name="getLimitResponse">
     <part name="parameters" element="tns:getLimitResponse"/>
   </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>
+  <message name="getPresets">
+    <part name="parameters" element="tns:getPresets"/>
+  </message>
+  <message name="getPresetsResponse">
+    <part name="parameters" element="tns:getPresetsResponse"/>
   </message>
   <portType name="MsaWS">
     <operation name="align">
@@ -128,21 +128,21 @@
       <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/pullExecStatisticsRequest" message="tns:pullExecStatistics"/>
       <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/pullExecStatisticsResponse" message="tns:pullExecStatisticsResponse"/>
     </operation>
-    <operation name="getPresets">
-      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getPresetsRequest" message="tns:getPresets"/>
-      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getPresetsResponse" message="tns:getPresetsResponse"/>
-    </operation>
-    <operation name="getLimits">
-      <input wsam:Action="http://msa.data.compbio/01/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="getLimit">
       <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitRequest" message="tns:getLimit"/>
       <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitResponse" message="tns:getLimitResponse"/>
     </operation>
-    <operation name="getRunnerOptions">
-      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getRunnerOptionsRequest" message="tns:getRunnerOptions"/>
-      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getRunnerOptionsResponse" message="tns:getRunnerOptionsResponse"/>
+    <operation name="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>
+    <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>
   </portType>
   <binding name="ClustalWSPortBinding" type="tns:MsaWS">
@@ -246,7 +246,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getPresets">
+    <operation name="getRunnerOptions">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -255,7 +255,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLimits">
+    <operation name="getLimit">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -264,7 +264,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLimit">
+    <operation name="getLimits">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -273,7 +273,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getRunnerOptions">
+    <operation name="getPresets">
       <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 99e928a..7bd79b9 100644
--- a/webservices/compbio/ws/server/resource/ClustalWS_schema1.xsd
+++ b/webservices/compbio/ws/server/resource/ClustalWS_schema1.xsd
@@ -161,25 +161,35 @@
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getLimit">
+  <xs:complexType name="getPresets">
+    <xs:sequence/>
+  </xs:complexType>
+
+  <xs:complexType name="getPresetsResponse">
     <xs:sequence>
-      <xs:element name="presetName" type="xs:string" minOccurs="0"/>
+      <xs:element name="return" type="tns:presetManager" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getLimitResponse">
+  <xs:complexType name="presetManager">
     <xs:sequence>
-      <xs:element name="return" type="tns:limit" minOccurs="0"/>
+      <xs:element name="runnerClassName" type="xs:string"/>
+      <xs:element name="preset" type="tns:preset" maxOccurs="unbounded"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="limit">
+  <xs:complexType name="preset">
     <xs:sequence>
-      <xs:element name="preset" type="xs:string" minOccurs="0"/>
-      <xs:element name="seqNumber" type="xs:int"/>
-      <xs:element name="seqLength" type="xs:int"/>
+      <xs:element name="name" type="xs:string"/>
+      <xs:element name="description" type="xs:string" minOccurs="0"/>
+      <xs:element name="optlist" minOccurs="0">
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element name="option" type="xs:string" maxOccurs="unbounded"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
     </xs:sequence>
-    <xs:attribute name="isDefault" type="xs:boolean" use="required"/>
   </xs:complexType>
 
   <xs:complexType name="getLimits">
@@ -199,34 +209,24 @@
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getPresets">
-    <xs:sequence/>
-  </xs:complexType>
-
-  <xs:complexType name="getPresetsResponse">
+  <xs:complexType name="limit">
     <xs:sequence>
-      <xs:element name="return" type="tns:presetManager" minOccurs="0"/>
+      <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="presetManager">
+  <xs:complexType name="getLimit">
     <xs:sequence>
-      <xs:element name="runnerClassName" type="xs:string"/>
-      <xs:element name="preset" type="tns:preset" maxOccurs="unbounded"/>
+      <xs:element name="presetName" type="xs:string" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="preset">
+  <xs:complexType name="getLimitResponse">
     <xs:sequence>
-      <xs:element name="name" type="xs:string"/>
-      <xs:element name="description" type="xs:string" minOccurs="0"/>
-      <xs:element name="optlist" minOccurs="0">
-        <xs:complexType>
-          <xs:sequence>
-            <xs:element name="option" type="xs:string" maxOccurs="unbounded"/>
-          </xs:sequence>
-        </xs:complexType>
-      </xs:element>
+      <xs:element name="return" type="tns:limit" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
diff --git a/webservices/compbio/ws/server/resource/DisemblWS.wsdl b/webservices/compbio/ws/server/resource/DisemblWS.wsdl
index cb2fc9c..93ba619 100644
--- a/webservices/compbio/ws/server/resource/DisemblWS.wsdl
+++ b/webservices/compbio/ws/server/resource/DisemblWS.wsdl
@@ -63,17 +63,11 @@
   <message name="pullExecStatisticsResponse">
     <part name="parameters" element="tns:pullExecStatisticsResponse"/>
   </message>
-  <message name="getPresets">
-    <part name="parameters" element="tns:getPresets"/>
-  </message>
-  <message name="getPresetsResponse">
-    <part name="parameters" element="tns:getPresetsResponse"/>
-  </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="getLimit">
     <part name="parameters" element="tns:getLimit"/>
@@ -81,11 +75,17 @@
   <message name="getLimitResponse">
     <part name="parameters" element="tns:getLimitResponse"/>
   </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>
+  <message name="getPresets">
+    <part name="parameters" element="tns:getPresets"/>
+  </message>
+  <message name="getPresetsResponse">
+    <part name="parameters" element="tns:getPresetsResponse"/>
   </message>
   <portType name="SequenceAnnotation">
     <operation name="getAnnotation">
@@ -128,21 +128,21 @@
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/pullExecStatisticsRequest" message="tns:pullExecStatistics"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/pullExecStatisticsResponse" message="tns:pullExecStatisticsResponse"/>
     </operation>
-    <operation name="getPresets">
-      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getPresetsRequest" message="tns:getPresets"/>
-      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getPresetsResponse" message="tns:getPresetsResponse"/>
-    </operation>
-    <operation name="getLimits">
-      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitsRequest" message="tns:getLimits"/>
-      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitsResponse" message="tns:getLimitsResponse"/>
+    <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="getLimit">
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitRequest" message="tns:getLimit"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitResponse" message="tns:getLimitResponse"/>
     </operation>
-    <operation name="getRunnerOptions">
-      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getRunnerOptionsRequest" message="tns:getRunnerOptions"/>
-      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getRunnerOptionsResponse" message="tns:getRunnerOptionsResponse"/>
+    <operation name="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>
+    <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>
   </portType>
   <binding name="DisemblWSPortBinding" type="tns:SequenceAnnotation">
@@ -246,7 +246,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getPresets">
+    <operation name="getRunnerOptions">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -255,7 +255,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLimits">
+    <operation name="getLimit">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -264,7 +264,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLimit">
+    <operation name="getLimits">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -273,7 +273,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getRunnerOptions">
+    <operation name="getPresets">
       <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 d37dc1d..42b831b 100644
--- a/webservices/compbio/ws/server/resource/DisemblWS_schema1.xsd
+++ b/webservices/compbio/ws/server/resource/DisemblWS_schema1.xsd
@@ -203,6 +203,14 @@
     </xs:sequence>
   </xs:complexType>
 
+  <xs:complexType name="rnaStructScoreManager">
+    <xs:complexContent>
+      <xs:extension base="tns:scoreManager">
+        <xs:sequence/>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
   <xs:complexType name="ResultNotAvailableException">
     <xs:sequence>
       <xs:element name="message" type="xs:string" minOccurs="0"/>
@@ -262,25 +270,21 @@
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getLimit">
-    <xs:sequence>
-      <xs:element name="presetName" type="xs:string" minOccurs="0"/>
-    </xs:sequence>
+  <xs:complexType name="getPresets">
+    <xs:sequence/>
   </xs:complexType>
 
-  <xs:complexType name="getLimitResponse">
+  <xs:complexType name="getPresetsResponse">
     <xs:sequence>
-      <xs:element name="return" type="tns:limit" minOccurs="0"/>
+      <xs:element name="return" type="tns:presetManager" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="limit">
+  <xs:complexType name="presetManager">
     <xs:sequence>
-      <xs:element name="preset" type="xs:string" minOccurs="0"/>
-      <xs:element name="seqNumber" type="xs:int"/>
-      <xs:element name="seqLength" type="xs:int"/>
+      <xs:element name="runnerClassName" type="xs:string"/>
+      <xs:element name="preset" type="tns:preset" maxOccurs="unbounded"/>
     </xs:sequence>
-    <xs:attribute name="isDefault" type="xs:boolean" use="required"/>
   </xs:complexType>
 
   <xs:complexType name="getLimits">
@@ -300,20 +304,24 @@
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getPresets">
-    <xs:sequence/>
+  <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="getPresetsResponse">
+  <xs:complexType name="getLimit">
     <xs:sequence>
-      <xs:element name="return" type="tns:presetManager" minOccurs="0"/>
+      <xs:element name="presetName" type="xs:string" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="presetManager">
+  <xs:complexType name="getLimitResponse">
     <xs:sequence>
-      <xs:element name="runnerClassName" type="xs:string"/>
-      <xs:element name="preset" type="tns:preset" maxOccurs="unbounded"/>
+      <xs:element name="return" type="tns:limit" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
diff --git a/webservices/compbio/ws/server/resource/GlobPlotWS.wsdl b/webservices/compbio/ws/server/resource/GlobPlotWS.wsdl
index 7745a15..6cbe021 100644
--- a/webservices/compbio/ws/server/resource/GlobPlotWS.wsdl
+++ b/webservices/compbio/ws/server/resource/GlobPlotWS.wsdl
@@ -63,17 +63,11 @@
   <message name="pullExecStatisticsResponse">
     <part name="parameters" element="tns:pullExecStatisticsResponse"/>
   </message>
-  <message name="getPresets">
-    <part name="parameters" element="tns:getPresets"/>
-  </message>
-  <message name="getPresetsResponse">
-    <part name="parameters" element="tns:getPresetsResponse"/>
-  </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="getLimit">
     <part name="parameters" element="tns:getLimit"/>
@@ -81,11 +75,17 @@
   <message name="getLimitResponse">
     <part name="parameters" element="tns:getLimitResponse"/>
   </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>
+  <message name="getPresets">
+    <part name="parameters" element="tns:getPresets"/>
+  </message>
+  <message name="getPresetsResponse">
+    <part name="parameters" element="tns:getPresetsResponse"/>
   </message>
   <portType name="SequenceAnnotation">
     <operation name="getAnnotation">
@@ -128,21 +128,21 @@
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/pullExecStatisticsRequest" message="tns:pullExecStatistics"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/pullExecStatisticsResponse" message="tns:pullExecStatisticsResponse"/>
     </operation>
-    <operation name="getPresets">
-      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getPresetsRequest" message="tns:getPresets"/>
-      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getPresetsResponse" message="tns:getPresetsResponse"/>
-    </operation>
-    <operation name="getLimits">
-      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitsRequest" message="tns:getLimits"/>
-      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitsResponse" message="tns:getLimitsResponse"/>
+    <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="getLimit">
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitRequest" message="tns:getLimit"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitResponse" message="tns:getLimitResponse"/>
     </operation>
-    <operation name="getRunnerOptions">
-      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getRunnerOptionsRequest" message="tns:getRunnerOptions"/>
-      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getRunnerOptionsResponse" message="tns:getRunnerOptionsResponse"/>
+    <operation name="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>
+    <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>
   </portType>
   <binding name="GlobPlotWSPortBinding" type="tns:SequenceAnnotation">
@@ -246,7 +246,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getPresets">
+    <operation name="getRunnerOptions">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -255,7 +255,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLimits">
+    <operation name="getLimit">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -264,7 +264,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLimit">
+    <operation name="getLimits">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -273,7 +273,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getRunnerOptions">
+    <operation name="getPresets">
       <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 ca07152..305f11a 100644
--- a/webservices/compbio/ws/server/resource/GlobPlotWS_schema1.xsd
+++ b/webservices/compbio/ws/server/resource/GlobPlotWS_schema1.xsd
@@ -249,6 +249,14 @@
     </xs:sequence>
   </xs:complexType>
 
+  <xs:complexType name="rnaStructScoreManager">
+    <xs:complexContent>
+      <xs:extension base="tns:scoreManager">
+        <xs:sequence/>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
   <xs:complexType name="ResultNotAvailableException">
     <xs:sequence>
       <xs:element name="message" type="xs:string" minOccurs="0"/>
@@ -275,25 +283,21 @@
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getLimit">
-    <xs:sequence>
-      <xs:element name="presetName" type="xs:string" minOccurs="0"/>
-    </xs:sequence>
+  <xs:complexType name="getPresets">
+    <xs:sequence/>
   </xs:complexType>
 
-  <xs:complexType name="getLimitResponse">
+  <xs:complexType name="getPresetsResponse">
     <xs:sequence>
-      <xs:element name="return" type="tns:limit" minOccurs="0"/>
+      <xs:element name="return" type="tns:presetManager" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="limit">
+  <xs:complexType name="presetManager">
     <xs:sequence>
-      <xs:element name="preset" type="xs:string" minOccurs="0"/>
-      <xs:element name="seqNumber" type="xs:int"/>
-      <xs:element name="seqLength" type="xs:int"/>
+      <xs:element name="runnerClassName" type="xs:string"/>
+      <xs:element name="preset" type="tns:preset" maxOccurs="unbounded"/>
     </xs:sequence>
-    <xs:attribute name="isDefault" type="xs:boolean" use="required"/>
   </xs:complexType>
 
   <xs:complexType name="getLimits">
@@ -313,20 +317,24 @@
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getPresets">
-    <xs:sequence/>
+  <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="getPresetsResponse">
+  <xs:complexType name="getLimit">
     <xs:sequence>
-      <xs:element name="return" type="tns:presetManager" minOccurs="0"/>
+      <xs:element name="presetName" type="xs:string" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="presetManager">
+  <xs:complexType name="getLimitResponse">
     <xs:sequence>
-      <xs:element name="runnerClassName" type="xs:string"/>
-      <xs:element name="preset" type="tns:preset" maxOccurs="unbounded"/>
+      <xs:element name="return" type="tns:limit" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
diff --git a/webservices/compbio/ws/server/resource/IUPredWS.wsdl b/webservices/compbio/ws/server/resource/IUPredWS.wsdl
index e47e929..da3e7ff 100644
--- a/webservices/compbio/ws/server/resource/IUPredWS.wsdl
+++ b/webservices/compbio/ws/server/resource/IUPredWS.wsdl
@@ -63,17 +63,11 @@
   <message name="pullExecStatisticsResponse">
     <part name="parameters" element="tns:pullExecStatisticsResponse"/>
   </message>
-  <message name="getPresets">
-    <part name="parameters" element="tns:getPresets"/>
-  </message>
-  <message name="getPresetsResponse">
-    <part name="parameters" element="tns:getPresetsResponse"/>
-  </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="getLimit">
     <part name="parameters" element="tns:getLimit"/>
@@ -81,11 +75,17 @@
   <message name="getLimitResponse">
     <part name="parameters" element="tns:getLimitResponse"/>
   </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>
+  <message name="getPresets">
+    <part name="parameters" element="tns:getPresets"/>
+  </message>
+  <message name="getPresetsResponse">
+    <part name="parameters" element="tns:getPresetsResponse"/>
   </message>
   <portType name="SequenceAnnotation">
     <operation name="getAnnotation">
@@ -128,21 +128,21 @@
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/pullExecStatisticsRequest" message="tns:pullExecStatistics"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/pullExecStatisticsResponse" message="tns:pullExecStatisticsResponse"/>
     </operation>
-    <operation name="getPresets">
-      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getPresetsRequest" message="tns:getPresets"/>
-      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getPresetsResponse" message="tns:getPresetsResponse"/>
-    </operation>
-    <operation name="getLimits">
-      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitsRequest" message="tns:getLimits"/>
-      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitsResponse" message="tns:getLimitsResponse"/>
+    <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="getLimit">
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitRequest" message="tns:getLimit"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitResponse" message="tns:getLimitResponse"/>
     </operation>
-    <operation name="getRunnerOptions">
-      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getRunnerOptionsRequest" message="tns:getRunnerOptions"/>
-      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getRunnerOptionsResponse" message="tns:getRunnerOptionsResponse"/>
+    <operation name="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>
+    <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>
   </portType>
   <binding name="IUPredWSPortBinding" type="tns:SequenceAnnotation">
@@ -246,7 +246,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getPresets">
+    <operation name="getRunnerOptions">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -255,7 +255,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLimits">
+    <operation name="getLimit">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -264,7 +264,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLimit">
+    <operation name="getLimits">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -273,7 +273,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getRunnerOptions">
+    <operation name="getPresets">
       <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 e302e4b..118e6ad 100644
--- a/webservices/compbio/ws/server/resource/IUPredWS_schema1.xsd
+++ b/webservices/compbio/ws/server/resource/IUPredWS_schema1.xsd
@@ -203,6 +203,14 @@
     </xs:sequence>
   </xs:complexType>
 
+  <xs:complexType name="rnaStructScoreManager">
+    <xs:complexContent>
+      <xs:extension base="tns:scoreManager">
+        <xs:sequence/>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
   <xs:complexType name="ResultNotAvailableException">
     <xs:sequence>
       <xs:element name="message" type="xs:string" minOccurs="0"/>
@@ -248,25 +256,35 @@
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getLimit">
+  <xs:complexType name="getPresets">
+    <xs:sequence/>
+  </xs:complexType>
+
+  <xs:complexType name="getPresetsResponse">
     <xs:sequence>
-      <xs:element name="presetName" type="xs:string" minOccurs="0"/>
+      <xs:element name="return" type="tns:presetManager" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getLimitResponse">
+  <xs:complexType name="presetManager">
     <xs:sequence>
-      <xs:element name="return" type="tns:limit" minOccurs="0"/>
+      <xs:element name="runnerClassName" type="xs:string"/>
+      <xs:element name="preset" type="tns:preset" maxOccurs="unbounded"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="limit">
+  <xs:complexType name="preset">
     <xs:sequence>
-      <xs:element name="preset" type="xs:string" minOccurs="0"/>
-      <xs:element name="seqNumber" type="xs:int"/>
-      <xs:element name="seqLength" type="xs:int"/>
+      <xs:element name="name" type="xs:string"/>
+      <xs:element name="description" type="xs:string" minOccurs="0"/>
+      <xs:element name="optlist" minOccurs="0">
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element name="option" type="xs:string" maxOccurs="unbounded"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
     </xs:sequence>
-    <xs:attribute name="isDefault" type="xs:boolean" use="required"/>
   </xs:complexType>
 
   <xs:complexType name="getLimits">
@@ -286,34 +304,24 @@
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getPresets">
-    <xs:sequence/>
-  </xs:complexType>
-
-  <xs:complexType name="getPresetsResponse">
+  <xs:complexType name="limit">
     <xs:sequence>
-      <xs:element name="return" type="tns:presetManager" minOccurs="0"/>
+      <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="presetManager">
+  <xs:complexType name="getLimit">
     <xs:sequence>
-      <xs:element name="runnerClassName" type="xs:string"/>
-      <xs:element name="preset" type="tns:preset" maxOccurs="unbounded"/>
+      <xs:element name="presetName" type="xs:string" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="preset">
+  <xs:complexType name="getLimitResponse">
     <xs:sequence>
-      <xs:element name="name" type="xs:string"/>
-      <xs:element name="description" type="xs:string" minOccurs="0"/>
-      <xs:element name="optlist" minOccurs="0">
-        <xs:complexType>
-          <xs:sequence>
-            <xs:element name="option" type="xs:string" maxOccurs="unbounded"/>
-          </xs:sequence>
-        </xs:complexType>
-      </xs:element>
+      <xs:element name="return" type="tns:limit" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
diff --git a/webservices/compbio/ws/server/resource/JpredWS.wsdl b/webservices/compbio/ws/server/resource/JpredWS.wsdl
index c66ed79..02ca1db 100644
--- a/webservices/compbio/ws/server/resource/JpredWS.wsdl
+++ b/webservices/compbio/ws/server/resource/JpredWS.wsdl
@@ -63,17 +63,11 @@
   <message name="pullExecStatisticsResponse">
     <part name="parameters" element="tns:pullExecStatisticsResponse"/>
   </message>
-  <message name="getPresets">
-    <part name="parameters" element="tns:getPresets"/>
-  </message>
-  <message name="getPresetsResponse">
-    <part name="parameters" element="tns:getPresetsResponse"/>
-  </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="getLimit">
     <part name="parameters" element="tns:getLimit"/>
@@ -81,11 +75,17 @@
   <message name="getLimitResponse">
     <part name="parameters" element="tns:getLimitResponse"/>
   </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>
+  <message name="getPresets">
+    <part name="parameters" element="tns:getPresets"/>
+  </message>
+  <message name="getPresetsResponse">
+    <part name="parameters" element="tns:getPresetsResponse"/>
   </message>
   <portType name="MsaWS">
     <operation name="align">
@@ -128,21 +128,21 @@
       <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/pullExecStatisticsRequest" message="tns:pullExecStatistics"/>
       <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/pullExecStatisticsResponse" message="tns:pullExecStatisticsResponse"/>
     </operation>
-    <operation name="getPresets">
-      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getPresetsRequest" message="tns:getPresets"/>
-      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getPresetsResponse" message="tns:getPresetsResponse"/>
-    </operation>
-    <operation name="getLimits">
-      <input wsam:Action="http://msa.data.compbio/01/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="getLimit">
       <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitRequest" message="tns:getLimit"/>
       <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitResponse" message="tns:getLimitResponse"/>
     </operation>
-    <operation name="getRunnerOptions">
-      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getRunnerOptionsRequest" message="tns:getRunnerOptions"/>
-      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getRunnerOptionsResponse" message="tns:getRunnerOptionsResponse"/>
+    <operation name="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>
+    <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>
   </portType>
   <binding name="JpredWSPortBinding" type="tns:MsaWS">
@@ -246,7 +246,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getPresets">
+    <operation name="getRunnerOptions">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -255,7 +255,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLimits">
+    <operation name="getLimit">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -264,7 +264,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLimit">
+    <operation name="getLimits">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -273,7 +273,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getRunnerOptions">
+    <operation name="getPresets">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
diff --git a/webservices/compbio/ws/server/resource/JpredWS_schema1.xsd b/webservices/compbio/ws/server/resource/JpredWS_schema1.xsd
index 8a7c93f..3053136 100644
--- a/webservices/compbio/ws/server/resource/JpredWS_schema1.xsd
+++ b/webservices/compbio/ws/server/resource/JpredWS_schema1.xsd
@@ -179,25 +179,21 @@
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getLimit">
-    <xs:sequence>
-      <xs:element name="presetName" type="xs:string" minOccurs="0"/>
-    </xs:sequence>
+  <xs:complexType name="getPresets">
+    <xs:sequence/>
   </xs:complexType>
 
-  <xs:complexType name="getLimitResponse">
+  <xs:complexType name="getPresetsResponse">
     <xs:sequence>
-      <xs:element name="return" type="tns:limit" minOccurs="0"/>
+      <xs:element name="return" type="tns:presetManager" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="limit">
+  <xs:complexType name="presetManager">
     <xs:sequence>
-      <xs:element name="preset" type="xs:string" minOccurs="0"/>
-      <xs:element name="seqNumber" type="xs:int"/>
-      <xs:element name="seqLength" type="xs:int"/>
+      <xs:element name="runnerClassName" type="xs:string"/>
+      <xs:element name="preset" type="tns:preset" maxOccurs="unbounded"/>
     </xs:sequence>
-    <xs:attribute name="isDefault" type="xs:boolean" use="required"/>
   </xs:complexType>
 
   <xs:complexType name="getLimits">
@@ -217,20 +213,24 @@
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getPresets">
-    <xs:sequence/>
+  <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="getPresetsResponse">
+  <xs:complexType name="getLimit">
     <xs:sequence>
-      <xs:element name="return" type="tns:presetManager" minOccurs="0"/>
+      <xs:element name="presetName" type="xs:string" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="presetManager">
+  <xs:complexType name="getLimitResponse">
     <xs:sequence>
-      <xs:element name="runnerClassName" type="xs:string"/>
-      <xs:element name="preset" type="tns:preset" maxOccurs="unbounded"/>
+      <xs:element name="return" type="tns:limit" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
diff --git a/webservices/compbio/ws/server/resource/JronnWS.wsdl b/webservices/compbio/ws/server/resource/JronnWS.wsdl
index b109393..87701c4 100644
--- a/webservices/compbio/ws/server/resource/JronnWS.wsdl
+++ b/webservices/compbio/ws/server/resource/JronnWS.wsdl
@@ -63,17 +63,11 @@
   <message name="pullExecStatisticsResponse">
     <part name="parameters" element="tns:pullExecStatisticsResponse"/>
   </message>
-  <message name="getPresets">
-    <part name="parameters" element="tns:getPresets"/>
-  </message>
-  <message name="getPresetsResponse">
-    <part name="parameters" element="tns:getPresetsResponse"/>
-  </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="getLimit">
     <part name="parameters" element="tns:getLimit"/>
@@ -81,11 +75,17 @@
   <message name="getLimitResponse">
     <part name="parameters" element="tns:getLimitResponse"/>
   </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>
+  <message name="getPresets">
+    <part name="parameters" element="tns:getPresets"/>
+  </message>
+  <message name="getPresetsResponse">
+    <part name="parameters" element="tns:getPresetsResponse"/>
   </message>
   <portType name="SequenceAnnotation">
     <operation name="getAnnotation">
@@ -128,21 +128,21 @@
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/pullExecStatisticsRequest" message="tns:pullExecStatistics"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/pullExecStatisticsResponse" message="tns:pullExecStatisticsResponse"/>
     </operation>
-    <operation name="getPresets">
-      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getPresetsRequest" message="tns:getPresets"/>
-      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getPresetsResponse" message="tns:getPresetsResponse"/>
-    </operation>
-    <operation name="getLimits">
-      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitsRequest" message="tns:getLimits"/>
-      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitsResponse" message="tns:getLimitsResponse"/>
+    <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="getLimit">
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitRequest" message="tns:getLimit"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitResponse" message="tns:getLimitResponse"/>
     </operation>
-    <operation name="getRunnerOptions">
-      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getRunnerOptionsRequest" message="tns:getRunnerOptions"/>
-      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getRunnerOptionsResponse" message="tns:getRunnerOptionsResponse"/>
+    <operation name="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>
+    <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>
   </portType>
   <binding name="JronnWSPortBinding" type="tns:SequenceAnnotation">
@@ -246,7 +246,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getPresets">
+    <operation name="getRunnerOptions">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -255,7 +255,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLimits">
+    <operation name="getLimit">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -264,7 +264,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLimit">
+    <operation name="getLimits">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -273,7 +273,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getRunnerOptions">
+    <operation name="getPresets">
       <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 a9becf7..47e1266 100644
--- a/webservices/compbio/ws/server/resource/JronnWS_schema1.xsd
+++ b/webservices/compbio/ws/server/resource/JronnWS_schema1.xsd
@@ -236,6 +236,14 @@
     </xs:sequence>
   </xs:complexType>
 
+  <xs:complexType name="rnaStructScoreManager">
+    <xs:complexContent>
+      <xs:extension base="tns:scoreManager">
+        <xs:sequence/>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
   <xs:complexType name="ResultNotAvailableException">
     <xs:sequence>
       <xs:element name="message" type="xs:string" minOccurs="0"/>
@@ -255,25 +263,21 @@
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getLimit">
-    <xs:sequence>
-      <xs:element name="presetName" type="xs:string" minOccurs="0"/>
-    </xs:sequence>
+  <xs:complexType name="getPresets">
+    <xs:sequence/>
   </xs:complexType>
 
-  <xs:complexType name="getLimitResponse">
+  <xs:complexType name="getPresetsResponse">
     <xs:sequence>
-      <xs:element name="return" type="tns:limit" minOccurs="0"/>
+      <xs:element name="return" type="tns:presetManager" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="limit">
+  <xs:complexType name="presetManager">
     <xs:sequence>
-      <xs:element name="preset" type="xs:string" minOccurs="0"/>
-      <xs:element name="seqNumber" type="xs:int"/>
-      <xs:element name="seqLength" type="xs:int"/>
+      <xs:element name="runnerClassName" type="xs:string"/>
+      <xs:element name="preset" type="tns:preset" maxOccurs="unbounded"/>
     </xs:sequence>
-    <xs:attribute name="isDefault" type="xs:boolean" use="required"/>
   </xs:complexType>
 
   <xs:complexType name="getLimits">
@@ -293,20 +297,24 @@
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getPresets">
-    <xs:sequence/>
+  <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="getPresetsResponse">
+  <xs:complexType name="getLimit">
     <xs:sequence>
-      <xs:element name="return" type="tns:presetManager" minOccurs="0"/>
+      <xs:element name="presetName" type="xs:string" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="presetManager">
+  <xs:complexType name="getLimitResponse">
     <xs:sequence>
-      <xs:element name="runnerClassName" type="xs:string"/>
-      <xs:element name="preset" type="tns:preset" maxOccurs="unbounded"/>
+      <xs:element name="return" type="tns:limit" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
diff --git a/webservices/compbio/ws/server/resource/MafftWS.wsdl b/webservices/compbio/ws/server/resource/MafftWS.wsdl
index 0a9063c..ce52fbe 100644
--- a/webservices/compbio/ws/server/resource/MafftWS.wsdl
+++ b/webservices/compbio/ws/server/resource/MafftWS.wsdl
@@ -63,17 +63,11 @@
   <message name="pullExecStatisticsResponse">
     <part name="parameters" element="tns:pullExecStatisticsResponse"/>
   </message>
-  <message name="getPresets">
-    <part name="parameters" element="tns:getPresets"/>
-  </message>
-  <message name="getPresetsResponse">
-    <part name="parameters" element="tns:getPresetsResponse"/>
-  </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="getLimit">
     <part name="parameters" element="tns:getLimit"/>
@@ -81,11 +75,17 @@
   <message name="getLimitResponse">
     <part name="parameters" element="tns:getLimitResponse"/>
   </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>
+  <message name="getPresets">
+    <part name="parameters" element="tns:getPresets"/>
+  </message>
+  <message name="getPresetsResponse">
+    <part name="parameters" element="tns:getPresetsResponse"/>
   </message>
   <portType name="MsaWS">
     <operation name="align">
@@ -128,21 +128,21 @@
       <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/pullExecStatisticsRequest" message="tns:pullExecStatistics"/>
       <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/pullExecStatisticsResponse" message="tns:pullExecStatisticsResponse"/>
     </operation>
-    <operation name="getPresets">
-      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getPresetsRequest" message="tns:getPresets"/>
-      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getPresetsResponse" message="tns:getPresetsResponse"/>
-    </operation>
-    <operation name="getLimits">
-      <input wsam:Action="http://msa.data.compbio/01/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="getLimit">
       <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitRequest" message="tns:getLimit"/>
       <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitResponse" message="tns:getLimitResponse"/>
     </operation>
-    <operation name="getRunnerOptions">
-      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getRunnerOptionsRequest" message="tns:getRunnerOptions"/>
-      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getRunnerOptionsResponse" message="tns:getRunnerOptionsResponse"/>
+    <operation name="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>
+    <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>
   </portType>
   <binding name="MafftWSPortBinding" type="tns:MsaWS">
@@ -246,7 +246,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getPresets">
+    <operation name="getRunnerOptions">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -255,7 +255,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLimits">
+    <operation name="getLimit">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -264,7 +264,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLimit">
+    <operation name="getLimits">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -273,7 +273,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getRunnerOptions">
+    <operation name="getPresets">
       <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 99e928a..7bd79b9 100644
--- a/webservices/compbio/ws/server/resource/MafftWS_schema1.xsd
+++ b/webservices/compbio/ws/server/resource/MafftWS_schema1.xsd
@@ -161,25 +161,35 @@
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getLimit">
+  <xs:complexType name="getPresets">
+    <xs:sequence/>
+  </xs:complexType>
+
+  <xs:complexType name="getPresetsResponse">
     <xs:sequence>
-      <xs:element name="presetName" type="xs:string" minOccurs="0"/>
+      <xs:element name="return" type="tns:presetManager" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getLimitResponse">
+  <xs:complexType name="presetManager">
     <xs:sequence>
-      <xs:element name="return" type="tns:limit" minOccurs="0"/>
+      <xs:element name="runnerClassName" type="xs:string"/>
+      <xs:element name="preset" type="tns:preset" maxOccurs="unbounded"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="limit">
+  <xs:complexType name="preset">
     <xs:sequence>
-      <xs:element name="preset" type="xs:string" minOccurs="0"/>
-      <xs:element name="seqNumber" type="xs:int"/>
-      <xs:element name="seqLength" type="xs:int"/>
+      <xs:element name="name" type="xs:string"/>
+      <xs:element name="description" type="xs:string" minOccurs="0"/>
+      <xs:element name="optlist" minOccurs="0">
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element name="option" type="xs:string" maxOccurs="unbounded"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
     </xs:sequence>
-    <xs:attribute name="isDefault" type="xs:boolean" use="required"/>
   </xs:complexType>
 
   <xs:complexType name="getLimits">
@@ -199,34 +209,24 @@
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getPresets">
-    <xs:sequence/>
-  </xs:complexType>
-
-  <xs:complexType name="getPresetsResponse">
+  <xs:complexType name="limit">
     <xs:sequence>
-      <xs:element name="return" type="tns:presetManager" minOccurs="0"/>
+      <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="presetManager">
+  <xs:complexType name="getLimit">
     <xs:sequence>
-      <xs:element name="runnerClassName" type="xs:string"/>
-      <xs:element name="preset" type="tns:preset" maxOccurs="unbounded"/>
+      <xs:element name="presetName" type="xs:string" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="preset">
+  <xs:complexType name="getLimitResponse">
     <xs:sequence>
-      <xs:element name="name" type="xs:string"/>
-      <xs:element name="description" type="xs:string" minOccurs="0"/>
-      <xs:element name="optlist" minOccurs="0">
-        <xs:complexType>
-          <xs:sequence>
-            <xs:element name="option" type="xs:string" maxOccurs="unbounded"/>
-          </xs:sequence>
-        </xs:complexType>
-      </xs:element>
+      <xs:element name="return" type="tns:limit" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
diff --git a/webservices/compbio/ws/server/resource/MuscleWS.wsdl b/webservices/compbio/ws/server/resource/MuscleWS.wsdl
index a9f7bc7..86c9329 100644
--- a/webservices/compbio/ws/server/resource/MuscleWS.wsdl
+++ b/webservices/compbio/ws/server/resource/MuscleWS.wsdl
@@ -63,17 +63,11 @@
   <message name="pullExecStatisticsResponse">
     <part name="parameters" element="tns:pullExecStatisticsResponse"/>
   </message>
-  <message name="getPresets">
-    <part name="parameters" element="tns:getPresets"/>
-  </message>
-  <message name="getPresetsResponse">
-    <part name="parameters" element="tns:getPresetsResponse"/>
-  </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="getLimit">
     <part name="parameters" element="tns:getLimit"/>
@@ -81,11 +75,17 @@
   <message name="getLimitResponse">
     <part name="parameters" element="tns:getLimitResponse"/>
   </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>
+  <message name="getPresets">
+    <part name="parameters" element="tns:getPresets"/>
+  </message>
+  <message name="getPresetsResponse">
+    <part name="parameters" element="tns:getPresetsResponse"/>
   </message>
   <portType name="MsaWS">
     <operation name="align">
@@ -128,21 +128,21 @@
       <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/pullExecStatisticsRequest" message="tns:pullExecStatistics"/>
       <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/pullExecStatisticsResponse" message="tns:pullExecStatisticsResponse"/>
     </operation>
-    <operation name="getPresets">
-      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getPresetsRequest" message="tns:getPresets"/>
-      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getPresetsResponse" message="tns:getPresetsResponse"/>
-    </operation>
-    <operation name="getLimits">
-      <input wsam:Action="http://msa.data.compbio/01/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="getLimit">
       <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitRequest" message="tns:getLimit"/>
       <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitResponse" message="tns:getLimitResponse"/>
     </operation>
-    <operation name="getRunnerOptions">
-      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getRunnerOptionsRequest" message="tns:getRunnerOptions"/>
-      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getRunnerOptionsResponse" message="tns:getRunnerOptionsResponse"/>
+    <operation name="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>
+    <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>
   </portType>
   <binding name="MuscleWSPortBinding" type="tns:MsaWS">
@@ -246,7 +246,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getPresets">
+    <operation name="getRunnerOptions">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -255,7 +255,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLimits">
+    <operation name="getLimit">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -264,7 +264,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLimit">
+    <operation name="getLimits">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -273,7 +273,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getRunnerOptions">
+    <operation name="getPresets">
       <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 c32281e..0cd8da8 100644
--- a/webservices/compbio/ws/server/resource/MuscleWS_schema1.xsd
+++ b/webservices/compbio/ws/server/resource/MuscleWS_schema1.xsd
@@ -152,25 +152,35 @@
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getLimit">
+  <xs:complexType name="getPresets">
+    <xs:sequence/>
+  </xs:complexType>
+
+  <xs:complexType name="getPresetsResponse">
     <xs:sequence>
-      <xs:element name="presetName" type="xs:string" minOccurs="0"/>
+      <xs:element name="return" type="tns:presetManager" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getLimitResponse">
+  <xs:complexType name="presetManager">
     <xs:sequence>
-      <xs:element name="return" type="tns:limit" minOccurs="0"/>
+      <xs:element name="runnerClassName" type="xs:string"/>
+      <xs:element name="preset" type="tns:preset" maxOccurs="unbounded"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="limit">
+  <xs:complexType name="preset">
     <xs:sequence>
-      <xs:element name="preset" type="xs:string" minOccurs="0"/>
-      <xs:element name="seqNumber" type="xs:int"/>
-      <xs:element name="seqLength" type="xs:int"/>
+      <xs:element name="name" type="xs:string"/>
+      <xs:element name="description" type="xs:string" minOccurs="0"/>
+      <xs:element name="optlist" minOccurs="0">
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element name="option" type="xs:string" maxOccurs="unbounded"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
     </xs:sequence>
-    <xs:attribute name="isDefault" type="xs:boolean" use="required"/>
   </xs:complexType>
 
   <xs:complexType name="getLimits">
@@ -190,34 +200,24 @@
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getPresets">
-    <xs:sequence/>
-  </xs:complexType>
-
-  <xs:complexType name="getPresetsResponse">
+  <xs:complexType name="limit">
     <xs:sequence>
-      <xs:element name="return" type="tns:presetManager" minOccurs="0"/>
+      <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="presetManager">
+  <xs:complexType name="getLimit">
     <xs:sequence>
-      <xs:element name="runnerClassName" type="xs:string"/>
-      <xs:element name="preset" type="tns:preset" maxOccurs="unbounded"/>
+      <xs:element name="presetName" type="xs:string" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="preset">
+  <xs:complexType name="getLimitResponse">
     <xs:sequence>
-      <xs:element name="name" type="xs:string"/>
-      <xs:element name="description" type="xs:string" minOccurs="0"/>
-      <xs:element name="optlist" minOccurs="0">
-        <xs:complexType>
-          <xs:sequence>
-            <xs:element name="option" type="xs:string" maxOccurs="unbounded"/>
-          </xs:sequence>
-        </xs:complexType>
-      </xs:element>
+      <xs:element name="return" type="tns:limit" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
diff --git a/webservices/compbio/ws/server/resource/RNAalifoldWS.wsdl b/webservices/compbio/ws/server/resource/RNAalifoldWS.wsdl
index 6b79952..6bfeef4 100644
--- a/webservices/compbio/ws/server/resource/RNAalifoldWS.wsdl
+++ b/webservices/compbio/ws/server/resource/RNAalifoldWS.wsdl
@@ -15,11 +15,11 @@
   <message name="ResultNotAvailableException">
     <part name="fault" element="tns:ResultNotAvailableException"/>
   </message>
-  <message name="customAnalize">
-    <part name="parameters" element="tns:customAnalize"/>
+  <message name="analize">
+    <part name="parameters" element="tns:analize"/>
   </message>
-  <message name="customAnalizeResponse">
-    <part name="parameters" element="tns:customAnalizeResponse"/>
+  <message name="analizeResponse">
+    <part name="parameters" element="tns:analizeResponse"/>
   </message>
   <message name="UnsupportedRuntimeException">
     <part name="fault" element="tns:UnsupportedRuntimeException"/>
@@ -30,6 +30,12 @@
   <message name="JobSubmissionException">
     <part name="fault" element="tns:JobSubmissionException"/>
   </message>
+  <message name="customAnalize">
+    <part name="parameters" element="tns:customAnalize"/>
+  </message>
+  <message name="customAnalizeResponse">
+    <part name="parameters" element="tns:customAnalizeResponse"/>
+  </message>
   <message name="WrongParameterException">
     <part name="fault" element="tns:WrongParameterException"/>
   </message>
@@ -39,11 +45,11 @@
   <message name="presetAnalizeResponse">
     <part name="parameters" element="tns:presetAnalizeResponse"/>
   </message>
-  <message name="analize">
-    <part name="parameters" element="tns:analize"/>
+  <message name="cancelJob">
+    <part name="parameters" element="tns:cancelJob"/>
   </message>
-  <message name="analizeResponse">
-    <part name="parameters" element="tns:analizeResponse"/>
+  <message name="cancelJobResponse">
+    <part name="parameters" element="tns:cancelJobResponse"/>
   </message>
   <message name="getJobStatus">
     <part name="parameters" element="tns:getJobStatus"/>
@@ -51,41 +57,35 @@
   <message name="getJobStatusResponse">
     <part name="parameters" element="tns:getJobStatusResponse"/>
   </message>
-  <message name="cancelJob">
-    <part name="parameters" element="tns:cancelJob"/>
-  </message>
-  <message name="cancelJobResponse">
-    <part name="parameters" element="tns:cancelJobResponse"/>
-  </message>
   <message name="pullExecStatistics">
     <part name="parameters" element="tns:pullExecStatistics"/>
   </message>
   <message name="pullExecStatisticsResponse">
     <part name="parameters" element="tns:pullExecStatisticsResponse"/>
   </message>
+  <message name="getRunnerOptions">
+    <part name="parameters" element="tns:getRunnerOptions"/>
+  </message>
+  <message name="getRunnerOptionsResponse">
+    <part name="parameters" element="tns:getRunnerOptionsResponse"/>
+  </message>
   <message name="getLimit">
     <part name="parameters" element="tns:getLimit"/>
   </message>
   <message name="getLimitResponse">
     <part name="parameters" element="tns:getLimitResponse"/>
   </message>
-  <message name="getPresets">
-    <part name="parameters" element="tns:getPresets"/>
-  </message>
-  <message name="getPresetsResponse">
-    <part name="parameters" element="tns:getPresetsResponse"/>
-  </message>
   <message name="getLimits">
     <part name="parameters" element="tns:getLimits"/>
   </message>
   <message name="getLimitsResponse">
     <part name="parameters" element="tns:getLimitsResponse"/>
   </message>
-  <message name="getRunnerOptions">
-    <part name="parameters" element="tns:getRunnerOptions"/>
+  <message name="getPresets">
+    <part name="parameters" element="tns:getPresets"/>
   </message>
-  <message name="getRunnerOptionsResponse">
-    <part name="parameters" element="tns:getRunnerOptionsResponse"/>
+  <message name="getPresetsResponse">
+    <part name="parameters" element="tns:getPresetsResponse"/>
   </message>
   <portType name="SequenceAnnotation">
     <operation name="getAnnotation">
@@ -93,6 +93,13 @@
       <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationResponse" message="tns:getAnnotationResponse"/>
       <fault message="tns:ResultNotAvailableException" name="ResultNotAvailableException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotation/Fault/ResultNotAvailableException"/>
     </operation>
+    <operation name="analize">
+      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/analizeRequest" message="tns:analize"/>
+      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/analizeResponse" message="tns:analizeResponse"/>
+      <fault message="tns:UnsupportedRuntimeException" name="UnsupportedRuntimeException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/analize/Fault/UnsupportedRuntimeException"/>
+      <fault message="tns:LimitExceededException" name="LimitExceededException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/analize/Fault/LimitExceededException"/>
+      <fault message="tns:JobSubmissionException" name="JobSubmissionException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/analize/Fault/JobSubmissionException"/>
+    </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"/>
@@ -109,40 +116,33 @@
       <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="analize">
-      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/analizeRequest" message="tns:analize"/>
-      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/analizeResponse" message="tns:analizeResponse"/>
-      <fault message="tns:UnsupportedRuntimeException" name="UnsupportedRuntimeException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/analize/Fault/UnsupportedRuntimeException"/>
-      <fault message="tns:LimitExceededException" name="LimitExceededException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/analize/Fault/LimitExceededException"/>
-      <fault message="tns:JobSubmissionException" name="JobSubmissionException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/analize/Fault/JobSubmissionException"/>
+    <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"/>
     </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="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="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="getLimit">
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitRequest" message="tns:getLimit"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitResponse" message="tns:getLimitResponse"/>
     </operation>
-    <operation name="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="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>
-    <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="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>
   </portType>
   <binding name="RNAalifoldWSPortBinding" type="tns:SequenceAnnotation">
@@ -159,7 +159,7 @@
         <soap:fault name="ResultNotAvailableException" use="literal"/>
       </fault>
     </operation>
-    <operation name="customAnalize">
+    <operation name="analize">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -176,11 +176,8 @@
       <fault name="JobSubmissionException">
         <soap:fault name="JobSubmissionException" use="literal"/>
       </fault>
-      <fault name="WrongParameterException">
-        <soap:fault name="WrongParameterException" use="literal"/>
-      </fault>
     </operation>
-    <operation name="presetAnalize">
+    <operation name="customAnalize">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -201,7 +198,7 @@
         <soap:fault name="WrongParameterException" use="literal"/>
       </fault>
     </operation>
-    <operation name="analize">
+    <operation name="presetAnalize">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -218,8 +215,11 @@
       <fault name="JobSubmissionException">
         <soap:fault name="JobSubmissionException" use="literal"/>
       </fault>
+      <fault name="WrongParameterException">
+        <soap:fault name="WrongParameterException" use="literal"/>
+      </fault>
     </operation>
-    <operation name="getJobStatus">
+    <operation name="cancelJob">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -228,7 +228,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="cancelJob">
+    <operation name="getJobStatus">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -246,7 +246,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLimit">
+    <operation name="getRunnerOptions">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -255,7 +255,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getPresets">
+    <operation name="getLimit">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -273,7 +273,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getRunnerOptions">
+    <operation name="getPresets">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
diff --git a/webservices/compbio/ws/server/resource/RNAalifoldWS_schema1.xsd b/webservices/compbio/ws/server/resource/RNAalifoldWS_schema1.xsd
index 20fd41d..5bfa713 100644
--- a/webservices/compbio/ws/server/resource/RNAalifoldWS_schema1.xsd
+++ b/webservices/compbio/ws/server/resource/RNAalifoldWS_schema1.xsd
@@ -203,6 +203,14 @@
     </xs:sequence>
   </xs:complexType>
 
+  <xs:complexType name="rnaStructScoreManager">
+    <xs:complexContent>
+      <xs:extension base="tns:scoreManager">
+        <xs:sequence/>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
   <xs:complexType name="ResultNotAvailableException">
     <xs:sequence>
       <xs:element name="message" type="xs:string" minOccurs="0"/>
@@ -262,6 +270,23 @@
     </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>
@@ -288,23 +313,6 @@
     <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/RegistryWS.wsdl b/webservices/compbio/ws/server/resource/RegistryWS.wsdl
index 6405400..44b3939 100644
--- a/webservices/compbio/ws/server/resource/RegistryWS.wsdl
+++ b/webservices/compbio/ws/server/resource/RegistryWS.wsdl
@@ -18,12 +18,6 @@
   <message name="getNonoperatedServicesResponse">
     <part name="parameters" element="tns:getNonoperatedServicesResponse"/>
   </message>
-  <message name="testAllServices">
-    <part name="parameters" element="tns:testAllServices"/>
-  </message>
-  <message name="testAllServicesResponse">
-    <part name="parameters" element="tns:testAllServicesResponse"/>
-  </message>
   <message name="getLastTested">
     <part name="parameters" element="tns:getLastTested"/>
   </message>
@@ -36,6 +30,12 @@
   <message name="getLastTestedOnResponse">
     <part name="parameters" element="tns:getLastTestedOnResponse"/>
   </message>
+  <message name="testAllServices">
+    <part name="parameters" element="tns:testAllServices"/>
+  </message>
+  <message name="testAllServicesResponse">
+    <part name="parameters" element="tns:testAllServicesResponse"/>
+  </message>
   <message name="testService">
     <part name="parameters" element="tns:testService"/>
   </message>
@@ -69,10 +69,6 @@
       <input wsam:Action="http://msa.data.compbio/01/12/2010/RegistryWS/getNonoperatedServicesRequest" message="tns:getNonoperatedServices"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/RegistryWS/getNonoperatedServicesResponse" message="tns:getNonoperatedServicesResponse"/>
     </operation>
-    <operation name="testAllServices">
-      <input wsam:Action="http://msa.data.compbio/01/12/2010/RegistryWS/testAllServicesRequest" message="tns:testAllServices"/>
-      <output wsam:Action="http://msa.data.compbio/01/12/2010/RegistryWS/testAllServicesResponse" message="tns:testAllServicesResponse"/>
-    </operation>
     <operation name="getLastTested">
       <input wsam:Action="http://msa.data.compbio/01/12/2010/RegistryWS/getLastTestedRequest" message="tns:getLastTested"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/RegistryWS/getLastTestedResponse" message="tns:getLastTestedResponse"/>
@@ -81,6 +77,10 @@
       <input wsam:Action="http://msa.data.compbio/01/12/2010/RegistryWS/getLastTestedOnRequest" message="tns:getLastTestedOn"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/RegistryWS/getLastTestedOnResponse" message="tns:getLastTestedOnResponse"/>
     </operation>
+    <operation name="testAllServices">
+      <input wsam:Action="http://msa.data.compbio/01/12/2010/RegistryWS/testAllServicesRequest" message="tns:testAllServices"/>
+      <output wsam:Action="http://msa.data.compbio/01/12/2010/RegistryWS/testAllServicesResponse" message="tns:testAllServicesResponse"/>
+    </operation>
     <operation name="testService">
       <input wsam:Action="http://msa.data.compbio/01/12/2010/RegistryWS/testServiceRequest" message="tns:testService"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/RegistryWS/testServiceResponse" message="tns:testServiceResponse"/>
@@ -118,7 +118,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="testAllServices">
+    <operation name="getLastTested">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -127,7 +127,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLastTested">
+    <operation name="getLastTestedOn">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -136,7 +136,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLastTestedOn">
+    <operation name="testAllServices">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
diff --git a/webservices/compbio/ws/server/resource/RegistryWS_schema1.xsd b/webservices/compbio/ws/server/resource/RegistryWS_schema1.xsd
index 94b5696..2efa715 100644
--- a/webservices/compbio/ws/server/resource/RegistryWS_schema1.xsd
+++ b/webservices/compbio/ws/server/resource/RegistryWS_schema1.xsd
@@ -158,6 +158,7 @@
       <xs:enumeration value="GlobPlotWS"/>
       <xs:enumeration value="IUPredWS"/>
       <xs:enumeration value="JpredWS"/>
+      <xs:enumeration value="RNAalifoldWS"/>
     </xs:restriction>
   </xs:simpleType>
 </xs:schema>
diff --git a/webservices/compbio/ws/server/resource/TcoffeeWS.wsdl b/webservices/compbio/ws/server/resource/TcoffeeWS.wsdl
index 00263ea..4419df7 100644
--- a/webservices/compbio/ws/server/resource/TcoffeeWS.wsdl
+++ b/webservices/compbio/ws/server/resource/TcoffeeWS.wsdl
@@ -63,17 +63,11 @@
   <message name="pullExecStatisticsResponse">
     <part name="parameters" element="tns:pullExecStatisticsResponse"/>
   </message>
-  <message name="getPresets">
-    <part name="parameters" element="tns:getPresets"/>
-  </message>
-  <message name="getPresetsResponse">
-    <part name="parameters" element="tns:getPresetsResponse"/>
-  </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="getLimit">
     <part name="parameters" element="tns:getLimit"/>
@@ -81,11 +75,17 @@
   <message name="getLimitResponse">
     <part name="parameters" element="tns:getLimitResponse"/>
   </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>
+  <message name="getPresets">
+    <part name="parameters" element="tns:getPresets"/>
+  </message>
+  <message name="getPresetsResponse">
+    <part name="parameters" element="tns:getPresetsResponse"/>
   </message>
   <portType name="MsaWS">
     <operation name="align">
@@ -128,21 +128,21 @@
       <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/pullExecStatisticsRequest" message="tns:pullExecStatistics"/>
       <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/pullExecStatisticsResponse" message="tns:pullExecStatisticsResponse"/>
     </operation>
-    <operation name="getPresets">
-      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getPresetsRequest" message="tns:getPresets"/>
-      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getPresetsResponse" message="tns:getPresetsResponse"/>
-    </operation>
-    <operation name="getLimits">
-      <input wsam:Action="http://msa.data.compbio/01/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="getLimit">
       <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitRequest" message="tns:getLimit"/>
       <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitResponse" message="tns:getLimitResponse"/>
     </operation>
-    <operation name="getRunnerOptions">
-      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getRunnerOptionsRequest" message="tns:getRunnerOptions"/>
-      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getRunnerOptionsResponse" message="tns:getRunnerOptionsResponse"/>
+    <operation name="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>
+    <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>
   </portType>
   <binding name="TcoffeeWSPortBinding" type="tns:MsaWS">
@@ -246,7 +246,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getPresets">
+    <operation name="getRunnerOptions">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -255,7 +255,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLimits">
+    <operation name="getLimit">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -264,7 +264,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLimit">
+    <operation name="getLimits">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -273,7 +273,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getRunnerOptions">
+    <operation name="getPresets">
       <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 b80961d..de826f8 100644
--- a/webservices/compbio/ws/server/resource/TcoffeeWS_schema1.xsd
+++ b/webservices/compbio/ws/server/resource/TcoffeeWS_schema1.xsd
@@ -152,25 +152,35 @@
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getLimit">
+  <xs:complexType name="getPresets">
+    <xs:sequence/>
+  </xs:complexType>
+
+  <xs:complexType name="getPresetsResponse">
     <xs:sequence>
-      <xs:element name="presetName" type="xs:string" minOccurs="0"/>
+      <xs:element name="return" type="tns:presetManager" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getLimitResponse">
+  <xs:complexType name="presetManager">
     <xs:sequence>
-      <xs:element name="return" type="tns:limit" minOccurs="0"/>
+      <xs:element name="runnerClassName" type="xs:string"/>
+      <xs:element name="preset" type="tns:preset" maxOccurs="unbounded"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="limit">
+  <xs:complexType name="preset">
     <xs:sequence>
-      <xs:element name="preset" type="xs:string" minOccurs="0"/>
-      <xs:element name="seqNumber" type="xs:int"/>
-      <xs:element name="seqLength" type="xs:int"/>
+      <xs:element name="name" type="xs:string"/>
+      <xs:element name="description" type="xs:string" minOccurs="0"/>
+      <xs:element name="optlist" minOccurs="0">
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element name="option" type="xs:string" maxOccurs="unbounded"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
     </xs:sequence>
-    <xs:attribute name="isDefault" type="xs:boolean" use="required"/>
   </xs:complexType>
 
   <xs:complexType name="getLimits">
@@ -190,34 +200,24 @@
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getPresets">
-    <xs:sequence/>
-  </xs:complexType>
-
-  <xs:complexType name="getPresetsResponse">
+  <xs:complexType name="limit">
     <xs:sequence>
-      <xs:element name="return" type="tns:presetManager" minOccurs="0"/>
+      <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="presetManager">
+  <xs:complexType name="getLimit">
     <xs:sequence>
-      <xs:element name="runnerClassName" type="xs:string"/>
-      <xs:element name="preset" type="tns:preset" maxOccurs="unbounded"/>
+      <xs:element name="presetName" type="xs:string" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="preset">
+  <xs:complexType name="getLimitResponse">
     <xs:sequence>
-      <xs:element name="name" type="xs:string"/>
-      <xs:element name="description" type="xs:string" minOccurs="0"/>
-      <xs:element name="optlist" minOccurs="0">
-        <xs:complexType>
-          <xs:sequence>
-            <xs:element name="option" type="xs:string" maxOccurs="unbounded"/>
-          </xs:sequence>
-        </xs:complexType>
-      </xs:element>
+      <xs:element name="return" type="tns:limit" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>