regenerated stubs & TODO

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

diff --git a/TODO.txt b/TODO.txt
index 45a50d4..b2060ce 100644 (file)
--- a/TODO.txt
+++ b/TODO.txt
@@ -1,3 +1,5 @@
+Add more detailed tests for webservices? \r
+\r

 ? ideally should introduce native Mac support (and maybe abandon native windows support in \r
 favour of VM)   \r
 \r
 ? ideally should introduce native Mac support (and maybe abandon native windows support in \r
 favour of VM)   \r
 \r

@@ -14,6 +16,10 @@ add to help text: To disable a web service remove it from WEB-INF/sun-jaxws.xml
 rename jaba.war to jabaws.war and make sure jabaws context path is used throughout. \r
 \r
 Current stat collector has to rely on file dates! \r
 rename jaba.war to jabaws.war and make sure jabaws context path is used throughout. \r
 \r
 Current stat collector has to rely on file dates! \r

+To change this you need \r
+1) Collect all the stats in old format into the DB\r
+2) Update the code to get the date out of the file.  \r
+Can be done once JABAWS 1 is replaced with 2. \r

 \r
 Globprot need a proper reference to bio python and sav_gol binaries -> they should be \r
 somehow taken from disembl. \r
 \r
 Globprot need a proper reference to bio python and sav_gol binaries -> they should be \r
 somehow taken from disembl. \r

diff --git a/webservices/compbio/ws/server/resource/AAConWS.wsdl b/webservices/compbio/ws/server/resource/AAConWS.wsdl
index 9329c44..8ff9829 100644 (file)
--- a/webservices/compbio/ws/server/resource/AAConWS.wsdl
+++ b/webservices/compbio/ws/server/resource/AAConWS.wsdl
@@ -69,11 +69,11 @@
   <message name="getLimitResponse">
     <part name="parameters" element="tns:getLimitResponse"/>
   </message>
   <message name="getLimitResponse">
     <part name="parameters" element="tns:getLimitResponse"/>
   </message>

-  <message name="getLimits">
-    <part name="parameters" element="tns:getLimits"/>
+  <message name="getRunnerOptions">
+    <part name="parameters" element="tns:getRunnerOptions"/>

   </message>
   </message>

-  <message name="getLimitsResponse">
-    <part name="parameters" element="tns:getLimitsResponse"/>
+  <message name="getRunnerOptionsResponse">
+    <part name="parameters" element="tns:getRunnerOptionsResponse"/>

   </message>
   <message name="getPresets">
     <part name="parameters" element="tns:getPresets"/>
   </message>
   <message name="getPresets">
     <part name="parameters" element="tns:getPresets"/>

@@ -81,11 +81,11 @@
   <message name="getPresetsResponse">
     <part name="parameters" element="tns:getPresetsResponse"/>
   </message>
   <message name="getPresetsResponse">
     <part name="parameters" element="tns:getPresetsResponse"/>
   </message>

-  <message name="getRunnerOptions">
-    <part name="parameters" element="tns:getRunnerOptions"/>
+  <message name="getLimits">
+    <part name="parameters" element="tns:getLimits"/>

   </message>
   </message>

-  <message name="getRunnerOptionsResponse">
-    <part name="parameters" element="tns:getRunnerOptionsResponse"/>
+  <message name="getLimitsResponse">
+    <part name="parameters" element="tns:getLimitsResponse"/>

   </message>
   <portType name="SequenceAnnotation">
     <operation name="analize">
   </message>
   <portType name="SequenceAnnotation">
     <operation name="analize">

@@ -132,17 +132,17 @@
       <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>
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitRequest" message="tns:getLimit"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitResponse" message="tns:getLimitResponse"/>
     </operation>

-    <operation name="getLimits">
-      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitsRequest" message="tns:getLimits"/>
-      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitsResponse" message="tns:getLimitsResponse"/>
+    <operation name="getRunnerOptions">
+      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getRunnerOptionsRequest" message="tns:getRunnerOptions"/>
+      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getRunnerOptionsResponse" message="tns:getRunnerOptionsResponse"/>

     </operation>
     <operation name="getPresets">
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getPresetsRequest" message="tns:getPresets"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getPresetsResponse" message="tns:getPresetsResponse"/>
     </operation>
     </operation>
     <operation name="getPresets">
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getPresetsRequest" message="tns:getPresets"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getPresetsResponse" message="tns:getPresetsResponse"/>
     </operation>

-    <operation name="getRunnerOptions">
-      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getRunnerOptionsRequest" message="tns:getRunnerOptions"/>
-      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getRunnerOptionsResponse" message="tns:getRunnerOptionsResponse"/>
+    <operation name="getLimits">
+      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitsRequest" message="tns:getLimits"/>
+      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getLimitsResponse" message="tns:getLimitsResponse"/>

     </operation>
   </portType>
   <binding name="AAConWSPortBinding" type="tns:SequenceAnnotation">
     </operation>
   </portType>
   <binding name="AAConWSPortBinding" type="tns:SequenceAnnotation">

@@ -255,7 +255,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
         <soap:body use="literal"/>
       </output>
     </operation>

-    <operation name="getLimits">
+    <operation name="getRunnerOptions">

       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>

@@ -273,7 +273,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
         <soap:body use="literal"/>
       </output>
     </operation>

-    <operation name="getRunnerOptions">
+    <operation name="getLimits">

       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
       <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 ce87a32..99b9b4d 100644 (file)
--- a/webservices/compbio/ws/server/resource/AAConWS_schema1.xsd
+++ b/webservices/compbio/ws/server/resource/AAConWS_schema1.xsd
@@ -61,15 +61,52 @@
 
   <xs:element name="runnerConfig" type="tns:runnerConfig"/>
 
 
   <xs:element name="runnerConfig" type="tns:runnerConfig"/>
 

-  <xs:complexType name="getJobStatus">
+  <xs:complexType name="getRunnerOptions">
+    <xs:sequence/>
+  </xs:complexType>
+
+  <xs:complexType name="getRunnerOptionsResponse">

     <xs:sequence>
     <xs:sequence>

-      <xs:element name="jobId" type="xs:string" minOccurs="0"/>
+      <xs:element name="return" type="tns:runnerConfig" minOccurs="0"/>

     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

-  <xs:complexType name="getJobStatusResponse">
+  <xs:complexType name="runnerConfig">

     <xs:sequence>
     <xs:sequence>

-      <xs:element name="return" type="tns:jobStatus" minOccurs="0"/>
+      <xs:element name="options" type="tns:option" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="parameters" type="tns:parameter" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="prmSeparator" type="xs:string" minOccurs="0"/>
+      <xs:element name="runnerClassName" type="xs:string"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="option">
+    <xs:sequence>
+      <xs:element name="description" type="xs:string"/>
+      <xs:element name="optionNames" type="xs:string" maxOccurs="unbounded"/>
+      <xs:element name="name" type="xs:string"/>
+      <xs:element name="furtherDetails" type="xs:anyURI" minOccurs="0"/>
+      <xs:element name="defaultValue" type="xs:string" minOccurs="0"/>
+    </xs:sequence>
+    <xs:attribute name="isRequired" type="xs:boolean" use="required"/>
+  </xs:complexType>
+
+  <xs:complexType name="parameter">
+    <xs:complexContent>
+      <xs:extension base="tns:option">
+        <xs:sequence>
+          <xs:element name="possibleValues" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+          <xs:element name="validValue" type="tns:valueConstrain" minOccurs="0"/>
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:complexType name="valueConstrain">
+    <xs:sequence>
+      <xs:element name="type" type="tns:type"/>
+      <xs:element name="max" type="xs:string" minOccurs="0"/>
+      <xs:element name="min" type="xs:string" minOccurs="0"/>

     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

@@ -114,52 +151,15 @@
     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

-  <xs:complexType name="getRunnerOptions">
-    <xs:sequence/>
-  </xs:complexType>
-
-  <xs:complexType name="getRunnerOptionsResponse">
-    <xs:sequence>
-      <xs:element name="return" type="tns:runnerConfig" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="runnerConfig">
-    <xs:sequence>
-      <xs:element name="options" type="tns:option" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="parameters" type="tns:parameter" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="prmSeparator" type="xs:string" minOccurs="0"/>
-      <xs:element name="runnerClassName" type="xs:string"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="option">
+  <xs:complexType name="getJobStatus">

     <xs:sequence>
     <xs:sequence>

-      <xs:element name="description" type="xs:string"/>
-      <xs:element name="optionNames" type="xs:string" maxOccurs="unbounded"/>
-      <xs:element name="name" type="xs:string"/>
-      <xs:element name="furtherDetails" type="xs:anyURI" minOccurs="0"/>
-      <xs:element name="defaultValue" type="xs:string" minOccurs="0"/>
+      <xs:element name="jobId" type="xs:string" minOccurs="0"/>

     </xs:sequence>
     </xs:sequence>

-    <xs:attribute name="isRequired" type="xs:boolean" use="required"/>
-  </xs:complexType>
-
-  <xs:complexType name="parameter">
-    <xs:complexContent>
-      <xs:extension base="tns:option">
-        <xs:sequence>
-          <xs:element name="possibleValues" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-          <xs:element name="validValue" type="tns:valueConstrain" minOccurs="0"/>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>

   </xs:complexType>
 
   </xs:complexType>
 

-  <xs:complexType name="valueConstrain">
+  <xs:complexType name="getJobStatusResponse">

     <xs:sequence>
     <xs:sequence>

-      <xs:element name="type" type="tns:type"/>
-      <xs:element name="max" type="xs:string" minOccurs="0"/>
-      <xs:element name="min" type="xs:string" minOccurs="0"/>
+      <xs:element name="return" type="tns:jobStatus" minOccurs="0"/>

     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

@@ -242,20 +242,16 @@
     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

-  <xs:complexType name="getPresets">
-    <xs:sequence/>
-  </xs:complexType>
-
-  <xs:complexType name="getPresetsResponse">
+  <xs:complexType name="customAnalize">

     <xs:sequence>
     <xs:sequence>

-      <xs:element name="return" type="tns:presetManager" minOccurs="0"/>
+      <xs:element name="fastaSequences" type="tns:fastaSequence" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="options" type="tns:option" minOccurs="0" maxOccurs="unbounded"/>

     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

-  <xs:complexType name="presetManager">
+  <xs:complexType name="customAnalizeResponse">

     <xs:sequence>
     <xs:sequence>

-      <xs:element name="runnerClassName" type="xs:string"/>
-      <xs:element name="preset" type="tns:preset" maxOccurs="unbounded"/>
+      <xs:element name="return" type="xs:string" minOccurs="0"/>

     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

@@ -285,40 +281,44 @@
     <xs:attribute name="isDefault" type="xs:boolean" use="required"/>
   </xs:complexType>
 
     <xs:attribute name="isDefault" type="xs:boolean" use="required"/>
   </xs:complexType>
 

-  <xs:complexType name="getLimit">
+  <xs:complexType name="getPresets">
+    <xs:sequence/>
+  </xs:complexType>
+
+  <xs:complexType name="getPresetsResponse">

     <xs:sequence>
     <xs:sequence>

-      <xs:element name="presetName" type="xs:string" minOccurs="0"/>
+      <xs:element name="return" type="tns:presetManager" minOccurs="0"/>

     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

-  <xs:complexType name="getLimitResponse">
+  <xs:complexType name="presetManager">

     <xs:sequence>
     <xs:sequence>

-      <xs:element name="return" type="tns:limit" minOccurs="0"/>
+      <xs:element name="runnerClassName" type="xs:string"/>
+      <xs:element name="preset" type="tns:preset" maxOccurs="unbounded"/>

     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

-  <xs:complexType name="cancelJob">
+  <xs:complexType name="getLimit">

     <xs:sequence>
     <xs:sequence>

-      <xs:element name="jobId" type="xs:string" minOccurs="0"/>
+      <xs:element name="presetName" type="xs:string" minOccurs="0"/>

     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

-  <xs:complexType name="cancelJobResponse">
+  <xs:complexType name="getLimitResponse">

     <xs:sequence>
     <xs:sequence>

-      <xs:element name="return" type="xs:boolean"/>
+      <xs:element name="return" type="tns:limit" minOccurs="0"/>

     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

-  <xs:complexType name="customAnalize">
+  <xs:complexType name="cancelJob">

     <xs:sequence>
     <xs:sequence>

-      <xs:element name="fastaSequences" type="tns:fastaSequence" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="options" type="tns:option" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="jobId" type="xs:string" minOccurs="0"/>

     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

-  <xs:complexType name="customAnalizeResponse">
+  <xs:complexType name="cancelJobResponse">

     <xs:sequence>
     <xs:sequence>

-      <xs:element name="return" type="xs:string" minOccurs="0"/>
+      <xs:element name="return" type="xs:boolean"/>

     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

@@ -342,6 +342,13 @@
     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

+  <xs:simpleType name="type">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="Integer"/>
+      <xs:enumeration value="Float"/>
+    </xs:restriction>
+  </xs:simpleType>
+

   <xs:simpleType name="jobStatus">
     <xs:restriction base="xs:string">
       <xs:enumeration value="PENDING"/>
   <xs:simpleType name="jobStatus">
     <xs:restriction base="xs:string">
       <xs:enumeration value="PENDING"/>

@@ -355,12 +362,5 @@
       <xs:enumeration value="COLLECTED"/>
     </xs:restriction>
   </xs:simpleType>
       <xs:enumeration value="COLLECTED"/>
     </xs:restriction>
   </xs:simpleType>

-
-  <xs:simpleType name="type">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="Integer"/>
-      <xs:enumeration value="Float"/>
-    </xs:restriction>
-  </xs:simpleType>

 </xs:schema>
 
 </xs:schema>
 

diff --git a/webservices/compbio/ws/server/resource/ClustalWS.wsdl b/webservices/compbio/ws/server/resource/ClustalWS.wsdl
index b52327b..d317bac 100644 (file)
--- a/webservices/compbio/ws/server/resource/ClustalWS.wsdl
+++ b/webservices/compbio/ws/server/resource/ClustalWS.wsdl
@@ -69,11 +69,11 @@
   <message name="getLimitResponse">
     <part name="parameters" element="tns:getLimitResponse"/>
   </message>
   <message name="getLimitResponse">
     <part name="parameters" element="tns:getLimitResponse"/>
   </message>

-  <message name="getLimits">
-    <part name="parameters" element="tns:getLimits"/>
+  <message name="getRunnerOptions">
+    <part name="parameters" element="tns:getRunnerOptions"/>

   </message>
   </message>

-  <message name="getLimitsResponse">
-    <part name="parameters" element="tns:getLimitsResponse"/>
+  <message name="getRunnerOptionsResponse">
+    <part name="parameters" element="tns:getRunnerOptionsResponse"/>

   </message>
   <message name="getPresets">
     <part name="parameters" element="tns:getPresets"/>
   </message>
   <message name="getPresets">
     <part name="parameters" element="tns:getPresets"/>

@@ -81,11 +81,11 @@
   <message name="getPresetsResponse">
     <part name="parameters" element="tns:getPresetsResponse"/>
   </message>
   <message name="getPresetsResponse">
     <part name="parameters" element="tns:getPresetsResponse"/>
   </message>

