Web service stubs are regenerated to incorporate new the methods. Excveption handling...

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

diff --git a/webservices/compbio/data/msa/jaxws/GetLastTested.java b/webservices/compbio/data/msa/jaxws/GetLastTested.java
new file mode 100644 (file)
index 0000000..7f8b672
--- /dev/null
+++ b/webservices/compbio/data/msa/jaxws/GetLastTested.java
@@ -0,0 +1,36 @@
+\r
+package compbio.data.msa.jaxws;\r
+\r
+import javax.xml.bind.annotation.XmlAccessType;\r
+import javax.xml.bind.annotation.XmlAccessorType;\r
+import javax.xml.bind.annotation.XmlElement;\r
+import javax.xml.bind.annotation.XmlRootElement;\r
+import javax.xml.bind.annotation.XmlType;\r
+\r
+@XmlRootElement(name = "getLastTested", namespace = "http://msa.data.compbio/01/12/2010/")\r
+@XmlAccessorType(XmlAccessType.FIELD)\r
+@XmlType(name = "getLastTested", namespace = "http://msa.data.compbio/01/12/2010/")\r
+public class GetLastTested {\r
+\r
+    @XmlElement(name = "arg0", namespace = "")\r
+    private compbio.ws.client.Services arg0;\r
+\r
+    /**\r
+     * \r
+     * @return\r
+     *     returns Services\r
+     */\r
+    public compbio.ws.client.Services getArg0() {\r
+        return this.arg0;\r
+    }\r
+\r
+    /**\r
+     * \r
+     * @param arg0\r
+     *     the value for the arg0 property\r
+     */\r
+    public void setArg0(compbio.ws.client.Services arg0) {\r
+        this.arg0 = arg0;\r
+    }\r
+\r
+}\r

diff --git a/webservices/compbio/data/msa/jaxws/GetLastTestedOn.java b/webservices/compbio/data/msa/jaxws/GetLastTestedOn.java
new file mode 100644 (file)
index 0000000..ca4af03
--- /dev/null
+++ b/webservices/compbio/data/msa/jaxws/GetLastTestedOn.java
@@ -0,0 +1,36 @@
+\r
+package compbio.data.msa.jaxws;\r
+\r
+import javax.xml.bind.annotation.XmlAccessType;\r
+import javax.xml.bind.annotation.XmlAccessorType;\r
+import javax.xml.bind.annotation.XmlElement;\r
+import javax.xml.bind.annotation.XmlRootElement;\r
+import javax.xml.bind.annotation.XmlType;\r
+\r
+@XmlRootElement(name = "getLastTestedOn", namespace = "http://msa.data.compbio/01/12/2010/")\r
+@XmlAccessorType(XmlAccessType.FIELD)\r
+@XmlType(name = "getLastTestedOn", namespace = "http://msa.data.compbio/01/12/2010/")\r
+public class GetLastTestedOn {\r
+\r
+    @XmlElement(name = "arg0", namespace = "")\r
+    private compbio.ws.client.Services arg0;\r
+\r
+    /**\r
+     * \r
+     * @return\r
+     *     returns Services\r
+     */\r
+    public compbio.ws.client.Services getArg0() {\r
+        return this.arg0;\r
+    }\r
+\r
+    /**\r
+     * \r
+     * @param arg0\r
+     *     the value for the arg0 property\r
+     */\r
+    public void setArg0(compbio.ws.client.Services arg0) {\r
+        this.arg0 = arg0;\r
+    }\r
+\r
+}\r

diff --git a/webservices/compbio/data/msa/jaxws/GetLastTestedOnResponse.java b/webservices/compbio/data/msa/jaxws/GetLastTestedOnResponse.java
new file mode 100644 (file)
index 0000000..379c2b9
--- /dev/null
+++ b/webservices/compbio/data/msa/jaxws/GetLastTestedOnResponse.java
@@ -0,0 +1,37 @@
+\r
+package compbio.data.msa.jaxws;\r
+\r
+import java.util.Date;\r
+import javax.xml.bind.annotation.XmlAccessType;\r
+import javax.xml.bind.annotation.XmlAccessorType;\r
+import javax.xml.bind.annotation.XmlElement;\r
+import javax.xml.bind.annotation.XmlRootElement;\r
+import javax.xml.bind.annotation.XmlType;\r
+\r
+@XmlRootElement(name = "getLastTestedOnResponse", namespace = "http://msa.data.compbio/01/12/2010/")\r
+@XmlAccessorType(XmlAccessType.FIELD)\r
+@XmlType(name = "getLastTestedOnResponse", namespace = "http://msa.data.compbio/01/12/2010/")\r
+public class GetLastTestedOnResponse {\r
+\r
+    @XmlElement(name = "return", namespace = "")\r
+    private Date _return;\r
+\r
+    /**\r
+     * \r
+     * @return\r
+     *     returns Date\r
+     */\r
+    public Date getReturn() {\r
+        return this._return;\r
+    }\r
+\r
+    /**\r
+     * \r
+     * @param _return\r
+     *     the value for the _return property\r
+     */\r
+    public void setReturn(Date _return) {\r
+        this._return = _return;\r
+    }\r
+\r
+}\r

diff --git a/webservices/compbio/data/msa/jaxws/GetLastTestedResponse.java b/webservices/compbio/data/msa/jaxws/GetLastTestedResponse.java
new file mode 100644 (file)
index 0000000..adba7db
--- /dev/null
+++ b/webservices/compbio/data/msa/jaxws/GetLastTestedResponse.java
@@ -0,0 +1,36 @@
+\r
+package compbio.data.msa.jaxws;\r
+\r
+import javax.xml.bind.annotation.XmlAccessType;\r
+import javax.xml.bind.annotation.XmlAccessorType;\r
+import javax.xml.bind.annotation.XmlElement;\r
+import javax.xml.bind.annotation.XmlRootElement;\r
+import javax.xml.bind.annotation.XmlType;\r
+\r
+@XmlRootElement(name = "getLastTestedResponse", namespace = "http://msa.data.compbio/01/12/2010/")\r
+@XmlAccessorType(XmlAccessType.FIELD)\r
+@XmlType(name = "getLastTestedResponse", namespace = "http://msa.data.compbio/01/12/2010/")\r
+public class GetLastTestedResponse {\r
+\r
+    @XmlElement(name = "return", namespace = "")\r
+    private int _return;\r
+\r
+    /**\r
+     * \r
+     * @return\r
+     *     returns int\r
+     */\r
+    public int getReturn() {\r
+        return this._return;\r
+    }\r
+\r
+    /**\r
+     * \r
+     * @param _return\r
+     *     the value for the _return property\r
+     */\r
+    public void setReturn(int _return) {\r
+        this._return = _return;\r
+    }\r
+\r
+}\r

diff --git a/webservices/compbio/data/msa/jaxws/GetSupportedServices.java b/webservices/compbio/data/msa/jaxws/GetSupportedServices.java
new file mode 100644 (file)
index 0000000..fe979ca
--- /dev/null
+++ b/webservices/compbio/data/msa/jaxws/GetSupportedServices.java
@@ -0,0 +1,15 @@
+\r
+package compbio.data.msa.jaxws;\r
+\r
+import javax.xml.bind.annotation.XmlAccessType;\r
+import javax.xml.bind.annotation.XmlAccessorType;\r
+import javax.xml.bind.annotation.XmlRootElement;\r
+import javax.xml.bind.annotation.XmlType;\r
+\r
+@XmlRootElement(name = "getSupportedServices", namespace = "http://msa.data.compbio/01/12/2010/")\r
+@XmlAccessorType(XmlAccessType.FIELD)\r
+@XmlType(name = "getSupportedServices", namespace = "http://msa.data.compbio/01/12/2010/")\r
+public class GetSupportedServices {\r
+\r
+\r
+}\r

diff --git a/webservices/compbio/data/msa/jaxws/GetSupportedServicesResponse.java b/webservices/compbio/data/msa/jaxws/GetSupportedServicesResponse.java
new file mode 100644 (file)
index 0000000..3073df5
--- /dev/null
+++ b/webservices/compbio/data/msa/jaxws/GetSupportedServicesResponse.java
@@ -0,0 +1,37 @@
+\r
+package compbio.data.msa.jaxws;\r
+\r
+import java.util.Set;\r
+import javax.xml.bind.annotation.XmlAccessType;\r
+import javax.xml.bind.annotation.XmlAccessorType;\r
+import javax.xml.bind.annotation.XmlElement;\r
+import javax.xml.bind.annotation.XmlRootElement;\r
+import javax.xml.bind.annotation.XmlType;\r
+\r
+@XmlRootElement(name = "getSupportedServicesResponse", namespace = "http://msa.data.compbio/01/12/2010/")\r
+@XmlAccessorType(XmlAccessType.FIELD)\r
+@XmlType(name = "getSupportedServicesResponse", namespace = "http://msa.data.compbio/01/12/2010/")\r
+public class GetSupportedServicesResponse {\r
+\r
+    @XmlElement(name = "return", namespace = "")\r
+    private Set<compbio.ws.client.Services> _return;\r
+\r
+    /**\r
+     * \r
+     * @return\r
+     *     returns Set<Services>\r
+     */\r
+    public Set<compbio.ws.client.Services> getReturn() {\r
+        return this._return;\r
+    }\r
+\r
+    /**\r
+     * \r
+     * @param _return\r
+     *     the value for the _return property\r
+     */\r
+    public void setReturn(Set<compbio.ws.client.Services> _return) {\r
+        this._return = _return;\r
+    }\r
+\r
+}\r

