X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=webservices%2Fcompbio%2Fws%2Fserver%2Fresource%2FTcoffeeWS_schema1.xsd;h=2095e1a8881186da1444dd8a452a316e375704e3;hb=5578f2d3e8226bd931755da3feeecb91fdb26c3f;hp=9f5bbee5dd7bf6f55ce1f371dfc050a4945d7889;hpb=f500c782a6b1aa1bfcc8aae17e466b35fe59624e;p=jabaws.git

diff --git a/webservices/compbio/ws/server/resource/TcoffeeWS_schema1.xsd b/webservices/compbio/ws/server/resource/TcoffeeWS_schema1.xsd
index 9f5bbee..2095e1a 100644
--- a/webservices/compbio/ws/server/resource/TcoffeeWS_schema1.xsd
+++ b/webservices/compbio/ws/server/resource/TcoffeeWS_schema1.xsd
@@ -152,32 +152,6 @@
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="getLimits">
-    <xs:sequence/>
-  </xs:complexType>
-
-  <xs:complexType name="getLimitsResponse">
-    <xs:sequence>
-      <xs:element name="return" type="tns:limitsManager" 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>
-
-  <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="getPresets">
     <xs:sequence/>
   </xs:complexType>
@@ -209,6 +183,32 @@
     </xs:sequence>
   </xs:complexType>
 
+  <xs:complexType name="getLimits">
+    <xs:sequence/>
+  </xs:complexType>
+
+  <xs:complexType name="getLimitsResponse">
+    <xs:sequence>
+      <xs:element name="return" type="tns:limitsManager" 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>
+
+  <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">
     <xs:sequence>
       <xs:element name="presetName" type="xs:string" minOccurs="0"/>
@@ -296,7 +296,7 @@
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="alignment" final="extension restriction">
+  <xs:complexType name="alignment">
     <xs:sequence>
       <xs:element name="metadata" type="tns:alignmentMetadata" minOccurs="0"/>
       <xs:element name="sequences" type="tns:fastaSequence" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
@@ -310,6 +310,14 @@
     </xs:sequence>
   </xs:complexType>
 
+  <xs:complexType name="jpredAlignment">
+    <xs:complexContent>
+      <xs:extension base="tns:alignment">
+        <xs:sequence/>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
   <xs:complexType name="ResultNotAvailableException">
     <xs:sequence>
       <xs:element name="message" type="xs:string" minOccurs="0"/>
@@ -338,10 +346,12 @@
   <xs:simpleType name="program">
     <xs:restriction base="xs:string">
       <xs:enumeration value="CLUSTAL"/>
-      <xs:enumeration value="MAFFT"/>
-      <xs:enumeration value="MUSCLE"/>
+      <xs:enumeration value="ClustalO"/>
+      <xs:enumeration value="Mafft"/>
+      <xs:enumeration value="Muscle"/>
       <xs:enumeration value="Tcoffee"/>
       <xs:enumeration value="Probcons"/>
+      <xs:enumeration value="Jpred"/>
     </xs:restriction>
   </xs:simpleType>