-  <message name="getRunnerOptions">
-    <part name="parameters" element="tns:getRunnerOptions"/>
+  <message name="getLimits">
+    <part name="parameters" element="tns:getLimits"/>

   </message>
   </message>

-  <message name="getRunnerOptionsResponse">
-    <part name="parameters" element="tns:getRunnerOptionsResponse"/>
+  <message name="getLimitsResponse">
+    <part name="parameters" element="tns:getLimitsResponse"/>

   </message>
   <portType name="MsaWS">
     <operation name="getResult">
   </message>
   <portType name="MsaWS">
     <operation name="getResult">

@@ -132,17 +132,17 @@
       <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitRequest" message="tns:getLimit"/>
       <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitResponse" message="tns:getLimitResponse"/>
     </operation>
       <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitRequest" message="tns:getLimit"/>
       <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitResponse" message="tns:getLimitResponse"/>
     </operation>

-    <operation name="getLimits">
-      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitsRequest" message="tns:getLimits"/>
-      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitsResponse" message="tns:getLimitsResponse"/>
+    <operation name="getRunnerOptions">
+      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getRunnerOptionsRequest" message="tns:getRunnerOptions"/>
+      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getRunnerOptionsResponse" message="tns:getRunnerOptionsResponse"/>

     </operation>
     <operation name="getPresets">
       <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getPresetsRequest" message="tns:getPresets"/>
       <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getPresetsResponse" message="tns:getPresetsResponse"/>
     </operation>
     </operation>
     <operation name="getPresets">
       <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getPresetsRequest" message="tns:getPresets"/>
       <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getPresetsResponse" message="tns:getPresetsResponse"/>
     </operation>

-    <operation name="getRunnerOptions">
-      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getRunnerOptionsRequest" message="tns:getRunnerOptions"/>
-      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getRunnerOptionsResponse" message="tns:getRunnerOptionsResponse"/>
+    <operation name="getLimits">
+      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitsRequest" message="tns:getLimits"/>
+      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitsResponse" message="tns:getLimitsResponse"/>

     </operation>
   </portType>
   <binding name="ClustalWSPortBinding" type="tns:MsaWS">
     </operation>
   </portType>
   <binding name="ClustalWSPortBinding" type="tns:MsaWS">

@@ -255,7 +255,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
         <soap:body use="literal"/>
       </output>
     </operation>

-    <operation name="getLimits">
+    <operation name="getRunnerOptions">

       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>

@@ -273,7 +273,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
         <soap:body use="literal"/>
       </output>
     </operation>

-    <operation name="getRunnerOptions">
+    <operation name="getLimits">

       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>

diff --git a/webservices/compbio/ws/server/resource/ClustalWS_schema1.xsd b/webservices/compbio/ws/server/resource/ClustalWS_schema1.xsd
index c432550..05f2a89 100644 (file)
--- a/webservices/compbio/ws/server/resource/ClustalWS_schema1.xsd
+++ b/webservices/compbio/ws/server/resource/ClustalWS_schema1.xsd
@@ -161,6 +161,32 @@
     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

+  <xs:complexType name="getLimits">
+    <xs:sequence/>
+  </xs:complexType>
+
+  <xs:complexType name="getLimitsResponse">
+    <xs:sequence>
+      <xs:element name="return" type="tns:limitsManager" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="limitsManager">
+    <xs:sequence>
+      <xs:element name="runnerClassName" type="xs:string" minOccurs="0"/>
+      <xs:element name="limit" type="tns:limit" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="limit">
+    <xs:sequence>
+      <xs:element name="preset" type="xs:string" minOccurs="0"/>
+      <xs:element name="seqNumber" type="xs:int"/>
+      <xs:element name="seqLength" type="xs:int"/>
+    </xs:sequence>
+    <xs:attribute name="isDefault" type="xs:boolean" use="required"/>
+  </xs:complexType>
+

   <xs:complexType name="getPresets">
     <xs:sequence/>
   </xs:complexType>
   <xs:complexType name="getPresets">
     <xs:sequence/>
   </xs:complexType>

@@ -192,32 +218,6 @@
     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

-  <xs:complexType name="getLimits">
-    <xs:sequence/>
-  </xs:complexType>
-
-  <xs:complexType name="getLimitsResponse">
-    <xs:sequence>
-      <xs:element name="return" type="tns:limitsManager" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="limitsManager">
-    <xs:sequence>
-      <xs:element name="runnerClassName" type="xs:string" minOccurs="0"/>
-      <xs:element name="limit" type="tns:limit" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="limit">
-    <xs:sequence>
-      <xs:element name="preset" type="xs:string" minOccurs="0"/>
-      <xs:element name="seqNumber" type="xs:int"/>
-      <xs:element name="seqLength" type="xs:int"/>
-    </xs:sequence>
-    <xs:attribute name="isDefault" type="xs:boolean" use="required"/>
-  </xs:complexType>
-

   <xs:complexType name="getLimit">
     <xs:sequence>
       <xs:element name="presetName" type="xs:string" minOccurs="0"/>
   <xs:complexType name="getLimit">
     <xs:sequence>
       <xs:element name="presetName" type="xs:string" minOccurs="0"/>

diff --git a/webservices/compbio/ws/server/resource/DisemblWS.wsdl b/webservices/compbio/ws/server/resource/DisemblWS.wsdl
index 3635014..324f199 100644 (file)
--- a/webservices/compbio/ws/server/resource/DisemblWS.wsdl
+++ b/webservices/compbio/ws/server/resource/DisemblWS.wsdl
@@ -24,18 +24,18 @@
   <message name="WrongParameterException">
     <part name="fault" element="tns:WrongParameterException"/>
   </message>
   <message name="WrongParameterException">
     <part name="fault" element="tns:WrongParameterException"/>
   </message>

-  <message name="analize">
-    <part name="parameters" element="tns:analize"/>
-  </message>
-  <message name="analizeResponse">
-    <part name="parameters" element="tns:analizeResponse"/>
-  </message>

   <message name="presetAnalize">
     <part name="parameters" element="tns:presetAnalize"/>
   </message>
   <message name="presetAnalizeResponse">
     <part name="parameters" element="tns:presetAnalizeResponse"/>
   </message>
   <message name="presetAnalize">
     <part name="parameters" element="tns:presetAnalize"/>
   </message>
   <message name="presetAnalizeResponse">
     <part name="parameters" element="tns:presetAnalizeResponse"/>
   </message>

+  <message name="analize">
+    <part name="parameters" element="tns:analize"/>
+  </message>
+  <message name="analizeResponse">
+    <part name="parameters" element="tns:analizeResponse"/>
+  </message>

   <message name="getAnnotation">
     <part name="parameters" element="tns:getAnnotation"/>
   </message>
   <message name="getAnnotation">
     <part name="parameters" element="tns:getAnnotation"/>
   </message>

@@ -45,12 +45,6 @@
   <message name="ResultNotAvailableException">
     <part name="fault" element="tns:ResultNotAvailableException"/>
   </message>
   <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="cancelJob">
     <part name="parameters" element="tns:cancelJob"/>
   </message>

@@ -63,17 +57,17 @@
   <message name="getJobStatusResponse">
     <part name="parameters" element="tns:getJobStatusResponse"/>
   </message>
   <message name="getJobStatusResponse">
     <part name="parameters" element="tns:getJobStatusResponse"/>
   </message>

-  <message name="getLimit">
-    <part name="parameters" element="tns:getLimit"/>
+  <message name="pullExecStatistics">
+    <part name="parameters" element="tns:pullExecStatistics"/>

   </message>
   </message>

-  <message name="getLimitResponse">
-    <part name="parameters" element="tns:getLimitResponse"/>
+  <message name="pullExecStatisticsResponse">
+    <part name="parameters" element="tns:pullExecStatisticsResponse"/>

   </message>
   </message>

-  <message name="getLimits">
-    <part name="parameters" element="tns:getLimits"/>
+  <message name="getRunnerOptions">
+    <part name="parameters" element="tns:getRunnerOptions"/>

   </message>
   </message>

-  <message name="getLimitsResponse">
-    <part name="parameters" element="tns:getLimitsResponse"/>
+  <message name="getRunnerOptionsResponse">
+    <part name="parameters" element="tns:getRunnerOptionsResponse"/>

   </message>
   <message name="getPresets">
     <part name="parameters" element="tns:getPresets"/>
   </message>
   <message name="getPresets">
     <part name="parameters" element="tns:getPresets"/>

@@ -81,11 +75,17 @@
   <message name="getPresetsResponse">
     <part name="parameters" element="tns:getPresetsResponse"/>
   </message>
   <message name="getPresetsResponse">
     <part name="parameters" element="tns:getPresetsResponse"/>
   </message>

-  <message name="getRunnerOptions">
-    <part name="parameters" element="tns:getRunnerOptions"/>
+  <message name="getLimit">
+    <part name="parameters" element="tns:getLimit"/>

   </message>
   </message>

-  <message name="getRunnerOptionsResponse">
-    <part name="parameters" element="tns:getRunnerOptionsResponse"/>
+  <message name="getLimitResponse">
+    <part name="parameters" element="tns:getLimitResponse"/>
+  </message>
+  <message name="getLimits">
+    <part name="parameters" element="tns:getLimits"/>
+  </message>
+  <message name="getLimitsResponse">
+    <part name="parameters" element="tns:getLimitsResponse"/>

   </message>
   <portType name="SequenceAnnotation">
     <operation name="customAnalize">
   </message>
   <portType name="SequenceAnnotation">
     <operation name="customAnalize">

@@ -96,13 +96,6 @@
       <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>
       <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="analize">
-      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/analizeRequest" message="tns:analize"/>
-      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/analizeResponse" message="tns:analizeResponse"/>
-      <fault message="tns:UnsupportedRuntimeException" name="UnsupportedRuntimeException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/analize/Fault/UnsupportedRuntimeException"/>
-      <fault message="tns:LimitExceededException" name="LimitExceededException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/analize/Fault/LimitExceededException"/>
-      <fault message="tns:JobSubmissionException" name="JobSubmissionException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/analize/Fault/JobSubmissionException"/>
-    </operation>

     <operation name="presetAnalize">
       <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"/>
     <operation name="presetAnalize">
       <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"/>

@@ -111,15 +104,18 @@
       <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>
       <fault message="tns:JobSubmissionException" name="JobSubmissionException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/presetAnalize/Fault/JobSubmissionException"/>
       <fault message="tns:WrongParameterException" name="WrongParameterException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/presetAnalize/Fault/WrongParameterException"/>
     </operation>

+    <operation name="analize">
+      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/analizeRequest" message="tns:analize"/>
+      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/analizeResponse" message="tns:analizeResponse"/>
+      <fault message="tns:UnsupportedRuntimeException" name="UnsupportedRuntimeException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/analize/Fault/UnsupportedRuntimeException"/>
+      <fault message="tns:LimitExceededException" name="LimitExceededException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/analize/Fault/LimitExceededException"/>
+      <fault message="tns:JobSubmissionException" name="JobSubmissionException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/analize/Fault/JobSubmissionException"/>
+    </operation>

     <operation name="getAnnotation">
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationRequest" message="tns:getAnnotation"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationResponse" message="tns:getAnnotationResponse"/>
       <fault message="tns:ResultNotAvailableException" name="ResultNotAvailableException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotation/Fault/ResultNotAvailableException"/>
     </operation>
     <operation name="getAnnotation">
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationRequest" message="tns:getAnnotation"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationResponse" message="tns:getAnnotationResponse"/>
       <fault message="tns:ResultNotAvailableException" name="ResultNotAvailableException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotation/Fault/ResultNotAvailableException"/>
     </operation>

-    <operation name="pullExecStatistics">
-      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/pullExecStatisticsRequest" message="tns:pullExecStatistics"/>
-      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/pullExecStatisticsResponse" message="tns:pullExecStatisticsResponse"/>
-    </operation>

     <operation name="cancelJob">
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/cancelJobRequest" message="tns:cancelJob"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/cancelJobResponse" message="tns:cancelJobResponse"/>
     <operation 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"/>

@@ -128,6 +124,18 @@
       <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>
       <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="pullExecStatistics">
+      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/pullExecStatisticsRequest" message="tns:pullExecStatistics"/>
+      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/pullExecStatisticsResponse" message="tns:pullExecStatisticsResponse"/>
+    </operation>
+    <operation name="getRunnerOptions">
+      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getRunnerOptionsRequest" message="tns:getRunnerOptions"/>
+      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getRunnerOptionsResponse" message="tns:getRunnerOptionsResponse"/>
+    </operation>
+    <operation name="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"/>
     <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"/>

@@ -136,14 +144,6 @@
       <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>
       <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"/>
-    </operation>

   </portType>
   <binding name="DisemblWSPortBinding" type="tns:SequenceAnnotation">
     <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
   </portType>
   <binding name="DisemblWSPortBinding" type="tns:SequenceAnnotation">
     <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>

@@ -168,7 +168,7 @@
         <soap:fault name="WrongParameterException" use="literal"/>
       </fault>
     </operation>
         <soap:fault name="WrongParameterException" use="literal"/>
       </fault>
     </operation>

-    <operation name="analize">
+    <operation name="presetAnalize">

       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>

@@ -185,8 +185,11 @@
       <fault name="JobSubmissionException">
         <soap:fault name="JobSubmissionException" use="literal"/>
       </fault>
       <fault name="JobSubmissionException">
         <soap:fault name="JobSubmissionException" use="literal"/>
       </fault>

+      <fault name="WrongParameterException">
+        <soap:fault name="WrongParameterException" use="literal"/>
+      </fault>

     </operation>
     </operation>

-    <operation name="presetAnalize">
+    <operation name="analize">

       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>

@@ -203,9 +206,6 @@
       <fault name="JobSubmissionException">
         <soap:fault name="JobSubmissionException" use="literal"/>
       </fault>
       <fault name="JobSubmissionException">
         <soap:fault name="JobSubmissionException" use="literal"/>
       </fault>

-      <fault name="WrongParameterException">
-        <soap:fault name="WrongParameterException" use="literal"/>
-      </fault>

     </operation>
     <operation name="getAnnotation">
       <soap:operation soapAction=""/>
     </operation>
     <operation name="getAnnotation">
       <soap:operation soapAction=""/>

@@ -219,7 +219,7 @@
         <soap:fault name="ResultNotAvailableException" use="literal"/>
       </fault>
     </operation>
         <soap:fault name="ResultNotAvailableException" use="literal"/>
       </fault>
     </operation>

-    <operation name="pullExecStatistics">
+    <operation name="cancelJob">

       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>

@@ -228,7 +228,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
         <soap:body use="literal"/>
       </output>
     </operation>

-    <operation name="cancelJob">
+    <operation name="getJobStatus">

       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>

@@ -237,7 +237,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
         <soap:body use="literal"/>
       </output>
     </operation>

-    <operation name="getJobStatus">
+    <operation name="pullExecStatistics">

       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>

@@ -246,7 +246,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
         <soap:body use="literal"/>
       </output>
     </operation>

-    <operation name="getLimit">
+    <operation name="getRunnerOptions">

       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>