diff --git a/webservices/compbio/data/msa/jaxws/IsOperating.java b/webservices/compbio/data/msa/jaxws/IsOperating.java
new file mode 100644 (file)
index 0000000..cde7d15
--- /dev/null
+++ b/webservices/compbio/data/msa/jaxws/IsOperating.java
@@ -0,0 +1,36 @@
+\r
+package compbio.data.msa.jaxws;\r
+\r
+import javax.xml.bind.annotation.XmlAccessType;\r
+import javax.xml.bind.annotation.XmlAccessorType;\r
+import javax.xml.bind.annotation.XmlElement;\r
+import javax.xml.bind.annotation.XmlRootElement;\r
+import javax.xml.bind.annotation.XmlType;\r
+\r
+@XmlRootElement(name = "isOperating", namespace = "http://msa.data.compbio/01/12/2010/")\r
+@XmlAccessorType(XmlAccessType.FIELD)\r
+@XmlType(name = "isOperating", namespace = "http://msa.data.compbio/01/12/2010/")\r
+public class IsOperating {\r
+\r
+    @XmlElement(name = "arg0", namespace = "")\r
+    private compbio.ws.client.Services arg0;\r
+\r
+    /**\r
+     * \r
+     * @return\r
+     *     returns Services\r
+     */\r
+    public compbio.ws.client.Services getArg0() {\r
+        return this.arg0;\r
+    }\r
+\r
+    /**\r
+     * \r
+     * @param arg0\r
+     *     the value for the arg0 property\r
+     */\r
+    public void setArg0(compbio.ws.client.Services arg0) {\r
+        this.arg0 = arg0;\r
+    }\r
+\r
+}\r

diff --git a/webservices/compbio/data/msa/jaxws/IsOperatingResponse.java b/webservices/compbio/data/msa/jaxws/IsOperatingResponse.java
new file mode 100644 (file)
index 0000000..f9854b1
--- /dev/null
+++ b/webservices/compbio/data/msa/jaxws/IsOperatingResponse.java
@@ -0,0 +1,36 @@
+\r
+package compbio.data.msa.jaxws;\r
+\r
+import javax.xml.bind.annotation.XmlAccessType;\r
+import javax.xml.bind.annotation.XmlAccessorType;\r
+import javax.xml.bind.annotation.XmlElement;\r
+import javax.xml.bind.annotation.XmlRootElement;\r
+import javax.xml.bind.annotation.XmlType;\r
+\r
+@XmlRootElement(name = "isOperatingResponse", namespace = "http://msa.data.compbio/01/12/2010/")\r
+@XmlAccessorType(XmlAccessType.FIELD)\r
+@XmlType(name = "isOperatingResponse", namespace = "http://msa.data.compbio/01/12/2010/")\r
+public class IsOperatingResponse {\r
+\r
+    @XmlElement(name = "return", namespace = "")\r
+    private boolean _return;\r
+\r
+    /**\r
+     * \r
+     * @return\r
+     *     returns boolean\r
+     */\r
+    public boolean isReturn() {\r
+        return this._return;\r
+    }\r
+\r
+    /**\r
+     * \r
+     * @param _return\r
+     *     the value for the _return property\r
+     */\r
+    public void setReturn(boolean _return) {\r
+        this._return = _return;\r
+    }\r
+\r
+}\r

diff --git a/webservices/compbio/data/msa/jaxws/JobSubmissionExceptionBean.java b/webservices/compbio/data/msa/jaxws/JobSubmissionExceptionBean.java
index b2d62d6..30950b4 100644 (file)
--- a/webservices/compbio/data/msa/jaxws/JobSubmissionExceptionBean.java
+++ b/webservices/compbio/data/msa/jaxws/JobSubmissionExceptionBean.java
@@ -9,8 +9,8 @@ import javax.xml.bind.annotation.XmlType;
 \r
 /**\r
  * This class was generated by the JAX-WS RI.\r
- * JAX-WS RI 2.1.6 in JDK 6\r
- * Generated source version: 2.1.6\r
+ * JAX-WS RI 2.2.1-hudson-28-\r
+ * Generated source version: 2.2.1\r
  * \r
  */\r
 @XmlRootElement(name = "JobSubmissionException", namespace = "http://msa.data.compbio/01/12/2010/")\r

diff --git a/webservices/compbio/data/msa/jaxws/LimitExceededExceptionBean.java b/webservices/compbio/data/msa/jaxws/LimitExceededExceptionBean.java
index e1bf0bf..c9c3a4e 100644 (file)
--- a/webservices/compbio/data/msa/jaxws/LimitExceededExceptionBean.java
+++ b/webservices/compbio/data/msa/jaxws/LimitExceededExceptionBean.java
@@ -9,8 +9,8 @@ import javax.xml.bind.annotation.XmlType;
 \r
 /**\r
  * This class was generated by the JAX-WS RI.\r
- * JAX-WS RI 2.1.6 in JDK 6\r
- * Generated source version: 2.1.6\r
+ * JAX-WS RI 2.2.1-hudson-28-\r
+ * Generated source version: 2.2.1\r
  * \r
  */\r
 @XmlRootElement(name = "LimitExceededException", namespace = "http://msa.data.compbio/01/12/2010/")\r

diff --git a/webservices/compbio/data/msa/jaxws/ResultNotAvailableExceptionBean.java b/webservices/compbio/data/msa/jaxws/ResultNotAvailableExceptionBean.java
index 7016909..be8a26d 100644 (file)
--- a/webservices/compbio/data/msa/jaxws/ResultNotAvailableExceptionBean.java
+++ b/webservices/compbio/data/msa/jaxws/ResultNotAvailableExceptionBean.java
@@ -9,8 +9,8 @@ import javax.xml.bind.annotation.XmlType;
 \r
 /**\r
  * This class was generated by the JAX-WS RI.\r
- * JAX-WS RI 2.1.6 in JDK 6\r
- * Generated source version: 2.1.6\r
+ * JAX-WS RI 2.2.1-hudson-28-\r
+ * Generated source version: 2.2.1\r
  * \r
  */\r
 @XmlRootElement(name = "ResultNotAvailableException", namespace = "http://msa.data.compbio/01/12/2010/")\r

diff --git a/webservices/compbio/data/msa/jaxws/TestAllServices.java b/webservices/compbio/data/msa/jaxws/TestAllServices.java
new file mode 100644 (file)
index 0000000..2ff7814
--- /dev/null
+++ b/webservices/compbio/data/msa/jaxws/TestAllServices.java
@@ -0,0 +1,15 @@
+\r
+package compbio.data.msa.jaxws;\r
+\r
+import javax.xml.bind.annotation.XmlAccessType;\r
+import javax.xml.bind.annotation.XmlAccessorType;\r
+import javax.xml.bind.annotation.XmlRootElement;\r
+import javax.xml.bind.annotation.XmlType;\r
+\r
+@XmlRootElement(name = "testAllServices", namespace = "http://msa.data.compbio/01/12/2010/")\r
+@XmlAccessorType(XmlAccessType.FIELD)\r
+@XmlType(name = "testAllServices", namespace = "http://msa.data.compbio/01/12/2010/")\r
+public class TestAllServices {\r
+\r
+\r
+}\r

diff --git a/webservices/compbio/data/msa/jaxws/TestAllServicesResponse.java b/webservices/compbio/data/msa/jaxws/TestAllServicesResponse.java
new file mode 100644 (file)
index 0000000..4f42b3a
--- /dev/null
+++ b/webservices/compbio/data/msa/jaxws/TestAllServicesResponse.java
@@ -0,0 +1,36 @@
+\r
+package compbio.data.msa.jaxws;\r
+\r
+import javax.xml.bind.annotation.XmlAccessType;\r
+import javax.xml.bind.annotation.XmlAccessorType;\r
+import javax.xml.bind.annotation.XmlElement;\r
+import javax.xml.bind.annotation.XmlRootElement;\r
+import javax.xml.bind.annotation.XmlType;\r
+\r
+@XmlRootElement(name = "testAllServicesResponse", namespace = "http://msa.data.compbio/01/12/2010/")\r
+@XmlAccessorType(XmlAccessType.FIELD)\r
+@XmlType(name = "testAllServicesResponse", namespace = "http://msa.data.compbio/01/12/2010/")\r
+public class TestAllServicesResponse {\r
+\r
+    @XmlElement(name = "return", namespace = "")\r
+    private String _return;\r
+\r
+    /**\r
+     * \r
+     * @return\r
+     *     returns String\r
+     */\r
+    public String getReturn() {\r
+        return this._return;\r
+    }\r
+\r
+    /**\r
+     * \r
+     * @param _return\r
+     *     the value for the _return property\r
+     */\r
+    public void setReturn(String _return) {\r
+        this._return = _return;\r
+    }\r
+\r
+}\r

