From: pvtroshin <pvtroshin@e3abac25-378b-4346-85de-24260fe3988d>
Date: Mon, 5 Sep 2011 15:20:11 +0000 (+0000)
Subject: Update for web services stubs
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=5f8278b40ae7ded9d08d1940bb71d261abca658f;p=jabaws.git

Update for web services stubs

git-svn-id: link to svn.lifesci.dundee.ac.uk/svn/barton/ptroshin/JABA2@4566 e3abac25-378b-4346-85de-24260fe3988d
---

diff --git a/webservices/compbio/data/msa/jaxws/GetServiceCategories.java b/webservices/compbio/data/msa/jaxws/GetServiceCategories.java
new file mode 100644
index 0000000..0c77d6a
--- /dev/null
+++ b/webservices/compbio/data/msa/jaxws/GetServiceCategories.java
@@ -0,0 +1,15 @@
+
+package compbio.data.msa.jaxws;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+@XmlRootElement(name = "getServiceCategories", namespace = "http://msa.data.compbio/01/12/2010/")
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "getServiceCategories", namespace = "http://msa.data.compbio/01/12/2010/")
+public class GetServiceCategories {
+
+
+}
diff --git a/webservices/compbio/data/msa/jaxws/GetServiceCategoriesResponse.java b/webservices/compbio/data/msa/jaxws/GetServiceCategoriesResponse.java
new file mode 100644
index 0000000..536dabc
--- /dev/null
+++ b/webservices/compbio/data/msa/jaxws/GetServiceCategoriesResponse.java
@@ -0,0 +1,37 @@
+
+package compbio.data.msa.jaxws;
+
+import java.util.Set;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+@XmlRootElement(name = "getServiceCategoriesResponse", namespace = "http://msa.data.compbio/01/12/2010/")
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "getServiceCategoriesResponse", namespace = "http://msa.data.compbio/01/12/2010/")
+public class GetServiceCategoriesResponse {
+
+    @XmlElement(name = "return", namespace = "")
+    private Set<compbio.ws.server.Category> _return;
+
+    /**
+     * 
+     * @return
+     *     returns Set<Category>
+     */
+    public Set<compbio.ws.server.Category> getReturn() {
+        return this._return;
+    }
+
+    /**
+     * 
+     * @param _return
+     *     the value for the _return property
+     */
+    public void setReturn(Set<compbio.ws.server.Category> _return) {
+        this._return = _return;
+    }
+
+}
diff --git a/webservices/compbio/data/msa/jaxws/GetServiceDescription.java b/webservices/compbio/data/msa/jaxws/GetServiceDescription.java
new file mode 100644
index 0000000..d55a43b
--- /dev/null
+++ b/webservices/compbio/data/msa/jaxws/GetServiceDescription.java
@@ -0,0 +1,36 @@
+
+package compbio.data.msa.jaxws;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+@XmlRootElement(name = "getServiceDescription", namespace = "http://msa.data.compbio/01/12/2010/")
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "getServiceDescription", namespace = "http://msa.data.compbio/01/12/2010/")
+public class GetServiceDescription {
+
+    @XmlElement(name = "arg0", namespace = "")
+    private compbio.ws.client.Services arg0;
+
+    /**
+     * 
+     * @return
+     *     returns Services
+     */
+    public compbio.ws.client.Services getArg0() {
+        return this.arg0;
+    }
+
+    /**
+     * 
+     * @param arg0
+     *     the value for the arg0 property
+     */
+    public void setArg0(compbio.ws.client.Services arg0) {
+        this.arg0 = arg0;
+    }
+
+}
diff --git a/webservices/compbio/data/msa/jaxws/GetServiceDescriptionResponse.java b/webservices/compbio/data/msa/jaxws/GetServiceDescriptionResponse.java
new file mode 100644
index 0000000..42a76ad
--- /dev/null
+++ b/webservices/compbio/data/msa/jaxws/GetServiceDescriptionResponse.java
@@ -0,0 +1,36 @@
+
+package compbio.data.msa.jaxws;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+@XmlRootElement(name = "getServiceDescriptionResponse", namespace = "http://msa.data.compbio/01/12/2010/")
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "getServiceDescriptionResponse", namespace = "http://msa.data.compbio/01/12/2010/")
+public class GetServiceDescriptionResponse {
+
+    @XmlElement(name = "return", namespace = "")
+    private String _return;
+
+    /**
+     * 
+     * @return
+     *     returns String
+     */
+    public String getReturn() {
+        return this._return;
+    }
+
+    /**
+     * 
+     * @param _return
+     *     the value for the _return property
+     */
+    public void setReturn(String _return) {
+        this._return = _return;
+    }
+
+}
diff --git a/webservices/compbio/ws/client/Services.java b/webservices/compbio/ws/client/Services.java
index 3616e1b..2ffafb6 100644
--- a/webservices/compbio/ws/client/Services.java
+++ b/webservices/compbio/ws/client/Services.java
@@ -21,6 +21,8 @@ package compbio.ws.client;
 import java.net.URL;
 import java.util.Set;
 
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.namespace.QName;
 import javax.xml.ws.Service;
 
@@ -187,6 +189,7 @@ public enum Services {
 					+ "Parallelization of the MAFFT multiple sequence alignment program. ",
 			"6.8.57", "http://mafft.cbrc.jp/alignment/software/").toString();;
 
