X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=webservices%2Fcompbio%2Fws%2Fserver%2Fresource%2FClustalWS_schema1.xsd;h=8947341934c44629354ff7e2ff7d00c897a5d532;hb=212bbd43c19f645cccef34a608dc001fb694833c;hp=cd1b2d11b327dd1e479b38cf7e81d8d3d2913628;hpb=6648d48e760ddfd676aaadd10a0bc15fb60f71b0;p=jabaws.git

diff --git a/webservices/compbio/ws/server/resource/ClustalWS_schema1.xsd b/webservices/compbio/ws/server/resource/ClustalWS_schema1.xsd
index cd1b2d1..8947341 100644
--- a/webservices/compbio/ws/server/resource/ClustalWS_schema1.xsd
+++ b/webservices/compbio/ws/server/resource/ClustalWS_schema1.xsd
@@ -47,20 +47,14 @@
 
   <xs:element name="getRunnerOptionsResponse" type="tns:getRunnerOptionsResponse"/>
 
-  <xs:element name="limits" type="tns:limitsManager"/>
-
   <xs:element name="presetAlign" type="tns:presetAlign"/>
 
   <xs:element name="presetAlignResponse" type="tns:presetAlignResponse"/>
 
-  <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"/>
@@ -73,45 +67,6 @@
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getResult">
-    <xs:sequence>
-      <xs:element name="jobId" type="xs:string" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="getResultResponse">
-    <xs:sequence>
-      <xs:element name="return" type="tns:alignment" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="alignment" final="extension restriction">
-    <xs:sequence>
-      <xs:element name="metadata" type="tns:alignmentMetadata" minOccurs="0"/>
-      <xs:element name="sequences" type="tns:fastaSequence" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="alignmentMetadata">
-    <xs:sequence>
-      <xs:element name="program" type="tns:program" minOccurs="0"/>
-      <xs:element name="gapchar" type="xs:unsignedShort"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="fastaSequence">
-    <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="ResultNotAvailableException">
-    <xs:sequence>
-      <xs:element name="message" type="xs:string" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-
   <xs:complexType name="getRunnerOptions">
     <xs:sequence/>
   </xs:complexType>
@@ -127,26 +82,25 @@
       <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="runnerClassName" type="xs:string" minOccurs="0"/>
     </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:element name="description" type="xs:string" minOccurs="0"/>
+      <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: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="optionName" type="xs:string" minOccurs="0"/>
           <xs:element name="validValue" type="tns:valueConstrain" minOccurs="0"/>
         </xs:sequence>
       </xs:extension>
@@ -155,48 +109,44 @@
 
   <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:element name="type" type="tns:type" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="cancelJob">
+  <xs:complexType name="getResult">
     <xs:sequence>
       <xs:element name="jobId" type="xs:string" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="cancelJobResponse">
+  <xs:complexType name="getResultResponse">
     <xs:sequence>
-      <xs:element name="return" type="xs:boolean"/>
+      <xs:element name="return" type="tns:alignment" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getLimits">
+  <xs:complexType name="alignment" final="extension restriction">
     <xs:sequence/>
   </xs:complexType>
 
-  <xs:complexType name="getLimitsResponse">
+  <xs:complexType name="ResultNotAvailableException">
     <xs:sequence>
-      <xs:element name="return" type="tns:limitsManager" minOccurs="0"/>
+      <xs:element name="message" type="xs:string" 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 name="getLimits">
+    <xs:sequence/>
   </xs:complexType>
 
-  <xs:complexType name="limit">
+  <xs:complexType name="getLimitsResponse">
     <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="return" type="tns:limitsManager" minOccurs="0"/>
     </xs:sequence>
-    <xs:attribute name="isDefault" type="xs:boolean" use="required"/>
+  </xs:complexType>
+
+  <xs:complexType name="limitsManager">
+    <xs:sequence/>
   </xs:complexType>
 
   <xs:complexType name="getLimit">
@@ -211,6 +161,10 @@
     </xs:sequence>
   </xs:complexType>
 
+  <xs:complexType name="limit">
+    <xs:sequence/>
+  </xs:complexType>
+
   <xs:complexType name="getPresets">
     <xs:sequence/>
   </xs:complexType>
@@ -223,22 +177,28 @@
 
   <xs:complexType name="presetManager">
     <xs:sequence>
-      <xs:element name="runnerClassName" type="xs:string"/>
-      <xs:element name="preset" type="tns:preset" maxOccurs="unbounded"/>
+      <xs:element name="presets" type="tns:preset" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="runnerClassName" type="xs:string" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
   <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="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="name" type="xs:string" minOccurs="0"/>
+      <xs:element name="options" type="xs:string" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
+    </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>
 
@@ -249,6 +209,10 @@
     </xs:sequence>
   </xs:complexType>
 
+  <xs:complexType name="fastaSequence">
+    <xs:sequence/>
+  </xs:complexType>
+
   <xs:complexType name="presetAlignResponse">
     <xs:sequence>
       <xs:element name="return" type="xs:string" minOccurs="0"/>
@@ -297,10 +261,7 @@
   </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:sequence/>
   </xs:complexType>
 
   <xs:complexType name="align">
@@ -342,16 +303,6 @@
     </xs:restriction>
   </xs:simpleType>
 
-  <xs:simpleType name="program">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="CLUSTAL"/>
-      <xs:enumeration value="MAFFT"/>
-      <xs:enumeration value="MUSCLE"/>
-      <xs:enumeration value="Tcoffee"/>
-      <xs:enumeration value="Probcons"/>
-    </xs:restriction>
-  </xs:simpleType>
-
   <xs:simpleType name="type">
     <xs:restriction base="xs:string">
       <xs:enumeration value="Integer"/>