convert CommonExtensions to All extensions

Add new schema to AllSchemas Update the list of schemas in InformationObject (this is still broken)
ETPartners · Mar 16, 2020 · b9bd974 · CharlieG021163 · Mar 16, 2020 · CharlieG021163
1 parent 58ad2a8
commit b9bd974
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 32 deletions.
diff --git a/Schema/AllSchemas.xsd b/Schema/AllSchemas.xsd
@@ -58,14 +58,18 @@
  <xsd:include schemaLocation ="B2MML-Common.xsd"/>
  <xsd:include schemaLocation ="B2MML-ConfirmBOD.xsd"/>
  <xsd:include schemaLocation ="B2MML-Equipment.xsd"/>
- <xsd:include schemaLocation ="B2MML-PhysicalAsset.xsd"/>
+ <xsd:include schemaLocation ="B2MML-InformationObject.xsd"/>
  <xsd:include schemaLocation ="B2MML-Material.xsd"/>
  <xsd:include schemaLocation ="B2MML-Personnel.xsd"/>
+ <xsd:include schemaLocation ="B2MML-PhysicalAsset.xsd"/>
  <xsd:include schemaLocation ="B2MML-ProcessSegment.xsd"/>
- <xsd:include schemaLocation ="B2MML-OperationsDefinition.xsd"/>
+ <xsd:include schemaLocation ="B2MML-OperationalLocation.xsd"/>
  <xsd:include schemaLocation ="B2MML-OperationsCapability.xsd"/>
+ <xsd:include schemaLocation ="B2MML-OperationsDefinition.xsd"/>
+ <xsd:include schemaLocation ="B2MML-OperationsEvent.xsd"/>
  <xsd:include schemaLocation ="B2MML-OperationsPerformance.xsd"/>
  <xsd:include schemaLocation ="B2MML-OperationsSchedule.xsd"/>
+ <xsd:include schemaLocation ="B2MML-OperationsPerformanceTypes.xsd"/>
  <xsd:include schemaLocation ="B2MML-ResourceRelationshipNetwork.xsd"/>
  <xsd:include schemaLocation ="B2MML-TransactionProfile.xsd"/>
  <xsd:include schemaLocation ="B2MML-WorkAlert.xsd"/>

diff --git a/Schema/B2MML-Common.xsd b/Schema/B2MML-Common.xsd
@@ -6,7 +6,7 @@
     <xsd:include schemaLocation="B2MML-InformationObject.xsd"/>    
     <!-- Import the Common Extension Schema                 -->
     <xsd:import namespace="http://www.mesa.org/xml/B2MML-AllExtensions" 
-                schemaLocation="B2MML-CommonExtensions.xsd"/>
+                schemaLocation="B2MML-AllExtensions.xsd"/>
     <xsd:annotation>
         <xsd:documentation>
 

diff --git a/Schema/B2MML-Extensions.xsd b/Schema/B2MML-Extensions.xsd
@@ -12,7 +12,8 @@
 <!-- This also brings in the Core Components under the 'b2mml' name space  -->
      <xsd:import namespace         = "http://www.mesa.org/xml/B2MML"
                  schemaLocation    = "B2MML-Common.xsd"/> 
-<xsd:include schemaLocation="B2MML-CommonExtensions.xsd"/>
+
+<xsd:include schemaLocation="B2MML-AllExtensions.xsd"/>
 <xsd:annotation> 
    <xsd:documentation>
 

diff --git a/Schema/B2MML-InformationObject.xsd b/Schema/B2MML-InformationObject.xsd
@@ -55,31 +55,33 @@
    </xsd:documentation>
 </xsd:annotation>
 
