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

diff --git a/webservices/compbio/ws/server/resource/AAConWS_schema1.xsd b/webservices/compbio/ws/server/resource/AAConWS_schema1.xsd
index 77fe8df..6f34ece 100644
--- 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:complexType name="getJobStatus">
+  <xs:complexType name="getRunnerOptions">
+    <xs:sequence/>
+  </xs:complexType>
+
+  <xs:complexType name="getRunnerOptionsResponse">
     <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:complexType name="getJobStatusResponse">
+  <xs:complexType name="runnerConfig">
     <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>
 
@@ -114,52 +151,15 @@
     </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: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: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:complexType name="getJobStatusResponse">
     <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>
 
@@ -204,20 +204,36 @@
 
   <xs:complexType name="getAnnotationResponse">
     <xs:sequence>
-      <xs:element name="return" type="tns:hashMap" minOccurs="0"/>
+      <xs:element name="return" type="tns:scoreManager" 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 name="scoreManager">
+    <xs:sequence>
+      <xs:element name="seqScores" type="tns:scoreHolder" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="abstractMap" abstract="true">
-    <xs:sequence/>
+  <xs:complexType name="scoreHolder">
+    <xs:sequence>
+      <xs:element name="id" type="xs:string" minOccurs="0"/>
+      <xs:element name="scores" type="tns:score" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="score">
+    <xs:sequence>
+      <xs:element name="method" type="xs:string" minOccurs="0"/>
+      <xs:element name="ranges" type="tns:range" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="scores" type="xs:float" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="range">
+    <xs:sequence>
+      <xs:element name="from" type="xs:int"/>
+      <xs:element name="to" type="xs:int"/>
+    </xs:sequence>
   </xs:complexType>
 
   <xs:complexType name="ResultNotAvailableException">
@@ -226,6 +242,36 @@
     </xs:sequence>
   </xs:complexType>
 
+  <xs:complexType name="customAnalize">
+    <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: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="getPresets">
+    <xs:sequence/>
+  </xs:complexType>
+
+  <xs:complexType name="getPresetsResponse">
+    <xs:sequence>
+      <xs:element name="return" type="tns:presetManager" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="presetManager">
+    <xs:sequence>
+      <xs:element name="runnerClassName" type="xs:string"/>
+      <xs:element name="preset" type="tns:preset" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+
   <xs:complexType name="getLimits">
     <xs:sequence/>
   </xs:complexType>
@@ -264,23 +310,6 @@
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getPresets">
-    <xs:sequence/>
-  </xs:complexType>
-
-  <xs:complexType name="getPresetsResponse">
-    <xs:sequence>
-      <xs:element name="return" type="tns:presetManager" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="presetManager">
-    <xs:sequence>
-      <xs:element name="runnerClassName" type="xs:string"/>
-      <xs:element name="preset" type="tns:preset" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-
   <xs:complexType name="cancelJob">
     <xs:sequence>
       <xs:element name="jobId" type="xs:string" minOccurs="0"/>
@@ -293,19 +322,6 @@
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="customAnalize">
-    <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: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="pullExecStatistics">
     <xs:sequence>
       <xs:element name="jobId" type="xs:string" minOccurs="0"/>
@@ -326,6 +342,13 @@
     </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"/>
@@ -339,12 +362,5 @@
       <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>