X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=webservices%2Fcompbio%2Fws%2Fserver%2Fresource%2FDisemblWS_schema1.xsd;h=a03987fe08d71ff3cd0a530aaadd64ccc3e9bc92;hb=84bf22e2d581e73c2e3eec18e0b315741360eb21;hp=97d69893dc557f1d99d21ee53f1afc5c4e5d32cf;hpb=d1d2e0d38c08f6ac5ce95cfbf049c4ddcdc49e62;p=jabaws.git

diff --git a/webservices/compbio/ws/server/resource/DisemblWS_schema1.xsd b/webservices/compbio/ws/server/resource/DisemblWS_schema1.xsd
index 97d6989..a03987f 100644
--- a/webservices/compbio/ws/server/resource/DisemblWS_schema1.xsd
+++ b/webservices/compbio/ws/server/resource/DisemblWS_schema1.xsd
@@ -61,6 +61,55 @@
 
   <xs:element name="runnerConfig" type="tns:runnerConfig"/>
 
+  <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: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:complexType name="analize">
     <xs:sequence>
       <xs:element name="fastaSequences" type="tns:fastaSequence" minOccurs="0" maxOccurs="unbounded"/>
@@ -114,107 +163,56 @@
     </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: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:complexType name="getAnnotation">
     <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="jobId" type="xs:string" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getLimits">
-    <xs:sequence/>
-  </xs:complexType>
-
-  <xs:complexType name="getLimitsResponse">
+  <xs:complexType name="getAnnotationResponse">
     <xs:sequence>
-      <xs:element name="return" type="tns:limitsManager" minOccurs="0"/>
+      <xs:element name="return" type="tns:scoreManager" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="limitsManager">
+  <xs:complexType name="scoreManager">
     <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:element name="seqScores" type="tns:scoreHolder" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="limit">
+  <xs:complexType name="scoreHolder">
     <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:element name="id" type="xs:string" minOccurs="0"/>
+      <xs:element name="scores" type="tns:score" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
     </xs:sequence>
-    <xs:attribute name="isDefault" type="xs:boolean" use="required"/>
   </xs:complexType>
 
-  <xs:complexType name="getLimit">
+  <xs:complexType name="score">
     <xs:sequence>
-      <xs:element name="presetName" type="xs:string" minOccurs="0"/>
+      <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="getLimitResponse">
+  <xs:complexType name="range">
     <xs:sequence>
-      <xs:element name="return" type="tns:limit" minOccurs="0"/>
+      <xs:element name="from" type="xs:int"/>
+      <xs:element name="to" type="xs:int"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getPresets">
-    <xs:sequence/>
-  </xs:complexType>
-
-  <xs:complexType name="getPresetsResponse">
+  <xs:complexType name="ResultNotAvailableException">
     <xs:sequence>
-      <xs:element name="return" type="tns:presetManager" minOccurs="0"/>
+      <xs:element name="message" type="xs:string" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="presetManager">
+  <xs:complexType name="presetAnalize">
     <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>
 
@@ -232,100 +230,102 @@
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="cancelJob">
+  <xs:complexType name="presetAnalizeResponse">
     <xs:sequence>
-      <xs:element name="jobId" type="xs:string" minOccurs="0"/>
+      <xs:element name="return" type="xs:string" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="cancelJobResponse">
+  <xs:complexType name="WrongParameterException">
     <xs:sequence>
-      <xs:element name="return" type="xs:boolean"/>
+      <xs:element name="message" type="xs:string" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="presetAnalize">
+  <xs:complexType name="pullExecStatistics">
     <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="jobId" type="xs:string" minOccurs="0"/>
+      <xs:element name="position" type="xs:long"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="presetAnalizeResponse">
+  <xs:complexType name="pullExecStatisticsResponse">
     <xs:sequence>
-      <xs:element name="return" type="xs:string" minOccurs="0"/>
+      <xs:element name="return" type="tns:chunkHolder" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="WrongParameterException">
+  <xs:complexType name="chunkHolder">
     <xs:sequence>
-      <xs:element name="message" type="xs:string" minOccurs="0"/>
+      <xs:element name="chunk" type="xs:string" minOccurs="0"/>
+      <xs:element name="position" type="xs:long"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getAnnotation">
-    <xs:sequence>
-      <xs:element name="jobId" type="xs:string" minOccurs="0"/>
-    </xs:sequence>
+  <xs:complexType name="getPresets">
+    <xs:sequence/>
   </xs:complexType>
 
-  <xs:complexType name="getAnnotationResponse">
+  <xs:complexType name="getPresetsResponse">
     <xs:sequence>
-      <xs:element name="return" type="tns:scoreManager" minOccurs="0"/>
+      <xs:element name="return" type="tns:presetManager" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="scoreManager">
+  <xs:complexType name="presetManager">
     <xs:sequence>
-      <xs:element name="seqScores" type="tns:scoreHolder" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="runnerClassName" type="xs:string"/>
+      <xs:element name="preset" type="tns:preset" maxOccurs="unbounded"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="scoreHolder">
+  <xs:complexType name="getLimits">
+    <xs:sequence/>
+  </xs:complexType>
+
+  <xs:complexType name="getLimitsResponse">
     <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:element name="return" type="tns:limitsManager" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="score">
+  <xs:complexType name="limitsManager">
     <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: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="range">
+  <xs:complexType name="limit">
     <xs:sequence>
-      <xs:element name="from" type="xs:int"/>
-      <xs:element name="to" type="xs:int"/>
+      <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="ResultNotAvailableException">
+  <xs:complexType name="getLimit">
     <xs:sequence>
-      <xs:element name="message" type="xs:string" minOccurs="0"/>
+      <xs:element name="presetName" type="xs:string" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="pullExecStatistics">
+  <xs:complexType name="getLimitResponse">
     <xs:sequence>
-      <xs:element name="jobId" type="xs:string" minOccurs="0"/>
-      <xs:element name="position" type="xs:long"/>
+      <xs:element name="return" type="tns:limit" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="pullExecStatisticsResponse">
+  <xs:complexType name="cancelJob">
     <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:complexType name="chunkHolder">
+  <xs:complexType name="cancelJobResponse">
     <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>
 
@@ -342,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"/>
@@ -355,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>