diff --git a/webservices/compbio/data/msa/jaxws/TestService.java b/webservices/compbio/data/msa/jaxws/TestService.java
new file mode 100644 (file)
index 0000000..c831953
--- /dev/null
+++ b/webservices/compbio/data/msa/jaxws/TestService.java
@@ -0,0 +1,36 @@
+\r
+package compbio.data.msa.jaxws;\r
+\r
+import javax.xml.bind.annotation.XmlAccessType;\r
+import javax.xml.bind.annotation.XmlAccessorType;\r
+import javax.xml.bind.annotation.XmlElement;\r
+import javax.xml.bind.annotation.XmlRootElement;\r
+import javax.xml.bind.annotation.XmlType;\r
+\r
+@XmlRootElement(name = "testService", namespace = "http://msa.data.compbio/01/12/2010/")\r
+@XmlAccessorType(XmlAccessType.FIELD)\r
+@XmlType(name = "testService", namespace = "http://msa.data.compbio/01/12/2010/")\r
+public class TestService {\r
+\r
+    @XmlElement(name = "arg0", namespace = "")\r
+    private compbio.ws.client.Services arg0;\r
+\r
+    /**\r
+     * \r
+     * @return\r
+     *     returns Services\r
+     */\r
+    public compbio.ws.client.Services getArg0() {\r
+        return this.arg0;\r
+    }\r
+\r
+    /**\r
+     * \r
+     * @param arg0\r
+     *     the value for the arg0 property\r
+     */\r
+    public void setArg0(compbio.ws.client.Services arg0) {\r
+        this.arg0 = arg0;\r
+    }\r
+\r
+}\r

diff --git a/webservices/compbio/data/msa/jaxws/TestServiceResponse.java b/webservices/compbio/data/msa/jaxws/TestServiceResponse.java
new file mode 100644 (file)
index 0000000..e274d42
--- /dev/null
+++ b/webservices/compbio/data/msa/jaxws/TestServiceResponse.java
@@ -0,0 +1,36 @@
+\r
+package compbio.data.msa.jaxws;\r
+\r
+import javax.xml.bind.annotation.XmlAccessType;\r
+import javax.xml.bind.annotation.XmlAccessorType;\r
+import javax.xml.bind.annotation.XmlElement;\r
+import javax.xml.bind.annotation.XmlRootElement;\r
+import javax.xml.bind.annotation.XmlType;\r
+\r
+@XmlRootElement(name = "testServiceResponse", namespace = "http://msa.data.compbio/01/12/2010/")\r
+@XmlAccessorType(XmlAccessType.FIELD)\r
+@XmlType(name = "testServiceResponse", namespace = "http://msa.data.compbio/01/12/2010/")\r
+public class TestServiceResponse {\r
+\r
+    @XmlElement(name = "return", namespace = "")\r
+    private String _return;\r
+\r
+    /**\r
+     * \r
+     * @return\r
+     *     returns String\r
+     */\r
+    public String getReturn() {\r
+        return this._return;\r
+    }\r
+\r
+    /**\r
+     * \r
+     * @param _return\r
+     *     the value for the _return property\r
+     */\r
+    public void setReturn(String _return) {\r
+        this._return = _return;\r
+    }\r
+\r
+}\r

diff --git a/webservices/compbio/data/msa/jaxws/UnsupportedRuntimeExceptionBean.java b/webservices/compbio/data/msa/jaxws/UnsupportedRuntimeExceptionBean.java
index fa77aae..5e1268a 100644 (file)
--- a/webservices/compbio/data/msa/jaxws/UnsupportedRuntimeExceptionBean.java
+++ b/webservices/compbio/data/msa/jaxws/UnsupportedRuntimeExceptionBean.java
@@ -9,8 +9,8 @@ import javax.xml.bind.annotation.XmlType;
 \r
 /**\r
  * This class was generated by the JAX-WS RI.\r
- * JAX-WS RI 2.1.6 in JDK 6\r
- * Generated source version: 2.1.6\r
+ * JAX-WS RI 2.2.1-hudson-28-\r
+ * Generated source version: 2.2.1\r
  * \r
  */\r
 @XmlRootElement(name = "UnsupportedRuntimeException", namespace = "http://msa.data.compbio/01/12/2010/")\r

diff --git a/webservices/compbio/data/msa/jaxws/WrongParameterExceptionBean.java b/webservices/compbio/data/msa/jaxws/WrongParameterExceptionBean.java
index fc22bd0..62be910 100644 (file)
--- a/webservices/compbio/data/msa/jaxws/WrongParameterExceptionBean.java
+++ b/webservices/compbio/data/msa/jaxws/WrongParameterExceptionBean.java
@@ -9,8 +9,8 @@ import javax.xml.bind.annotation.XmlType;
 \r
 /**\r
  * This class was generated by the JAX-WS RI.\r
- * JAX-WS RI 2.1.6 in JDK 6\r
- * Generated source version: 2.1.6\r
+ * JAX-WS RI 2.2.1-hudson-28-\r
+ * Generated source version: 2.2.1\r
  * \r
  */\r
 @XmlRootElement(name = "WrongParameterException", namespace = "http://msa.data.compbio/01/12/2010/")\r

diff --git a/webservices/compbio/ws/client/WSTester.java b/webservices/compbio/ws/client/WSTester.java
index 4db6778..7091f02 100644 (file)
--- a/webservices/compbio/ws/client/WSTester.java
+++ b/webservices/compbio/ws/client/WSTester.java
@@ -182,8 +182,7 @@ public class WSTester {
                return succeed;\r
        }\r
 \r
-       private <T> boolean testMsaWS(MsaWS<T> msaws)\r
-                       throws UnsupportedRuntimeException {\r
+       private <T> boolean testMsaWS(MsaWS<T> msaws) throws Exception {\r
                assert msaws != null;\r
 \r
                boolean succeed = testDefaultAlignment(msaws);\r
@@ -225,14 +224,14 @@ public class WSTester {
                                throw new UnsupportedOperationException("The service: "\r
                                                + wservice.getClass() + " is not supported! ");\r
                        }\r
-               } catch (UnsupportedRuntimeException e) {\r
+               } catch (Exception e) {\r
                        reportException(e);\r
                        return false;\r
                }\r
        }\r
 \r
        private <T> boolean testSequenceAnnotationWS(SequenceAnnotation<T> wservice)\r
