X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=webservices%2Fcompbio%2Fws%2Fserver%2Fresource%2FAAConWS_schema1.xsd;fp=webservices%2Fcompbio%2Fws%2Fserver%2Fresource%2FAAConWS_schema1.xsd;h=77fe8dfcebbfa322e3fee4c3b5516f8beb234204;hb=7e625752237ee07e815bfb28048bb0b1193b45c5;hp=ddd1c72bfe90012ce4a02e390e0ee5307c94c674;hpb=a79900255139dc7bcab23320de2a3630f6531107;p=jabaws.git

diff --git a/webservices/compbio/ws/server/resource/AAConWS_schema1.xsd b/webservices/compbio/ws/server/resource/AAConWS_schema1.xsd
index ddd1c72..77fe8df 100644
--- a/webservices/compbio/ws/server/resource/AAConWS_schema1.xsd
+++ b/webservices/compbio/ws/server/resource/AAConWS_schema1.xsd
@@ -23,9 +23,9 @@
 
   <xs:element name="customAnalizeResponse" type="tns:customAnalizeResponse"/>
 
-  <xs:element name="getConservation" type="tns:getConservation"/>
+  <xs:element name="getAnnotation" type="tns:getAnnotation"/>
 
-  <xs:element name="getConservationResponse" type="tns:getConservationResponse"/>
+  <xs:element name="getAnnotationResponse" type="tns:getAnnotationResponse"/>
 
   <xs:element name="getJobStatus" type="tns:getJobStatus"/>
 
@@ -47,14 +47,20 @@
 
   <xs:element name="getRunnerOptionsResponse" type="tns:getRunnerOptionsResponse"/>
 
+  <xs:element name="limits" type="tns:limitsManager"/>
+
   <xs:element name="presetAnalize" type="tns:presetAnalize"/>
 
   <xs:element name="presetAnalizeResponse" type="tns:presetAnalizeResponse"/>
 
+  <xs:element name="presets" type="tns:presetManager"/>
+
   <xs:element name="pullExecStatistics" type="tns:pullExecStatistics"/>
 
   <xs:element name="pullExecStatisticsResponse" type="tns:pullExecStatisticsResponse"/>
 
+  <xs:element name="runnerConfig" type="tns:runnerConfig"/>
+
   <xs:complexType name="getJobStatus">
     <xs:sequence>
       <xs:element name="jobId" type="xs:string" minOccurs="0"/>
@@ -74,7 +80,10 @@
   </xs:complexType>
 
   <xs:complexType name="fastaSequence">
-    <xs:sequence/>
+    <xs:sequence>
+      <xs:element name="id" type="xs:string" minOccurs="0"/>
+      <xs:element name="sequence" type="xs:string" minOccurs="0"/>
+    </xs:sequence>
   </xs:complexType>
 
   <xs:complexType name="analizeResponse">
@@ -120,25 +129,26 @@
       <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" minOccurs="0"/>
+      <xs:element name="runnerClassName" type="xs:string"/>
     </xs:sequence>
   </xs:complexType>
 
   <xs:complexType name="option">
     <xs:sequence>
-      <xs:element name="defaultValue" type="xs:string" minOccurs="0"/>
-      <xs:element name="description" type="xs:string" minOccurs="0"/>
+      <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="name" type="xs:string" minOccurs="0"/>
-      <xs:element name="required" type="xs:boolean"/>
+      <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="optionName" type="xs:string" minOccurs="0"/>
+          <xs:element name="possibleValues" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
           <xs:element name="validValue" type="tns:valueConstrain" minOccurs="0"/>
         </xs:sequence>
       </xs:extension>
@@ -147,7 +157,9 @@
 
   <xs:complexType name="valueConstrain">
     <xs:sequence>
-      <xs:element name="type" type="tns:type" 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>
 
@@ -160,9 +172,15 @@
 
   <xs:complexType name="preset">
     <xs:sequence>
+      <xs:element name="name" type="xs:string"/>
       <xs:element name="description" type="xs:string" minOccurs="0"/>
-      <xs:element name="name" type="xs:string" minOccurs="0"/>
-      <xs:element name="options" type="xs:string" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
+      <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>
 
@@ -178,6 +196,36 @@
     </xs:sequence>
   </xs:complexType>
 
+  <xs:complexType name="getAnnotation">
+    <xs:sequence>
+      <xs:element name="jobId" type="xs:string" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="getAnnotationResponse">
+    <xs:sequence>
+      <xs:element name="return" type="tns:hashMap" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="hashMap">
+    <xs:complexContent>
+      <xs:extension base="tns:abstractMap">
+        <xs:sequence/>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:complexType name="abstractMap" abstract="true">
+    <xs:sequence/>
+  </xs:complexType>
+
+  <xs:complexType name="ResultNotAvailableException">
+    <xs:sequence>
+      <xs:element name="message" type="xs:string" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
   <xs:complexType name="getLimits">
     <xs:sequence/>
   </xs:complexType>
@@ -189,7 +237,19 @@
   </xs:complexType>
 
   <xs:complexType name="limitsManager">
-    <xs:sequence/>
+    <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">
@@ -204,10 +264,6 @@
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="limit">
-    <xs:sequence/>
-  </xs:complexType>
-
   <xs:complexType name="getPresets">
     <xs:sequence/>
   </xs:complexType>
@@ -220,8 +276,8 @@
 
   <xs:complexType name="presetManager">
     <xs:sequence>
-      <xs:element name="presets" type="tns:preset" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
-      <xs:element name="runnerClassName" 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>
 
@@ -250,31 +306,6 @@
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getConservation">
-    <xs:sequence>
-      <xs:element name="jobId" type="xs:string" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="getConservationResponse">
-    <xs:sequence>
-      <xs:element name="return" type="tns:score" minOccurs="0" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="score">
-    <xs:sequence>
-      <xs:element name="method" type="tns:method" minOccurs="0"/>
-      <xs:element name="scores" type="xs:float" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="ResultNotAvailableException">
-    <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"/>
@@ -289,7 +320,10 @@
   </xs:complexType>
 
   <xs:complexType name="chunkHolder">
-    <xs:sequence/>
+    <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="jobStatus">
@@ -312,28 +346,5 @@
       <xs:enumeration value="Float"/>
     </xs:restriction>
   </xs:simpleType>
-
-  <xs:simpleType name="method">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="KABAT"/>
-      <xs:enumeration value="JORES"/>
-      <xs:enumeration value="SCHNEIDER"/>
-      <xs:enumeration value="SHENKIN"/>
-      <xs:enumeration value="GERSTEIN"/>
-      <xs:enumeration value="TAYLOR_GAPS"/>
-      <xs:enumeration value="TAYLOR_NO_GAPS"/>
-      <xs:enumeration value="ZVELIBIL"/>
-      <xs:enumeration value="KARLIN"/>
-      <xs:enumeration value="ARMON"/>
-      <xs:enumeration value="THOMPSON"/>
-      <xs:enumeration value="NOT_LANCET"/>
-      <xs:enumeration value="MIRNY"/>
-      <xs:enumeration value="WILLIAMSON"/>
-      <xs:enumeration value="LANDGRAF"/>
-      <xs:enumeration value="SANDER"/>
-      <xs:enumeration value="VALDAR"/>
-      <xs:enumeration value="SMERFS"/>
-    </xs:restriction>
-  </xs:simpleType>
 </xs:schema>