@@ -255,7 +255,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
         <soap:body use="literal"/>
       </output>
     </operation>

-    <operation name="getLimits">
+    <operation name="getPresets">

       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>

@@ -264,7 +264,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
         <soap:body use="literal"/>
       </output>
     </operation>

-    <operation name="getPresets">
+    <operation name="getLimit">

       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>

@@ -273,7 +273,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
         <soap:body use="literal"/>
       </output>
     </operation>

-    <operation name="getRunnerOptions">
+    <operation name="getLimits">

       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
       <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 ab7d3ee..321cfdd 100644 (file)
--- a/webservices/compbio/ws/server/resource/DisemblWS_schema1.xsd
+++ b/webservices/compbio/ws/server/resource/DisemblWS_schema1.xsd
@@ -61,15 +61,52 @@
 
   <xs:element name="runnerConfig" type="tns:runnerConfig"/>
 
 
   <xs:element name="runnerConfig" type="tns:runnerConfig"/>
 

-  <xs:complexType name="getJobStatus">
+  <xs:complexType name="getRunnerOptions">
+    <xs:sequence/>
+  </xs:complexType>
+
+  <xs:complexType name="getRunnerOptionsResponse">

     <xs:sequence>
     <xs:sequence>

-      <xs:element name="jobId" type="xs:string" minOccurs="0"/>
+      <xs:element name="return" type="tns:runnerConfig" minOccurs="0"/>

     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

-  <xs:complexType name="getJobStatusResponse">
+  <xs:complexType name="runnerConfig">

     <xs:sequence>
     <xs:sequence>

-      <xs:element name="return" type="tns:jobStatus" minOccurs="0"/>
+      <xs:element name="options" type="tns:option" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="parameters" type="tns:parameter" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="prmSeparator" type="xs:string" minOccurs="0"/>
+      <xs:element name="runnerClassName" type="xs:string"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="option">
+    <xs:sequence>
+      <xs:element name="description" type="xs:string"/>
+      <xs:element name="optionNames" type="xs:string" maxOccurs="unbounded"/>
+      <xs:element name="name" type="xs:string"/>
+      <xs:element name="furtherDetails" type="xs:anyURI" minOccurs="0"/>
+      <xs:element name="defaultValue" type="xs:string" minOccurs="0"/>
+    </xs:sequence>
+    <xs:attribute name="isRequired" type="xs:boolean" use="required"/>
+  </xs:complexType>
+
+  <xs:complexType name="parameter">
+    <xs:complexContent>
+      <xs:extension base="tns:option">
+        <xs:sequence>
+          <xs:element name="possibleValues" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+          <xs:element name="validValue" type="tns:valueConstrain" minOccurs="0"/>
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:complexType name="valueConstrain">
+    <xs:sequence>
+      <xs:element name="type" type="tns:type"/>
+      <xs:element name="max" type="xs:string" minOccurs="0"/>
+      <xs:element name="min" type="xs:string" minOccurs="0"/>

     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

@@ -114,52 +151,15 @@
     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

-  <xs:complexType name="getRunnerOptions">
-    <xs:sequence/>
-  </xs:complexType>
-
-  <xs:complexType name="getRunnerOptionsResponse">
-    <xs:sequence>
-      <xs:element name="return" type="tns:runnerConfig" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="runnerConfig">
-    <xs:sequence>
-      <xs:element name="options" type="tns:option" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="parameters" type="tns:parameter" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="prmSeparator" type="xs:string" minOccurs="0"/>
-      <xs:element name="runnerClassName" type="xs:string"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="option">
+  <xs:complexType name="getJobStatus">

     <xs:sequence>
     <xs:sequence>

-      <xs:element name="description" type="xs:string"/>
-      <xs:element name="optionNames" type="xs:string" maxOccurs="unbounded"/>
-      <xs:element name="name" type="xs:string"/>
-      <xs:element name="furtherDetails" type="xs:anyURI" minOccurs="0"/>
-      <xs:element name="defaultValue" type="xs:string" minOccurs="0"/>
+      <xs:element name="jobId" type="xs:string" minOccurs="0"/>

     </xs:sequence>
     </xs:sequence>

-    <xs:attribute name="isRequired" type="xs:boolean" use="required"/>

   </xs:complexType>
 
   </xs:complexType>
 

-  <xs:complexType name="parameter">
-    <xs:complexContent>
-      <xs:extension base="tns:option">
-        <xs:sequence>
-          <xs:element name="possibleValues" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-          <xs:element name="validValue" type="tns:valueConstrain" minOccurs="0"/>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name="valueConstrain">
+  <xs:complexType name="getJobStatusResponse">

     <xs:sequence>
     <xs:sequence>

-      <xs:element name="type" type="tns:type"/>
-      <xs:element name="max" type="xs:string" minOccurs="0"/>
-      <xs:element name="min" type="xs:string" minOccurs="0"/>
+      <xs:element name="return" type="tns:jobStatus" minOccurs="0"/>

     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

@@ -209,20 +209,10 @@
     </xs:sequence>
   </xs:complexType>
 
     </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:complexType name="presetAnalize">

     <xs:sequence>
     <xs:sequence>

-      <xs:element name="runnerClassName" type="xs:string"/>
-      <xs:element name="preset" type="tns:preset" maxOccurs="unbounded"/>
+      <xs:element name="fastaSequences" type="tns:fastaSequence" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="preset" type="tns:preset" minOccurs="0"/>

     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

@@ -240,6 +230,38 @@
     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

+  <xs:complexType name="presetAnalizeResponse">
+    <xs:sequence>
+      <xs:element name="return" type="xs:string" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="WrongParameterException">
+    <xs:sequence>
+      <xs:element name="message" type="xs:string" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="pullExecStatistics">
+    <xs:sequence>
+      <xs:element name="jobId" type="xs:string" minOccurs="0"/>
+      <xs:element name="position" type="xs:long"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="pullExecStatisticsResponse">
+    <xs:sequence>
+      <xs:element name="return" type="tns:chunkHolder" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="chunkHolder">
+    <xs:sequence>
+      <xs:element name="chunk" type="xs:string" minOccurs="0"/>
+      <xs:element name="position" type="xs:long"/>
+    </xs:sequence>
+  </xs:complexType>
+

   <xs:complexType name="getLimits">
     <xs:sequence/>
   </xs:complexType>
   <xs:complexType name="getLimits">
     <xs:sequence/>
   </xs:complexType>

@@ -278,34 +300,32 @@
     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

-  <xs:complexType name="cancelJob">
-    <xs:sequence>
-      <xs:element name="jobId" type="xs:string" minOccurs="0"/>
-    </xs:sequence>
+  <xs:complexType name="getPresets">
+    <xs:sequence/>

   </xs:complexType>
 
   </xs:complexType>
 

-  <xs:complexType name="cancelJobResponse">
+  <xs:complexType name="getPresetsResponse">

     <xs:sequence>
     <xs:sequence>

-      <xs:element name="return" type="xs:boolean"/>
+      <xs:element name="return" type="tns:presetManager" minOccurs="0"/>

     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

-  <xs:complexType name="presetAnalize">
+  <xs:complexType name="presetManager">

     <xs:sequence>
     <xs:sequence>

-      <xs:element name="fastaSequences" type="tns:fastaSequence" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="preset" type="tns:preset" minOccurs="0"/>
+      <xs:element name="runnerClassName" type="xs:string"/>
+      <xs:element name="preset" type="tns:preset" maxOccurs="unbounded"/>

     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

-  <xs:complexType name="presetAnalizeResponse">
+  <xs:complexType name="cancelJob">

     <xs:sequence>
     <xs:sequence>

-      <xs:element name="return" type="xs:string" minOccurs="0"/>
+      <xs:element name="jobId" type="xs:string" minOccurs="0"/>

     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

-  <xs:complexType name="WrongParameterException">
+  <xs:complexType name="cancelJobResponse">

     <xs:sequence>
     <xs:sequence>

-      <xs:element name="message" type="xs:string" minOccurs="0"/>
+      <xs:element name="return" type="xs:boolean"/>

     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

@@ -322,25 +342,12 @@
     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

-  <xs:complexType name="pullExecStatistics">
-    <xs:sequence>
-      <xs:element name="jobId" type="xs:string" minOccurs="0"/>
-      <xs:element name="position" type="xs:long"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="pullExecStatisticsResponse">
-    <xs:sequence>
-      <xs:element name="return" type="tns:chunkHolder" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="chunkHolder">
-    <xs:sequence>
-      <xs:element name="chunk" type="xs:string" minOccurs="0"/>
-      <xs:element name="position" type="xs:long"/>
-    </xs:sequence>
-  </xs:complexType>
+  <xs:simpleType name="type">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="Integer"/>
+      <xs:enumeration value="Float"/>
+    </xs:restriction>
+  </xs:simpleType>

 
   <xs:simpleType name="jobStatus">
     <xs:restriction base="xs:string">
 
   <xs:simpleType name="jobStatus">
     <xs:restriction base="xs:string">

@@ -355,12 +362,5 @@
       <xs:enumeration value="COLLECTED"/>
     </xs:restriction>
   </xs:simpleType>
       <xs:enumeration value="COLLECTED"/>
     </xs:restriction>
   </xs:simpleType>

-
-  <xs:simpleType name="type">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="Integer"/>
-      <xs:enumeration value="Float"/>
-    </xs:restriction>
-  </xs:simpleType>

 </xs:schema>
 
 </xs:schema>
 

diff --git a/webservices/compbio/ws/server/resource/GlobPlotWS.wsdl b/webservices/compbio/ws/server/resource/GlobPlotWS.wsdl
index b87e366..9577bb8 100644 (file)
--- a/webservices/compbio/ws/server/resource/GlobPlotWS.wsdl
+++ b/webservices/compbio/ws/server/resource/GlobPlotWS.wsdl
@@ -24,18 +24,18 @@
   <message name="WrongParameterException">
     <part name="fault" element="tns:WrongParameterException"/>
   </message>
   <message name="WrongParameterException">
     <part name="fault" element="tns:WrongParameterException"/>
   </message>

-  <message name="analize">
-    <part name="parameters" element="tns:analize"/>
-  </message>
-  <message name="analizeResponse">
-    <part name="parameters" element="tns:analizeResponse"/>
-  </message>

   <message name="presetAnalize">
     <part name="parameters" element="tns:presetAnalize"/>
   </message>
   <message name="presetAnalizeResponse">
     <part name="parameters" element="tns:presetAnalizeResponse"/>
   </message>
   <message name="presetAnalize">
     <part name="parameters" element="tns:presetAnalize"/>
   </message>
   <message name="presetAnalizeResponse">
     <part name="parameters" element="tns:presetAnalizeResponse"/>
   </message>

+  <message name="analize">
+    <part name="parameters" element="tns:analize"/>
+  </message>
+  <message name="analizeResponse">
+    <part name="parameters" element="tns:analizeResponse"/>
+  </message>

   <message name="getAnnotation">
     <part name="parameters" element="tns:getAnnotation"/>
   </message>
   <message name="getAnnotation">
     <part name="parameters" element="tns:getAnnotation"/>
   </message>

@@ -45,12 +45,6 @@
   <message name="ResultNotAvailableException">
     <part name="fault" element="tns:ResultNotAvailableException"/>
   </message>
   <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="cancelJob">
     <part name="parameters" element="tns:cancelJob"/>
   </message>

@@ -63,17 +57,17 @@
   <message name="getJobStatusResponse">
     <part name="parameters" element="tns:getJobStatusResponse"/>
   </message>
   <message name="getJobStatusResponse">
     <part name="parameters" element="tns:getJobStatusResponse"/>
   </message>

-  <message name="getLimit">
-    <part name="parameters" element="tns:getLimit"/>
+  <message name="pullExecStatistics">
+    <part name="parameters" element="tns:pullExecStatistics"/>

   </message>
   </message>

-  <message name="getLimitResponse">
-    <part name="parameters" element="tns:getLimitResponse"/>
+  <message name="pullExecStatisticsResponse">
+    <part name="parameters" element="tns:pullExecStatisticsResponse"/>

   </message>
   </message>

-  <message name="getLimits">
-    <part name="parameters" element="tns:getLimits"/>
+  <message name="getRunnerOptions">
+    <part name="parameters" element="tns:getRunnerOptions"/>

   </message>
   </message>

-  <message name="getLimitsResponse">
-    <part name="parameters" element="tns:getLimitsResponse"/>
+  <message name="getRunnerOptionsResponse">
+    <part name="parameters" element="tns:getRunnerOptionsResponse"/>

   </message>
   <message name="getPresets">
     <part name="parameters" element="tns:getPresets"/>
   </message>
   <message name="getPresets">
     <part name="parameters" element="tns:getPresets"/>

@@ -81,11 +75,17 @@
   <message name="getPresetsResponse">
     <part name="parameters" element="tns:getPresetsResponse"/>
   </message>
   <message name="getPresetsResponse">
     <part name="parameters" element="tns:getPresetsResponse"/>
   </message>

-  <message name="getRunnerOptions">
-    <part name="parameters" element="tns:getRunnerOptions"/>
+  <message name="getLimit">
+    <part name="parameters" element="tns:getLimit"/>

   </message>
   </message>

-  <message name="getRunnerOptionsResponse">
-    <part name="parameters" element="tns:getRunnerOptionsResponse"/>
+  <message name="getLimitResponse">
+    <part name="parameters" element="tns:getLimitResponse"/>
+  </message>
+  <message name="getLimits">
+    <part name="parameters" element="tns:getLimits"/>
+  </message>
+  <message name="getLimitsResponse">
+    <part name="parameters" element="tns:getLimitsResponse"/>

   </message>
   <portType name="SequenceAnnotation">
     <operation name="customAnalize">
   </message>
   <portType name="SequenceAnnotation">
     <operation name="customAnalize">

@@ -96,13 +96,6 @@
       <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>
       <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="analize">
-      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/analizeRequest" message="tns:analize"/>
-      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/analizeResponse" message="tns:analizeResponse"/>
-      <fault message="tns:UnsupportedRuntimeException" name="UnsupportedRuntimeException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/analize/Fault/UnsupportedRuntimeException"/>
-      <fault message="tns:LimitExceededException" name="LimitExceededException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/analize/Fault/LimitExceededException"/>
-      <fault message="tns:JobSubmissionException" name="JobSubmissionException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/analize/Fault/JobSubmissionException"/>
-    </operation>

     <operation name="presetAnalize">
       <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"/>
     <operation name="presetAnalize">
       <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"/>

@@ -111,15 +104,18 @@
       <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>
       <fault message="tns:JobSubmissionException" name="JobSubmissionException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/presetAnalize/Fault/JobSubmissionException"/>
       <fault message="tns:WrongParameterException" name="WrongParameterException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/presetAnalize/Fault/WrongParameterException"/>
     </operation>

