moved trade from input to instruments xsd

Author: chris

xsd/input.xsd

@@ -34,23 +34,23 @@
     </xs:sequence>
   </xs:complexType>
 
-  <xs:complexType name="trade">
-    <xs:sequence>
-      <xs:element type="oreTradeType" name="TradeType"/>
-      <xs:element type="envelope" name="Envelope" minOccurs="0"/>
-      <xs:element type="tradeActions" name="TradeActions" minOccurs="0"/>
-      <xs:group ref="oreTradeData" minOccurs="0"/>
-    </xs:sequence>
-    <xs:attribute type="xs:string" name="id" use="required"/>
-  </xs:complexType>
-  <xs:complexType name="subTrade">
-    <xs:sequence>
-      <xs:element type="oreTradeType" name="SubTradeType"/>
-      <xs:element type="envelope" name="Envelope" minOccurs="0"/>
-      <xs:element type="tradeActions" name="TradeActions" minOccurs="0"/>
-      <xs:group ref="oreTradeData" minOccurs="0"/>
-    </xs:sequence>
-    <xs:attribute type="xs:string" name="id"/>
-  </xs:complexType>
+  <!-- <xs:complexType name="trade"> -->
+    <!-- <xs:sequence> -->
+      <!-- <xs:element type="oreTradeType" name="TradeType"/> -->
+      <!-- <xs:element type="envelope" name="Envelope" minOccurs="0"/> -->
+      <!-- <xs:element type="tradeActions" name="TradeActions" minOccurs="0"/> -->
+      <!-- <xs:group ref="oreTradeData" minOccurs="0"/> -->
+    <!-- </xs:sequence> -->
+    <!-- <xs:attribute type="xs:string" name="id" use="required"/> -->
+  <!-- </xs:complexType> -->
+  <!-- <xs:complexType name="subTrade"> -->
+    <!-- <xs:sequence> -->
+      <!-- <xs:element type="oreTradeType" name="SubTradeType"/> -->
+      <!-- <xs:element type="envelope" name="Envelope" minOccurs="0"/> -->
+      <!-- <xs:element type="tradeActions" name="TradeActions" minOccurs="0"/> -->
+      <!-- <xs:group ref="oreTradeData" minOccurs="0"/> -->
+    <!-- </xs:sequence> -->
+    <!-- <xs:attribute type="xs:string" name="id"/> -->
+  <!-- </xs:complexType> -->
 
 </xs:schema>

xsd/instruments.xsd

@@ -2355,6 +2355,26 @@
 <xs:element name="SubTrade" type="subTrade" substitutionGroup="subTradeGroup"/>
 
 
+  <xs:complexType name="trade">
+    <xs:sequence>
+      <xs:element type="oreTradeType" name="TradeType"/>
+      <xs:element type="envelope" name="Envelope" minOccurs="0"/>
+      <xs:element type="tradeActions" name="TradeActions" minOccurs="0"/>
+      <xs:group ref="oreTradeData" minOccurs="0"/>
+    </xs:sequence>
+    <xs:attribute type="xs:string" name="id" use="required"/>
+  </xs:complexType>
+  <xs:complexType name="subTrade">
+    <xs:sequence>
+      <xs:element type="oreTradeType" name="SubTradeType"/>
+      <xs:element type="envelope" name="Envelope" minOccurs="0"/>
+      <xs:element type="tradeActions" name="TradeActions" minOccurs="0"/>
+      <xs:group ref="oreTradeData" minOccurs="0"/>
+    </xs:sequence>
+    <xs:attribute type="xs:string" name="id"/>
+  </xs:complexType>
+
+
   <xs:complexType name="trsUnderlyingData">
     <xs:sequence>
       <xs:choice maxOccurs="unbounded">