X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=webservices%2Fcompbio%2Fws%2Fserver%2Fresource%2FMafftWS_schema1.xsd;h=0099b0eb510e54d12a53e61c43c59a2976824cc9;hb=68fe46f278b4ec408d6c68677bd56199aac749b3;hp=05f2a89e99f818fd0b8f9f7c1f76679e395cdf41;hpb=7522ace91fc0804a9719dbac9f68bc8154da3132;p=jabaws.git

diff --git a/webservices/compbio/ws/server/resource/MafftWS_schema1.xsd b/webservices/compbio/ws/server/resource/MafftWS_schema1.xsd
index 05f2a89..0099b0e 100644
--- a/webservices/compbio/ws/server/resource/MafftWS_schema1.xsd
+++ b/webservices/compbio/ws/server/resource/MafftWS_schema1.xsd
@@ -97,7 +97,7 @@
       <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="furtherDetails" type="xs:string" minOccurs="0"/>
       <xs:element name="defaultValue" type="xs:string" minOccurs="0"/>
     </xs:sequence>
     <xs:attribute name="isRequired" type="xs:boolean" use="required"/>
@@ -134,7 +134,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"/>
@@ -155,36 +155,18 @@
     </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="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 name="jpredAlignment">
+    <xs:complexContent>
+      <xs:extension base="tns:alignment">
+        <xs:sequence/>
+      </xs:extension>
+    </xs:complexContent>
   </xs:complexType>
 
-  <xs:complexType name="limit">
+  <xs:complexType name="ResultNotAvailableException">
     <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="message" type="xs:string" minOccurs="0"/>
     </xs:sequence>
-    <xs:attribute name="isDefault" type="xs:boolean" use="required"/>
   </xs:complexType>
 
   <xs:complexType name="getPresets">
@@ -218,6 +200,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"/>
@@ -352,10 +360,14 @@
   <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="MSAprobs"/>
+      <xs:enumeration value="GLprobs"/>
+      <xs:enumeration value="Jpred"/>
     </xs:restriction>
   </xs:simpleType>
 </xs:schema>