+    <operation name="analize">
+      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/analizeRequest" message="tns:analize"/>
+      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/analizeResponse" message="tns:analizeResponse"/>
+      <fault message="tns:UnsupportedRuntimeException" name="UnsupportedRuntimeException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/analize/Fault/UnsupportedRuntimeException"/>
+      <fault message="tns:LimitExceededException" name="LimitExceededException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/analize/Fault/LimitExceededException"/>
+      <fault message="tns:JobSubmissionException" name="JobSubmissionException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/analize/Fault/JobSubmissionException"/>
+    </operation>

     <operation name="getAnnotation">
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationRequest" message="tns:getAnnotation"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationResponse" message="tns:getAnnotationResponse"/>
       <fault message="tns:ResultNotAvailableException" name="ResultNotAvailableException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotation/Fault/ResultNotAvailableException"/>
     </operation>
     <operation name="getAnnotation">
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationRequest" message="tns:getAnnotation"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationResponse" message="tns:getAnnotationResponse"/>
       <fault message="tns:ResultNotAvailableException" name="ResultNotAvailableException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotation/Fault/ResultNotAvailableException"/>
     </operation>

-    <operation name="pullExecStatistics">
-      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/pullExecStatisticsRequest" message="tns:pullExecStatistics"/>
-      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/pullExecStatisticsResponse" message="tns:pullExecStatisticsResponse"/>
-    </operation>

     <operation name="cancelJob">
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/cancelJobRequest" message="tns:cancelJob"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/cancelJobResponse" message="tns:cancelJobResponse"/>
     <operation 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"/>

@@ -128,6 +124,18 @@
       <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>
       <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="pullExecStatistics">
+      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/pullExecStatisticsRequest" message="tns:pullExecStatistics"/>
+      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/pullExecStatisticsResponse" message="tns:pullExecStatisticsResponse"/>
+    </operation>
+    <operation name="getRunnerOptions">
+      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getRunnerOptionsRequest" message="tns:getRunnerOptions"/>
+      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getRunnerOptionsResponse" message="tns:getRunnerOptionsResponse"/>
+    </operation>
+    <operation name="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"/>
     <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"/>

@@ -136,14 +144,6 @@
       <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>
       <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"/>
-    </operation>

   </portType>
   <binding name="GlobPlotWSPortBinding" type="tns:SequenceAnnotation">
     <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
   </portType>
   <binding name="GlobPlotWSPortBinding" type="tns:SequenceAnnotation">
     <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>

@@ -168,7 +168,7 @@
         <soap:fault name="WrongParameterException" use="literal"/>
       </fault>
     </operation>
         <soap:fault name="WrongParameterException" use="literal"/>
       </fault>
     </operation>

-    <operation name="analize">
+    <operation name="presetAnalize">

       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>

@@ -185,8 +185,11 @@
       <fault name="JobSubmissionException">
         <soap:fault name="JobSubmissionException" use="literal"/>
       </fault>
       <fault name="JobSubmissionException">
         <soap:fault name="JobSubmissionException" use="literal"/>
       </fault>

+      <fault name="WrongParameterException">
+        <soap:fault name="WrongParameterException" use="literal"/>
+      </fault>

     </operation>
     </operation>

-    <operation name="presetAnalize">
+    <operation name="analize">

       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>

@@ -203,9 +206,6 @@
       <fault name="JobSubmissionException">
         <soap:fault name="JobSubmissionException" use="literal"/>
       </fault>
       <fault name="JobSubmissionException">
         <soap:fault name="JobSubmissionException" use="literal"/>
       </fault>

-      <fault name="WrongParameterException">
-        <soap:fault name="WrongParameterException" use="literal"/>
-      </fault>

     </operation>
     <operation name="getAnnotation">
       <soap:operation soapAction=""/>
     </operation>
     <operation name="getAnnotation">
       <soap:operation soapAction=""/>

@@ -219,7 +219,7 @@
         <soap:fault name="ResultNotAvailableException" use="literal"/>
       </fault>
     </operation>
         <soap:fault name="ResultNotAvailableException" use="literal"/>
       </fault>
     </operation>

-    <operation name="pullExecStatistics">
+    <operation name="cancelJob">

       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>

@@ -228,7 +228,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
         <soap:body use="literal"/>
       </output>
     </operation>

-    <operation name="cancelJob">
+    <operation name="getJobStatus">

       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>

@@ -237,7 +237,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
         <soap:body use="literal"/>
       </output>
     </operation>

-    <operation name="getJobStatus">
+    <operation name="pullExecStatistics">

       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>

@@ -246,7 +246,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
         <soap:body use="literal"/>
       </output>
     </operation>

-    <operation name="getLimit">
+    <operation name="getRunnerOptions">

       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>

@@ -255,7 +255,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
         <soap:body use="literal"/>
       </output>
     </operation>

-    <operation name="getLimits">
+    <operation name="getPresets">

       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>

@@ -264,7 +264,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
         <soap:body use="literal"/>
       </output>
     </operation>

-    <operation name="getPresets">
+    <operation name="getLimit">

       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>

@@ -273,7 +273,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
         <soap:body use="literal"/>
       </output>
     </operation>

-    <operation name="getRunnerOptions">
+    <operation name="getLimits">

       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
       <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 49ed492..72ac6ff 100644 (file)
--- a/webservices/compbio/ws/server/resource/GlobPlotWS_schema1.xsd
+++ b/webservices/compbio/ws/server/resource/GlobPlotWS_schema1.xsd
@@ -61,18 +61,6 @@
 
   <xs:element name="runnerConfig" type="tns:runnerConfig"/>
 
 
   <xs:element name="runnerConfig" type="tns:runnerConfig"/>
 

-  <xs:complexType name="getJobStatus">
-    <xs:sequence>
-      <xs:element name="jobId" type="xs:string" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="getJobStatusResponse">
-    <xs:sequence>
-      <xs:element name="return" type="tns:jobStatus" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-

   <xs:complexType name="presetAnalize">
     <xs:sequence>
       <xs:element name="fastaSequences" type="tns:fastaSequence" minOccurs="0" maxOccurs="unbounded"/>
   <xs:complexType name="presetAnalize">
     <xs:sequence>
       <xs:element name="fastaSequences" type="tns:fastaSequence" minOccurs="0" maxOccurs="unbounded"/>

@@ -135,22 +123,22 @@
     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

-  <xs:complexType name="analize">
-    <xs:sequence>
-      <xs:element name="fastaSequences" type="tns:fastaSequence" minOccurs="0" maxOccurs="unbounded"/>
-    </xs:sequence>
+  <xs:complexType name="getRunnerOptions">
+    <xs:sequence/>

   </xs:complexType>
 
   </xs:complexType>
 

-  <xs:complexType name="analizeResponse">
+  <xs:complexType name="getRunnerOptionsResponse">

     <xs:sequence>
     <xs:sequence>

-      <xs:element name="return" type="xs:string" minOccurs="0"/>
+      <xs:element name="return" type="tns:runnerConfig" minOccurs="0"/>

     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

-  <xs:complexType name="customAnalize">
+  <xs:complexType name="runnerConfig">

     <xs:sequence>
     <xs:sequence>

-      <xs:element name="fastaSequences" type="tns:fastaSequence" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="options" type="tns:option" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="options" type="tns:option" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="parameters" type="tns:parameter" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="prmSeparator" type="xs:string" minOccurs="0"/>
+      <xs:element name="runnerClassName" type="xs:string"/>

     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

@@ -165,47 +153,59 @@
     <xs:attribute name="isRequired" type="xs:boolean" use="required"/>
   </xs:complexType>
 
     <xs:attribute name="isRequired" type="xs:boolean" use="required"/>
   </xs:complexType>
 

-  <xs:complexType name="customAnalizeResponse">
+  <xs:complexType name="parameter">
+    <xs:complexContent>
+      <xs:extension base="tns:option">
+        <xs:sequence>
+          <xs:element name="possibleValues" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+          <xs:element name="validValue" type="tns:valueConstrain" minOccurs="0"/>
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:complexType name="valueConstrain">

     <xs:sequence>
     <xs:sequence>

-      <xs:element name="return" type="xs:string" minOccurs="0"/>
+      <xs:element name="type" type="tns:type"/>
+      <xs:element name="max" type="xs:string" minOccurs="0"/>
+      <xs:element name="min" type="xs:string" minOccurs="0"/>

     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

-  <xs:complexType name="getRunnerOptions">
-    <xs:sequence/>
+  <xs:complexType name="analize">
+    <xs:sequence>
+      <xs:element name="fastaSequences" type="tns:fastaSequence" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:sequence>

   </xs:complexType>
 
   </xs:complexType>
 

-  <xs:complexType name="getRunnerOptionsResponse">
+  <xs:complexType name="analizeResponse">

     <xs:sequence>
     <xs:sequence>

-      <xs:element name="return" type="tns:runnerConfig" minOccurs="0"/>
+      <xs:element name="return" type="xs:string" minOccurs="0"/>

     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

-  <xs:complexType name="runnerConfig">
+  <xs:complexType name="getJobStatus">

     <xs:sequence>
     <xs:sequence>

-      <xs:element name="options" type="tns:option" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="parameters" type="tns:parameter" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="prmSeparator" type="xs:string" minOccurs="0"/>
-      <xs:element name="runnerClassName" type="xs:string"/>
+      <xs:element name="jobId" type="xs:string" minOccurs="0"/>

     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

-  <xs:complexType name="parameter">
-    <xs:complexContent>
-      <xs:extension base="tns:option">
-        <xs:sequence>
-          <xs:element name="possibleValues" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-          <xs:element name="validValue" type="tns:valueConstrain" minOccurs="0"/>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
+  <xs:complexType name="getJobStatusResponse">
+    <xs:sequence>
+      <xs:element name="return" type="tns:jobStatus" minOccurs="0"/>
+    </xs:sequence>

   </xs:complexType>
 
   </xs:complexType>
 

-  <xs:complexType name="valueConstrain">
+  <xs:complexType name="customAnalize">

     <xs:sequence>
     <xs:sequence>

-      <xs:element name="type" type="tns:type"/>
-      <xs:element name="max" type="xs:string" minOccurs="0"/>
-      <xs:element name="min" type="xs:string" minOccurs="0"/>
+      <xs:element name="fastaSequences" type="tns:fastaSequence" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="options" type="tns:option" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="customAnalizeResponse">
+    <xs:sequence>
+      <xs:element name="return" type="xs:string" minOccurs="0"/>

     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

@@ -255,20 +255,23 @@
     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

-  <xs:complexType name="getPresets">
-    <xs:sequence/>
+  <xs:complexType name="pullExecStatistics">
+    <xs:sequence>
+      <xs:element name="jobId" type="xs:string" minOccurs="0"/>
+      <xs:element name="position" type="xs:long"/>
+    </xs:sequence>

   </xs:complexType>
 
   </xs:complexType>
 

-  <xs:complexType name="getPresetsResponse">
+  <xs:complexType name="pullExecStatisticsResponse">

     <xs:sequence>
     <xs:sequence>

-      <xs:element name="return" type="tns:presetManager" minOccurs="0"/>
+      <xs:element name="return" type="tns:chunkHolder" minOccurs="0"/>

     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

-  <xs:complexType name="presetManager">
+  <xs:complexType name="chunkHolder">

     <xs:sequence>
     <xs:sequence>

-      <xs:element name="runnerClassName" type="xs:string"/>
-      <xs:element name="preset" type="tns:preset" maxOccurs="unbounded"/>
+      <xs:element name="chunk" type="xs:string" minOccurs="0"/>
+      <xs:element name="position" type="xs:long"/>

     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

@@ -310,38 +313,42 @@
     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

-  <xs:complexType name="cancelJob">
-    <xs:sequence>
-      <xs:element name="jobId" type="xs:string" minOccurs="0"/>
-    </xs:sequence>
+  <xs:complexType name="getPresets">
+    <xs:sequence/>

   </xs:complexType>
 
   </xs:complexType>
 

-  <xs:complexType name="cancelJobResponse">
+  <xs:complexType name="getPresetsResponse">

     <xs:sequence>
     <xs:sequence>

-      <xs:element name="return" type="xs:boolean"/>
+      <xs:element name="return" type="tns:presetManager" minOccurs="0"/>

     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

-  <xs:complexType name="pullExecStatistics">
+  <xs:complexType name="presetManager">

     <xs:sequence>
     <xs:sequence>

-      <xs:element name="jobId" type="xs:string" minOccurs="0"/>
-      <xs:element name="position" type="xs:long"/>
+      <xs:element name="runnerClassName" type="xs:string"/>
+      <xs:element name="preset" type="tns:preset" maxOccurs="unbounded"/>

     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

-  <xs:complexType name="pullExecStatisticsResponse">
+  <xs:complexType name="cancelJob">

     <xs:sequence>
     <xs:sequence>

-      <xs:element name="return" type="tns:chunkHolder" minOccurs="0"/>
+      <xs:element name="jobId" type="xs:string" minOccurs="0"/>

     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

-  <xs:complexType name="chunkHolder">
+  <xs:complexType name="cancelJobResponse">

     <xs:sequence>
     <xs:sequence>

-      <xs:element name="chunk" type="xs:string" minOccurs="0"/>
-      <xs:element name="position" type="xs:long"/>
+      <xs:element name="return" type="xs:boolean"/>

     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

+  <xs:simpleType name="type">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="Integer"/>
+      <xs:enumeration value="Float"/>
+    </xs:restriction>
+  </xs:simpleType>
+

   <xs:simpleType name="jobStatus">
     <xs:restriction base="xs:string">
       <xs:enumeration value="PENDING"/>
   <xs:simpleType name="jobStatus">
     <xs:restriction base="xs:string">
       <xs:enumeration value="PENDING"/>

@@ -355,12 +362,5 @@
       <xs:enumeration value="COLLECTED"/>
     </xs:restriction>
   </xs:simpleType>
       <xs:enumeration value="COLLECTED"/>
     </xs:restriction>
   </xs:simpleType>

-
-  <xs:simpleType name="type">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="Integer"/>
-      <xs:enumeration value="Float"/>
-    </xs:restriction>
-  </xs:simpleType>

 </xs:schema>
 
 </xs:schema>
 

diff --git a/webservices/compbio/ws/server/resource/IUPredWS.wsdl b/webservices/compbio/ws/server/resource/IUPredWS.wsdl
index e589bb1..f10eb02 100644 (file)
--- a/webservices/compbio/ws/server/resource/IUPredWS.wsdl
+++ b/webservices/compbio/ws/server/resource/IUPredWS.wsdl
@@ -24,18 +24,18 @@
   <message name="WrongParameterException">
     <part name="fault" element="tns:WrongParameterException"/>
   </message>
   <message name="WrongParameterException">
     <part name="fault" element="tns:WrongParameterException"/>
   </message>

-  <message name="analize">
-    <part name="parameters" element="tns:analize"/>
-  </message>
-  <message name="analizeResponse">
-    <part name="parameters" element="tns:analizeResponse"/>
-  </message>

   <message name="presetAnalize">
     <part name="parameters" element="tns:presetAnalize"/>
   </message>
   <message name="presetAnalizeResponse">
     <part name="parameters" element="tns:presetAnalizeResponse"/>
   </message>
   <message name="presetAnalize">
     <part name="parameters" element="tns:presetAnalize"/>
   </message>
   <message name="presetAnalizeResponse">
     <part name="parameters" element="tns:presetAnalizeResponse"/>
   </message>