- <xsd:include schemaLocation = "B2MML-Common.xsd"/>
- <xsd:include schemaLocation = "B2MML-Equipment.xsd"/>
- <xsd:include schemaLocation = "B2MML-Material.xsd"/>
- <xsd:include schemaLocation = "B2MML-OperationalLocation.xsd"/>
- <xsd:include schemaLocation = "B2MML-OperationsCapability.xsd"/>
- <xsd:include schemaLocation = "B2MML-OperationsDefinition.xsd"/>
- <xsd:include schemaLocation = "B2MML-OperationsEvent.xsd"/>
- <xsd:include schemaLocation = "B2MML-OperationsPerformance.xsd"/>
- <xsd:include schemaLocation = "B2MML-OperationsSchedule.xsd"/>
- <xsd:include schemaLocation = "B2MML-OperationsTest.xsd"/>
- <xsd:include schemaLocation = "B2MML-Personnel.xsd"/>
- <xsd:include schemaLocation = "B2MML-PhysicalAsset.xsd"/>
- <xsd:include schemaLocation = "B2MML-ProcessSegment.xsd"/>
- <xsd:include schemaLocation = "B2MML-ResourceRelationshipNetwork.xsd"/>
- <xsd:include schemaLocation = "B2MML-WorkAlert.xsd"/>
- <xsd:include schemaLocation = "B2MML-WorkCalendar.xsd"/>
- <xsd:include schemaLocation = "B2MML-WorkDefinition.xsd"/>
- <xsd:include schemaLocation = "B2MML-WorkCapability.xsd"/>
- <xsd:include schemaLocation = "B2MML-WorkflowSpecification.xsd"/>
- <xsd:include schemaLocation = "B2MML-WorkPerformance.xsd"/>
- <xsd:include schemaLocation = "B2MML-WorkRecord.xsd"/>
- <xsd:include schemaLocation = "B2MML-WorkSchedule.xsd"/>
- <xsd:include schemaLocation = "BatchML-BatchInformation.xsd"/>
- <xsd:include schemaLocation = "BatchML-GeneralRecipe.xsd"/>
- <xsd:include schemaLocation = "BatchML-BatchProductionRecord.xsd"/>
+<xsd:include schemaLocation ="B2MML-CoreComponents.xsd"/>
+<xsd:include schemaLocation ="B2MML-Common.xsd"/>
+<xsd:include schemaLocation ="B2MML-ConfirmBOD.xsd"/>
+<xsd:include schemaLocation ="B2MML-Equipment.xsd"/>
+<xsd:include schemaLocation ="B2MML-Material.xsd"/>
+<xsd:include schemaLocation ="B2MML-Personnel.xsd"/>
+<xsd:include schemaLocation ="B2MML-PhysicalAsset.xsd"/>
+<xsd:include schemaLocation ="B2MML-ProcessSegment.xsd"/>
+<xsd:include schemaLocation ="B2MML-OperationalLocation.xsd"/>
+<xsd:include schemaLocation ="B2MML-OperationsCapability.xsd"/>
+<xsd:include schemaLocation ="B2MML-OperationsDefinition.xsd"/>
+<xsd:include schemaLocation ="B2MML-OperationsEvent.xsd"/>
+<xsd:include schemaLocation ="B2MML-OperationsPerformance.xsd"/>
+<xsd:include schemaLocation ="B2MML-OperationsSchedule.xsd"/>
+<xsd:include schemaLocation ="B2MML-OperationsPerformanceTypes.xsd"/>
+<xsd:include schemaLocation ="B2MML-ResourceRelationshipNetwork.xsd"/>
+<xsd:include schemaLocation ="B2MML-TransactionProfile.xsd"/>
+<xsd:include schemaLocation ="B2MML-WorkAlert.xsd"/>
+<xsd:include schemaLocation ="B2MML-WorkCalendar.xsd"/>
+<xsd:include schemaLocation ="B2MML-WorkCapability.xsd"/>
+<xsd:include schemaLocation ="B2MML-WorkCapability.xsd"/>
+<xsd:include schemaLocation ="B2MML-WorkflowSpecification.xsd"/>
+<xsd:include schemaLocation ="B2MML-WorkRecord.xsd"/>
+<xsd:include schemaLocation ="B2MML-WorkSchedule.xsd"/>
+<xsd:include schemaLocation ="BatchML-BatchInformation.xsd"/>
+<xsd:include schemaLocation ="BatchML-GeneralRecipe.xsd"/>
+<xsd:include schemaLocation ="BatchML-BatchProductionRecord.xsd"/>
 
  <xsd:import  namespace="http://www.mesa.org/xml/B2MML-AllExtensions"
               schemaLocation="B2MML-AllExtensions.xsd"/>

diff --git a/Schema/BatchML-BatchInformationExtensions.xsd b/Schema/BatchML-BatchInformationExtensions.xsd
@@ -15,7 +15,8 @@
    <xsd:import
             namespace              = "http://www.mesa.org/xml/B2MML"
             schemaLocation         = "B2MML-Common.xsd"/> 
-  <xsd:include schemaLocation="B2MML-CommonExtensions.xsd"/>
+
+  <xsd:include schemaLocation="B2MML-AllExtensions.xsd"/>
 
 <xsd:annotation> 
    <xsd:documentation>

diff --git a/Schema/BatchML-BatchProductionRecordExtensions.xsd b/Schema/BatchML-BatchProductionRecordExtensions.xsd
@@ -16,7 +16,7 @@
             namespace              = "http://www.mesa.org/xml/B2MML"
             schemaLocation         = "B2MML-Common.xsd"/> 
 
-  <xsd:include schemaLocation="B2MML-CommonExtensions.xsd"/>
+  <xsd:include schemaLocation="B2MML-AllExtensions.xsd"/>
 
 
 <xsd:annotation> 

diff --git a/Schema/BatchML-GeneralRecipeExtensions.xsd b/Schema/BatchML-GeneralRecipeExtensions.xsd
@@ -16,7 +16,7 @@
             namespace              = "http://www.mesa.org/xml/B2MML"
             schemaLocation         = "B2MML-Common.xsd"/>
 
-<xsd:include schemaLocation="B2MML-CommonExtensions.xsd"/>
+<xsd:include schemaLocation="B2MML-AllExtensions.xsd"/>
 
 <xsd:annotation>
    <xsd:documentation>