Update instruments.xsd

Converted all subtrade/trade choice instances to be just a trade, with subtrade as a substitution group option

Author: chris

xsd/instruments.xsd

@@ -2350,25 +2350,18 @@
     </xs:all>
   </xs:complexType>
 
+<xs:element name="subTradeGroup" abstract="true"/>
+<xs:element name="Trade" type="tradeType" substitutionGroup="subTradeGroup"/>
+<xs:element name="SubTrade" type="tradeType" substitutionGroup="subTradeGroup"/>
+
   <xs:complexType name="trsUnderlyingData">
     <xs:sequence>
       <xs:choice maxOccurs="unbounded">
         <xs:element name="Derivative">
 		 <xs:complexType>
           <xs:sequence>
            <xs:element type="xs:string" name="Id"/>
-		   <xs:choice>
-           <xs:element name="SubTrade">
-            <xs:complexType>
-             <xs:sequence>
-              <xs:element type="oreTradeType" name="SubTradeType"/>
-              <xs:element type="envelope" name="Envelope" minOccurs="0"/>
-              <xs:group ref="oreTradeData"/>
-             </xs:sequence>
-             <xs:attribute type="xs:string" name="id"/>
-            </xs:complexType>
-           </xs:element>
-		   <xs:element name="Trade">
+           <xs:element name="Trade">
             <xs:complexType>
              <xs:sequence>
               <xs:element type="oreTradeType" name="TradeType"/>
@@ -2378,19 +2371,8 @@
              <xs:attribute type="xs:string" name="id"/>
             </xs:complexType>
            </xs:element>
-		   </xs:choice>
 		  </xs:sequence>
          </xs:complexType>
-        </xs:element>
-        <xs:element name="SubTrade">
-         <xs:complexType>
-           <xs:sequence>
-            <xs:element type="oreTradeType" name="SubTradeType"/>
-            <xs:element type="envelope" name="Envelope" minOccurs="0"/>
-            <xs:group ref="oreTradeData"/>
-            </xs:sequence>
-          <xs:attribute type="xs:string" name="id"/>
-         </xs:complexType>
         </xs:element>
 		<xs:element name="Trade">
          <xs:complexType>
@@ -2609,17 +2591,6 @@
   <xs:complexType name="cboBondBasketData">
 
 	<xs:sequence>
-	<xs:choice maxOccurs="unbounded">
-      <xs:element name="SubTrade" maxOccurs="unbounded">
-        <xs:complexType>
-          <xs:all>
-            <xs:element type="oreTradeType" name="SubTradeType"/>
-            <xs:element type="envelope" name="Envelope" minOccurs="0"/>
-            <xs:element type="bondData" name="BondData" maxOccurs="1" minOccurs="0"/>
-          </xs:all>
-          <xs:attribute type="xs:string" name="id"/>
-        </xs:complexType>
-      </xs:element>
       <xs:element name="Trade" maxOccurs="unbounded">
         <xs:complexType>
           <xs:all>
@@ -2630,7 +2601,6 @@
           <xs:attribute type="xs:string" name="id"/>
         </xs:complexType>
       </xs:element>
-	</xs:choice>
     </xs:sequence>
   </xs:complexType>
 
@@ -3063,17 +3033,6 @@
 
   <xs:complexType name="compositeTradeComponents">
     <xs:sequence>
-	<xs:choice maxOccurs="unbounded">
-      <xs:element name="SubTrade" maxOccurs="unbounded">
-        <xs:complexType>
-          <xs:sequence>
-            <xs:element type="oreTradeType" name="SubTradeType"/>
-            <xs:element type="envelope" name="Envelope" minOccurs="0"/>
-            <xs:group ref="oreTradeData"/>
-          </xs:sequence>
-          <xs:attribute type="xs:string" name="id"/>
-        </xs:complexType>
-      </xs:element>
 	  <xs:element name="Trade" maxOccurs="unbounded">
         <xs:complexType>
           <xs:sequence>
@@ -3084,7 +3043,6 @@
           <xs:attribute type="xs:string" name="id"/>
         </xs:complexType>
       </xs:element>
-	  </xs:choice>
     </xs:sequence>
   </xs:complexType>