+  <message name="analize">
+    <part name="parameters" element="tns:analize"/>
+  </message>
+  <message name="analizeResponse">
+    <part name="parameters" element="tns:analizeResponse"/>
+  </message>

   <message name="getAnnotation">
     <part name="parameters" element="tns:getAnnotation"/>
   </message>
   <message name="getAnnotation">
     <part name="parameters" element="tns:getAnnotation"/>
   </message>

@@ -45,12 +45,6 @@
   <message name="ResultNotAvailableException">
     <part name="fault" element="tns:ResultNotAvailableException"/>
   </message>
   <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="cancelJob">
     <part name="parameters" element="tns:cancelJob"/>
   </message>

@@ -63,17 +57,17 @@
   <message name="getJobStatusResponse">
     <part name="parameters" element="tns:getJobStatusResponse"/>
   </message>
   <message name="getJobStatusResponse">
     <part name="parameters" element="tns:getJobStatusResponse"/>
   </message>

-  <message name="getLimit">
-    <part name="parameters" element="tns:getLimit"/>
+  <message name="pullExecStatistics">
+    <part name="parameters" element="tns:pullExecStatistics"/>

   </message>
   </message>

-  <message name="getLimitResponse">
-    <part name="parameters" element="tns:getLimitResponse"/>
+  <message name="pullExecStatisticsResponse">
+    <part name="parameters" element="tns:pullExecStatisticsResponse"/>

   </message>
   </message>

-  <message name="getLimits">
-    <part name="parameters" element="tns:getLimits"/>
+  <message name="getRunnerOptions">
+    <part name="parameters" element="tns:getRunnerOptions"/>

   </message>
   </message>

-  <message name="getLimitsResponse">
-    <part name="parameters" element="tns:getLimitsResponse"/>
+  <message name="getRunnerOptionsResponse">
+    <part name="parameters" element="tns:getRunnerOptionsResponse"/>

   </message>
   <message name="getPresets">
     <part name="parameters" element="tns:getPresets"/>
   </message>
   <message name="getPresets">
     <part name="parameters" element="tns:getPresets"/>

@@ -81,11 +75,17 @@
   <message name="getPresetsResponse">
     <part name="parameters" element="tns:getPresetsResponse"/>
   </message>
   <message name="getPresetsResponse">
     <part name="parameters" element="tns:getPresetsResponse"/>
   </message>

-  <message name="getRunnerOptions">
-    <part name="parameters" element="tns:getRunnerOptions"/>
+  <message name="getLimit">
+    <part name="parameters" element="tns:getLimit"/>

   </message>
   </message>

-  <message name="getRunnerOptionsResponse">
-    <part name="parameters" element="tns:getRunnerOptionsResponse"/>
+  <message name="getLimitResponse">
+    <part name="parameters" element="tns:getLimitResponse"/>
+  </message>
+  <message name="getLimits">
+    <part name="parameters" element="tns:getLimits"/>
+  </message>
+  <message name="getLimitsResponse">
+    <part name="parameters" element="tns:getLimitsResponse"/>

   </message>
   <portType name="SequenceAnnotation">
     <operation name="customAnalize">
   </message>
   <portType name="SequenceAnnotation">
     <operation name="customAnalize">

@@ -96,13 +96,6 @@
       <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>
       <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="analize">
-      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/analizeRequest" message="tns:analize"/>
-      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/analizeResponse" message="tns:analizeResponse"/>
-      <fault message="tns:UnsupportedRuntimeException" name="UnsupportedRuntimeException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/analize/Fault/UnsupportedRuntimeException"/>
-      <fault message="tns:LimitExceededException" name="LimitExceededException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/analize/Fault/LimitExceededException"/>
-      <fault message="tns:JobSubmissionException" name="JobSubmissionException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/analize/Fault/JobSubmissionException"/>
-    </operation>

     <operation name="presetAnalize">
       <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"/>
     <operation name="presetAnalize">
       <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"/>

@@ -111,15 +104,18 @@
       <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>
       <fault message="tns:JobSubmissionException" name="JobSubmissionException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/presetAnalize/Fault/JobSubmissionException"/>
       <fault message="tns:WrongParameterException" name="WrongParameterException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/presetAnalize/Fault/WrongParameterException"/>
     </operation>

+    <operation name="analize">
+      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/analizeRequest" message="tns:analize"/>
+      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/analizeResponse" message="tns:analizeResponse"/>
+      <fault message="tns:UnsupportedRuntimeException" name="UnsupportedRuntimeException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/analize/Fault/UnsupportedRuntimeException"/>
+      <fault message="tns:LimitExceededException" name="LimitExceededException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/analize/Fault/LimitExceededException"/>
+      <fault message="tns:JobSubmissionException" name="JobSubmissionException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/analize/Fault/JobSubmissionException"/>
+    </operation>

     <operation name="getAnnotation">
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationRequest" message="tns:getAnnotation"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationResponse" message="tns:getAnnotationResponse"/>
       <fault message="tns:ResultNotAvailableException" name="ResultNotAvailableException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotation/Fault/ResultNotAvailableException"/>
     </operation>
     <operation name="getAnnotation">
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationRequest" message="tns:getAnnotation"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationResponse" message="tns:getAnnotationResponse"/>
       <fault message="tns:ResultNotAvailableException" name="ResultNotAvailableException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotation/Fault/ResultNotAvailableException"/>
     </operation>

-    <operation name="pullExecStatistics">
-      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/pullExecStatisticsRequest" message="tns:pullExecStatistics"/>
-      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/pullExecStatisticsResponse" message="tns:pullExecStatisticsResponse"/>
-    </operation>

     <operation name="cancelJob">
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/cancelJobRequest" message="tns:cancelJob"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/cancelJobResponse" message="tns:cancelJobResponse"/>
     <operation 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"/>

@@ -128,6 +124,18 @@
       <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>
       <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="pullExecStatistics">
+      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/pullExecStatisticsRequest" message="tns:pullExecStatistics"/>
+      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/pullExecStatisticsResponse" message="tns:pullExecStatisticsResponse"/>
+    </operation>
+    <operation name="getRunnerOptions">
+      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getRunnerOptionsRequest" message="tns:getRunnerOptions"/>
+      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getRunnerOptionsResponse" message="tns:getRunnerOptionsResponse"/>
+    </operation>
+    <operation name="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"/>
     <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"/>

@@ -136,14 +144,6 @@
       <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>
       <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"/>
-    </operation>

   </portType>
   <binding name="IUPredWSPortBinding" type="tns:SequenceAnnotation">
     <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
   </portType>
   <binding name="IUPredWSPortBinding" type="tns:SequenceAnnotation">
     <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>

@@ -168,7 +168,7 @@
         <soap:fault name="WrongParameterException" use="literal"/>
       </fault>
     </operation>
         <soap:fault name="WrongParameterException" use="literal"/>
       </fault>
     </operation>

-    <operation name="analize">
+    <operation name="presetAnalize">

       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>

@@ -185,8 +185,11 @@
       <fault name="JobSubmissionException">
         <soap:fault name="JobSubmissionException" use="literal"/>
       </fault>
       <fault name="JobSubmissionException">
         <soap:fault name="JobSubmissionException" use="literal"/>
       </fault>

+      <fault name="WrongParameterException">
+        <soap:fault name="WrongParameterException" use="literal"/>
+      </fault>

     </operation>
     </operation>

-    <operation name="presetAnalize">
+    <operation name="analize">

       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>

@@ -203,9 +206,6 @@
       <fault name="JobSubmissionException">
         <soap:fault name="JobSubmissionException" use="literal"/>
       </fault>
       <fault name="JobSubmissionException">
         <soap:fault name="JobSubmissionException" use="literal"/>
       </fault>

-      <fault name="WrongParameterException">
-        <soap:fault name="WrongParameterException" use="literal"/>
-      </fault>

     </operation>
     <operation name="getAnnotation">
       <soap:operation soapAction=""/>
     </operation>
     <operation name="getAnnotation">
       <soap:operation soapAction=""/>

@@ -219,7 +219,7 @@
         <soap:fault name="ResultNotAvailableException" use="literal"/>
       </fault>
     </operation>
         <soap:fault name="ResultNotAvailableException" use="literal"/>
       </fault>
     </operation>

-    <operation name="pullExecStatistics">
+    <operation name="cancelJob">

       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>

@@ -228,7 +228,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
         <soap:body use="literal"/>
       </output>
     </operation>

-    <operation name="cancelJob">
+    <operation name="getJobStatus">

       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>

@@ -237,7 +237,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
         <soap:body use="literal"/>
       </output>
     </operation>

-    <operation name="getJobStatus">
+    <operation name="pullExecStatistics">

       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>

@@ -246,7 +246,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
         <soap:body use="literal"/>
       </output>
     </operation>

-    <operation name="getLimit">
+    <operation name="getRunnerOptions">

       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>

@@ -255,7 +255,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
         <soap:body use="literal"/>
       </output>
     </operation>

-    <operation name="getLimits">
+    <operation name="getPresets">

       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>

@@ -264,7 +264,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
         <soap:body use="literal"/>
       </output>
     </operation>

-    <operation name="getPresets">
+    <operation name="getLimit">

       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>

@@ -273,7 +273,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
         <soap:body use="literal"/>
       </output>
     </operation>

-    <operation name="getRunnerOptions">
+    <operation name="getLimits">

       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>

diff --git a/webservices/compbio/ws/server/resource/IUPredWS_schema1.xsd b/webservices/compbio/ws/server/resource/IUPredWS_schema1.xsd
index 54d1b3d..9c46d87 100644 (file)
--- a/webservices/compbio/ws/server/resource/IUPredWS_schema1.xsd
+++ b/webservices/compbio/ws/server/resource/IUPredWS_schema1.xsd
@@ -61,15 +61,52 @@
 
   <xs:element name="runnerConfig" type="tns:runnerConfig"/>
 
 
   <xs:element name="runnerConfig" type="tns:runnerConfig"/>
 

-  <xs:complexType name="getJobStatus">
+  <xs:complexType name="getRunnerOptions">
+    <xs:sequence/>
+  </xs:complexType>
+
+  <xs:complexType name="getRunnerOptionsResponse">

     <xs:sequence>
     <xs:sequence>

-      <xs:element name="jobId" type="xs:string" minOccurs="0"/>
+      <xs:element name="return" type="tns:runnerConfig" minOccurs="0"/>

     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

-  <xs:complexType name="getJobStatusResponse">
+  <xs:complexType name="runnerConfig">

     <xs:sequence>
     <xs:sequence>

-      <xs:element name="return" type="tns:jobStatus" minOccurs="0"/>
+      <xs:element name="options" type="tns:option" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="parameters" type="tns:parameter" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="prmSeparator" type="xs:string" minOccurs="0"/>
+      <xs:element name="runnerClassName" type="xs:string"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="option">
+    <xs:sequence>
+      <xs:element name="description" type="xs:string"/>
+      <xs:element name="optionNames" type="xs:string" maxOccurs="unbounded"/>
+      <xs:element name="name" type="xs:string"/>
+      <xs:element name="furtherDetails" type="xs:anyURI" minOccurs="0"/>
+      <xs:element name="defaultValue" type="xs:string" minOccurs="0"/>
+    </xs:sequence>
+    <xs:attribute name="isRequired" type="xs:boolean" use="required"/>
+  </xs:complexType>
+
+  <xs:complexType name="parameter">
+    <xs:complexContent>
+      <xs:extension base="tns:option">
+        <xs:sequence>
+          <xs:element name="possibleValues" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+          <xs:element name="validValue" type="tns:valueConstrain" minOccurs="0"/>
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:complexType name="valueConstrain">
+    <xs:sequence>
+      <xs:element name="type" type="tns:type"/>
+      <xs:element name="max" type="xs:string" minOccurs="0"/>
+      <xs:element name="min" type="xs:string" minOccurs="0"/>

     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

@@ -114,52 +151,15 @@
     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

-  <xs:complexType name="getRunnerOptions">
-    <xs:sequence/>
-  </xs:complexType>
-
-  <xs:complexType name="getRunnerOptionsResponse">
-    <xs:sequence>
-      <xs:element name="return" type="tns:runnerConfig" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="runnerConfig">
-    <xs:sequence>
-      <xs:element name="options" type="tns:option" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="parameters" type="tns:parameter" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="prmSeparator" type="xs:string" minOccurs="0"/>
-      <xs:element name="runnerClassName" type="xs:string"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="option">
+  <xs:complexType name="getJobStatus">

     <xs:sequence>
     <xs:sequence>

-      <xs:element name="description" type="xs:string"/>
-      <xs:element name="optionNames" type="xs:string" maxOccurs="unbounded"/>
-      <xs:element name="name" type="xs:string"/>
-      <xs:element name="furtherDetails" type="xs:anyURI" minOccurs="0"/>
-      <xs:element name="defaultValue" type="xs:string" minOccurs="0"/>
+      <xs:element name="jobId" type="xs:string" minOccurs="0"/>

     </xs:sequence>
     </xs:sequence>

-    <xs:attribute name="isRequired" type="xs:boolean" use="required"/>

   </xs:complexType>
 
   </xs:complexType>
 

-  <xs:complexType name="parameter">
-    <xs:complexContent>
-      <xs:extension base="tns:option">
-        <xs:sequence>
-          <xs:element name="possibleValues" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-          <xs:element name="validValue" type="tns:valueConstrain" minOccurs="0"/>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name="valueConstrain">
+  <xs:complexType name="getJobStatusResponse">

     <xs:sequence>
     <xs:sequence>

-      <xs:element name="type" type="tns:type"/>
-      <xs:element name="max" type="xs:string" minOccurs="0"/>
-      <xs:element name="min" type="xs:string" minOccurs="0"/>
+      <xs:element name="return" type="tns:jobStatus" minOccurs="0"/>

     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

@@ -209,34 +209,42 @@
     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

-  <xs:complexType name="getPresets">
-    <xs:sequence/>
+  <xs:complexType name="pullExecStatistics">
+    <xs:sequence>
+      <xs:element name="jobId" type="xs:string" minOccurs="0"/>
+      <xs:element name="position" type="xs:long"/>
+    </xs:sequence>

   </xs:complexType>
 
   </xs:complexType>
 

-  <xs:complexType name="getPresetsResponse">
+  <xs:complexType name="pullExecStatisticsResponse">

     <xs:sequence>
     <xs:sequence>

-      <xs:element name="return" type="tns:presetManager" minOccurs="0"/>
+      <xs:element name="return" type="tns:chunkHolder" minOccurs="0"/>

     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

-  <xs:complexType name="presetManager">
+  <xs:complexType name="chunkHolder">

     <xs:sequence>
     <xs:sequence>

-      <xs:element name="runnerClassName" type="xs:string"/>
-      <xs:element name="preset" type="tns:preset" maxOccurs="unbounded"/>
+      <xs:element name="chunk" type="xs:string" minOccurs="0"/>
+      <xs:element name="position" type="xs:long"/>

     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

-  <xs:complexType name="preset">
+  <xs:complexType name="customAnalize">

     <xs:sequence>
     <xs:sequence>