+	@XmlAccessorType(XmlAccessType.FIELD)
 	static class ServiceInfo {
 		Services service;
 		String reference;
@@ -195,6 +198,9 @@ public enum Services {
 		final static String jabaws_version = "2.0";
 		final static String line_delimiter = "\n";
 
+		private ServiceInfo() {
+			// Default constructor for JAXB
+		}
 		private ServiceInfo(Services service, String reference, String version,
 				String moreinfo) {
 			this.service = service;
diff --git a/webservices/compbio/ws/server/Category.java b/webservices/compbio/ws/server/Category.java
index f01ad18..5e164c4 100644
--- a/webservices/compbio/ws/server/Category.java
+++ b/webservices/compbio/ws/server/Category.java
@@ -4,6 +4,9 @@ import java.util.HashSet;
 import java.util.Set;
 import java.util.TreeSet;
 
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+
 import compbio.ws.client.Services;
 
 /**
@@ -17,6 +20,7 @@ import compbio.ws.client.Services;
  * @author pvtroshin
  * @version 1.0 September 2011
  */
+@XmlAccessorType(XmlAccessType.FIELD)
 public class Category {
 	/*
 	 * TODO refactor initialization and constrains into separate classes if
@@ -38,6 +42,10 @@ public class Category {
 		this.services = services;
 	}
 
+	private Category() {
+		// Default constructor for JAXB
+	}
+
 	Set<Services> getServices() {
 		return new TreeSet<Services>(services);
 	}
diff --git a/webservices/compbio/ws/server/resource/AAConWS.wsdl b/webservices/compbio/ws/server/resource/AAConWS.wsdl
index 772fca7..b02eaf9 100644
--- a/webservices/compbio/ws/server/resource/AAConWS.wsdl
+++ b/webservices/compbio/ws/server/resource/AAConWS.wsdl
@@ -6,6 +6,15 @@
       <xsd:import namespace="http://msa.data.compbio/01/12/2010/" schemaLocation="AAConWS_schema1.xsd"/>
     </xsd:schema>
   </types>
+  <message name="getAnnotation">
+    <part name="parameters" element="tns:getAnnotation"/>
+  </message>
+  <message name="getAnnotationResponse">
+    <part name="parameters" element="tns:getAnnotationResponse"/>
+  </message>
+  <message name="ResultNotAvailableException">
+    <part name="fault" element="tns:ResultNotAvailableException"/>
+  </message>
   <message name="analize">
     <part name="parameters" element="tns:analize"/>
   </message>
@@ -36,15 +45,6 @@
   <message name="presetAnalizeResponse">
     <part name="parameters" element="tns:presetAnalizeResponse"/>
   </message>
-  <message name="getAnnotation">
-    <part name="parameters" element="tns:getAnnotation"/>
-  </message>
-  <message name="getAnnotationResponse">
-    <part name="parameters" element="tns:getAnnotationResponse"/>
-  </message>
-  <message name="ResultNotAvailableException">
-    <part name="fault" element="tns:ResultNotAvailableException"/>
-  </message>
   <message name="cancelJob">
     <part name="parameters" element="tns:cancelJob"/>
   </message>
@@ -88,6 +88,11 @@
     <part name="parameters" element="tns:getRunnerOptionsResponse"/>
   </message>
   <portType name="SequenceAnnotation">
+    <operation name="getAnnotation">
+      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationRequest" message="tns:getAnnotation"/>
+      <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"/>
@@ -111,11 +116,6 @@
       <fault message="tns:JobSubmissionException" name="JobSubmissionException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/presetAnalize/Fault/JobSubmissionException"/>
       <fault message="tns:WrongParameterException" name="WrongParameterException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/presetAnalize/Fault/WrongParameterException"/>
     </operation>
-    <operation name="getAnnotation">
-      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationRequest" message="tns:getAnnotation"/>
-      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationResponse" message="tns:getAnnotationResponse"/>
-      <fault message="tns:ResultNotAvailableException" name="ResultNotAvailableException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotation/Fault/ResultNotAvailableException"/>
-    </operation>
     <operation name="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"/>
@@ -147,6 +147,18 @@
   </portType>
   <binding name="AAConWSPortBinding" type="tns:SequenceAnnotation">
     <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
+    <operation name="getAnnotation">
+      <soap:operation soapAction=""/>
+      <input>
+        <soap:body use="literal"/>
+      </input>
+      <output>
+        <soap:body use="literal"/>
+      </output>
+      <fault name="ResultNotAvailableException">
+        <soap:fault name="ResultNotAvailableException" use="literal"/>
+      </fault>
+    </operation>
     <operation name="analize">
       <soap:operation soapAction=""/>
       <input>
@@ -207,18 +219,6 @@
         <soap:fault name="WrongParameterException" use="literal"/>
       </fault>
     </operation>
-    <operation name="getAnnotation">
-      <soap:operation soapAction=""/>
-      <input>
-        <soap:body use="literal"/>
-      </input>
-      <output>
-        <soap:body use="literal"/>
-      </output>
-      <fault name="ResultNotAvailableException">
-        <soap:fault name="ResultNotAvailableException" use="literal"/>
-      </fault>
-    </operation>
     <operation name="cancelJob">
       <soap:operation soapAction=""/>
       <input>
diff --git a/webservices/compbio/ws/server/resource/ClustalWS.wsdl b/webservices/compbio/ws/server/resource/ClustalWS.wsdl
index 7ea9514..61508ac 100644
--- a/webservices/compbio/ws/server/resource/ClustalWS.wsdl
+++ b/webservices/compbio/ws/server/resource/ClustalWS.wsdl
@@ -15,11 +15,11 @@
   <message name="ResultNotAvailableException">
     <part name="fault" element="tns:ResultNotAvailableException"/>
   </message>
-  <message name="presetAlign">
-    <part name="parameters" element="tns:presetAlign"/>
+  <message name="align">
+    <part name="parameters" element="tns:align"/>
   </message>
-  <message name="presetAlignResponse">
-    <part name="parameters" element="tns:presetAlignResponse"/>
+  <message name="alignResponse">
+    <part name="parameters" element="tns:alignResponse"/>
   </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="presetAlign">
+    <part name="parameters" element="tns:presetAlign"/>
+  </message>
+  <message name="presetAlignResponse">
+    <part name="parameters" element="tns:presetAlignResponse"/>
+  </message>
   <message name="WrongParameterException">
     <part name="fault" element="tns:WrongParameterException"/>
   </message>
@@ -39,12 +45,6 @@
   <message name="customAlignResponse">
     <part name="parameters" element="tns:customAlignResponse"/>
   </message>
-  <message name="align">
-    <part name="parameters" element="tns:align"/>
-  </message>
-  <message name="alignResponse">
-    <part name="parameters" element="tns:alignResponse"/>
-  </message>
   <message name="cancelJob">
     <part name="parameters" element="tns:cancelJob"/>
   </message>
@@ -93,6 +93,13 @@
       <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getResultResponse" message="tns:getResultResponse"/>
       <fault message="tns:ResultNotAvailableException" name="ResultNotAvailableException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getResult/Fault/ResultNotAvailableException"/>
     </operation>
+    <operation name="align">
+      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/alignRequest" message="tns:align"/>
+      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/alignResponse" message="tns:alignResponse"/>
+      <fault message="tns:UnsupportedRuntimeException" name="UnsupportedRuntimeException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/align/Fault/UnsupportedRuntimeException"/>
+      <fault message="tns:LimitExceededException" name="LimitExceededException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/align/Fault/LimitExceededException"/>
+      <fault message="tns:JobSubmissionException" name="JobSubmissionException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/align/Fault/JobSubmissionException"/>
+    </operation>
     <operation name="presetAlign">
       <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/presetAlignRequest" message="tns:presetAlign"/>
       <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/presetAlignResponse" message="tns:presetAlignResponse"/>
@@ -109,13 +116,6 @@
       <fault message="tns:JobSubmissionException" name="JobSubmissionException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/customAlign/Fault/JobSubmissionException"/>
       <fault message="tns:WrongParameterException" name="WrongParameterException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/customAlign/Fault/WrongParameterException"/>
     </operation>
-    <operation name="align">
-      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/alignRequest" message="tns:align"/>
-      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/alignResponse" message="tns:alignResponse"/>
-      <fault message="tns:UnsupportedRuntimeException" name="UnsupportedRuntimeException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/align/Fault/UnsupportedRuntimeException"/>
-      <fault message="tns:LimitExceededException" name="LimitExceededException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/align/Fault/LimitExceededException"/>
-      <fault message="tns:JobSubmissionException" name="JobSubmissionException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/align/Fault/JobSubmissionException"/>
-    </operation>
     <operation name="cancelJob">
       <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/cancelJobRequest" message="tns:cancelJob"/>
       <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/cancelJobResponse" message="tns:cancelJobResponse"/>
@@ -159,7 +159,7 @@
         <soap:fault name="ResultNotAvailableException" use="literal"/>
       </fault>
     </operation>
-    <operation name="presetAlign">
+    <operation name="align">
       <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="customAlign">
+    <operation name="presetAlign">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -201,7 +198,7 @@
         <soap:fault name="WrongParameterException" use="literal"/>
       </fault>
     </operation>
-    <operation name="align">
+    <operation name="customAlign">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -218,6 +215,9 @@
       <fault name="JobSubmissionException">
         <soap:fault name="JobSubmissionException" use="literal"/>
       </fault>
+      <fault name="WrongParameterException">
+        <soap:fault name="WrongParameterException" use="literal"/>
+      </fault>
     </operation>
     <operation name="cancelJob">
       <soap:operation soapAction=""/>
diff --git a/webservices/compbio/ws/server/resource/DisemblWS.wsdl b/webservices/compbio/ws/server/resource/DisemblWS.wsdl
index ad062c4..0938649 100644
--- a/webservices/compbio/ws/server/resource/DisemblWS.wsdl
+++ b/webservices/compbio/ws/server/resource/DisemblWS.wsdl
@@ -6,6 +6,15 @@
       <xsd:import namespace="http://msa.data.compbio/01/12/2010/" schemaLocation="DisemblWS_schema1.xsd"/>
     </xsd:schema>
   </types>
+  <message name="getAnnotation">
+    <part name="parameters" element="tns:getAnnotation"/>
+  </message>
+  <message name="getAnnotationResponse">
+    <part name="parameters" element="tns:getAnnotationResponse"/>
+  </message>
+  <message name="ResultNotAvailableException">
+    <part name="fault" element="tns:ResultNotAvailableException"/>
+  </message>
   <message name="customAnalize">
     <part name="parameters" element="tns:customAnalize"/>
   </message>
@@ -36,15 +45,6 @@
   <message name="presetAnalizeResponse">
     <part name="parameters" element="tns:presetAnalizeResponse"/>
   </message>
-  <message name="getAnnotation">
-    <part name="parameters" element="tns:getAnnotation"/>
-  </message>
-  <message name="getAnnotationResponse">
-    <part name="parameters" element="tns:getAnnotationResponse"/>
-  </message>
-  <message name="ResultNotAvailableException">
-    <part name="fault" element="tns:ResultNotAvailableException"/>
-  </message>
   <message name="cancelJob">
     <part name="parameters" element="tns:cancelJob"/>
   </message>
@@ -88,6 +88,11 @@
     <part name="parameters" element="tns:getRunnerOptionsResponse"/>
   </message>
   <portType name="SequenceAnnotation">
+    <operation name="getAnnotation">
+      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationRequest" message="tns:getAnnotation"/>
+      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationResponse" message="tns:getAnnotationResponse"/>
+      <fault message="tns:ResultNotAvailableException" name="ResultNotAvailableException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotation/Fault/ResultNotAvailableException"/>
+    </operation>
     <operation name="customAnalize">
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/customAnalizeRequest" message="tns:customAnalize"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/customAnalizeResponse" message="tns:customAnalizeResponse"/>
@@ -111,11 +116,6 @@
       <fault message="tns:JobSubmissionException" name="JobSubmissionException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/presetAnalize/Fault/JobSubmissionException"/>
       <fault message="tns:WrongParameterException" name="WrongParameterException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/presetAnalize/Fault/WrongParameterException"/>
     </operation>
-    <operation name="getAnnotation">
-      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationRequest" message="tns:getAnnotation"/>
-      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationResponse" message="tns:getAnnotationResponse"/>
-      <fault message="tns:ResultNotAvailableException" name="ResultNotAvailableException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotation/Fault/ResultNotAvailableException"/>
-    </operation>
     <operation name="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"/>
@@ -147,6 +147,18 @@
   </portType>
   <binding name="DisemblWSPortBinding" type="tns:SequenceAnnotation">
     <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
+    <operation name="getAnnotation">
+      <soap:operation soapAction=""/>
+      <input>
+        <soap:body use="literal"/>
+      </input>
+      <output>
+        <soap:body use="literal"/>
+      </output>
+      <fault name="ResultNotAvailableException">
+        <soap:fault name="ResultNotAvailableException" use="literal"/>
+      </fault>
+    </operation>
     <operation name="customAnalize">
       <soap:operation soapAction=""/>
       <input>
@@ -207,18 +219,6 @@
         <soap:fault name="WrongParameterException" use="literal"/>
       </fault>
     </operation>
-    <operation name="getAnnotation">
-      <soap:operation soapAction=""/>
-      <input>
-        <soap:body use="literal"/>
-      </input>
-      <output>
-        <soap:body use="literal"/>
-      </output>
-      <fault name="ResultNotAvailableException">
-        <soap:fault name="ResultNotAvailableException" use="literal"/>
-      </fault>
-    </operation>
     <operation name="cancelJob">
       <soap:operation soapAction=""/>
       <input>
diff --git a/webservices/compbio/ws/server/resource/GlobPlotWS.wsdl b/webservices/compbio/ws/server/resource/GlobPlotWS.wsdl
index 67f9169..c85f5ae 100644
--- a/webservices/compbio/ws/server/resource/GlobPlotWS.wsdl
+++ b/webservices/compbio/ws/server/resource/GlobPlotWS.wsdl
@@ -6,6 +6,15 @@
       <xsd:import namespace="http://msa.data.compbio/01/12/2010/" schemaLocation="GlobPlotWS_schema1.xsd"/>
     </xsd:schema>
   </types>
+  <message name="getAnnotation">
+    <part name="parameters" element="tns:getAnnotation"/>
+  </message>
+  <message name="getAnnotationResponse">
+    <part name="parameters" element="tns:getAnnotationResponse"/>
+  </message>
+  <message name="ResultNotAvailableException">
+    <part name="fault" element="tns:ResultNotAvailableException"/>
+  </message>
   <message name="customAnalize">
     <part name="parameters" element="tns:customAnalize"/>
   </message>
@@ -36,15 +45,6 @@
   <message name="presetAnalizeResponse">
     <part name="parameters" element="tns:presetAnalizeResponse"/>
   </message>
-  <message name="getAnnotation">
-    <part name="parameters" element="tns:getAnnotation"/>
-  </message>
-  <message name="getAnnotationResponse">
-    <part name="parameters" element="tns:getAnnotationResponse"/>
-  </message>
-  <message name="ResultNotAvailableException">
-    <part name="fault" element="tns:ResultNotAvailableException"/>
-  </message>
   <message name="cancelJob">
     <part name="parameters" element="tns:cancelJob"/>
   </message>
@@ -88,6 +88,11 @@
     <part name="parameters" element="tns:getRunnerOptionsResponse"/>
   </message>
   <portType name="SequenceAnnotation">
+    <operation name="getAnnotation">
+      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationRequest" message="tns:getAnnotation"/>
+      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationResponse" message="tns:getAnnotationResponse"/>
+      <fault message="tns:ResultNotAvailableException" name="ResultNotAvailableException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotation/Fault/ResultNotAvailableException"/>
+    </operation>
     <operation name="customAnalize">
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/customAnalizeRequest" message="tns:customAnalize"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/customAnalizeResponse" message="tns:customAnalizeResponse"/>
@@ -111,11 +116,6 @@
       <fault message="tns:JobSubmissionException" name="JobSubmissionException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/presetAnalize/Fault/JobSubmissionException"/>
       <fault message="tns:WrongParameterException" name="WrongParameterException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/presetAnalize/Fault/WrongParameterException"/>
     </operation>
-    <operation name="getAnnotation">
-      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationRequest" message="tns:getAnnotation"/>
-      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationResponse" message="tns:getAnnotationResponse"/>
-      <fault message="tns:ResultNotAvailableException" name="ResultNotAvailableException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotation/Fault/ResultNotAvailableException"/>
-    </operation>
     <operation name="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"/>
@@ -147,6 +147,18 @@
   </portType>
   <binding name="GlobPlotWSPortBinding" type="tns:SequenceAnnotation">
     <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
+    <operation name="getAnnotation">
+      <soap:operation soapAction=""/>
+      <input>
+        <soap:body use="literal"/>
+      </input>
+      <output>
+        <soap:body use="literal"/>
+      </output>
+      <fault name="ResultNotAvailableException">
+        <soap:fault name="ResultNotAvailableException" use="literal"/>
+      </fault>
+    </operation>
     <operation name="customAnalize">
       <soap:operation soapAction=""/>
       <input>
@@ -207,18 +219,6 @@
         <soap:fault name="WrongParameterException" use="literal"/>
       </fault>
     </operation>
-    <operation name="getAnnotation">
-      <soap:operation soapAction=""/>
-      <input>
-        <soap:body use="literal"/>
-      </input>
-      <output>
-        <soap:body use="literal"/>
-      </output>
-      <fault name="ResultNotAvailableException">
-        <soap:fault name="ResultNotAvailableException" use="literal"/>
-      </fault>
-    </operation>
     <operation name="cancelJob">
       <soap:operation soapAction=""/>
       <input>
diff --git a/webservices/compbio/ws/server/resource/IUPredWS.wsdl b/webservices/compbio/ws/server/resource/IUPredWS.wsdl
index 4627adb..ddfde64 100644
--- a/webservices/compbio/ws/server/resource/IUPredWS.wsdl
+++ b/webservices/compbio/ws/server/resource/IUPredWS.wsdl
@@ -6,6 +6,15 @@
       <xsd:import namespace="http://msa.data.compbio/01/12/2010/" schemaLocation="IUPredWS_schema1.xsd"/>
     </xsd:schema>
   </types>
+  <message name="getAnnotation">
+    <part name="parameters" element="tns:getAnnotation"/>
+  </message>
+  <message name="getAnnotationResponse">
+    <part name="parameters" element="tns:getAnnotationResponse"/>
+  </message>
+  <message name="ResultNotAvailableException">
+    <part name="fault" element="tns:ResultNotAvailableException"/>
+  </message>
   <message name="customAnalize">
     <part name="parameters" element="tns:customAnalize"/>
   </message>
@@ -36,15 +45,6 @@
   <message name="presetAnalizeResponse">
     <part name="parameters" element="tns:presetAnalizeResponse"/>
   </message>
-  <message name="getAnnotation">
-    <part name="parameters" element="tns:getAnnotation"/>
-  </message>
-  <message name="getAnnotationResponse">
-    <part name="parameters" element="tns:getAnnotationResponse"/>
-  </message>
-  <message name="ResultNotAvailableException">
-    <part name="fault" element="tns:ResultNotAvailableException"/>
-  </message>
   <message name="cancelJob">
     <part name="parameters" element="tns:cancelJob"/>
   </message>
@@ -88,6 +88,11 @@
     <part name="parameters" element="tns:getRunnerOptionsResponse"/>
   </message>
   <portType name="SequenceAnnotation">
+    <operation name="getAnnotation">
+      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationRequest" message="tns:getAnnotation"/>
+      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationResponse" message="tns:getAnnotationResponse"/>
+      <fault message="tns:ResultNotAvailableException" name="ResultNotAvailableException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotation/Fault/ResultNotAvailableException"/>
+    </operation>
     <operation name="customAnalize">
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/customAnalizeRequest" message="tns:customAnalize"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/customAnalizeResponse" message="tns:customAnalizeResponse"/>
@@ -111,11 +116,6 @@
       <fault message="tns:JobSubmissionException" name="JobSubmissionException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/presetAnalize/Fault/JobSubmissionException"/>
       <fault message="tns:WrongParameterException" name="WrongParameterException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/presetAnalize/Fault/WrongParameterException"/>
     </operation>
-    <operation name="getAnnotation">
-      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationRequest" message="tns:getAnnotation"/>
-      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationResponse" message="tns:getAnnotationResponse"/>
-      <fault message="tns:ResultNotAvailableException" name="ResultNotAvailableException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotation/Fault/ResultNotAvailableException"/>
-    </operation>
     <operation name="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"/>
@@ -147,6 +147,18 @@
   </portType>
   <binding name="IUPredWSPortBinding" type="tns:SequenceAnnotation">
     <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
+    <operation name="getAnnotation">
+      <soap:operation soapAction=""/>
+      <input>
+        <soap:body use="literal"/>
+      </input>
+      <output>
+        <soap:body use="literal"/>
+      </output>
+      <fault name="ResultNotAvailableException">
+        <soap:fault name="ResultNotAvailableException" use="literal"/>
+      </fault>
+    </operation>
     <operation name="customAnalize">
       <soap:operation soapAction=""/>
       <input>
@@ -207,18 +219,6 @@
         <soap:fault name="WrongParameterException" use="literal"/>
       </fault>
     </operation>
-    <operation name="getAnnotation">
-      <soap:operation soapAction=""/>
-      <input>
-        <soap:body use="literal"/>
-      </input>
-      <output>
-        <soap:body use="literal"/>
-      </output>
-      <fault name="ResultNotAvailableException">
-        <soap:fault name="ResultNotAvailableException" use="literal"/>
-      </fault>
-    </operation>
     <operation name="cancelJob">
       <soap:operation soapAction=""/>
       <input>
diff --git a/webservices/compbio/ws/server/resource/JronnWS.wsdl b/webservices/compbio/ws/server/resource/JronnWS.wsdl
index f8caa2c..b56cf06 100644
--- a/webservices/compbio/ws/server/resource/JronnWS.wsdl
+++ b/webservices/compbio/ws/server/resource/JronnWS.wsdl
@@ -6,6 +6,15 @@
       <xsd:import namespace="http://msa.data.compbio/01/12/2010/" schemaLocation="JronnWS_schema1.xsd"/>
     </xsd:schema>
   </types>
+  <message name="getAnnotation">
+    <part name="parameters" element="tns:getAnnotation"/>
+  </message>
+  <message name="getAnnotationResponse">
+    <part name="parameters" element="tns:getAnnotationResponse"/>
+  </message>
+  <message name="ResultNotAvailableException">
+    <part name="fault" element="tns:ResultNotAvailableException"/>
+  </message>
   <message name="customAnalize">
     <part name="parameters" element="tns:customAnalize"/>
   </message>
@@ -36,15 +45,6 @@
   <message name="presetAnalizeResponse">
     <part name="parameters" element="tns:presetAnalizeResponse"/>
   </message>
-  <message name="getAnnotation">
-    <part name="parameters" element="tns:getAnnotation"/>
-  </message>
-  <message name="getAnnotationResponse">
-    <part name="parameters" element="tns:getAnnotationResponse"/>
-  </message>
-  <message name="ResultNotAvailableException">
-    <part name="fault" element="tns:ResultNotAvailableException"/>
-  </message>
   <message name="cancelJob">
     <part name="parameters" element="tns:cancelJob"/>
   </message>
@@ -88,6 +88,11 @@
     <part name="parameters" element="tns:getRunnerOptionsResponse"/>
   </message>
   <portType name="SequenceAnnotation">
+    <operation name="getAnnotation">
+      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationRequest" message="tns:getAnnotation"/>
+      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationResponse" message="tns:getAnnotationResponse"/>
+      <fault message="tns:ResultNotAvailableException" name="ResultNotAvailableException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotation/Fault/ResultNotAvailableException"/>
+    </operation>
     <operation name="customAnalize">
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/customAnalizeRequest" message="tns:customAnalize"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/customAnalizeResponse" message="tns:customAnalizeResponse"/>
@@ -111,11 +116,6 @@
       <fault message="tns:JobSubmissionException" name="JobSubmissionException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/presetAnalize/Fault/JobSubmissionException"/>
       <fault message="tns:WrongParameterException" name="WrongParameterException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/presetAnalize/Fault/WrongParameterException"/>
     </operation>
-    <operation name="getAnnotation">
-      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationRequest" message="tns:getAnnotation"/>
-      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationResponse" message="tns:getAnnotationResponse"/>
-      <fault message="tns:ResultNotAvailableException" name="ResultNotAvailableException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotation/Fault/ResultNotAvailableException"/>
-    </operation>
     <operation name="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"/>
@@ -147,6 +147,18 @@
   </portType>
   <binding name="JronnWSPortBinding" type="tns:SequenceAnnotation">
     <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
+    <operation name="getAnnotation">
+      <soap:operation soapAction=""/>
+      <input>
+        <soap:body use="literal"/>
+      </input>
+      <output>
+        <soap:body use="literal"/>
+      </output>
+      <fault name="ResultNotAvailableException">
+        <soap:fault name="ResultNotAvailableException" use="literal"/>
+      </fault>
+    </operation>
     <operation name="customAnalize">
       <soap:operation soapAction=""/>
       <input>
@@ -207,18 +219,6 @@
         <soap:fault name="WrongParameterException" use="literal"/>
       </fault>
     </operation>
-    <operation name="getAnnotation">
-      <soap:operation soapAction=""/>
-      <input>
-        <soap:body use="literal"/>
-      </input>
-      <output>
-        <soap:body use="literal"/>
-      </output>
-      <fault name="ResultNotAvailableException">
-        <soap:fault name="ResultNotAvailableException" use="literal"/>
-      </fault>
-    </operation>
     <operation name="cancelJob">
       <soap:operation soapAction=""/>
       <input>
diff --git a/webservices/compbio/ws/server/resource/MafftWS.wsdl b/webservices/compbio/ws/server/resource/MafftWS.wsdl
index c4fcf1c..bebc64b 100644
--- a/webservices/compbio/ws/server/resource/MafftWS.wsdl
+++ b/webservices/compbio/ws/server/resource/MafftWS.wsdl
@@ -15,11 +15,11 @@
   <message name="ResultNotAvailableException">
     <part name="fault" element="tns:ResultNotAvailableException"/>
   </message>
-  <message name="presetAlign">
-    <part name="parameters" element="tns:presetAlign"/>
+  <message name="align">
+    <part name="parameters" element="tns:align"/>
   </message>
-  <message name="presetAlignResponse">
-    <part name="parameters" element="tns:presetAlignResponse"/>
+  <message name="alignResponse">
+    <part name="parameters" element="tns:alignResponse"/>
   </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="presetAlign">
+    <part name="parameters" element="tns:presetAlign"/>
+  </message>
+  <message name="presetAlignResponse">
+    <part name="parameters" element="tns:presetAlignResponse"/>
+  </message>
   <message name="WrongParameterException">
     <part name="fault" element="tns:WrongParameterException"/>
   </message>
@@ -39,12 +45,6 @@
   <message name="customAlignResponse">
     <part name="parameters" element="tns:customAlignResponse"/>
   </message>
-  <message name="align">
-    <part name="parameters" element="tns:align"/>
-  </message>
-  <message name="alignResponse">
-    <part name="parameters" element="tns:alignResponse"/>
-  </message>
   <message name="cancelJob">
     <part name="parameters" element="tns:cancelJob"/>
   </message>
@@ -93,6 +93,13 @@
       <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getResultResponse" message="tns:getResultResponse"/>
       <fault message="tns:ResultNotAvailableException" name="ResultNotAvailableException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getResult/Fault/ResultNotAvailableException"/>
     </operation>
+    <operation name="align">
+      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/alignRequest" message="tns:align"/>
+      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/alignResponse" message="tns:alignResponse"/>
+      <fault message="tns:UnsupportedRuntimeException" name="UnsupportedRuntimeException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/align/Fault/UnsupportedRuntimeException"/>
+      <fault message="tns:LimitExceededException" name="LimitExceededException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/align/Fault/LimitExceededException"/>
+      <fault message="tns:JobSubmissionException" name="JobSubmissionException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/align/Fault/JobSubmissionException"/>
+    </operation>
     <operation name="presetAlign">
       <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/presetAlignRequest" message="tns:presetAlign"/>
       <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/presetAlignResponse" message="tns:presetAlignResponse"/>
@@ -109,13 +116,6 @@
       <fault message="tns:JobSubmissionException" name="JobSubmissionException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/customAlign/Fault/JobSubmissionException"/>
       <fault message="tns:WrongParameterException" name="WrongParameterException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/customAlign/Fault/WrongParameterException"/>
     </operation>
-    <operation name="align">
-      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/alignRequest" message="tns:align"/>
-      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/alignResponse" message="tns:alignResponse"/>
-      <fault message="tns:UnsupportedRuntimeException" name="UnsupportedRuntimeException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/align/Fault/UnsupportedRuntimeException"/>
-      <fault message="tns:LimitExceededException" name="LimitExceededException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/align/Fault/LimitExceededException"/>
-      <fault message="tns:JobSubmissionException" name="JobSubmissionException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/align/Fault/JobSubmissionException"/>
-    </operation>
     <operation name="cancelJob">
       <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/cancelJobRequest" message="tns:cancelJob"/>
       <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/cancelJobResponse" message="tns:cancelJobResponse"/>
@@ -159,7 +159,7 @@
         <soap:fault name="ResultNotAvailableException" use="literal"/>
       </fault>
     </operation>
-    <operation name="presetAlign">
+    <operation name="align">
       <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="customAlign">
+    <operation name="presetAlign">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -201,7 +198,7 @@
         <soap:fault name="WrongParameterException" use="literal"/>
       </fault>
     </operation>
-    <operation name="align">
+    <operation name="customAlign">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -218,6 +215,9 @@
       <fault name="JobSubmissionException">
         <soap:fault name="JobSubmissionException" use="literal"/>
       </fault>
+      <fault name="WrongParameterException">
+        <soap:fault name="WrongParameterException" use="literal"/>
+      </fault>
     </operation>
     <operation name="cancelJob">
       <soap:operation soapAction=""/>
diff --git a/webservices/compbio/ws/server/resource/MuscleWS.wsdl b/webservices/compbio/ws/server/resource/MuscleWS.wsdl
index da4ed97..4f2af4f 100644
--- a/webservices/compbio/ws/server/resource/MuscleWS.wsdl
+++ b/webservices/compbio/ws/server/resource/MuscleWS.wsdl
@@ -15,11 +15,11 @@
   <message name="ResultNotAvailableException">
     <part name="fault" element="tns:ResultNotAvailableException"/>
   </message>
-  <message name="presetAlign">
-    <part name="parameters" element="tns:presetAlign"/>
+  <message name="align">
+    <part name="parameters" element="tns:align"/>
   </message>
-  <message name="presetAlignResponse">
-    <part name="parameters" element="tns:presetAlignResponse"/>
+  <message name="alignResponse">
+    <part name="parameters" element="tns:alignResponse"/>
   </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="presetAlign">
+    <part name="parameters" element="tns:presetAlign"/>
+  </message>
+  <message name="presetAlignResponse">
+    <part name="parameters" element="tns:presetAlignResponse"/>
+  </message>
   <message name="WrongParameterException">
     <part name="fault" element="tns:WrongParameterException"/>
   </message>
@@ -39,12 +45,6 @@
   <message name="customAlignResponse">
     <part name="parameters" element="tns:customAlignResponse"/>
   </message>
-  <message name="align">
-    <part name="parameters" element="tns:align"/>
-  </message>
-  <message name="alignResponse">
-    <part name="parameters" element="tns:alignResponse"/>
-  </message>
   <message name="cancelJob">
     <part name="parameters" element="tns:cancelJob"/>
   </message>
@@ -93,6 +93,13 @@
       <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getResultResponse" message="tns:getResultResponse"/>
       <fault message="tns:ResultNotAvailableException" name="ResultNotAvailableException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getResult/Fault/ResultNotAvailableException"/>
     </operation>
+    <operation name="align">
+      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/alignRequest" message="tns:align"/>
+      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/alignResponse" message="tns:alignResponse"/>
+      <fault message="tns:UnsupportedRuntimeException" name="UnsupportedRuntimeException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/align/Fault/UnsupportedRuntimeException"/>
+      <fault message="tns:LimitExceededException" name="LimitExceededException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/align/Fault/LimitExceededException"/>
+      <fault message="tns:JobSubmissionException" name="JobSubmissionException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/align/Fault/JobSubmissionException"/>
+    </operation>
     <operation name="presetAlign">
       <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/presetAlignRequest" message="tns:presetAlign"/>
       <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/presetAlignResponse" message="tns:presetAlignResponse"/>
@@ -109,13 +116,6 @@
       <fault message="tns:JobSubmissionException" name="JobSubmissionException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/customAlign/Fault/JobSubmissionException"/>
       <fault message="tns:WrongParameterException" name="WrongParameterException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/customAlign/Fault/WrongParameterException"/>
     </operation>
-    <operation name="align">
-      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/alignRequest" message="tns:align"/>
-      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/alignResponse" message="tns:alignResponse"/>
-      <fault message="tns:UnsupportedRuntimeException" name="UnsupportedRuntimeException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/align/Fault/UnsupportedRuntimeException"/>
-      <fault message="tns:LimitExceededException" name="LimitExceededException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/align/Fault/LimitExceededException"/>
-      <fault message="tns:JobSubmissionException" name="JobSubmissionException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/align/Fault/JobSubmissionException"/>
-    </operation>
     <operation name="cancelJob">
       <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/cancelJobRequest" message="tns:cancelJob"/>
       <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/cancelJobResponse" message="tns:cancelJobResponse"/>
@@ -159,7 +159,7 @@
         <soap:fault name="ResultNotAvailableException" use="literal"/>
       </fault>
     </operation>
-    <operation name="presetAlign">
+    <operation name="align">
       <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="customAlign">
+    <operation name="presetAlign">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -201,7 +198,7 @@
         <soap:fault name="WrongParameterException" use="literal"/>
       </fault>
     </operation>
-    <operation name="align">
+    <operation name="customAlign">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -218,6 +215,9 @@
       <fault name="JobSubmissionException">
         <soap:fault name="JobSubmissionException" use="literal"/>
       </fault>
+      <fault name="WrongParameterException">
+        <soap:fault name="WrongParameterException" use="literal"/>
+      </fault>
     </operation>
     <operation name="cancelJob">
       <soap:operation soapAction=""/>
diff --git a/webservices/compbio/ws/server/resource/RegistryWS.wsdl b/webservices/compbio/ws/server/resource/RegistryWS.wsdl
index 6760f66..6e2d9f9 100644
--- a/webservices/compbio/ws/server/resource/RegistryWS.wsdl
+++ b/webservices/compbio/ws/server/resource/RegistryWS.wsdl
@@ -42,6 +42,18 @@
   <message name="isOperatingResponse">
     <part name="parameters" element="tns:isOperatingResponse"/>
   </message>
+  <message name="getServiceDescription">
+    <part name="parameters" element="tns:getServiceDescription"/>
+  </message>
+  <message name="getServiceDescriptionResponse">
+    <part name="parameters" element="tns:getServiceDescriptionResponse"/>
+  </message>
+  <message name="getServiceCategories">
+    <part name="parameters" element="tns:getServiceCategories"/>
+  </message>
+  <message name="getServiceCategoriesResponse">
+    <part name="parameters" element="tns:getServiceCategoriesResponse"/>
+  </message>
   <portType name="RegistryWS">
     <operation name="getSupportedServices">
       <input wsam:Action="http://msa.data.compbio/01/12/2010/RegistryWS/getSupportedServicesRequest" message="tns:getSupportedServices"/>
@@ -67,6 +79,14 @@
       <input wsam:Action="http://msa.data.compbio/01/12/2010/RegistryWS/isOperatingRequest" message="tns:isOperating"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/RegistryWS/isOperatingResponse" message="tns:isOperatingResponse"/>
     </operation>
+    <operation name="getServiceDescription">
+      <input wsam:Action="http://msa.data.compbio/01/12/2010/RegistryWS/getServiceDescriptionRequest" message="tns:getServiceDescription"/>
+      <output wsam:Action="http://msa.data.compbio/01/12/2010/RegistryWS/getServiceDescriptionResponse" message="tns:getServiceDescriptionResponse"/>
+    </operation>
+    <operation name="getServiceCategories">
+      <input wsam:Action="http://msa.data.compbio/01/12/2010/RegistryWS/getServiceCategoriesRequest" message="tns:getServiceCategories"/>
+      <output wsam:Action="http://msa.data.compbio/01/12/2010/RegistryWS/getServiceCategoriesResponse" message="tns:getServiceCategoriesResponse"/>
+    </operation>
   </portType>
   <binding name="RegistryWSPortBinding" type="tns:RegistryWS">
     <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
@@ -124,6 +144,24 @@
         <soap:body use="literal"/>
       </output>
     </operation>
+    <operation name="getServiceDescription">
+      <soap:operation soapAction=""/>
+      <input>
+        <soap:body use="literal"/>
+      </input>
+      <output>
+        <soap:body use="literal"/>
+      </output>
+    </operation>
+    <operation name="getServiceCategories">
+      <soap:operation soapAction=""/>
+      <input>
+        <soap:body use="literal"/>
+      </input>
+      <output>
+        <soap:body use="literal"/>
+      </output>
+    </operation>
   </binding>
   <service name="RegistryWS">
     <port name="RegistryWSPort" binding="tns:RegistryWSPortBinding">
diff --git a/webservices/compbio/ws/server/resource/RegistryWS_schema1.xsd b/webservices/compbio/ws/server/resource/RegistryWS_schema1.xsd
index a7cb4c7..745515a 100644
--- a/webservices/compbio/ws/server/resource/RegistryWS_schema1.xsd
+++ b/webservices/compbio/ws/server/resource/RegistryWS_schema1.xsd
@@ -9,6 +9,14 @@
 
   <xs:element name="getLastTestedResponse" type="tns:getLastTestedResponse"/>
 
+  <xs:element name="getServiceCategories" type="tns:getServiceCategories"/>
+
+  <xs:element name="getServiceCategoriesResponse" type="tns:getServiceCategoriesResponse"/>
+
+  <xs:element name="getServiceDescription" type="tns:getServiceDescription"/>
+
+  <xs:element name="getServiceDescriptionResponse" type="tns:getServiceDescriptionResponse"/>
+
   <xs:element name="getSupportedServices" type="tns:getSupportedServices"/>
 
   <xs:element name="getSupportedServicesResponse" type="tns:getSupportedServicesResponse"/>
@@ -47,6 +55,18 @@
     </xs:sequence>
   </xs:complexType>
 
+  <xs:complexType name="getServiceDescription">
+    <xs:sequence>
+      <xs:element name="arg0" type="tns:services" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="getServiceDescriptionResponse">
+    <xs:sequence>
+      <xs:element name="return" type="xs:string" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
   <xs:complexType name="getSupportedServices">
     <xs:sequence/>
   </xs:complexType>
@@ -57,6 +77,23 @@
     </xs:sequence>
   </xs:complexType>
 
+  <xs:complexType name="getServiceCategories">
+    <xs:sequence/>
+  </xs:complexType>
+
+  <xs:complexType name="getServiceCategoriesResponse">
+    <xs:sequence>
+      <xs:element name="return" type="tns:category" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="category">
+    <xs:sequence>
+      <xs:element name="name" type="xs:string" minOccurs="0"/>
+      <xs:element name="services" type="tns:services" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+
   <xs:complexType name="isOperating">
     <xs:sequence>
       <xs:element name="arg0" type="tns:services" minOccurs="0"/>
@@ -98,6 +135,7 @@
       <xs:enumeration value="MafftWS"/>
       <xs:enumeration value="MuscleWS"/>
       <xs:enumeration value="ClustalWS"/>
+      <xs:enumeration value="ClustalOWS"/>
       <xs:enumeration value="TcoffeeWS"/>
       <xs:enumeration value="ProbconsWS"/>
       <xs:enumeration value="AAConWS"/>
diff --git a/webservices/compbio/ws/server/resource/TcoffeeWS.wsdl b/webservices/compbio/ws/server/resource/TcoffeeWS.wsdl
index 6781837..5129abb 100644
--- a/webservices/compbio/ws/server/resource/TcoffeeWS.wsdl
+++ b/webservices/compbio/ws/server/resource/TcoffeeWS.wsdl
@@ -15,11 +15,11 @@
   <message name="ResultNotAvailableException">
     <part name="fault" element="tns:ResultNotAvailableException"/>
   </message>
-  <message name="presetAlign">
-    <part name="parameters" element="tns:presetAlign"/>
+  <message name="align">
+    <part name="parameters" element="tns:align"/>
   </message>
-  <message name="presetAlignResponse">
-    <part name="parameters" element="tns:presetAlignResponse"/>
+  <message name="alignResponse">
+    <part name="parameters" element="tns:alignResponse"/>
   </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="presetAlign">
+    <part name="parameters" element="tns:presetAlign"/>
+  </message>
+  <message name="presetAlignResponse">
+    <part name="parameters" element="tns:presetAlignResponse"/>
+  </message>
   <message name="WrongParameterException">
     <part name="fault" element="tns:WrongParameterException"/>
   </message>
@@ -39,12 +45,6 @@
   <message name="customAlignResponse">
     <part name="parameters" element="tns:customAlignResponse"/>
   </message>
-  <message name="align">
-    <part name="parameters" element="tns:align"/>
-  </message>
-  <message name="alignResponse">
-    <part name="parameters" element="tns:alignResponse"/>
-  </message>
   <message name="cancelJob">
     <part name="parameters" element="tns:cancelJob"/>
   </message>
@@ -93,6 +93,13 @@
       <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getResultResponse" message="tns:getResultResponse"/>
       <fault message="tns:ResultNotAvailableException" name="ResultNotAvailableException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getResult/Fault/ResultNotAvailableException"/>
     </operation>
+    <operation name="align">
+      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/alignRequest" message="tns:align"/>
+      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/alignResponse" message="tns:alignResponse"/>
+      <fault message="tns:UnsupportedRuntimeException" name="UnsupportedRuntimeException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/align/Fault/UnsupportedRuntimeException"/>
+      <fault message="tns:LimitExceededException" name="LimitExceededException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/align/Fault/LimitExceededException"/>
+      <fault message="tns:JobSubmissionException" name="JobSubmissionException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/align/Fault/JobSubmissionException"/>
+    </operation>
     <operation name="presetAlign">
       <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/presetAlignRequest" message="tns:presetAlign"/>
       <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/presetAlignResponse" message="tns:presetAlignResponse"/>
@@ -109,13 +116,6 @@
       <fault message="tns:JobSubmissionException" name="JobSubmissionException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/customAlign/Fault/JobSubmissionException"/>
       <fault message="tns:WrongParameterException" name="WrongParameterException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/customAlign/Fault/WrongParameterException"/>
     </operation>
-    <operation name="align">
-      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/alignRequest" message="tns:align"/>
-      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/alignResponse" message="tns:alignResponse"/>
-      <fault message="tns:UnsupportedRuntimeException" name="UnsupportedRuntimeException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/align/Fault/UnsupportedRuntimeException"/>
-      <fault message="tns:LimitExceededException" name="LimitExceededException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/align/Fault/LimitExceededException"/>
-      <fault message="tns:JobSubmissionException" name="JobSubmissionException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/align/Fault/JobSubmissionException"/>
-    </operation>
     <operation name="cancelJob">
       <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/cancelJobRequest" message="tns:cancelJob"/>
       <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/cancelJobResponse" message="tns:cancelJobResponse"/>
@@ -159,7 +159,7 @@
         <soap:fault name="ResultNotAvailableException" use="literal"/>
       </fault>
     </operation>
-    <operation name="presetAlign">
+    <operation name="align">
       <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="customAlign">
+    <operation name="presetAlign">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -201,7 +198,7 @@
         <soap:fault name="WrongParameterException" use="literal"/>
       </fault>
     </operation>
-    <operation name="align">
+    <operation name="customAlign">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -218,6 +215,9 @@
       <fault name="JobSubmissionException">
         <soap:fault name="JobSubmissionException" use="literal"/>
       </fault>
+      <fault name="WrongParameterException">
+        <soap:fault name="WrongParameterException" use="literal"/>
+      </fault>
     </operation>
     <operation name="cancelJob">
       <soap:operation soapAction=""/>