Merge branch 'revert-xsd-schemas_nathaniel2' into 'master'

NathanielVolfango · NathanielVolfango · commit ede252debf87 · 2024-05-22T23:24:02.000Z
Revert GitHub 214 - "Make XSD files include all schema dependencies"

See merge request qs/ore-github!49
diff --git a/xsd/calendaradjustment.xsd b/xsd/calendaradjustment.xsd
@@ -1,5 +1,4 @@
 <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <xs:include schemaLocation="ore_types.xsd"/>
 
   <xs:element type="calendaradjustment" name="CalendarAdjustments"/>
 
diff --git a/xsd/conventions.xsd b/xsd/conventions.xsd
@@ -1,5 +1,4 @@
 <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <xs:include schemaLocation="ore_types.xsd"/>
 
   <xs:element type="conventions" name="Conventions"/>
 
diff --git a/xsd/creditsimulation.xsd b/xsd/creditsimulation.xsd
@@ -1,7 +1,5 @@
 <?xml version="1.0"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" attributeFormDefault="unqualified" elementFormDefault="qualified">
-  <xs:include schemaLocation="ore_types.xsd"/>
-
   <xs:element type="creditsimulation" name="CreditSimulation"/>
   <xs:complexType name="creditsimulation">
     <xs:all>
diff --git a/xsd/iborfallbackconfig.xsd b/xsd/iborfallbackconfig.xsd
@@ -1,5 +1,4 @@
 <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <xs:include schemaLocation="ore_types.xsd"/>
 
   <xs:element name="IborFallbackConfig">
     <xs:complexType>
diff --git a/xsd/instruments.xsd b/xsd/instruments.xsd
@@ -2,7 +2,6 @@
   xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
   <xs:include schemaLocation="ore_types.xsd"/>
-  <xs:include schemaLocation="scriptlibrary.xsd"/>
 
   <xs:group name="oreTradeData">
     <xs:choice>
diff --git a/xsd/nettingsetdefinitions.xsd b/xsd/nettingsetdefinitions.xsd
@@ -1,6 +1,4 @@
 <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <xs:include schemaLocation="ore_types.xsd"/>
-  <xs:include schemaLocation="instruments.xsd"/>
 
   <xs:element type="collateralBalances" name="CollateralBalances"/>
 
diff --git a/xsd/referencedata.xsd b/xsd/referencedata.xsd
@@ -1,5 +1,4 @@
 <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <xs:include schemaLocation="instruments.xsd"/>
 
   <xs:element name="ReferenceData">
     <xs:complexType>
diff --git a/xsd/sensitivity.xsd b/xsd/sensitivity.xsd
@@ -1,5 +1,4 @@
 <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <xs:include schemaLocation="ore_types.xsd"/>
 
   <xs:element type="sensitivityanalysis" name="SensitivityAnalysis"/>
 
diff --git a/xsd/simulation.xsd b/xsd/simulation.xsd
@@ -1,5 +1,4 @@
 <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <xs:include schemaLocation="ore_types.xsd"/>
 
   <xs:element type="simulation" name="Simulation"/>
 
diff --git a/xsd/stress.xsd b/xsd/stress.xsd
@@ -1,5 +1,4 @@
 <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <xs:include schemaLocation="sensitivity.xsd"/>
 
   <xs:element type="stresstesting" name="StressTesting"/>
 
diff --git a/xsd/todaysmarket.xsd b/xsd/todaysmarket.xsd
@@ -1,5 +1,4 @@
 <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <xs:include schemaLocation="ore_types.xsd"/>
 
   <xs:element type="todaysmarket" name="TodaysMarket"/>
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">`
`2`		`- <xs:include schemaLocation="ore_types.xsd"/>`
`3`	`2`
`4`	`3`	`<xs:element type="calendaradjustment" name="CalendarAdjustments"/>`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">`
`2`		`- <xs:include schemaLocation="instruments.xsd"/>`
`3`	`2`
`4`	`3`	`<xs:element name="ReferenceData">`
`5`	`4`	`<xs:complexType>`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">`
`2`		`- <xs:include schemaLocation="sensitivity.xsd"/>`
`3`	`2`
`4`	`3`	`<xs:element type="stresstesting" name="StressTesting"/>`
`5`	`4`