-      <xs:element name="name" type="xs:string"/>
-      <xs:element name="description" type="xs:string" minOccurs="0"/>
-      <xs:element name="optlist" minOccurs="0">
-        <xs:complexType>
-          <xs:sequence>
-            <xs:element name="option" type="xs:string" maxOccurs="unbounded"/>
-          </xs:sequence>
-        </xs:complexType>
-      </xs:element>
+      <xs:element name="fastaSequences" type="tns:fastaSequence" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="options" type="tns:option" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="customAnalizeResponse">
+    <xs:sequence>
+      <xs:element name="return" type="xs:string" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="WrongParameterException">
+    <xs:sequence>
+      <xs:element name="message" type="xs:string" minOccurs="0"/>

     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

@@ -278,54 +286,46 @@
     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

-  <xs:complexType name="cancelJob">
-    <xs:sequence>
-      <xs:element name="jobId" type="xs:string" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="cancelJobResponse">
-    <xs:sequence>
-      <xs:element name="return" type="xs:boolean"/>
-    </xs:sequence>
+  <xs:complexType name="getPresets">
+    <xs:sequence/>

   </xs:complexType>
 
   </xs:complexType>
 

-  <xs:complexType name="customAnalize">
+  <xs:complexType name="getPresetsResponse">

     <xs:sequence>
     <xs:sequence>

-      <xs:element name="fastaSequences" type="tns:fastaSequence" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="options" type="tns:option" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="return" type="tns:presetManager" minOccurs="0"/>

     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

-  <xs:complexType name="customAnalizeResponse">
+  <xs:complexType name="presetManager">

     <xs:sequence>
     <xs:sequence>

-      <xs:element name="return" type="xs:string" minOccurs="0"/>
+      <xs:element name="runnerClassName" type="xs:string"/>
+      <xs:element name="preset" type="tns:preset" maxOccurs="unbounded"/>

     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

-  <xs:complexType name="WrongParameterException">
+  <xs:complexType name="preset">

     <xs:sequence>
     <xs:sequence>

-      <xs:element name="message" type="xs:string" minOccurs="0"/>
+      <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:sequence>
   </xs:complexType>
 

-  <xs:complexType name="pullExecStatistics">
+  <xs:complexType name="cancelJob">

     <xs:sequence>
       <xs:element name="jobId" type="xs:string" minOccurs="0"/>
     <xs:sequence>
       <xs:element name="jobId" type="xs:string" minOccurs="0"/>

-      <xs:element name="position" type="xs:long"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="pullExecStatisticsResponse">
-    <xs:sequence>
-      <xs:element name="return" type="tns:chunkHolder" minOccurs="0"/>

     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

-  <xs:complexType name="chunkHolder">
+  <xs:complexType name="cancelJobResponse">

     <xs:sequence>
     <xs:sequence>

-      <xs:element name="chunk" type="xs:string" minOccurs="0"/>
-      <xs:element name="position" type="xs:long"/>
+      <xs:element name="return" type="xs:boolean"/>

     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

@@ -342,6 +342,13 @@
     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

+  <xs:simpleType name="type">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="Integer"/>
+      <xs:enumeration value="Float"/>
+    </xs:restriction>
+  </xs:simpleType>
+

   <xs:simpleType name="jobStatus">
     <xs:restriction base="xs:string">
       <xs:enumeration value="PENDING"/>
   <xs:simpleType name="jobStatus">
     <xs:restriction base="xs:string">
       <xs:enumeration value="PENDING"/>

@@ -355,12 +362,5 @@
       <xs:enumeration value="COLLECTED"/>
     </xs:restriction>
   </xs:simpleType>
       <xs:enumeration value="COLLECTED"/>
     </xs:restriction>
   </xs:simpleType>

-
-  <xs:simpleType name="type">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="Integer"/>
-      <xs:enumeration value="Float"/>
-    </xs:restriction>
-  </xs:simpleType>

 </xs:schema>
 
 </xs:schema>
 

diff --git a/webservices/compbio/ws/server/resource/JronnWS.wsdl b/webservices/compbio/ws/server/resource/JronnWS.wsdl
index 244be15..baca048 100644 (file)
--- a/webservices/compbio/ws/server/resource/JronnWS.wsdl
+++ b/webservices/compbio/ws/server/resource/JronnWS.wsdl
@@ -24,18 +24,18 @@
   <message name="WrongParameterException">
     <part name="fault" element="tns:WrongParameterException"/>
   </message>
   <message name="WrongParameterException">
     <part name="fault" element="tns:WrongParameterException"/>
   </message>

-  <message name="analize">
-    <part name="parameters" element="tns:analize"/>
-  </message>
-  <message name="analizeResponse">
-    <part name="parameters" element="tns:analizeResponse"/>
-  </message>

   <message name="presetAnalize">
     <part name="parameters" element="tns:presetAnalize"/>
   </message>
   <message name="presetAnalizeResponse">
     <part name="parameters" element="tns:presetAnalizeResponse"/>
   </message>
   <message name="presetAnalize">
     <part name="parameters" element="tns:presetAnalize"/>
   </message>
   <message name="presetAnalizeResponse">
     <part name="parameters" element="tns:presetAnalizeResponse"/>
   </message>

+  <message name="analize">
+    <part name="parameters" element="tns:analize"/>
+  </message>
+  <message name="analizeResponse">
+    <part name="parameters" element="tns:analizeResponse"/>
+  </message>

   <message name="getAnnotation">
     <part name="parameters" element="tns:getAnnotation"/>
   </message>
   <message name="getAnnotation">
     <part name="parameters" element="tns:getAnnotation"/>
   </message>

@@ -45,12 +45,6 @@
   <message name="ResultNotAvailableException">
     <part name="fault" element="tns:ResultNotAvailableException"/>
   </message>
   <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="cancelJob">
     <part name="parameters" element="tns:cancelJob"/>
   </message>

@@ -63,17 +57,17 @@
   <message name="getJobStatusResponse">
     <part name="parameters" element="tns:getJobStatusResponse"/>
   </message>
   <message name="getJobStatusResponse">
     <part name="parameters" element="tns:getJobStatusResponse"/>
   </message>

-  <message name="getLimit">
-    <part name="parameters" element="tns:getLimit"/>
+  <message name="pullExecStatistics">
+    <part name="parameters" element="tns:pullExecStatistics"/>

   </message>
   </message>

-  <message name="getLimitResponse">
-    <part name="parameters" element="tns:getLimitResponse"/>
+  <message name="pullExecStatisticsResponse">
+    <part name="parameters" element="tns:pullExecStatisticsResponse"/>

   </message>
   </message>

-  <message name="getLimits">
-    <part name="parameters" element="tns:getLimits"/>
+  <message name="getRunnerOptions">
+    <part name="parameters" element="tns:getRunnerOptions"/>

   </message>
   </message>

-  <message name="getLimitsResponse">
-    <part name="parameters" element="tns:getLimitsResponse"/>
+  <message name="getRunnerOptionsResponse">
+    <part name="parameters" element="tns:getRunnerOptionsResponse"/>

   </message>
   <message name="getPresets">
     <part name="parameters" element="tns:getPresets"/>
   </message>
   <message name="getPresets">
     <part name="parameters" element="tns:getPresets"/>

@@ -81,11 +75,17 @@
   <message name="getPresetsResponse">
     <part name="parameters" element="tns:getPresetsResponse"/>
   </message>
   <message name="getPresetsResponse">
     <part name="parameters" element="tns:getPresetsResponse"/>
   </message>

-  <message name="getRunnerOptions">
-    <part name="parameters" element="tns:getRunnerOptions"/>
+  <message name="getLimit">
+    <part name="parameters" element="tns:getLimit"/>

   </message>
   </message>

-  <message name="getRunnerOptionsResponse">
-    <part name="parameters" element="tns:getRunnerOptionsResponse"/>
+  <message name="getLimitResponse">
+    <part name="parameters" element="tns:getLimitResponse"/>
+  </message>
+  <message name="getLimits">
+    <part name="parameters" element="tns:getLimits"/>
+  </message>
+  <message name="getLimitsResponse">
+    <part name="parameters" element="tns:getLimitsResponse"/>

   </message>
   <portType name="SequenceAnnotation">
     <operation name="customAnalize">
   </message>
   <portType name="SequenceAnnotation">
     <operation name="customAnalize">

@@ -96,13 +96,6 @@
       <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>
       <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="analize">
-      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/analizeRequest" message="tns:analize"/>
-      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/analizeResponse" message="tns:analizeResponse"/>
-      <fault message="tns:UnsupportedRuntimeException" name="UnsupportedRuntimeException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/analize/Fault/UnsupportedRuntimeException"/>
-      <fault message="tns:LimitExceededException" name="LimitExceededException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/analize/Fault/LimitExceededException"/>
-      <fault message="tns:JobSubmissionException" name="JobSubmissionException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/analize/Fault/JobSubmissionException"/>
-    </operation>

     <operation name="presetAnalize">
       <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"/>
     <operation name="presetAnalize">
       <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"/>

@@ -111,15 +104,18 @@
       <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>
       <fault message="tns:JobSubmissionException" name="JobSubmissionException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/presetAnalize/Fault/JobSubmissionException"/>
       <fault message="tns:WrongParameterException" name="WrongParameterException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/presetAnalize/Fault/WrongParameterException"/>
     </operation>

+    <operation name="analize">
+      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/analizeRequest" message="tns:analize"/>
+      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/analizeResponse" message="tns:analizeResponse"/>
+      <fault message="tns:UnsupportedRuntimeException" name="UnsupportedRuntimeException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/analize/Fault/UnsupportedRuntimeException"/>
+      <fault message="tns:LimitExceededException" name="LimitExceededException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/analize/Fault/LimitExceededException"/>
+      <fault message="tns:JobSubmissionException" name="JobSubmissionException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/analize/Fault/JobSubmissionException"/>
+    </operation>

     <operation name="getAnnotation">
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationRequest" message="tns:getAnnotation"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationResponse" message="tns:getAnnotationResponse"/>
       <fault message="tns:ResultNotAvailableException" name="ResultNotAvailableException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotation/Fault/ResultNotAvailableException"/>
     </operation>
     <operation name="getAnnotation">
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationRequest" message="tns:getAnnotation"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotationResponse" message="tns:getAnnotationResponse"/>
       <fault message="tns:ResultNotAvailableException" name="ResultNotAvailableException" wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getAnnotation/Fault/ResultNotAvailableException"/>
     </operation>

-    <operation name="pullExecStatistics">
-      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/pullExecStatisticsRequest" message="tns:pullExecStatistics"/>
-      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/pullExecStatisticsResponse" message="tns:pullExecStatisticsResponse"/>
-    </operation>

     <operation name="cancelJob">
       <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/cancelJobRequest" message="tns:cancelJob"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/cancelJobResponse" message="tns:cancelJobResponse"/>
     <operation 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"/>

@@ -128,6 +124,18 @@
       <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>
       <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="pullExecStatistics">
+      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/pullExecStatisticsRequest" message="tns:pullExecStatistics"/>
+      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/pullExecStatisticsResponse" message="tns:pullExecStatisticsResponse"/>
+    </operation>
+    <operation name="getRunnerOptions">
+      <input wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getRunnerOptionsRequest" message="tns:getRunnerOptions"/>
+      <output wsam:Action="http://msa.data.compbio/01/12/2010/SequenceAnnotation/getRunnerOptionsResponse" message="tns:getRunnerOptionsResponse"/>
+    </operation>
+    <operation name="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"/>
     <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"/>

@@ -136,14 +144,6 @@
       <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>
       <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"/>
-    </operation>

   </portType>
   <binding name="JronnWSPortBinding" type="tns:SequenceAnnotation">
     <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
   </portType>
   <binding name="JronnWSPortBinding" type="tns:SequenceAnnotation">
     <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>

@@ -168,7 +168,7 @@
         <soap:fault name="WrongParameterException" use="literal"/>
       </fault>
     </operation>
         <soap:fault name="WrongParameterException" use="literal"/>
       </fault>
     </operation>

-    <operation name="analize">
+    <operation name="presetAnalize">

       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>

@@ -185,8 +185,11 @@
       <fault name="JobSubmissionException">
         <soap:fault name="JobSubmissionException" use="literal"/>
       </fault>
       <fault name="JobSubmissionException">
         <soap:fault name="JobSubmissionException" use="literal"/>
       </fault>

+      <fault name="WrongParameterException">
+        <soap:fault name="WrongParameterException" use="literal"/>
+      </fault>

     </operation>
     </operation>

-    <operation name="presetAnalize">
+    <operation name="analize">

       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>

@@ -203,9 +206,6 @@
       <fault name="JobSubmissionException">
         <soap:fault name="JobSubmissionException" use="literal"/>
       </fault>
       <fault name="JobSubmissionException">
         <soap:fault name="JobSubmissionException" use="literal"/>
       </fault>

-      <fault name="WrongParameterException">
-        <soap:fault name="WrongParameterException" use="literal"/>
-      </fault>

     </operation>
     <operation name="getAnnotation">
       <soap:operation soapAction=""/>
     </operation>
     <operation name="getAnnotation">
       <soap:operation soapAction=""/>

@@ -219,7 +219,7 @@
         <soap:fault name="ResultNotAvailableException" use="literal"/>
       </fault>
     </operation>
         <soap:fault name="ResultNotAvailableException" use="literal"/>
       </fault>
     </operation>

-    <operation name="pullExecStatistics">
+    <operation name="cancelJob">

       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>

@@ -228,7 +228,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
         <soap:body use="literal"/>
       </output>
     </operation>

-    <operation name="cancelJob">
+    <operation name="getJobStatus">

       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>

@@ -237,7 +237,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
         <soap:body use="literal"/>
       </output>
     </operation>

-    <operation name="getJobStatus">
+    <operation name="pullExecStatistics">

       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>

@@ -246,7 +246,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
         <soap:body use="literal"/>
       </output>
     </operation>

-    <operation name="getLimit">
+    <operation name="getRunnerOptions">

       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>

@@ -255,7 +255,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
         <soap:body use="literal"/>
       </output>
     </operation>

-    <operation name="getLimits">
+    <operation name="getPresets">

       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>

@@ -264,7 +264,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
         <soap:body use="literal"/>
       </output>
     </operation>

-    <operation name="getPresets">
+    <operation name="getLimit">

       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>

@@ -273,7 +273,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
         <soap:body use="literal"/>
       </output>
     </operation>

-    <operation name="getRunnerOptions">
+    <operation name="getLimits">

       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
       <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 ce87a32..1da2262 100644 (file)
--- a/webservices/compbio/ws/server/resource/JronnWS_schema1.xsd
+++ b/webservices/compbio/ws/server/resource/JronnWS_schema1.xsd
@@ -61,15 +61,52 @@
 
   <xs:element name="runnerConfig" type="tns:runnerConfig"/>
 
 
   <xs:element name="runnerConfig" type="tns:runnerConfig"/>
 

-  <xs:complexType name="getJobStatus">
+  <xs:complexType name="getRunnerOptions">
+    <xs:sequence/>
+  </xs:complexType>
+
+  <xs:complexType name="getRunnerOptionsResponse">

     <xs:sequence>
     <xs:sequence>