-                       throws UnsupportedRuntimeException {\r
+                       throws Exception {\r
                writer.print("Calling analyse.........");\r
                boolean success = testDefaultAnalyse(loadAlignment(), wservice, null,\r
                                null);\r
@@ -253,30 +252,24 @@ public class WSTester {
 \r
        private <T> boolean testDefaultAnalyse(List<FastaSequence> fastalist,\r
                        SequenceAnnotation<T> wsproxy, Preset<T> preset,\r
-                       List<Option<T>> customOptions) throws UnsupportedRuntimeException {\r
+                       List<Option<T>> customOptions) throws Exception {\r
 \r
                ScoreManager scores = null;\r
-               try {\r
-                       String jobId = null;\r
-                       if (customOptions != null) {\r
-                               jobId = wsproxy.customAnalize(fastalist, customOptions);\r
-                       } else if (preset != null) {\r
-                               jobId = wsproxy.presetAnalize(fastalist, preset);\r
-                       } else {\r
-                               jobId = wsproxy.analize(fastalist);\r
-                       }\r
-                       Thread.sleep(1000);\r
-                       scores = wsproxy.getAnnotation(jobId);\r
-                       if (scores != null) {\r
-                               writer.println(OK);\r
-                       }\r
-               } catch (Exception e) {\r
-                       if (e instanceof UnsupportedRuntimeException) {\r
-                               throw (UnsupportedRuntimeException) e;\r
-                       } else {\r
-                               reportException(e);\r
-                       }\r
+\r
+               String jobId = null;\r
+               if (customOptions != null) {\r
+                       jobId = wsproxy.customAnalize(fastalist, customOptions);\r
+               } else if (preset != null) {\r
+                       jobId = wsproxy.presetAnalize(fastalist, preset);\r
+               } else {\r
+                       jobId = wsproxy.analize(fastalist);\r
                }\r
+               Thread.sleep(1000);\r
+               scores = wsproxy.getAnnotation(jobId);\r
+               if (scores != null) {\r
+                       writer.println(OK);\r
+               }\r
+\r
                return scores != null;\r
        }\r
 \r
@@ -332,30 +325,22 @@ public class WSTester {
         * @param msaws\r
         * @throws UnsupportedRuntimeException\r
         */\r
-       private <T> boolean testDefaultAlignment(MsaWS<T> msaws)\r
-                       throws UnsupportedRuntimeException {\r
+       private <T> boolean testDefaultAlignment(MsaWS<T> msaws) throws Exception {\r
                writer.print("Testing alignment with default parameters:");\r
                Alignment al = null;\r
                boolean succeed = false;\r
-               try {\r
-                       String taskId = msaws.align(seqs);\r
-                       writer.print("\nQuerying job status...");\r
-                       JobStatus status = msaws.getJobStatus(taskId);\r
-                       while (status != JobStatus.FINISHED) {\r
-                               Thread.sleep(1000);\r
-                               status = msaws.getJobStatus(taskId);\r
-                       }\r
-                       writer.println(OK);\r
-                       writer.print("Retrieving results...");\r
-                       al = msaws.getResult(taskId);\r
-                       succeed = true;\r
-               } catch (Exception e) {\r
-                       if (e instanceof UnsupportedRuntimeException) {\r
-                               throw (UnsupportedRuntimeException) e;\r
-                       } else {\r
-                               reportException(e);\r
-                       }\r
+\r
+               String taskId = msaws.align(seqs);\r
+               writer.print("\nQuerying job status...");\r
+               JobStatus status = msaws.getJobStatus(taskId);\r
+               while (status != JobStatus.FINISHED) {\r
+                       Thread.sleep(1000);\r
+                       status = msaws.getJobStatus(taskId);\r
                }\r
+               writer.println(OK);\r
+               writer.print("Retrieving results...");\r
+               al = msaws.getResult(taskId);\r
+               succeed = true;\r
                if (al != null) {\r
                        writer.println(OK);\r
                }\r
@@ -436,7 +421,7 @@ public class WSTester {
                        writer.println("Check is completed. The Service " + serv\r
                                        + " IS WORKING\n");\r
                } else {\r
-                       writer.println("Check is completed. The Service " + serv\r
+                       writer.println("Check is aborted. The Service " + serv\r
                                        + " HAS SOME PROBLEMS\n");\r
                }\r
        }\r

diff --git a/webservices/compbio/ws/server/resource/AAConWS.wsdl b/webservices/compbio/ws/server/resource/AAConWS.wsdl
index c9c8412..3f3a00a 100644 (file)
--- a/webservices/compbio/ws/server/resource/AAConWS.wsdl
+++ b/webservices/compbio/ws/server/resource/AAConWS.wsdl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!-- Generated by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.1.6 in JDK 6. -->
-<definitions targetNamespace="http://msa.data.compbio/01/12/2010/" name="AAConWS" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://msa.data.compbio/01/12/2010/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
+<!-- Generated by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.2.1-hudson-28-. -->
+<definitions targetNamespace="http://msa.data.compbio/01/12/2010/" name="AAConWS" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:wsp="http://www.w3.org/ns/ws-policy" xmlns:tns="http://msa.data.compbio/01/12/2010/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsp1_2="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">
   <types>
     <xsd:schema>
       <xsd:import namespace="http://msa.data.compbio/01/12/2010/" schemaLocation="AAConWS_schema1.xsd"/>
@@ -45,30 +45,24 @@
   <message name="ResultNotAvailableException">
     <part name="fault" element="tns:ResultNotAvailableException"/>
   </message>
-  <message name="pullExecStatistics">
-    <part name="parameters" element="tns:pullExecStatistics"/>
-  </message>
-  <message name="pullExecStatisticsResponse">
-    <part name="parameters" element="tns:pullExecStatisticsResponse"/>
-  </message>
   <message name="cancelJob">
     <part name="parameters" element="tns:cancelJob"/>
   </message>
   <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="getJobStatus">
     <part name="parameters" element="tns:getJobStatus"/>
   </message>
   <message name="getJobStatusResponse">
     <part name="parameters" element="tns:getJobStatusResponse"/>
   </message>
-  <message name="getPresets">
-    <part name="parameters" element="tns:getPresets"/>
-  </message>
-  <message name="getPresetsResponse">
-    <part name="parameters" element="tns:getPresetsResponse"/>
-  </message>
   <message name="getLimit">
     <part name="parameters" element="tns:getLimit"/>
   </message>
@@ -81,6 +75,12 @@
   <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>
   <message name="getRunnerOptions">
     <part name="parameters" element="tns:getRunnerOptions"/>
   </message>
@@ -89,60 +89,60 @@
   </message>
   <portType name="SequenceAnnotation">
     <operation name="analize">
-      <input message="tns:analize"/>
-      <output message="tns:analizeResponse"/>
-      <fault message="tns:UnsupportedRuntimeException" name="UnsupportedRuntimeException"/>
-      <fault message="tns:LimitExceededException" name="LimitExceededException"/>
-      <fault message="tns:JobSubmissionException" name="JobSubmissionException"/>
+      <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 message="tns:customAnalize"/>
-      <output message="tns:customAnalizeResponse"/>
-      <fault message="tns:UnsupportedRuntimeException" name="UnsupportedRuntimeException"/>
-      <fault message="tns:LimitExceededException" name="LimitExceededException"/>
-      <fault message="tns:JobSubmissionException" name="JobSubmissionException"/>
-      <fault message="tns:WrongParameterException" name="WrongParameterException"/>
+      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/customAnalizeRequest" message="tns:customAnalize"/>
+      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/customAnalizeResponse" message="tns:customAnalizeResponse"/>
+      <fault message="tns:UnsupportedRuntimeException" name="UnsupportedRuntimeException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/customAnalize/Fault/UnsupportedRuntimeException"/>
+      <fault message="tns:LimitExceededException" name="LimitExceededException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/customAnalize/Fault/LimitExceededException"/>
+      <fault message="tns:JobSubmissionException" name="JobSubmissionException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/customAnalize/Fault/JobSubmissionException"/>
+      <fault message="tns:WrongParameterException" name="WrongParameterException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/customAnalize/Fault/WrongParameterException"/>
     </operation>
     <operation name="presetAnalize">
-      <input message="tns:presetAnalize"/>
-      <output message="tns:presetAnalizeResponse"/>
-      <fault message="tns:UnsupportedRuntimeException" name="UnsupportedRuntimeException"/>
-      <fault message="tns:LimitExceededException" name="LimitExceededException"/>
-      <fault message="tns:JobSubmissionException" name="JobSubmissionException"/>
-      <fault message="tns:WrongParameterException" name="WrongParameterException"/>
+      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/presetAnalizeRequest" message="tns:presetAnalize"/>
+      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/presetAnalizeResponse" message="tns:presetAnalizeResponse"/>
+      <fault message="tns:UnsupportedRuntimeException" name="UnsupportedRuntimeException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/presetAnalize/Fault/UnsupportedRuntimeException"/>
+      <fault message="tns:LimitExceededException" name="LimitExceededException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/presetAnalize/Fault/LimitExceededException"/>
+      <fault message="tns:JobSubmissionException" name="JobSubmissionException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/presetAnalize/Fault/JobSubmissionException"/>
+      <fault message="tns:WrongParameterException" name="WrongParameterException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/presetAnalize/Fault/WrongParameterException"/>
     </operation>
     <operation name="getAnnotation">
-      <input message="tns:getAnnotation"/>
-      <output message="tns:getAnnotationResponse"/>
-      <fault message="tns:ResultNotAvailableException" name="ResultNotAvailableException"/>
-    </operation>
-    <operation name="pullExecStatistics">
-      <input message="tns:pullExecStatistics"/>
-      <output message="tns:pullExecStatisticsResponse"/>
+      <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 message="tns:cancelJob"/>
-      <output message="tns:cancelJobResponse"/>
+      <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 message="tns:getJobStatus"/>
-      <output message="tns:getJobStatusResponse"/>
+    <operation name="pullExecStatistics">
+      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/pullExecStatisticsRequest" message="tns:pullExecStatistics"/>
+      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/pullExecStatisticsResponse" message="tns:pullExecStatisticsResponse"/>
     </operation>
-    <operation name="getPresets">
-      <input message="tns:getPresets"/>
-      <output message="tns:getPresetsResponse"/>
+    <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="getLimit">
-      <input message="tns:getLimit"/>
-      <output message="tns:getLimitResponse"/>
+      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitRequest" message="tns:getLimit"/>
+      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitResponse" message="tns:getLimitResponse"/>
     </operation>
     <operation name="getLimits">
-      <input message="tns:getLimits"/>
-      <output message="tns:getLimitsResponse"/>
+      <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>
     <operation name="getRunnerOptions">
-      <input message="tns:getRunnerOptions"/>
-      <output message="tns:getRunnerOptionsResponse"/>
+      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getRunnerOptionsRequest" message="tns:getRunnerOptions"/>
+      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getRunnerOptionsResponse" message="tns:getRunnerOptionsResponse"/>
     </operation>
   </portType>
   <binding name="AAConWSPortBinding" type="tns:SequenceAnnotation">
@@ -219,7 +219,7 @@
         <soap:fault name="ResultNotAvailableException" use="literal"/>
       </fault>
     </operation>
-    <operation name="pullExecStatistics">
+    <operation name="cancelJob">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -228,7 +228,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="cancelJob">
+    <operation name="pullExecStatistics">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -246,7 +246,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getPresets">
+    <operation name="getLimit">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -255,7 +255,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLimit">
+    <operation name="getLimits">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -264,7 +264,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLimits">
+    <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 038af26..ce87a32 100644 (file)
--- a/webservices/compbio/ws/server/resource/AAConWS_schema1.xsd
+++ b/webservices/compbio/ws/server/resource/AAConWS_schema1.xsd
@@ -242,6 +242,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>
@@ -280,23 +297,6 @@
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getPresets">
-    <xs:sequence/>
-  </xs:complexType>
-
-  <xs:complexType name="getPresetsResponse">
-    <xs:sequence>
-      <xs:element name="return" type="tns:presetManager" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="presetManager">
-    <xs:sequence>
-      <xs:element name="runnerClassName" type="xs:string"/>
-      <xs:element name="preset" type="tns:preset" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-
   <xs:complexType name="cancelJob">
     <xs:sequence>
       <xs:element name="jobId" type="xs:string" minOccurs="0"/>

diff --git a/webservices/compbio/ws/server/resource/ClustalWS.wsdl b/webservices/compbio/ws/server/resource/ClustalWS.wsdl
index 47571d8..9e12c14 100644 (file)
--- a/webservices/compbio/ws/server/resource/ClustalWS.wsdl
+++ b/webservices/compbio/ws/server/resource/ClustalWS.wsdl
@@ -45,30 +45,24 @@
   <message name="alignResponse">
     <part name="parameters" element="tns:alignResponse"/>
   </message>
-  <message name="pullExecStatistics">
-    <part name="parameters" element="tns:pullExecStatistics"/>
-  </message>
-  <message name="pullExecStatisticsResponse">
-    <part name="parameters" element="tns:pullExecStatisticsResponse"/>
-  </message>
   <message name="cancelJob">
     <part name="parameters" element="tns:cancelJob"/>
   </message>
   <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="getJobStatus">
     <part name="parameters" element="tns:getJobStatus"/>
   </message>
   <message name="getJobStatusResponse">
     <part name="parameters" element="tns:getJobStatusResponse"/>
   </message>
-  <message name="getPresets">
-    <part name="parameters" element="tns:getPresets"/>
-  </message>
-  <message name="getPresetsResponse">
-    <part name="parameters" element="tns:getPresetsResponse"/>
-  </message>
   <message name="getLimit">
     <part name="parameters" element="tns:getLimit"/>
   </message>
@@ -81,6 +75,12 @@
   <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>
   <message name="getRunnerOptions">
     <part name="parameters" element="tns:getRunnerOptions"/>
   </message>
@@ -116,22 +116,18 @@
       <fault message="tns:LimitExceededException" name="LimitExceededException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/align/Fault/LimitExceededException"/>
       <fault message="tns:JobSubmissionException" name="JobSubmissionException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/align/Fault/JobSubmissionException"/>
     </operation>
-    <operation name="pullExecStatistics">
-      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/pullExecStatisticsRequest" message="tns:pullExecStatistics"/>
-      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/pullExecStatisticsResponse" message="tns:pullExecStatisticsResponse"/>
-    </operation>
     <operation name="cancelJob">
       <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/cancelJobRequest" message="tns:cancelJob"/>
       <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/cancelJobResponse" message="tns:cancelJobResponse"/>
     </operation>
+    <operation name="pullExecStatistics">
+      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/pullExecStatisticsRequest" message="tns:pullExecStatistics"/>
+      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/pullExecStatisticsResponse" message="tns:pullExecStatisticsResponse"/>
+    </operation>
     <operation name="getJobStatus">
       <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getJobStatusRequest" message="tns:getJobStatus"/>
       <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getJobStatusResponse" message="tns:getJobStatusResponse"/>
     </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="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"/>
@@ -140,6 +136,10 @@
       <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>
     <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"/>
@@ -219,7 +219,7 @@
         <soap:fault name="JobSubmissionException" use="literal"/>
       </fault>
     </operation>
-    <operation name="pullExecStatistics">
+    <operation name="cancelJob">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -228,7 +228,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="cancelJob">
+    <operation name="pullExecStatistics">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -246,7 +246,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getPresets">
+    <operation name="getLimit">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -255,7 +255,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLimit">
+    <operation name="getLimits">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -264,7 +264,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLimits">
+    <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 d15007b..c432550 100644 (file)
--- a/webservices/compbio/ws/server/resource/ClustalWS_schema1.xsd
+++ b/webservices/compbio/ws/server/resource/ClustalWS_schema1.xsd
@@ -161,6 +161,37 @@
     </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="preset">
+    <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:sequence>
+  </xs:complexType>
+
   <xs:complexType name="getLimits">
     <xs:sequence/>
   </xs:complexType>
@@ -199,37 +230,6 @@
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getPresets">
-    <xs:sequence/>
-  </xs:complexType>
-
-  <xs:complexType name="getPresetsResponse">
-    <xs:sequence>
-      <xs:element name="return" type="tns:presetManager" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="presetManager">
-    <xs:sequence>
-      <xs:element name="runnerClassName" type="xs:string"/>
-      <xs:element name="preset" type="tns:preset" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="preset">
-    <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:sequence>
-  </xs:complexType>
-
   <xs:complexType name="cancelJob">
     <xs:sequence>
       <xs:element name="jobId" type="xs:string" minOccurs="0"/>

diff --git a/webservices/compbio/ws/server/resource/DisemblWS.wsdl b/webservices/compbio/ws/server/resource/DisemblWS.wsdl
index 0682949..af14b4f 100644 (file)
--- a/webservices/compbio/ws/server/resource/DisemblWS.wsdl
+++ b/webservices/compbio/ws/server/resource/DisemblWS.wsdl
@@ -45,30 +45,24 @@
   <message name="ResultNotAvailableException">
     <part name="fault" element="tns:ResultNotAvailableException"/>
   </message>
-  <message name="pullExecStatistics">
-    <part name="parameters" element="tns:pullExecStatistics"/>
-  </message>
-  <message name="pullExecStatisticsResponse">
-    <part name="parameters" element="tns:pullExecStatisticsResponse"/>
-  </message>
   <message name="cancelJob">
     <part name="parameters" element="tns:cancelJob"/>
   </message>
   <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="getJobStatus">
     <part name="parameters" element="tns:getJobStatus"/>
   </message>
   <message name="getJobStatusResponse">
     <part name="parameters" element="tns:getJobStatusResponse"/>
   </message>
-  <message name="getPresets">
-    <part name="parameters" element="tns:getPresets"/>
-  </message>
-  <message name="getPresetsResponse">
-    <part name="parameters" element="tns:getPresetsResponse"/>
-  </message>
   <message name="getLimit">
     <part name="parameters" element="tns:getLimit"/>
   </message>
@@ -81,6 +75,12 @@
   <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>
   <message name="getRunnerOptions">
     <part name="parameters" element="tns:getRunnerOptions"/>
   </message>
@@ -116,22 +116,18 @@
       <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationResponse" message="tns:getAnnotationResponse"/>
       <fault message="tns:ResultNotAvailableException" name="ResultNotAvailableException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotation/Fault/ResultNotAvailableException"/>
     </operation>
-    <operation name="pullExecStatistics">
-      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/pullExecStatisticsRequest" message="tns:pullExecStatistics"/>
-      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/pullExecStatisticsResponse" message="tns:pullExecStatisticsResponse"/>
-    </operation>
     <operation name="cancelJob">
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/cancelJobRequest" message="tns:cancelJob"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/cancelJobResponse" message="tns:cancelJobResponse"/>
     </operation>
+    <operation name="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="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="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="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"/>
@@ -140,6 +136,10 @@
       <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>
     <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"/>
@@ -219,7 +219,7 @@
         <soap:fault name="ResultNotAvailableException" use="literal"/>
       </fault>
     </operation>
-    <operation name="pullExecStatistics">
+    <operation name="cancelJob">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -228,7 +228,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="cancelJob">
+    <operation name="pullExecStatistics">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -246,7 +246,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getPresets">
+    <operation name="getLimit">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -255,7 +255,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLimit">
+    <operation name="getLimits">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -264,7 +264,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLimits">
+    <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 97d6989..c4f25f1 100644 (file)
--- a/webservices/compbio/ws/server/resource/DisemblWS_schema1.xsd
+++ b/webservices/compbio/ws/server/resource/DisemblWS_schema1.xsd
@@ -163,6 +163,37 @@
     </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="preset">
+    <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:sequence>
+  </xs:complexType>
+
   <xs:complexType name="getLimits">
     <xs:sequence/>
   </xs:complexType>
@@ -201,37 +232,6 @@
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getPresets">
-    <xs:sequence/>
-  </xs:complexType>
-
-  <xs:complexType name="getPresetsResponse">
-    <xs:sequence>
-      <xs:element name="return" type="tns:presetManager" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="presetManager">
-    <xs:sequence>
-      <xs:element name="runnerClassName" type="xs:string"/>
-      <xs:element name="preset" type="tns:preset" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="preset">
-    <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:sequence>
-  </xs:complexType>
-
   <xs:complexType name="cancelJob">
     <xs:sequence>
       <xs:element name="jobId" type="xs:string" minOccurs="0"/>

diff --git a/webservices/compbio/ws/server/resource/GlobPlotWS.wsdl b/webservices/compbio/ws/server/resource/GlobPlotWS.wsdl
index aed2c95..766b329 100644 (file)
--- a/webservices/compbio/ws/server/resource/GlobPlotWS.wsdl
+++ b/webservices/compbio/ws/server/resource/GlobPlotWS.wsdl
@@ -45,30 +45,24 @@
   <message name="ResultNotAvailableException">
     <part name="fault" element="tns:ResultNotAvailableException"/>
   </message>
-  <message name="pullExecStatistics">
-    <part name="parameters" element="tns:pullExecStatistics"/>
-  </message>
-  <message name="pullExecStatisticsResponse">
-    <part name="parameters" element="tns:pullExecStatisticsResponse"/>
-  </message>
   <message name="cancelJob">
     <part name="parameters" element="tns:cancelJob"/>
   </message>
   <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="getJobStatus">
     <part name="parameters" element="tns:getJobStatus"/>
   </message>
   <message name="getJobStatusResponse">
     <part name="parameters" element="tns:getJobStatusResponse"/>
   </message>
-  <message name="getPresets">
-    <part name="parameters" element="tns:getPresets"/>
-  </message>
-  <message name="getPresetsResponse">
-    <part name="parameters" element="tns:getPresetsResponse"/>
-  </message>
   <message name="getLimit">
     <part name="parameters" element="tns:getLimit"/>
   </message>
@@ -81,6 +75,12 @@
   <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>
   <message name="getRunnerOptions">
     <part name="parameters" element="tns:getRunnerOptions"/>
   </message>
@@ -116,22 +116,18 @@
       <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationResponse" message="tns:getAnnotationResponse"/>
       <fault message="tns:ResultNotAvailableException" name="ResultNotAvailableException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotation/Fault/ResultNotAvailableException"/>
     </operation>
-    <operation name="pullExecStatistics">
-      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/pullExecStatisticsRequest" message="tns:pullExecStatistics"/>
-      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/pullExecStatisticsResponse" message="tns:pullExecStatisticsResponse"/>
-    </operation>
     <operation name="cancelJob">
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/cancelJobRequest" message="tns:cancelJob"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/cancelJobResponse" message="tns:cancelJobResponse"/>
     </operation>
+    <operation name="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="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="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="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"/>
@@ -140,6 +136,10 @@
       <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>
     <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"/>
@@ -219,7 +219,7 @@
         <soap:fault name="ResultNotAvailableException" use="literal"/>
       </fault>
     </operation>
-    <operation name="pullExecStatistics">
+    <operation name="cancelJob">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -228,7 +228,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="cancelJob">
+    <operation name="pullExecStatistics">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -246,7 +246,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getPresets">
+    <operation name="getLimit">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -255,7 +255,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLimit">
+    <operation name="getLimits">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -264,7 +264,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLimits">
+    <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 858d2c2..52acbb9 100644 (file)
--- a/webservices/compbio/ws/server/resource/GlobPlotWS_schema1.xsd
+++ b/webservices/compbio/ws/server/resource/GlobPlotWS_schema1.xsd
@@ -169,6 +169,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>
@@ -207,23 +224,6 @@
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getPresets">
-    <xs:sequence/>
-  </xs:complexType>
-
-  <xs:complexType name="getPresetsResponse">
-    <xs:sequence>
-      <xs:element name="return" type="tns:presetManager" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="presetManager">
-    <xs:sequence>
-      <xs:element name="runnerClassName" type="xs:string"/>
-      <xs:element name="preset" type="tns:preset" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-
   <xs:complexType name="cancelJob">
     <xs:sequence>
       <xs:element name="jobId" type="xs:string" minOccurs="0"/>

diff --git a/webservices/compbio/ws/server/resource/JronnWS.wsdl b/webservices/compbio/ws/server/resource/JronnWS.wsdl
index fc9670e..68edea7 100644 (file)
--- a/webservices/compbio/ws/server/resource/JronnWS.wsdl
+++ b/webservices/compbio/ws/server/resource/JronnWS.wsdl
@@ -45,30 +45,24 @@
   <message name="ResultNotAvailableException">
     <part name="fault" element="tns:ResultNotAvailableException"/>
   </message>
-  <message name="pullExecStatistics">
-    <part name="parameters" element="tns:pullExecStatistics"/>
-  </message>
-  <message name="pullExecStatisticsResponse">
-    <part name="parameters" element="tns:pullExecStatisticsResponse"/>
-  </message>
   <message name="cancelJob">
     <part name="parameters" element="tns:cancelJob"/>
   </message>
   <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="getJobStatus">
     <part name="parameters" element="tns:getJobStatus"/>
   </message>
   <message name="getJobStatusResponse">
     <part name="parameters" element="tns:getJobStatusResponse"/>
   </message>
-  <message name="getPresets">
-    <part name="parameters" element="tns:getPresets"/>
-  </message>
-  <message name="getPresetsResponse">
-    <part name="parameters" element="tns:getPresetsResponse"/>
-  </message>
   <message name="getLimit">
     <part name="parameters" element="tns:getLimit"/>
   </message>
@@ -81,6 +75,12 @@
   <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>
   <message name="getRunnerOptions">
     <part name="parameters" element="tns:getRunnerOptions"/>
   </message>
@@ -116,22 +116,18 @@
       <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationResponse" message="tns:getAnnotationResponse"/>
       <fault message="tns:ResultNotAvailableException" name="ResultNotAvailableException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotation/Fault/ResultNotAvailableException"/>
     </operation>
-    <operation name="pullExecStatistics">
-      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/pullExecStatisticsRequest" message="tns:pullExecStatistics"/>
-      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/pullExecStatisticsResponse" message="tns:pullExecStatisticsResponse"/>
-    </operation>
     <operation name="cancelJob">
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/cancelJobRequest" message="tns:cancelJob"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/cancelJobResponse" message="tns:cancelJobResponse"/>
     </operation>
+    <operation name="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="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="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="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"/>
@@ -140,6 +136,10 @@
       <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>
     <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"/>
@@ -219,7 +219,7 @@
         <soap:fault name="ResultNotAvailableException" use="literal"/>
       </fault>
     </operation>
-    <operation name="pullExecStatistics">
+    <operation name="cancelJob">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -228,7 +228,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="cancelJob">
+    <operation name="pullExecStatistics">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -246,7 +246,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getPresets">
+    <operation name="getLimit">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -255,7 +255,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLimit">
+    <operation name="getLimits">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -264,7 +264,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLimits">
+    <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 038af26..ce87a32 100644 (file)
--- a/webservices/compbio/ws/server/resource/JronnWS_schema1.xsd
+++ b/webservices/compbio/ws/server/resource/JronnWS_schema1.xsd
@@ -242,6 +242,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>
@@ -280,23 +297,6 @@
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getPresets">
-    <xs:sequence/>
-  </xs:complexType>
-
-  <xs:complexType name="getPresetsResponse">
-    <xs:sequence>
-      <xs:element name="return" type="tns:presetManager" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="presetManager">
-    <xs:sequence>
-      <xs:element name="runnerClassName" type="xs:string"/>
-      <xs:element name="preset" type="tns:preset" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-
   <xs:complexType name="cancelJob">
     <xs:sequence>
       <xs:element name="jobId" type="xs:string" minOccurs="0"/>

diff --git a/webservices/compbio/ws/server/resource/MafftWS.wsdl b/webservices/compbio/ws/server/resource/MafftWS.wsdl
index f769e97..dba8c70 100644 (file)
--- a/webservices/compbio/ws/server/resource/MafftWS.wsdl
+++ b/webservices/compbio/ws/server/resource/MafftWS.wsdl
@@ -45,30 +45,24 @@
   <message name="alignResponse">
     <part name="parameters" element="tns:alignResponse"/>
   </message>
-  <message name="pullExecStatistics">
-    <part name="parameters" element="tns:pullExecStatistics"/>
-  </message>
-  <message name="pullExecStatisticsResponse">
-    <part name="parameters" element="tns:pullExecStatisticsResponse"/>
-  </message>
   <message name="cancelJob">
     <part name="parameters" element="tns:cancelJob"/>
   </message>
   <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="getJobStatus">
     <part name="parameters" element="tns:getJobStatus"/>
   </message>
   <message name="getJobStatusResponse">
     <part name="parameters" element="tns:getJobStatusResponse"/>
   </message>
-  <message name="getPresets">
-    <part name="parameters" element="tns:getPresets"/>
-  </message>
-  <message name="getPresetsResponse">
-    <part name="parameters" element="tns:getPresetsResponse"/>
-  </message>
   <message name="getLimit">
     <part name="parameters" element="tns:getLimit"/>
   </message>
@@ -81,6 +75,12 @@
   <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>
   <message name="getRunnerOptions">
     <part name="parameters" element="tns:getRunnerOptions"/>
   </message>
@@ -116,22 +116,18 @@
       <fault message="tns:LimitExceededException" name="LimitExceededException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/align/Fault/LimitExceededException"/>
       <fault message="tns:JobSubmissionException" name="JobSubmissionException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/align/Fault/JobSubmissionException"/>
     </operation>
-    <operation name="pullExecStatistics">
-      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/pullExecStatisticsRequest" message="tns:pullExecStatistics"/>
-      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/pullExecStatisticsResponse" message="tns:pullExecStatisticsResponse"/>
-    </operation>
     <operation name="cancelJob">
       <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/cancelJobRequest" message="tns:cancelJob"/>
       <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/cancelJobResponse" message="tns:cancelJobResponse"/>
     </operation>
+    <operation name="pullExecStatistics">
+      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/pullExecStatisticsRequest" message="tns:pullExecStatistics"/>
+      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/pullExecStatisticsResponse" message="tns:pullExecStatisticsResponse"/>
+    </operation>
     <operation name="getJobStatus">
       <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getJobStatusRequest" message="tns:getJobStatus"/>
       <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getJobStatusResponse" message="tns:getJobStatusResponse"/>
     </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="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"/>
@@ -140,6 +136,10 @@
       <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>
     <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"/>
@@ -219,7 +219,7 @@
         <soap:fault name="JobSubmissionException" use="literal"/>
       </fault>
     </operation>
-    <operation name="pullExecStatistics">
+    <operation name="cancelJob">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -228,7 +228,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="cancelJob">
+    <operation name="pullExecStatistics">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -246,7 +246,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getPresets">
+    <operation name="getLimit">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -255,7 +255,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLimit">
+    <operation name="getLimits">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -264,7 +264,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLimits">
+    <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 d15007b..c432550 100644 (file)
--- a/webservices/compbio/ws/server/resource/MafftWS_schema1.xsd
+++ b/webservices/compbio/ws/server/resource/MafftWS_schema1.xsd
@@ -161,6 +161,37 @@
     </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="preset">
+    <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:sequence>
+  </xs:complexType>
+
   <xs:complexType name="getLimits">
     <xs:sequence/>
   </xs:complexType>
@@ -199,37 +230,6 @@
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getPresets">
-    <xs:sequence/>
-  </xs:complexType>
-
-  <xs:complexType name="getPresetsResponse">
-    <xs:sequence>
-      <xs:element name="return" type="tns:presetManager" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="presetManager">
-    <xs:sequence>
-      <xs:element name="runnerClassName" type="xs:string"/>
-      <xs:element name="preset" type="tns:preset" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="preset">
-    <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:sequence>
-  </xs:complexType>
-
   <xs:complexType name="cancelJob">
     <xs:sequence>
       <xs:element name="jobId" type="xs:string" minOccurs="0"/>

diff --git a/webservices/compbio/ws/server/resource/MuscleWS.wsdl b/webservices/compbio/ws/server/resource/MuscleWS.wsdl
index 6526111..ce1332f 100644 (file)
--- a/webservices/compbio/ws/server/resource/MuscleWS.wsdl
+++ b/webservices/compbio/ws/server/resource/MuscleWS.wsdl
@@ -45,30 +45,24 @@
   <message name="alignResponse">
     <part name="parameters" element="tns:alignResponse"/>
   </message>
-  <message name="pullExecStatistics">
-    <part name="parameters" element="tns:pullExecStatistics"/>
-  </message>
-  <message name="pullExecStatisticsResponse">
-    <part name="parameters" element="tns:pullExecStatisticsResponse"/>
-  </message>
   <message name="cancelJob">
     <part name="parameters" element="tns:cancelJob"/>
   </message>
   <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="getJobStatus">
     <part name="parameters" element="tns:getJobStatus"/>
   </message>
   <message name="getJobStatusResponse">
     <part name="parameters" element="tns:getJobStatusResponse"/>
   </message>
-  <message name="getPresets">
-    <part name="parameters" element="tns:getPresets"/>
-  </message>
-  <message name="getPresetsResponse">
-    <part name="parameters" element="tns:getPresetsResponse"/>
-  </message>
   <message name="getLimit">
     <part name="parameters" element="tns:getLimit"/>
   </message>
@@ -81,6 +75,12 @@
   <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>
   <message name="getRunnerOptions">
     <part name="parameters" element="tns:getRunnerOptions"/>
   </message>
@@ -116,22 +116,18 @@
       <fault message="tns:LimitExceededException" name="LimitExceededException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/align/Fault/LimitExceededException"/>
       <fault message="tns:JobSubmissionException" name="JobSubmissionException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/align/Fault/JobSubmissionException"/>
     </operation>
-    <operation name="pullExecStatistics">
-      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/pullExecStatisticsRequest" message="tns:pullExecStatistics"/>
-      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/pullExecStatisticsResponse" message="tns:pullExecStatisticsResponse"/>
-    </operation>
     <operation name="cancelJob">
       <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/cancelJobRequest" message="tns:cancelJob"/>
       <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/cancelJobResponse" message="tns:cancelJobResponse"/>
     </operation>
+    <operation name="pullExecStatistics">
+      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/pullExecStatisticsRequest" message="tns:pullExecStatistics"/>
+      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/pullExecStatisticsResponse" message="tns:pullExecStatisticsResponse"/>
+    </operation>
     <operation name="getJobStatus">
       <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getJobStatusRequest" message="tns:getJobStatus"/>
       <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getJobStatusResponse" message="tns:getJobStatusResponse"/>
     </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="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"/>
@@ -140,6 +136,10 @@
       <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>
     <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"/>
@@ -219,7 +219,7 @@
         <soap:fault name="JobSubmissionException" use="literal"/>
       </fault>
     </operation>
-    <operation name="pullExecStatistics">
+    <operation name="cancelJob">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -228,7 +228,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="cancelJob">
+    <operation name="pullExecStatistics">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -246,7 +246,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getPresets">
+    <operation name="getLimit">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -255,7 +255,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLimit">
+    <operation name="getLimits">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -264,7 +264,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLimits">
+    <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 e0440e8..0895916 100644 (file)
--- a/webservices/compbio/ws/server/resource/MuscleWS_schema1.xsd
+++ b/webservices/compbio/ws/server/resource/MuscleWS_schema1.xsd
@@ -152,6 +152,37 @@
     </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="preset">
+    <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:sequence>
+  </xs:complexType>
+
   <xs:complexType name="getLimits">
     <xs:sequence/>
   </xs:complexType>
@@ -190,37 +221,6 @@
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getPresets">
-    <xs:sequence/>
-  </xs:complexType>
-
-  <xs:complexType name="getPresetsResponse">
-    <xs:sequence>
-      <xs:element name="return" type="tns:presetManager" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="presetManager">
-    <xs:sequence>
-      <xs:element name="runnerClassName" type="xs:string"/>
-      <xs:element name="preset" type="tns:preset" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="preset">
-    <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:sequence>
-  </xs:complexType>
-
   <xs:complexType name="cancelJob">
     <xs:sequence>
       <xs:element name="jobId" type="xs:string" minOccurs="0"/>

diff --git a/webservices/compbio/ws/server/resource/RegistryWS.wsdl b/webservices/compbio/ws/server/resource/RegistryWS.wsdl
new file mode 100644 (file)
index 0000000..6ffd8d1
--- /dev/null
+++ b/webservices/compbio/ws/server/resource/RegistryWS.wsdl
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!-- Generated by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.2.1-hudson-28-. -->
+<definitions targetNamespace="http://msa.data.compbio/01/12/2010/" name="RegistryWS" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:wsp="http://www.w3.org/ns/ws-policy" xmlns:tns="http://msa.data.compbio/01/12/2010/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsp1_2="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">
+  <types>
+    <xsd:schema>
+      <xsd:import namespace="http://msa.data.compbio/01/12/2010/" schemaLocation="RegistryWS_schema1.xsd"/>
+    </xsd:schema>
+  </types>
+  <message name="getSupportedServices">
+    <part name="parameters" element="tns:getSupportedServices"/>
+  </message>
+  <message name="getSupportedServicesResponse">
+    <part name="parameters" element="tns:getSupportedServicesResponse"/>
+  </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>
+  <message name="getLastTestedResponse">
+    <part name="parameters" element="tns:getLastTestedResponse"/>
+  </message>
+  <message name="getLastTestedOn">
+    <part name="parameters" element="tns:getLastTestedOn"/>
+  </message>
+  <message name="getLastTestedOnResponse">
+    <part name="parameters" element="tns:getLastTestedOnResponse"/>
+  </message>
+  <message name="testService">
+    <part name="parameters" element="tns:testService"/>
+  </message>
+  <message name="testServiceResponse">
+    <part name="parameters" element="tns:testServiceResponse"/>
+  </message>
+  <message name="isOperating">
+    <part name="parameters" element="tns:isOperating"/>
+  </message>
+  <message name="isOperatingResponse">
+    <part name="parameters" element="tns:isOperatingResponse"/>
+  </message>
+  <portType name="RegistryWS">
+    <operation name="getSupportedServices">
+      <input wsam:Action="http://msa.data.compbio/01/12/2010/RegistryWS/getSupportedServicesRequest" message="tns:getSupportedServices"/>
+      <output wsam:Action="http://msa.data.compbio/01/12/2010/RegistryWS/getSupportedServicesResponse" message="tns:getSupportedServicesResponse"/>
+    </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"/>
+    </operation>
+    <operation name="getLastTestedOn">
+      <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="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"/>
+    </operation>
+    <operation name="isOperating">
+      <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>
+  </portType>
+  <binding name="RegistryWSPortBinding" type="tns:RegistryWS">
+    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
+    <operation name="getSupportedServices">
+      <soap:operation soapAction=""/>
+      <input>
+        <soap:body use="literal"/>
+      </input>
+      <output>
+        <soap:body use="literal"/>
+      </output>
+    </operation>
+    <operation name="testAllServices">
+      <soap:operation soapAction=""/>
+      <input>
+        <soap:body use="literal"/>
+      </input>
+      <output>
+        <soap:body use="literal"/>
+      </output>
+    </operation>
+    <operation name="getLastTested">
+      <soap:operation soapAction=""/>
+      <input>
+        <soap:body use="literal"/>
+      </input>
+      <output>
+        <soap:body use="literal"/>
+      </output>
+    </operation>
+    <operation name="getLastTestedOn">
+      <soap:operation soapAction=""/>
+      <input>
+        <soap:body use="literal"/>
+      </input>
+      <output>
+        <soap:body use="literal"/>
+      </output>
+    </operation>
+    <operation name="testService">
+      <soap:operation soapAction=""/>
+      <input>
+        <soap:body use="literal"/>
+      </input>
+      <output>
+        <soap:body use="literal"/>
+      </output>
+    </operation>
+    <operation name="isOperating">
+      <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">
+      <soap:address location="REPLACE_WITH_ACTUAL_URL"/>
+    </port>
+  </service>
+</definitions>
+

diff --git a/webservices/compbio/ws/server/resource/RegistryWS_schema1.xsd b/webservices/compbio/ws/server/resource/RegistryWS_schema1.xsd
new file mode 100644 (file)
index 0000000..10a476b
--- /dev/null
+++ b/webservices/compbio/ws/server/resource/RegistryWS_schema1.xsd
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<xs:schema version="1.0" targetNamespace="http://msa.data.compbio/01/12/2010/" xmlns:tns="http://msa.data.compbio/01/12/2010/" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+  <xs:element name="getLastTested" type="tns:getLastTested"/>
+
+  <xs:element name="getLastTestedOn" type="tns:getLastTestedOn"/>
+
+  <xs:element name="getLastTestedOnResponse" type="tns:getLastTestedOnResponse"/>
+
+  <xs:element name="getLastTestedResponse" type="tns:getLastTestedResponse"/>
+
+  <xs:element name="getSupportedServices" type="tns:getSupportedServices"/>
+
+  <xs:element name="getSupportedServicesResponse" type="tns:getSupportedServicesResponse"/>
+
+  <xs:element name="isOperating" type="tns:isOperating"/>
+
+  <xs:element name="isOperatingResponse" type="tns:isOperatingResponse"/>
+
+  <xs:element name="testAllServices" type="tns:testAllServices"/>
+
+  <xs:element name="testAllServicesResponse" type="tns:testAllServicesResponse"/>
+
+  <xs:element name="testService" type="tns:testService"/>
+
+  <xs:element name="testServiceResponse" type="tns:testServiceResponse"/>
+
+  <xs:complexType name="testAllServices">
+    <xs:sequence/>
+  </xs:complexType>
+
+  <xs:complexType name="testAllServicesResponse">
+    <xs:sequence>
+      <xs:element name="return" type="xs:string" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="getLastTestedOn">
+    <xs:sequence>
+      <xs:element name="arg0" type="tns:services" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="getLastTestedOnResponse">
+    <xs:sequence>
+      <xs:element name="return" type="xs:dateTime" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="getSupportedServices">
+    <xs:sequence/>
+  </xs:complexType>
+
+  <xs:complexType name="getSupportedServicesResponse">
+    <xs:sequence>
+      <xs:element name="return" type="tns:services" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="isOperating">
+    <xs:sequence>
+      <xs:element name="arg0" type="tns:services" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="isOperatingResponse">
+    <xs:sequence>
+      <xs:element name="return" type="xs:boolean"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="testService">
+    <xs:sequence>
+      <xs:element name="arg0" type="tns:services" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="testServiceResponse">
+    <xs:sequence>
+      <xs:element name="return" type="xs:string" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="getLastTested">
+    <xs:sequence>
+      <xs:element name="arg0" type="tns:services" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="getLastTestedResponse">
+    <xs:sequence>
+      <xs:element name="return" type="xs:int"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:simpleType name="services">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="MafftWS"/>
+      <xs:enumeration value="MuscleWS"/>
+      <xs:enumeration value="ClustalWS"/>
+      <xs:enumeration value="TcoffeeWS"/>
+      <xs:enumeration value="ProbconsWS"/>
+      <xs:enumeration value="AAConWS"/>
+      <xs:enumeration value="JronnWS"/>
+      <xs:enumeration value="DisemblWS"/>
+      <xs:enumeration value="GlobPlotWS"/>
+    </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 717b4a0..f8d2b22 100644 (file)
--- a/webservices/compbio/ws/server/resource/TcoffeeWS.wsdl
+++ b/webservices/compbio/ws/server/resource/TcoffeeWS.wsdl
@@ -45,30 +45,24 @@
   <message name="alignResponse">
     <part name="parameters" element="tns:alignResponse"/>
   </message>
-  <message name="pullExecStatistics">
-    <part name="parameters" element="tns:pullExecStatistics"/>
-  </message>
-  <message name="pullExecStatisticsResponse">
-    <part name="parameters" element="tns:pullExecStatisticsResponse"/>
-  </message>
   <message name="cancelJob">
     <part name="parameters" element="tns:cancelJob"/>
   </message>
   <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="getJobStatus">
     <part name="parameters" element="tns:getJobStatus"/>
   </message>
   <message name="getJobStatusResponse">
     <part name="parameters" element="tns:getJobStatusResponse"/>
   </message>
-  <message name="getPresets">
-    <part name="parameters" element="tns:getPresets"/>
-  </message>
-  <message name="getPresetsResponse">
-    <part name="parameters" element="tns:getPresetsResponse"/>
-  </message>
   <message name="getLimit">
     <part name="parameters" element="tns:getLimit"/>
   </message>
@@ -81,6 +75,12 @@
   <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>
   <message name="getRunnerOptions">
     <part name="parameters" element="tns:getRunnerOptions"/>
   </message>
@@ -116,22 +116,18 @@
       <fault message="tns:LimitExceededException" name="LimitExceededException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/align/Fault/LimitExceededException"/>
       <fault message="tns:JobSubmissionException" name="JobSubmissionException" wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/align/Fault/JobSubmissionException"/>
     </operation>
-    <operation name="pullExecStatistics">
-      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/pullExecStatisticsRequest" message="tns:pullExecStatistics"/>
-      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/pullExecStatisticsResponse" message="tns:pullExecStatisticsResponse"/>
-    </operation>
     <operation name="cancelJob">
       <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/cancelJobRequest" message="tns:cancelJob"/>
       <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/cancelJobResponse" message="tns:cancelJobResponse"/>
     </operation>
+    <operation name="pullExecStatistics">
+      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/pullExecStatisticsRequest" message="tns:pullExecStatistics"/>
+      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/pullExecStatisticsResponse" message="tns:pullExecStatisticsResponse"/>
+    </operation>
     <operation name="getJobStatus">
       <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getJobStatusRequest" message="tns:getJobStatus"/>
       <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getJobStatusResponse" message="tns:getJobStatusResponse"/>
     </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="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"/>
@@ -140,6 +136,10 @@
       <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>
     <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"/>
@@ -219,7 +219,7 @@
         <soap:fault name="JobSubmissionException" use="literal"/>
       </fault>
     </operation>
-    <operation name="pullExecStatistics">
+    <operation name="cancelJob">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -228,7 +228,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="cancelJob">
+    <operation name="pullExecStatistics">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -246,7 +246,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getPresets">
+    <operation name="getLimit">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -255,7 +255,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLimit">
+    <operation name="getLimits">
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
@@ -264,7 +264,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
-    <operation name="getLimits">
+    <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 bf15fb2..18262c9 100644 (file)
--- a/webservices/compbio/ws/server/resource/TcoffeeWS_schema1.xsd
+++ b/webservices/compbio/ws/server/resource/TcoffeeWS_schema1.xsd
@@ -152,6 +152,37 @@
     </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="preset">
+    <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:sequence>
+  </xs:complexType>
+
   <xs:complexType name="getLimits">
     <xs:sequence/>
   </xs:complexType>
@@ -190,37 +221,6 @@
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getPresets">
-    <xs:sequence/>
-  </xs:complexType>
-
-  <xs:complexType name="getPresetsResponse">
-    <xs:sequence>
-      <xs:element name="return" type="tns:presetManager" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="presetManager">
-    <xs:sequence>
-      <xs:element name="runnerClassName" type="xs:string"/>
-      <xs:element name="preset" type="tns:preset" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="preset">
-    <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:sequence>
-  </xs:complexType>
-
   <xs:complexType name="cancelJob">
     <xs:sequence>
       <xs:element name="jobId" type="xs:string" minOccurs="0"/>

diff --git a/wsbuild.xml b/wsbuild.xml
index bf55aaa..03a238f 100644 (file)
--- a/wsbuild.xml
+++ b/wsbuild.xml
@@ -26,6 +26,7 @@
        <property name="disembl.wsdl" location="${wsdl.dir}/DisemblWS.wsdl" />\r
        <property name="globplot.wsdl" location="${wsdl.dir}/GlobPlotWS.wsdl" />\r
        <property name="jronn.wsdl" location="${wsdl.dir}/JronnWS.wsdl" />\r
+       <property name="registry.wsdl" location="${wsdl.dir}/RegistryWS.wsdl" />\r
        \r
 \r
        <taskdef name="wsgen" onerror="report" classname="com.sun.tools.ws.ant.WsGen">\r
@@ -139,6 +140,17 @@
                                                <classpath refid="classes.path" />\r
                                                <classpath refid="project.classpath" />\r
                </wsgen>\r
+               <wsgen sei="compbio.ws.server.RegistryWS" \r
+                                               sourcedestdir="${basedir}/webservices" \r
+                                               destdir="${classes}" \r
+                                               resourcedestdir="${wsdl.dir}" \r
+                                               keep="true" genwsdl="true" \r
+                                               extension="false" \r
+                                               xendorsed="true"                        \r
+                                               verbose="true">\r
+                                               <classpath refid="classes.path" />\r
+                                               <classpath refid="project.classpath" />\r
+               </wsgen>\r
        </target>\r
 \r
 \r
@@ -183,6 +195,13 @@
                                package="compbio.ws.client.stub" \r
                                quiet="false">\r
                        </wsimport>\r
+                   <wsimport wsdl="${registry.wsdl}" \r
+                                               sourcedestdir="${basedir}/webservices/" \r
+                                               keep="true" extension="false" \r
+                                               verbose="true" xnocompile="true" \r
+                                               package="compbio.ws.client.stub" \r
+                                               quiet="false">\r
+                       </wsimport>\r
                        <!--            <xjcarg value="-cp" />\r
                                                <xjcarg pathref="project.classpath" />\r
                                                <xjcarg value="-Xcommons-lang" /> -->\r