From 175c6382f4b2838916a98a2d87f1a4fff0103ea6 Mon Sep 17 00:00:00 2001 From: pvtroshin Date: Wed, 8 Jun 2011 12:49:27 +0000 Subject: [PATCH] Web service stubs are regenerated to incorporate new the methods. Excveption handling improved for tester git-svn-id: link to svn.lifesci.dundee.ac.uk/svn/barton/ptroshin/JABA2@4231 e3abac25-378b-4346-85de-24260fe3988d --- .../compbio/data/msa/jaxws/GetLastTested.java | 36 ++++++ .../compbio/data/msa/jaxws/GetLastTestedOn.java | 36 ++++++ .../data/msa/jaxws/GetLastTestedOnResponse.java | 37 ++++++ .../data/msa/jaxws/GetLastTestedResponse.java | 36 ++++++ .../data/msa/jaxws/GetSupportedServices.java | 15 +++ .../msa/jaxws/GetSupportedServicesResponse.java | 37 ++++++ .../compbio/data/msa/jaxws/IsOperating.java | 36 ++++++ .../data/msa/jaxws/IsOperatingResponse.java | 36 ++++++ .../data/msa/jaxws/JobSubmissionExceptionBean.java | 4 +- .../data/msa/jaxws/LimitExceededExceptionBean.java | 4 +- .../msa/jaxws/ResultNotAvailableExceptionBean.java | 4 +- .../compbio/data/msa/jaxws/TestAllServices.java | 15 +++ .../data/msa/jaxws/TestAllServicesResponse.java | 36 ++++++ .../compbio/data/msa/jaxws/TestService.java | 36 ++++++ .../data/msa/jaxws/TestServiceResponse.java | 36 ++++++ .../msa/jaxws/UnsupportedRuntimeExceptionBean.java | 4 +- .../msa/jaxws/WrongParameterExceptionBean.java | 4 +- webservices/compbio/ws/client/WSTester.java | 77 +++++------ .../compbio/ws/server/resource/AAConWS.wsdl | 114 ++++++++--------- .../compbio/ws/server/resource/AAConWS_schema1.xsd | 34 ++--- .../compbio/ws/server/resource/ClustalWS.wsdl | 50 ++++---- .../ws/server/resource/ClustalWS_schema1.xsd | 62 ++++----- .../compbio/ws/server/resource/DisemblWS.wsdl | 50 ++++---- .../ws/server/resource/DisemblWS_schema1.xsd | 62 ++++----- .../compbio/ws/server/resource/GlobPlotWS.wsdl | 50 ++++---- .../ws/server/resource/GlobPlotWS_schema1.xsd | 34 ++--- .../compbio/ws/server/resource/JronnWS.wsdl | 50 ++++---- .../compbio/ws/server/resource/JronnWS_schema1.xsd | 34 ++--- .../compbio/ws/server/resource/MafftWS.wsdl | 50 ++++---- .../compbio/ws/server/resource/MafftWS_schema1.xsd | 62 ++++----- .../compbio/ws/server/resource/MuscleWS.wsdl | 50 ++++---- .../ws/server/resource/MuscleWS_schema1.xsd | 62 ++++----- .../compbio/ws/server/resource/RegistryWS.wsdl | 134 ++++++++++++++++++++ .../ws/server/resource/RegistryWS_schema1.xsd | 110 ++++++++++++++++ .../compbio/ws/server/resource/TcoffeeWS.wsdl | 50 ++++---- .../ws/server/resource/TcoffeeWS_schema1.xsd | 62 ++++----- wsbuild.xml | 19 +++ 37 files changed, 1134 insertions(+), 494 deletions(-) create mode 100644 webservices/compbio/data/msa/jaxws/GetLastTested.java create mode 100644 webservices/compbio/data/msa/jaxws/GetLastTestedOn.java create mode 100644 webservices/compbio/data/msa/jaxws/GetLastTestedOnResponse.java create mode 100644 webservices/compbio/data/msa/jaxws/GetLastTestedResponse.java create mode 100644 webservices/compbio/data/msa/jaxws/GetSupportedServices.java create mode 100644 webservices/compbio/data/msa/jaxws/GetSupportedServicesResponse.java create mode 100644 webservices/compbio/data/msa/jaxws/IsOperating.java create mode 100644 webservices/compbio/data/msa/jaxws/IsOperatingResponse.java create mode 100644 webservices/compbio/data/msa/jaxws/TestAllServices.java create mode 100644 webservices/compbio/data/msa/jaxws/TestAllServicesResponse.java create mode 100644 webservices/compbio/data/msa/jaxws/TestService.java create mode 100644 webservices/compbio/data/msa/jaxws/TestServiceResponse.java create mode 100644 webservices/compbio/ws/server/resource/RegistryWS.wsdl create mode 100644 webservices/compbio/ws/server/resource/RegistryWS_schema1.xsd diff --git a/webservices/compbio/data/msa/jaxws/GetLastTested.java b/webservices/compbio/data/msa/jaxws/GetLastTested.java new file mode 100644 index 0000000..7f8b672 --- /dev/null +++ b/webservices/compbio/data/msa/jaxws/GetLastTested.java @@ -0,0 +1,36 @@ + +package compbio.data.msa.jaxws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +@XmlRootElement(name = "getLastTested", namespace = "http://msa.data.compbio/01/12/2010/") +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getLastTested", namespace = "http://msa.data.compbio/01/12/2010/") +public class GetLastTested { + + @XmlElement(name = "arg0", namespace = "") + private compbio.ws.client.Services arg0; + + /** + * + * @return + * returns Services + */ + public compbio.ws.client.Services getArg0() { + return this.arg0; + } + + /** + * + * @param arg0 + * the value for the arg0 property + */ + public void setArg0(compbio.ws.client.Services arg0) { + this.arg0 = arg0; + } + +} diff --git a/webservices/compbio/data/msa/jaxws/GetLastTestedOn.java b/webservices/compbio/data/msa/jaxws/GetLastTestedOn.java new file mode 100644 index 0000000..ca4af03 --- /dev/null +++ b/webservices/compbio/data/msa/jaxws/GetLastTestedOn.java @@ -0,0 +1,36 @@ + +package compbio.data.msa.jaxws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +@XmlRootElement(name = "getLastTestedOn", namespace = "http://msa.data.compbio/01/12/2010/") +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getLastTestedOn", namespace = "http://msa.data.compbio/01/12/2010/") +public class GetLastTestedOn { + + @XmlElement(name = "arg0", namespace = "") + private compbio.ws.client.Services arg0; + + /** + * + * @return + * returns Services + */ + public compbio.ws.client.Services getArg0() { + return this.arg0; + } + + /** + * + * @param arg0 + * the value for the arg0 property + */ + public void setArg0(compbio.ws.client.Services arg0) { + this.arg0 = arg0; + } + +} diff --git a/webservices/compbio/data/msa/jaxws/GetLastTestedOnResponse.java b/webservices/compbio/data/msa/jaxws/GetLastTestedOnResponse.java new file mode 100644 index 0000000..379c2b9 --- /dev/null +++ b/webservices/compbio/data/msa/jaxws/GetLastTestedOnResponse.java @@ -0,0 +1,37 @@ + +package compbio.data.msa.jaxws; + +import java.util.Date; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +@XmlRootElement(name = "getLastTestedOnResponse", namespace = "http://msa.data.compbio/01/12/2010/") +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getLastTestedOnResponse", namespace = "http://msa.data.compbio/01/12/2010/") +public class GetLastTestedOnResponse { + + @XmlElement(name = "return", namespace = "") + private Date _return; + + /** + * + * @return + * returns Date + */ + public Date getReturn() { + return this._return; + } + + /** + * + * @param _return + * the value for the _return property + */ + public void setReturn(Date _return) { + this._return = _return; + } + +} diff --git a/webservices/compbio/data/msa/jaxws/GetLastTestedResponse.java b/webservices/compbio/data/msa/jaxws/GetLastTestedResponse.java new file mode 100644 index 0000000..adba7db --- /dev/null +++ b/webservices/compbio/data/msa/jaxws/GetLastTestedResponse.java @@ -0,0 +1,36 @@ + +package compbio.data.msa.jaxws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +@XmlRootElement(name = "getLastTestedResponse", namespace = "http://msa.data.compbio/01/12/2010/") +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getLastTestedResponse", namespace = "http://msa.data.compbio/01/12/2010/") +public class GetLastTestedResponse { + + @XmlElement(name = "return", namespace = "") + private int _return; + + /** + * + * @return + * returns int + */ + public int getReturn() { + return this._return; + } + + /** + * + * @param _return + * the value for the _return property + */ + public void setReturn(int _return) { + this._return = _return; + } + +} diff --git a/webservices/compbio/data/msa/jaxws/GetSupportedServices.java b/webservices/compbio/data/msa/jaxws/GetSupportedServices.java new file mode 100644 index 0000000..fe979ca --- /dev/null +++ b/webservices/compbio/data/msa/jaxws/GetSupportedServices.java @@ -0,0 +1,15 @@ + +package compbio.data.msa.jaxws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +@XmlRootElement(name = "getSupportedServices", namespace = "http://msa.data.compbio/01/12/2010/") +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getSupportedServices", namespace = "http://msa.data.compbio/01/12/2010/") +public class GetSupportedServices { + + +} diff --git a/webservices/compbio/data/msa/jaxws/GetSupportedServicesResponse.java b/webservices/compbio/data/msa/jaxws/GetSupportedServicesResponse.java new file mode 100644 index 0000000..3073df5 --- /dev/null +++ b/webservices/compbio/data/msa/jaxws/GetSupportedServicesResponse.java @@ -0,0 +1,37 @@ + +package compbio.data.msa.jaxws; + +import java.util.Set; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +@XmlRootElement(name = "getSupportedServicesResponse", namespace = "http://msa.data.compbio/01/12/2010/") +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "getSupportedServicesResponse", namespace = "http://msa.data.compbio/01/12/2010/") +public class GetSupportedServicesResponse { + + @XmlElement(name = "return", namespace = "") + private Set _return; + + /** + * + * @return + * returns Set + */ + public Set getReturn() { + return this._return; + } + + /** + * + * @param _return + * the value for the _return property + */ + public void setReturn(Set _return) { + this._return = _return; + } + +} diff --git a/webservices/compbio/data/msa/jaxws/IsOperating.java b/webservices/compbio/data/msa/jaxws/IsOperating.java new file mode 100644 index 0000000..cde7d15 --- /dev/null +++ b/webservices/compbio/data/msa/jaxws/IsOperating.java @@ -0,0 +1,36 @@ + +package compbio.data.msa.jaxws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +@XmlRootElement(name = "isOperating", namespace = "http://msa.data.compbio/01/12/2010/") +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "isOperating", namespace = "http://msa.data.compbio/01/12/2010/") +public class IsOperating { + + @XmlElement(name = "arg0", namespace = "") + private compbio.ws.client.Services arg0; + + /** + * + * @return + * returns Services + */ + public compbio.ws.client.Services getArg0() { + return this.arg0; + } + + /** + * + * @param arg0 + * the value for the arg0 property + */ + public void setArg0(compbio.ws.client.Services arg0) { + this.arg0 = arg0; + } + +} diff --git a/webservices/compbio/data/msa/jaxws/IsOperatingResponse.java b/webservices/compbio/data/msa/jaxws/IsOperatingResponse.java new file mode 100644 index 0000000..f9854b1 --- /dev/null +++ b/webservices/compbio/data/msa/jaxws/IsOperatingResponse.java @@ -0,0 +1,36 @@ + +package compbio.data.msa.jaxws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +@XmlRootElement(name = "isOperatingResponse", namespace = "http://msa.data.compbio/01/12/2010/") +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "isOperatingResponse", namespace = "http://msa.data.compbio/01/12/2010/") +public class IsOperatingResponse { + + @XmlElement(name = "return", namespace = "") + private boolean _return; + + /** + * + * @return + * returns boolean + */ + public boolean isReturn() { + return this._return; + } + + /** + * + * @param _return + * the value for the _return property + */ + public void setReturn(boolean _return) { + this._return = _return; + } + +} diff --git a/webservices/compbio/data/msa/jaxws/JobSubmissionExceptionBean.java b/webservices/compbio/data/msa/jaxws/JobSubmissionExceptionBean.java index b2d62d6..30950b4 100644 --- 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; /** * This class was generated by the JAX-WS RI. - * JAX-WS RI 2.1.6 in JDK 6 - * Generated source version: 2.1.6 + * JAX-WS RI 2.2.1-hudson-28- + * Generated source version: 2.2.1 * */ @XmlRootElement(name = "JobSubmissionException", namespace = "http://msa.data.compbio/01/12/2010/") diff --git a/webservices/compbio/data/msa/jaxws/LimitExceededExceptionBean.java b/webservices/compbio/data/msa/jaxws/LimitExceededExceptionBean.java index e1bf0bf..c9c3a4e 100644 --- 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; /** * This class was generated by the JAX-WS RI. - * JAX-WS RI 2.1.6 in JDK 6 - * Generated source version: 2.1.6 + * JAX-WS RI 2.2.1-hudson-28- + * Generated source version: 2.2.1 * */ @XmlRootElement(name = "LimitExceededException", namespace = "http://msa.data.compbio/01/12/2010/") diff --git a/webservices/compbio/data/msa/jaxws/ResultNotAvailableExceptionBean.java b/webservices/compbio/data/msa/jaxws/ResultNotAvailableExceptionBean.java index 7016909..be8a26d 100644 --- 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; /** * This class was generated by the JAX-WS RI. - * JAX-WS RI 2.1.6 in JDK 6 - * Generated source version: 2.1.6 + * JAX-WS RI 2.2.1-hudson-28- + * Generated source version: 2.2.1 * */ @XmlRootElement(name = "ResultNotAvailableException", namespace = "http://msa.data.compbio/01/12/2010/") diff --git a/webservices/compbio/data/msa/jaxws/TestAllServices.java b/webservices/compbio/data/msa/jaxws/TestAllServices.java new file mode 100644 index 0000000..2ff7814 --- /dev/null +++ b/webservices/compbio/data/msa/jaxws/TestAllServices.java @@ -0,0 +1,15 @@ + +package compbio.data.msa.jaxws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +@XmlRootElement(name = "testAllServices", namespace = "http://msa.data.compbio/01/12/2010/") +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "testAllServices", namespace = "http://msa.data.compbio/01/12/2010/") +public class TestAllServices { + + +} diff --git a/webservices/compbio/data/msa/jaxws/TestAllServicesResponse.java b/webservices/compbio/data/msa/jaxws/TestAllServicesResponse.java new file mode 100644 index 0000000..4f42b3a --- /dev/null +++ b/webservices/compbio/data/msa/jaxws/TestAllServicesResponse.java @@ -0,0 +1,36 @@ + +package compbio.data.msa.jaxws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +@XmlRootElement(name = "testAllServicesResponse", namespace = "http://msa.data.compbio/01/12/2010/") +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "testAllServicesResponse", namespace = "http://msa.data.compbio/01/12/2010/") +public class TestAllServicesResponse { + + @XmlElement(name = "return", namespace = "") + private String _return; + + /** + * + * @return + * returns String + */ + public String getReturn() { + return this._return; + } + + /** + * + * @param _return + * the value for the _return property + */ + public void setReturn(String _return) { + this._return = _return; + } + +} diff --git a/webservices/compbio/data/msa/jaxws/TestService.java b/webservices/compbio/data/msa/jaxws/TestService.java new file mode 100644 index 0000000..c831953 --- /dev/null +++ b/webservices/compbio/data/msa/jaxws/TestService.java @@ -0,0 +1,36 @@ + +package compbio.data.msa.jaxws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +@XmlRootElement(name = "testService", namespace = "http://msa.data.compbio/01/12/2010/") +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "testService", namespace = "http://msa.data.compbio/01/12/2010/") +public class TestService { + + @XmlElement(name = "arg0", namespace = "") + private compbio.ws.client.Services arg0; + + /** + * + * @return + * returns Services + */ + public compbio.ws.client.Services getArg0() { + return this.arg0; + } + + /** + * + * @param arg0 + * the value for the arg0 property + */ + public void setArg0(compbio.ws.client.Services arg0) { + this.arg0 = arg0; + } + +} diff --git a/webservices/compbio/data/msa/jaxws/TestServiceResponse.java b/webservices/compbio/data/msa/jaxws/TestServiceResponse.java new file mode 100644 index 0000000..e274d42 --- /dev/null +++ b/webservices/compbio/data/msa/jaxws/TestServiceResponse.java @@ -0,0 +1,36 @@ + +package compbio.data.msa.jaxws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +@XmlRootElement(name = "testServiceResponse", namespace = "http://msa.data.compbio/01/12/2010/") +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "testServiceResponse", namespace = "http://msa.data.compbio/01/12/2010/") +public class TestServiceResponse { + + @XmlElement(name = "return", namespace = "") + private String _return; + + /** + * + * @return + * returns String + */ + public String getReturn() { + return this._return; + } + + /** + * + * @param _return + * the value for the _return property + */ + public void setReturn(String _return) { + this._return = _return; + } + +} diff --git a/webservices/compbio/data/msa/jaxws/UnsupportedRuntimeExceptionBean.java b/webservices/compbio/data/msa/jaxws/UnsupportedRuntimeExceptionBean.java index fa77aae..5e1268a 100644 --- 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; /** * This class was generated by the JAX-WS RI. - * JAX-WS RI 2.1.6 in JDK 6 - * Generated source version: 2.1.6 + * JAX-WS RI 2.2.1-hudson-28- + * Generated source version: 2.2.1 * */ @XmlRootElement(name = "UnsupportedRuntimeException", namespace = "http://msa.data.compbio/01/12/2010/") diff --git a/webservices/compbio/data/msa/jaxws/WrongParameterExceptionBean.java b/webservices/compbio/data/msa/jaxws/WrongParameterExceptionBean.java index fc22bd0..62be910 100644 --- 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; /** * This class was generated by the JAX-WS RI. - * JAX-WS RI 2.1.6 in JDK 6 - * Generated source version: 2.1.6 + * JAX-WS RI 2.2.1-hudson-28- + * Generated source version: 2.2.1 * */ @XmlRootElement(name = "WrongParameterException", namespace = "http://msa.data.compbio/01/12/2010/") diff --git a/webservices/compbio/ws/client/WSTester.java b/webservices/compbio/ws/client/WSTester.java index 4db6778..7091f02 100644 --- a/webservices/compbio/ws/client/WSTester.java +++ b/webservices/compbio/ws/client/WSTester.java @@ -182,8 +182,7 @@ public class WSTester { return succeed; } - private boolean testMsaWS(MsaWS msaws) - throws UnsupportedRuntimeException { + private boolean testMsaWS(MsaWS msaws) throws Exception { assert msaws != null; boolean succeed = testDefaultAlignment(msaws); @@ -225,14 +224,14 @@ public class WSTester { throw new UnsupportedOperationException("The service: " + wservice.getClass() + " is not supported! "); } - } catch (UnsupportedRuntimeException e) { + } catch (Exception e) { reportException(e); return false; } } private boolean testSequenceAnnotationWS(SequenceAnnotation wservice) - throws UnsupportedRuntimeException { + throws Exception { writer.print("Calling analyse........."); boolean success = testDefaultAnalyse(loadAlignment(), wservice, null, null); @@ -253,30 +252,24 @@ public class WSTester { private boolean testDefaultAnalyse(List fastalist, SequenceAnnotation wsproxy, Preset preset, - List> customOptions) throws UnsupportedRuntimeException { + List> customOptions) throws Exception { ScoreManager scores = null; - try { - String jobId = null; - if (customOptions != null) { - jobId = wsproxy.customAnalize(fastalist, customOptions); - } else if (preset != null) { - jobId = wsproxy.presetAnalize(fastalist, preset); - } else { - jobId = wsproxy.analize(fastalist); - } - Thread.sleep(1000); - scores = wsproxy.getAnnotation(jobId); - if (scores != null) { - writer.println(OK); - } - } catch (Exception e) { - if (e instanceof UnsupportedRuntimeException) { - throw (UnsupportedRuntimeException) e; - } else { - reportException(e); - } + + String jobId = null; + if (customOptions != null) { + jobId = wsproxy.customAnalize(fastalist, customOptions); + } else if (preset != null) { + jobId = wsproxy.presetAnalize(fastalist, preset); + } else { + jobId = wsproxy.analize(fastalist); } + Thread.sleep(1000); + scores = wsproxy.getAnnotation(jobId); + if (scores != null) { + writer.println(OK); + } + return scores != null; } @@ -332,30 +325,22 @@ public class WSTester { * @param msaws * @throws UnsupportedRuntimeException */ - private boolean testDefaultAlignment(MsaWS msaws) - throws UnsupportedRuntimeException { + private boolean testDefaultAlignment(MsaWS msaws) throws Exception { writer.print("Testing alignment with default parameters:"); Alignment al = null; boolean succeed = false; - try { - String taskId = msaws.align(seqs); - writer.print("\nQuerying job status..."); - JobStatus status = msaws.getJobStatus(taskId); - while (status != JobStatus.FINISHED) { - Thread.sleep(1000); - status = msaws.getJobStatus(taskId); - } - writer.println(OK); - writer.print("Retrieving results..."); - al = msaws.getResult(taskId); - succeed = true; - } catch (Exception e) { - if (e instanceof UnsupportedRuntimeException) { - throw (UnsupportedRuntimeException) e; - } else { - reportException(e); - } + + String taskId = msaws.align(seqs); + writer.print("\nQuerying job status..."); + JobStatus status = msaws.getJobStatus(taskId); + while (status != JobStatus.FINISHED) { + Thread.sleep(1000); + status = msaws.getJobStatus(taskId); } + writer.println(OK); + writer.print("Retrieving results..."); + al = msaws.getResult(taskId); + succeed = true; if (al != null) { writer.println(OK); } @@ -436,7 +421,7 @@ public class WSTester { writer.println("Check is completed. The Service " + serv + " IS WORKING\n"); } else { - writer.println("Check is completed. The Service " + serv + writer.println("Check is aborted. The Service " + serv + " HAS SOME PROBLEMS\n"); } } diff --git a/webservices/compbio/ws/server/resource/AAConWS.wsdl b/webservices/compbio/ws/server/resource/AAConWS.wsdl index c9c8412..3f3a00a 100644 --- a/webservices/compbio/ws/server/resource/AAConWS.wsdl +++ b/webservices/compbio/ws/server/resource/AAConWS.wsdl @@ -1,6 +1,6 @@ - - + + @@ -45,30 +45,24 @@ - - - - - - + + + + + + - - - - - - @@ -81,6 +75,12 @@ + + + + + + @@ -89,60 +89,60 @@ - - - - - + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - + + + - - + + - - - + + + - - - + + + - - + + - - + + + + + + - - + + @@ -219,7 +219,7 @@ - + @@ -228,7 +228,7 @@ - + @@ -246,7 +246,7 @@ - + @@ -255,7 +255,7 @@ - + @@ -264,7 +264,7 @@ - + diff --git a/webservices/compbio/ws/server/resource/AAConWS_schema1.xsd b/webservices/compbio/ws/server/resource/AAConWS_schema1.xsd index 038af26..ce87a32 100644 --- a/webservices/compbio/ws/server/resource/AAConWS_schema1.xsd +++ b/webservices/compbio/ws/server/resource/AAConWS_schema1.xsd @@ -242,6 +242,23 @@ + + + + + + + + + + + + + + + + + @@ -280,23 +297,6 @@ - - - - - - - - - - - - - - - - - diff --git a/webservices/compbio/ws/server/resource/ClustalWS.wsdl b/webservices/compbio/ws/server/resource/ClustalWS.wsdl index 47571d8..9e12c14 100644 --- a/webservices/compbio/ws/server/resource/ClustalWS.wsdl +++ b/webservices/compbio/ws/server/resource/ClustalWS.wsdl @@ -45,30 +45,24 @@ - - - - - - + + + + + + - - - - - - @@ -81,6 +75,12 @@ + + + + + + @@ -116,22 +116,18 @@ - - - - + + + + - - - - @@ -140,6 +136,10 @@ + + + + @@ -219,7 +219,7 @@ - + @@ -228,7 +228,7 @@ - + @@ -246,7 +246,7 @@ - + @@ -255,7 +255,7 @@ - + @@ -264,7 +264,7 @@ - + diff --git a/webservices/compbio/ws/server/resource/ClustalWS_schema1.xsd b/webservices/compbio/ws/server/resource/ClustalWS_schema1.xsd index d15007b..c432550 100644 --- a/webservices/compbio/ws/server/resource/ClustalWS_schema1.xsd +++ b/webservices/compbio/ws/server/resource/ClustalWS_schema1.xsd @@ -161,6 +161,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -199,37 +230,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/webservices/compbio/ws/server/resource/DisemblWS.wsdl b/webservices/compbio/ws/server/resource/DisemblWS.wsdl index 0682949..af14b4f 100644 --- a/webservices/compbio/ws/server/resource/DisemblWS.wsdl +++ b/webservices/compbio/ws/server/resource/DisemblWS.wsdl @@ -45,30 +45,24 @@ - - - - - - + + + + + + - - - - - - @@ -81,6 +75,12 @@ + + + + + + @@ -116,22 +116,18 @@ - - - - + + + + - - - - @@ -140,6 +136,10 @@ + + + + @@ -219,7 +219,7 @@ - + @@ -228,7 +228,7 @@ - + @@ -246,7 +246,7 @@ - + @@ -255,7 +255,7 @@ - + @@ -264,7 +264,7 @@ - + diff --git a/webservices/compbio/ws/server/resource/DisemblWS_schema1.xsd b/webservices/compbio/ws/server/resource/DisemblWS_schema1.xsd index 97d6989..c4f25f1 100644 --- a/webservices/compbio/ws/server/resource/DisemblWS_schema1.xsd +++ b/webservices/compbio/ws/server/resource/DisemblWS_schema1.xsd @@ -163,6 +163,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -201,37 +232,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/webservices/compbio/ws/server/resource/GlobPlotWS.wsdl b/webservices/compbio/ws/server/resource/GlobPlotWS.wsdl index aed2c95..766b329 100644 --- a/webservices/compbio/ws/server/resource/GlobPlotWS.wsdl +++ b/webservices/compbio/ws/server/resource/GlobPlotWS.wsdl @@ -45,30 +45,24 @@ - - - - - - + + + + + + - - - - - - @@ -81,6 +75,12 @@ + + + + + + @@ -116,22 +116,18 @@ - - - - + + + + - - - - @@ -140,6 +136,10 @@ + + + + @@ -219,7 +219,7 @@ - + @@ -228,7 +228,7 @@ - + @@ -246,7 +246,7 @@ - + @@ -255,7 +255,7 @@ - + @@ -264,7 +264,7 @@ - + diff --git a/webservices/compbio/ws/server/resource/GlobPlotWS_schema1.xsd b/webservices/compbio/ws/server/resource/GlobPlotWS_schema1.xsd index 858d2c2..52acbb9 100644 --- a/webservices/compbio/ws/server/resource/GlobPlotWS_schema1.xsd +++ b/webservices/compbio/ws/server/resource/GlobPlotWS_schema1.xsd @@ -169,6 +169,23 @@ + + + + + + + + + + + + + + + + + @@ -207,23 +224,6 @@ - - - - - - - - - - - - - - - - - diff --git a/webservices/compbio/ws/server/resource/JronnWS.wsdl b/webservices/compbio/ws/server/resource/JronnWS.wsdl index fc9670e..68edea7 100644 --- a/webservices/compbio/ws/server/resource/JronnWS.wsdl +++ b/webservices/compbio/ws/server/resource/JronnWS.wsdl @@ -45,30 +45,24 @@ - - - - - - + + + + + + - - - - - - @@ -81,6 +75,12 @@ + + + + + + @@ -116,22 +116,18 @@ - - - - + + + + - - - - @@ -140,6 +136,10 @@ + + + + @@ -219,7 +219,7 @@ - + @@ -228,7 +228,7 @@ - + @@ -246,7 +246,7 @@ - + @@ -255,7 +255,7 @@ - + @@ -264,7 +264,7 @@ - + diff --git a/webservices/compbio/ws/server/resource/JronnWS_schema1.xsd b/webservices/compbio/ws/server/resource/JronnWS_schema1.xsd index 038af26..ce87a32 100644 --- a/webservices/compbio/ws/server/resource/JronnWS_schema1.xsd +++ b/webservices/compbio/ws/server/resource/JronnWS_schema1.xsd @@ -242,6 +242,23 @@ + + + + + + + + + + + + + + + + + @@ -280,23 +297,6 @@ - - - - - - - - - - - - - - - - - diff --git a/webservices/compbio/ws/server/resource/MafftWS.wsdl b/webservices/compbio/ws/server/resource/MafftWS.wsdl index f769e97..dba8c70 100644 --- a/webservices/compbio/ws/server/resource/MafftWS.wsdl +++ b/webservices/compbio/ws/server/resource/MafftWS.wsdl @@ -45,30 +45,24 @@ - - - - - - + + + + + + - - - - - - @@ -81,6 +75,12 @@ + + + + + + @@ -116,22 +116,18 @@ - - - - + + + + - - - - @@ -140,6 +136,10 @@ + + + + @@ -219,7 +219,7 @@ - + @@ -228,7 +228,7 @@ - + @@ -246,7 +246,7 @@ - + @@ -255,7 +255,7 @@ - + @@ -264,7 +264,7 @@ - + diff --git a/webservices/compbio/ws/server/resource/MafftWS_schema1.xsd b/webservices/compbio/ws/server/resource/MafftWS_schema1.xsd index d15007b..c432550 100644 --- a/webservices/compbio/ws/server/resource/MafftWS_schema1.xsd +++ b/webservices/compbio/ws/server/resource/MafftWS_schema1.xsd @@ -161,6 +161,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -199,37 +230,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/webservices/compbio/ws/server/resource/MuscleWS.wsdl b/webservices/compbio/ws/server/resource/MuscleWS.wsdl index 6526111..ce1332f 100644 --- a/webservices/compbio/ws/server/resource/MuscleWS.wsdl +++ b/webservices/compbio/ws/server/resource/MuscleWS.wsdl @@ -45,30 +45,24 @@ - - - - - - + + + + + + - - - - - - @@ -81,6 +75,12 @@ + + + + + + @@ -116,22 +116,18 @@ - - - - + + + + - - - - @@ -140,6 +136,10 @@ + + + + @@ -219,7 +219,7 @@ - + @@ -228,7 +228,7 @@ - + @@ -246,7 +246,7 @@ - + @@ -255,7 +255,7 @@ - + @@ -264,7 +264,7 @@ - + diff --git a/webservices/compbio/ws/server/resource/MuscleWS_schema1.xsd b/webservices/compbio/ws/server/resource/MuscleWS_schema1.xsd index e0440e8..0895916 100644 --- a/webservices/compbio/ws/server/resource/MuscleWS_schema1.xsd +++ b/webservices/compbio/ws/server/resource/MuscleWS_schema1.xsd @@ -152,6 +152,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -190,37 +221,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/webservices/compbio/ws/server/resource/RegistryWS.wsdl b/webservices/compbio/ws/server/resource/RegistryWS.wsdl new file mode 100644 index 0000000..6ffd8d1 --- /dev/null +++ b/webservices/compbio/ws/server/resource/RegistryWS.wsdl @@ -0,0 +1,134 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/webservices/compbio/ws/server/resource/RegistryWS_schema1.xsd b/webservices/compbio/ws/server/resource/RegistryWS_schema1.xsd new file mode 100644 index 0000000..10a476b --- /dev/null +++ b/webservices/compbio/ws/server/resource/RegistryWS_schema1.xsd @@ -0,0 +1,110 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/webservices/compbio/ws/server/resource/TcoffeeWS.wsdl b/webservices/compbio/ws/server/resource/TcoffeeWS.wsdl index 717b4a0..f8d2b22 100644 --- a/webservices/compbio/ws/server/resource/TcoffeeWS.wsdl +++ b/webservices/compbio/ws/server/resource/TcoffeeWS.wsdl @@ -45,30 +45,24 @@ - - - - - - + + + + + + - - - - - - @@ -81,6 +75,12 @@ + + + + + + @@ -116,22 +116,18 @@ - - - - + + + + - - - - @@ -140,6 +136,10 @@ + + + + @@ -219,7 +219,7 @@ - + @@ -228,7 +228,7 @@ - + @@ -246,7 +246,7 @@ - + @@ -255,7 +255,7 @@ - + @@ -264,7 +264,7 @@ - + diff --git a/webservices/compbio/ws/server/resource/TcoffeeWS_schema1.xsd b/webservices/compbio/ws/server/resource/TcoffeeWS_schema1.xsd index bf15fb2..18262c9 100644 --- a/webservices/compbio/ws/server/resource/TcoffeeWS_schema1.xsd +++ b/webservices/compbio/ws/server/resource/TcoffeeWS_schema1.xsd @@ -152,6 +152,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -190,37 +221,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/wsbuild.xml b/wsbuild.xml index bf55aaa..03a238f 100644 --- a/wsbuild.xml +++ b/wsbuild.xml @@ -26,6 +26,7 @@ + @@ -139,6 +140,17 @@ + + + + @@ -183,6 +195,13 @@ package="compbio.ws.client.stub" quiet="false"> + + -- 1.7.10.2