-      <xs:element name="jobId" type="xs:string" minOccurs="0"/>
+      <xs:element name="return" type="tns:runnerConfig" minOccurs="0"/>

     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

-  <xs:complexType name="getJobStatusResponse">
+  <xs:complexType name="runnerConfig">

     <xs:sequence>
     <xs:sequence>

-      <xs:element name="return" type="tns:jobStatus" minOccurs="0"/>
+      <xs:element name="options" type="tns:option" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="parameters" type="tns:parameter" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="prmSeparator" type="xs:string" minOccurs="0"/>
+      <xs:element name="runnerClassName" type="xs:string"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="option">
+    <xs:sequence>
+      <xs:element name="description" type="xs:string"/>
+      <xs:element name="optionNames" type="xs:string" maxOccurs="unbounded"/>
+      <xs:element name="name" type="xs:string"/>
+      <xs:element name="furtherDetails" type="xs:anyURI" minOccurs="0"/>
+      <xs:element name="defaultValue" type="xs:string" minOccurs="0"/>
+    </xs:sequence>
+    <xs:attribute name="isRequired" type="xs:boolean" use="required"/>
+  </xs:complexType>
+
+  <xs:complexType name="parameter">
+    <xs:complexContent>
+      <xs:extension base="tns:option">
+        <xs:sequence>
+          <xs:element name="possibleValues" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+          <xs:element name="validValue" type="tns:valueConstrain" minOccurs="0"/>
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:complexType name="valueConstrain">
+    <xs:sequence>
+      <xs:element name="type" type="tns:type"/>
+      <xs:element name="max" type="xs:string" minOccurs="0"/>
+      <xs:element name="min" type="xs:string" minOccurs="0"/>

     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

@@ -114,52 +151,15 @@
     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

-  <xs:complexType name="getRunnerOptions">
-    <xs:sequence/>
-  </xs:complexType>
-
-  <xs:complexType name="getRunnerOptionsResponse">
-    <xs:sequence>
-      <xs:element name="return" type="tns:runnerConfig" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="runnerConfig">
-    <xs:sequence>
-      <xs:element name="options" type="tns:option" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="parameters" type="tns:parameter" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="prmSeparator" type="xs:string" minOccurs="0"/>
-      <xs:element name="runnerClassName" type="xs:string"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="option">
+  <xs:complexType name="getJobStatus">

     <xs:sequence>
     <xs:sequence>

-      <xs:element name="description" type="xs:string"/>
-      <xs:element name="optionNames" type="xs:string" maxOccurs="unbounded"/>
-      <xs:element name="name" type="xs:string"/>
-      <xs:element name="furtherDetails" type="xs:anyURI" minOccurs="0"/>
-      <xs:element name="defaultValue" type="xs:string" minOccurs="0"/>
+      <xs:element name="jobId" type="xs:string" minOccurs="0"/>

     </xs:sequence>
     </xs:sequence>

-    <xs:attribute name="isRequired" type="xs:boolean" use="required"/>
-  </xs:complexType>
-
-  <xs:complexType name="parameter">
-    <xs:complexContent>
-      <xs:extension base="tns:option">
-        <xs:sequence>
-          <xs:element name="possibleValues" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-          <xs:element name="validValue" type="tns:valueConstrain" minOccurs="0"/>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>

   </xs:complexType>
 
   </xs:complexType>
 

-  <xs:complexType name="valueConstrain">
+  <xs:complexType name="getJobStatusResponse">

     <xs:sequence>
     <xs:sequence>

-      <xs:element name="type" type="tns:type"/>
-      <xs:element name="max" type="xs:string" minOccurs="0"/>
-      <xs:element name="min" type="xs:string" minOccurs="0"/>
+      <xs:element name="return" type="tns:jobStatus" minOccurs="0"/>

     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

@@ -242,20 +242,16 @@
     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

-  <xs:complexType name="getPresets">
-    <xs:sequence/>
-  </xs:complexType>
-
-  <xs:complexType name="getPresetsResponse">
+  <xs:complexType name="customAnalize">

     <xs:sequence>
     <xs:sequence>

-      <xs:element name="return" type="tns:presetManager" minOccurs="0"/>
+      <xs:element name="fastaSequences" type="tns:fastaSequence" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="options" type="tns:option" minOccurs="0" maxOccurs="unbounded"/>

     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

-  <xs:complexType name="presetManager">
+  <xs:complexType name="customAnalizeResponse">

     <xs:sequence>
     <xs:sequence>

-      <xs:element name="runnerClassName" type="xs:string"/>
-      <xs:element name="preset" type="tns:preset" maxOccurs="unbounded"/>
+      <xs:element name="return" type="xs:string" minOccurs="0"/>

     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

@@ -297,28 +293,32 @@
     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

-  <xs:complexType name="cancelJob">
+  <xs:complexType name="getPresets">
+    <xs:sequence/>
+  </xs:complexType>
+
+  <xs:complexType name="getPresetsResponse">

     <xs:sequence>
     <xs:sequence>

-      <xs:element name="jobId" type="xs:string" minOccurs="0"/>
+      <xs:element name="return" type="tns:presetManager" minOccurs="0"/>

     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

-  <xs:complexType name="cancelJobResponse">
+  <xs:complexType name="presetManager">

     <xs:sequence>
     <xs:sequence>

-      <xs:element name="return" type="xs:boolean"/>
+      <xs:element name="runnerClassName" type="xs:string"/>
+      <xs:element name="preset" type="tns:preset" maxOccurs="unbounded"/>

     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

-  <xs:complexType name="customAnalize">
+  <xs:complexType name="cancelJob">

     <xs:sequence>
     <xs:sequence>

-      <xs:element name="fastaSequences" type="tns:fastaSequence" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="options" type="tns:option" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="jobId" type="xs:string" minOccurs="0"/>

     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

-  <xs:complexType name="customAnalizeResponse">
+  <xs:complexType name="cancelJobResponse">

     <xs:sequence>
     <xs:sequence>

-      <xs:element name="return" type="xs:string" minOccurs="0"/>
+      <xs:element name="return" type="xs:boolean"/>

     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

@@ -342,6 +342,13 @@
     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

+  <xs:simpleType name="type">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="Integer"/>
+      <xs:enumeration value="Float"/>
+    </xs:restriction>
+  </xs:simpleType>
+

   <xs:simpleType name="jobStatus">
     <xs:restriction base="xs:string">
       <xs:enumeration value="PENDING"/>
   <xs:simpleType name="jobStatus">
     <xs:restriction base="xs:string">
       <xs:enumeration value="PENDING"/>

@@ -355,12 +362,5 @@
       <xs:enumeration value="COLLECTED"/>
     </xs:restriction>
   </xs:simpleType>
       <xs:enumeration value="COLLECTED"/>
     </xs:restriction>
   </xs:simpleType>

-
-  <xs:simpleType name="type">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="Integer"/>
-      <xs:enumeration value="Float"/>
-    </xs:restriction>
-  </xs:simpleType>

 </xs:schema>
 
 </xs:schema>
 

diff --git a/webservices/compbio/ws/server/resource/MafftWS.wsdl b/webservices/compbio/ws/server/resource/MafftWS.wsdl
index 86bf801..c7bfe2e 100644 (file)
--- a/webservices/compbio/ws/server/resource/MafftWS.wsdl
+++ b/webservices/compbio/ws/server/resource/MafftWS.wsdl
@@ -69,11 +69,11 @@
   <message name="getLimitResponse">
     <part name="parameters" element="tns:getLimitResponse"/>
   </message>
   <message name="getLimitResponse">
     <part name="parameters" element="tns:getLimitResponse"/>
   </message>

-  <message name="getLimits">
-    <part name="parameters" element="tns:getLimits"/>
+  <message name="getRunnerOptions">
+    <part name="parameters" element="tns:getRunnerOptions"/>

   </message>
   </message>

-  <message name="getLimitsResponse">
-    <part name="parameters" element="tns:getLimitsResponse"/>
+  <message name="getRunnerOptionsResponse">
+    <part name="parameters" element="tns:getRunnerOptionsResponse"/>

   </message>
   <message name="getPresets">
     <part name="parameters" element="tns:getPresets"/>
   </message>
   <message name="getPresets">
     <part name="parameters" element="tns:getPresets"/>

@@ -81,11 +81,11 @@
   <message name="getPresetsResponse">
     <part name="parameters" element="tns:getPresetsResponse"/>
   </message>
   <message name="getPresetsResponse">
     <part name="parameters" element="tns:getPresetsResponse"/>
   </message>

-  <message name="getRunnerOptions">
-    <part name="parameters" element="tns:getRunnerOptions"/>
+  <message name="getLimits">
+    <part name="parameters" element="tns:getLimits"/>

   </message>
   </message>

-  <message name="getRunnerOptionsResponse">
-    <part name="parameters" element="tns:getRunnerOptionsResponse"/>
+  <message name="getLimitsResponse">
+    <part name="parameters" element="tns:getLimitsResponse"/>

   </message>
   <portType name="MsaWS">
     <operation name="getResult">
   </message>
   <portType name="MsaWS">
     <operation name="getResult">

@@ -132,17 +132,17 @@
       <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitRequest" message="tns:getLimit"/>
       <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitResponse" message="tns:getLimitResponse"/>
     </operation>
       <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitRequest" message="tns:getLimit"/>
       <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitResponse" message="tns:getLimitResponse"/>
     </operation>

-    <operation name="getLimits">
-      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitsRequest" message="tns:getLimits"/>
-      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitsResponse" message="tns:getLimitsResponse"/>
+    <operation name="getRunnerOptions">
+      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getRunnerOptionsRequest" message="tns:getRunnerOptions"/>
+      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getRunnerOptionsResponse" message="tns:getRunnerOptionsResponse"/>

     </operation>
     <operation name="getPresets">
       <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getPresetsRequest" message="tns:getPresets"/>
       <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getPresetsResponse" message="tns:getPresetsResponse"/>
     </operation>
     </operation>
     <operation name="getPresets">
       <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getPresetsRequest" message="tns:getPresets"/>
       <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getPresetsResponse" message="tns:getPresetsResponse"/>
     </operation>

-    <operation name="getRunnerOptions">
-      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getRunnerOptionsRequest" message="tns:getRunnerOptions"/>
-      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getRunnerOptionsResponse" message="tns:getRunnerOptionsResponse"/>
+    <operation name="getLimits">
+      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitsRequest" message="tns:getLimits"/>
+      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitsResponse" message="tns:getLimitsResponse"/>

     </operation>
   </portType>
   <binding name="MafftWSPortBinding" type="tns:MsaWS">
     </operation>
   </portType>
   <binding name="MafftWSPortBinding" type="tns:MsaWS">

@@ -255,7 +255,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
         <soap:body use="literal"/>
       </output>
     </operation>

-    <operation name="getLimits">
+    <operation name="getRunnerOptions">

       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>

@@ -273,7 +273,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
         <soap:body use="literal"/>
       </output>
     </operation>

-    <operation name="getRunnerOptions">
+    <operation name="getLimits">

       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>

diff --git a/webservices/compbio/ws/server/resource/MafftWS_schema1.xsd b/webservices/compbio/ws/server/resource/MafftWS_schema1.xsd
index c432550..05f2a89 100644 (file)
--- a/webservices/compbio/ws/server/resource/MafftWS_schema1.xsd
+++ b/webservices/compbio/ws/server/resource/MafftWS_schema1.xsd
@@ -161,6 +161,32 @@
     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

+  <xs:complexType name="getLimits">
+    <xs:sequence/>
+  </xs:complexType>
+
+  <xs:complexType name="getLimitsResponse">
+    <xs:sequence>
+      <xs:element name="return" type="tns:limitsManager" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="limitsManager">
+    <xs:sequence>
+      <xs:element name="runnerClassName" type="xs:string" minOccurs="0"/>
+      <xs:element name="limit" type="tns:limit" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="limit">
+    <xs:sequence>
+      <xs:element name="preset" type="xs:string" minOccurs="0"/>
+      <xs:element name="seqNumber" type="xs:int"/>
+      <xs:element name="seqLength" type="xs:int"/>
+    </xs:sequence>
+    <xs:attribute name="isDefault" type="xs:boolean" use="required"/>
+  </xs:complexType>
+

   <xs:complexType name="getPresets">
     <xs:sequence/>
   </xs:complexType>
   <xs:complexType name="getPresets">
     <xs:sequence/>
   </xs:complexType>

@@ -192,32 +218,6 @@
     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

-  <xs:complexType name="getLimits">
-    <xs:sequence/>
-  </xs:complexType>
-
-  <xs:complexType name="getLimitsResponse">
-    <xs:sequence>
-      <xs:element name="return" type="tns:limitsManager" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="limitsManager">
-    <xs:sequence>
-      <xs:element name="runnerClassName" type="xs:string" minOccurs="0"/>
-      <xs:element name="limit" type="tns:limit" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="limit">
-    <xs:sequence>
-      <xs:element name="preset" type="xs:string" minOccurs="0"/>
-      <xs:element name="seqNumber" type="xs:int"/>
-      <xs:element name="seqLength" type="xs:int"/>
-    </xs:sequence>
-    <xs:attribute name="isDefault" type="xs:boolean" use="required"/>
-  </xs:complexType>
-

   <xs:complexType name="getLimit">
     <xs:sequence>
       <xs:element name="presetName" type="xs:string" minOccurs="0"/>
   <xs:complexType name="getLimit">
     <xs:sequence>
       <xs:element name="presetName" type="xs:string" minOccurs="0"/>

diff --git a/webservices/compbio/ws/server/resource/MuscleWS.wsdl b/webservices/compbio/ws/server/resource/MuscleWS.wsdl
index 8993c91..867020c 100644 (file)
--- a/webservices/compbio/ws/server/resource/MuscleWS.wsdl
+++ b/webservices/compbio/ws/server/resource/MuscleWS.wsdl
@@ -69,11 +69,11 @@
   <message name="getLimitResponse">
     <part name="parameters" element="tns:getLimitResponse"/>
   </message>
   <message name="getLimitResponse">
     <part name="parameters" element="tns:getLimitResponse"/>
   </message>

-  <message name="getLimits">
-    <part name="parameters" element="tns:getLimits"/>
+  <message name="getRunnerOptions">
+    <part name="parameters" element="tns:getRunnerOptions"/>

   </message>
   </message>

-  <message name="getLimitsResponse">
-    <part name="parameters" element="tns:getLimitsResponse"/>
+  <message name="getRunnerOptionsResponse">
+    <part name="parameters" element="tns:getRunnerOptionsResponse"/>

   </message>
   <message name="getPresets">
     <part name="parameters" element="tns:getPresets"/>
   </message>
   <message name="getPresets">
     <part name="parameters" element="tns:getPresets"/>

@@ -81,11 +81,11 @@
   <message name="getPresetsResponse">
     <part name="parameters" element="tns:getPresetsResponse"/>
   </message>
   <message name="getPresetsResponse">
     <part name="parameters" element="tns:getPresetsResponse"/>
   </message>

