Fix bug in category class and use Jim's test as a test case

[jabaws.git] / webservices / compbio / ws / server / resource / TcoffeeWS_schema1.xsd

diff --git a/webservices/compbio/ws/server/resource/TcoffeeWS_schema1.xsd b/webservices/compbio/ws/server/resource/TcoffeeWS_schema1.xsd
index 68087b4..9f5bbee 100644 (file)
--- a/webservices/compbio/ws/server/resource/TcoffeeWS_schema1.xsd
+++ b/webservices/compbio/ws/server/resource/TcoffeeWS_schema1.xsd
@@ -152,18 +152,6 @@
     </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>
-
   <xs:complexType name="getLimits">
     <xs:sequence/>
   </xs:complexType>
@@ -190,18 +178,6 @@
     <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:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="getLimitResponse">
-    <xs:sequence>
-      <xs:element name="return" type="tns:limit" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-
   <xs:complexType name="getPresets">
     <xs:sequence/>
   </xs:complexType>
@@ -233,48 +209,40 @@
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="presetAlign">
+  <xs:complexType name="getLimit">
     <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="presetName" type="xs:string" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="presetAlignResponse">
+  <xs:complexType name="getLimitResponse">
     <xs:sequence>
-      <xs:element name="return" type="xs:string" minOccurs="0"/>
+      <xs:element name="return" type="tns:limit" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getResult">
+  <xs:complexType name="cancelJob">
     <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:complexType name="cancelJobResponse">
     <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:element name="return" type="xs:boolean"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="alignmentMetadata">
+  <xs:complexType name="presetAlign">
     <xs:sequence>
-      <xs:element name="program" type="tns:program" minOccurs="0"/>
-      <xs:element name="gapchar" type="xs:unsignedShort"/>
+      <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:complexType name="ResultNotAvailableException">
+  <xs:complexType name="presetAlignResponse">
     <xs:sequence>
-      <xs:element name="message" type="xs:string" minOccurs="0"/>
+      <xs:element name="return" type="xs:string" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 
@@ -316,6 +284,38 @@
     </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="ResultNotAvailableException">
+    <xs:sequence>
+      <xs:element name="message" type="xs:string" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+
   <xs:complexType name="getJobStatus">
     <xs:sequence>
       <xs:element name="jobId" type="xs:string" minOccurs="0"/>
@@ -328,6 +328,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="program">
     <xs:restriction base="xs:string">
       <xs:enumeration value="CLUSTAL"/>
@@ -338,13 +345,6 @@
     </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:simpleType name="jobStatus">
     <xs:restriction base="xs:string">
       <xs:enumeration value="PENDING"/>