-  <message name="getRunnerOptions">
-    <part name="parameters" element="tns:getRunnerOptions"/>
+  <message name="getLimits">
+    <part name="parameters" element="tns:getLimits"/>

   </message>
   </message>

-  <message name="getRunnerOptionsResponse">
-    <part name="parameters" element="tns:getRunnerOptionsResponse"/>
+  <message name="getLimitsResponse">
+    <part name="parameters" element="tns:getLimitsResponse"/>

   </message>
   <portType name="MsaWS">
     <operation name="getResult">
   </message>
   <portType name="MsaWS">
     <operation name="getResult">

@@ -132,17 +132,17 @@
       <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitRequest" message="tns:getLimit"/>
       <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitResponse" message="tns:getLimitResponse"/>
     </operation>
       <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitRequest" message="tns:getLimit"/>
       <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitResponse" message="tns:getLimitResponse"/>
     </operation>

-    <operation name="getLimits">
-      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitsRequest" message="tns:getLimits"/>
-      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitsResponse" message="tns:getLimitsResponse"/>
+    <operation name="getRunnerOptions">
+      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getRunnerOptionsRequest" message="tns:getRunnerOptions"/>
+      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getRunnerOptionsResponse" message="tns:getRunnerOptionsResponse"/>

     </operation>
     <operation name="getPresets">
       <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getPresetsRequest" message="tns:getPresets"/>
       <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getPresetsResponse" message="tns:getPresetsResponse"/>
     </operation>
     </operation>
     <operation name="getPresets">
       <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getPresetsRequest" message="tns:getPresets"/>
       <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getPresetsResponse" message="tns:getPresetsResponse"/>
     </operation>

-    <operation name="getRunnerOptions">
-      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getRunnerOptionsRequest" message="tns:getRunnerOptions"/>
-      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getRunnerOptionsResponse" message="tns:getRunnerOptionsResponse"/>
+    <operation name="getLimits">
+      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitsRequest" message="tns:getLimits"/>
+      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitsResponse" message="tns:getLimitsResponse"/>

     </operation>
   </portType>
   <binding name="MuscleWSPortBinding" type="tns:MsaWS">
     </operation>
   </portType>
   <binding name="MuscleWSPortBinding" type="tns:MsaWS">

@@ -255,7 +255,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
         <soap:body use="literal"/>
       </output>
     </operation>

-    <operation name="getLimits">
+    <operation name="getRunnerOptions">

       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>

@@ -273,7 +273,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
         <soap:body use="literal"/>
       </output>
     </operation>

-    <operation name="getRunnerOptions">
+    <operation name="getLimits">

       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>

diff --git a/webservices/compbio/ws/server/resource/MuscleWS_schema1.xsd b/webservices/compbio/ws/server/resource/MuscleWS_schema1.xsd
index 0895916..e6c3574 100644 (file)
--- a/webservices/compbio/ws/server/resource/MuscleWS_schema1.xsd
+++ b/webservices/compbio/ws/server/resource/MuscleWS_schema1.xsd
@@ -152,6 +152,32 @@
     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

+  <xs:complexType name="getLimits">
+    <xs:sequence/>
+  </xs:complexType>
+
+  <xs:complexType name="getLimitsResponse">
+    <xs:sequence>
+      <xs:element name="return" type="tns:limitsManager" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="limitsManager">
+    <xs:sequence>
+      <xs:element name="runnerClassName" type="xs:string" minOccurs="0"/>
+      <xs:element name="limit" type="tns:limit" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="limit">
+    <xs:sequence>
+      <xs:element name="preset" type="xs:string" minOccurs="0"/>
+      <xs:element name="seqNumber" type="xs:int"/>
+      <xs:element name="seqLength" type="xs:int"/>
+    </xs:sequence>
+    <xs:attribute name="isDefault" type="xs:boolean" use="required"/>
+  </xs:complexType>
+

   <xs:complexType name="getPresets">
     <xs:sequence/>
   </xs:complexType>
   <xs:complexType name="getPresets">
     <xs:sequence/>
   </xs:complexType>

@@ -183,32 +209,6 @@
     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

-  <xs:complexType name="getLimits">
-    <xs:sequence/>
-  </xs:complexType>
-
-  <xs:complexType name="getLimitsResponse">
-    <xs:sequence>
-      <xs:element name="return" type="tns:limitsManager" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="limitsManager">
-    <xs:sequence>
-      <xs:element name="runnerClassName" type="xs:string" minOccurs="0"/>
-      <xs:element name="limit" type="tns:limit" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="limit">
-    <xs:sequence>
-      <xs:element name="preset" type="xs:string" minOccurs="0"/>
-      <xs:element name="seqNumber" type="xs:int"/>
-      <xs:element name="seqLength" type="xs:int"/>
-    </xs:sequence>
-    <xs:attribute name="isDefault" type="xs:boolean" use="required"/>
-  </xs:complexType>
-

   <xs:complexType name="getLimit">
     <xs:sequence>
       <xs:element name="presetName" type="xs:string" minOccurs="0"/>
   <xs:complexType name="getLimit">
     <xs:sequence>
       <xs:element name="presetName" type="xs:string" minOccurs="0"/>

diff --git a/webservices/compbio/ws/server/resource/RegistryWS.wsdl b/webservices/compbio/ws/server/resource/RegistryWS.wsdl
index 6760f66..8d7ec01 100644 (file)
--- a/webservices/compbio/ws/server/resource/RegistryWS.wsdl
+++ b/webservices/compbio/ws/server/resource/RegistryWS.wsdl
@@ -12,12 +12,6 @@
   <message name="getSupportedServicesResponse">
     <part name="parameters" element="tns:getSupportedServicesResponse"/>
   </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="getLastTested">
     <part name="parameters" element="tns:getLastTested"/>
   </message>

@@ -30,6 +24,12 @@
   <message name="getLastTestedOnResponse">
     <part name="parameters" element="tns:getLastTestedOnResponse"/>
   </message>
   <message name="getLastTestedOnResponse">
     <part name="parameters" element="tns:getLastTestedOnResponse"/>
   </message>

+  <message name="testAllServices">
+    <part name="parameters" element="tns:testAllServices"/>
+  </message>
+  <message name="testAllServicesResponse">
+    <part name="parameters" element="tns:testAllServicesResponse"/>
+  </message>

   <message name="testService">
     <part name="parameters" element="tns:testService"/>
   </message>
   <message name="testService">
     <part name="parameters" element="tns:testService"/>
   </message>

@@ -47,10 +47,6 @@
       <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>
       <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 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"/>

@@ -59,6 +55,10 @@
       <input wsam:Action="http://msa.data.compbio/01/12/2010/RegistryWS/getLastTestedOnRequest" message="tns:getLastTestedOn"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/RegistryWS/getLastTestedOnResponse" message="tns:getLastTestedOnResponse"/>
     </operation>
       <input wsam:Action="http://msa.data.compbio/01/12/2010/RegistryWS/getLastTestedOnRequest" message="tns:getLastTestedOn"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/RegistryWS/getLastTestedOnResponse" message="tns:getLastTestedOnResponse"/>
     </operation>

+    <operation name="testAllServices">
+      <input wsam:Action="http://msa.data.compbio/01/12/2010/RegistryWS/testAllServicesRequest" message="tns:testAllServices"/>
+      <output wsam:Action="http://msa.data.compbio/01/12/2010/RegistryWS/testAllServicesResponse" message="tns:testAllServicesResponse"/>
+    </operation>

     <operation name="testService">
       <input wsam:Action="http://msa.data.compbio/01/12/2010/RegistryWS/testServiceRequest" message="tns:testService"/>
       <output wsam:Action="http://msa.data.compbio/01/12/2010/RegistryWS/testServiceResponse" message="tns:testServiceResponse"/>
     <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"/>

@@ -79,7 +79,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
         <soap:body use="literal"/>
       </output>
     </operation>

-    <operation name="testAllServices">
+    <operation name="getLastTested">

       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>

@@ -88,7 +88,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
         <soap:body use="literal"/>
       </output>
     </operation>

-    <operation name="getLastTested">
+    <operation name="getLastTestedOn">

       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>

@@ -97,7 +97,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
         <soap:body use="literal"/>
       </output>
     </operation>

-    <operation name="getLastTestedOn">
+    <operation name="testAllServices">

       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>

diff --git a/webservices/compbio/ws/server/resource/TcoffeeWS.wsdl b/webservices/compbio/ws/server/resource/TcoffeeWS.wsdl
index 1ea1fcd..415612b 100644 (file)
--- a/webservices/compbio/ws/server/resource/TcoffeeWS.wsdl
+++ b/webservices/compbio/ws/server/resource/TcoffeeWS.wsdl
@@ -69,11 +69,11 @@
   <message name="getLimitResponse">
     <part name="parameters" element="tns:getLimitResponse"/>
   </message>
   <message name="getLimitResponse">
     <part name="parameters" element="tns:getLimitResponse"/>
   </message>

-  <message name="getLimits">
-    <part name="parameters" element="tns:getLimits"/>
+  <message name="getRunnerOptions">
+    <part name="parameters" element="tns:getRunnerOptions"/>

   </message>
   </message>

-  <message name="getLimitsResponse">
-    <part name="parameters" element="tns:getLimitsResponse"/>
+  <message name="getRunnerOptionsResponse">
+    <part name="parameters" element="tns:getRunnerOptionsResponse"/>

   </message>
   <message name="getPresets">
     <part name="parameters" element="tns:getPresets"/>
   </message>
   <message name="getPresets">
     <part name="parameters" element="tns:getPresets"/>

@@ -81,11 +81,11 @@
   <message name="getPresetsResponse">
     <part name="parameters" element="tns:getPresetsResponse"/>
   </message>
   <message name="getPresetsResponse">
     <part name="parameters" element="tns:getPresetsResponse"/>
   </message>

-  <message name="getRunnerOptions">
-    <part name="parameters" element="tns:getRunnerOptions"/>
+  <message name="getLimits">
+    <part name="parameters" element="tns:getLimits"/>

   </message>
   </message>

-  <message name="getRunnerOptionsResponse">
-    <part name="parameters" element="tns:getRunnerOptionsResponse"/>
+  <message name="getLimitsResponse">
+    <part name="parameters" element="tns:getLimitsResponse"/>

   </message>
   <portType name="MsaWS">
     <operation name="getResult">
   </message>
   <portType name="MsaWS">
     <operation name="getResult">

@@ -132,17 +132,17 @@
       <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitRequest" message="tns:getLimit"/>
       <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitResponse" message="tns:getLimitResponse"/>
     </operation>
       <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitRequest" message="tns:getLimit"/>
       <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitResponse" message="tns:getLimitResponse"/>
     </operation>

-    <operation name="getLimits">
-      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitsRequest" message="tns:getLimits"/>
-      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitsResponse" message="tns:getLimitsResponse"/>
+    <operation name="getRunnerOptions">
+      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getRunnerOptionsRequest" message="tns:getRunnerOptions"/>
+      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getRunnerOptionsResponse" message="tns:getRunnerOptionsResponse"/>

     </operation>
     <operation name="getPresets">
       <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getPresetsRequest" message="tns:getPresets"/>
       <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getPresetsResponse" message="tns:getPresetsResponse"/>
     </operation>
     </operation>
     <operation name="getPresets">
       <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getPresetsRequest" message="tns:getPresets"/>
       <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getPresetsResponse" message="tns:getPresetsResponse"/>
     </operation>

-    <operation name="getRunnerOptions">
-      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getRunnerOptionsRequest" message="tns:getRunnerOptions"/>
-      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getRunnerOptionsResponse" message="tns:getRunnerOptionsResponse"/>
+    <operation name="getLimits">
+      <input wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitsRequest" message="tns:getLimits"/>
+      <output wsam:Action="http://msa.data.compbio/01/01/2010/MsaWS/getLimitsResponse" message="tns:getLimitsResponse"/>

     </operation>
   </portType>
   <binding name="TcoffeeWSPortBinding" type="tns:MsaWS">
     </operation>
   </portType>
   <binding name="TcoffeeWSPortBinding" type="tns:MsaWS">

@@ -255,7 +255,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
         <soap:body use="literal"/>
       </output>
     </operation>

-    <operation name="getLimits">
+    <operation name="getRunnerOptions">

       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>

@@ -273,7 +273,7 @@
         <soap:body use="literal"/>
       </output>
     </operation>
         <soap:body use="literal"/>
       </output>
     </operation>

-    <operation name="getRunnerOptions">
+    <operation name="getLimits">

       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>
       <soap:operation soapAction=""/>
       <input>
         <soap:body use="literal"/>

diff --git a/webservices/compbio/ws/server/resource/TcoffeeWS_schema1.xsd b/webservices/compbio/ws/server/resource/TcoffeeWS_schema1.xsd
index 18262c9..9f5bbee 100644 (file)
--- a/webservices/compbio/ws/server/resource/TcoffeeWS_schema1.xsd
+++ b/webservices/compbio/ws/server/resource/TcoffeeWS_schema1.xsd
@@ -152,6 +152,32 @@
     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

+  <xs:complexType name="getLimits">
+    <xs:sequence/>
+  </xs:complexType>
+
+  <xs:complexType name="getLimitsResponse">
+    <xs:sequence>
+      <xs:element name="return" type="tns:limitsManager" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="limitsManager">
+    <xs:sequence>
+      <xs:element name="runnerClassName" type="xs:string" minOccurs="0"/>
+      <xs:element name="limit" type="tns:limit" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="limit">
+    <xs:sequence>
+      <xs:element name="preset" type="xs:string" minOccurs="0"/>
+      <xs:element name="seqNumber" type="xs:int"/>
+      <xs:element name="seqLength" type="xs:int"/>
+    </xs:sequence>
+    <xs:attribute name="isDefault" type="xs:boolean" use="required"/>
+  </xs:complexType>
+

   <xs:complexType name="getPresets">
     <xs:sequence/>
   </xs:complexType>
   <xs:complexType name="getPresets">
     <xs:sequence/>
   </xs:complexType>

@@ -183,32 +209,6 @@
     </xs:sequence>
   </xs:complexType>
 
     </xs:sequence>
   </xs:complexType>
 

-  <xs:complexType name="getLimits">
-    <xs:sequence/>
-  </xs:complexType>
-
-  <xs:complexType name="getLimitsResponse">
-    <xs:sequence>
-      <xs:element name="return" type="tns:limitsManager" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="limitsManager">
-    <xs:sequence>
-      <xs:element name="runnerClassName" type="xs:string" minOccurs="0"/>
-      <xs:element name="limit" type="tns:limit" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="limit">
-    <xs:sequence>
-      <xs:element name="preset" type="xs:string" minOccurs="0"/>
-      <xs:element name="seqNumber" type="xs:int"/>
-      <xs:element name="seqLength" type="xs:int"/>
-    </xs:sequence>
-    <xs:attribute name="isDefault" type="xs:boolean" use="required"/>
-  </xs:complexType>
-

   <xs:complexType name="getLimit">
     <xs:sequence>
       <xs:element name="presetName" type="xs:string" minOccurs="0"/>
   <xs:complexType name="getLimit">
     <xs:sequence>
       <xs:element name="presetName" type="xs:string" minOccurs="0"/>