From 58ad2a84fa3ce883cdeaa7fe6f4fe5fc1dc60b71 Mon Sep 17 00:00:00 2001
From: Terry Rankine <terry.rankine@etpartners.com.au>
Date: Mon, 16 Mar 2020 22:03:28 +0800
Subject: [PATCH 1/2] syntax errors.... validation errors... closer Unsure of
 intent of group Extended:ErrorMessage

---
 Schema/B2MML-ErrorMessage.xsd | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/Schema/B2MML-ErrorMessage.xsd b/Schema/B2MML-ErrorMessage.xsd
index 36a24b9..5cb8dd0 100644
--- a/Schema/B2MML-ErrorMessage.xsd
+++ b/Schema/B2MML-ErrorMessage.xsd
@@ -3,7 +3,7 @@
 <xsd:schema     xmlns:xsd               = "http://www.w3.org/2001/XMLSchema"
                 targetNamespace         = "http://www.mesa.org/xml/B2MML"
                 xmlns                   = "http://www.mesa.org/xml/B2MML"
-                xmlns:Extended          = "http://www.mesa.org/xml/B2MML-AllExtensions" 
+                xmlns:Extended          = "http://www.mesa.org/xml/B2MML-AllExtensions"> 
   
 <!-- Import the Extension Schema         -->
 
@@ -16,9 +16,8 @@
 
 <xsd:annotation> 
    <xsd:documentation>
-
         Copyright 2019 MESA International, Version 0700
-    All Rights Reserved. http://www.mesa.org
+        All Rights Reserved. http://www.mesa.org
 
         This MESA International work (including specifications, documents, 
         software, and related items) referred to as the Business To 
@@ -46,13 +45,10 @@
    </xsd:documentation>
 
    <xsd:documentation> 
-
       Revision History
 
         Ver     Date            Person          Note
         ---     ----            ------          ----
-     
-    
 
    </xsd:documentation>
 </xsd:annotation>
@@ -85,11 +81,11 @@
                                                       minOccurs = "0"/>
     <xsd:element name = "ErrorDescription"            type = "xsd:string" 
                                                       minOccurs = "0"/>
-    <xsd:element name = "CausedBy"                    type = "ext:ErrorMessageType" 
+    <xsd:element name = "CausedBy"                    type = "ErrorMessageType" 
                                                       minOccurs = "0"/>
     <xsd:group   ref  = "Extended:ErrorMessage"       minOccurs = "0" maxOccurs = "1"/>
-  </xs:sequence>
-</xs:complexType>
+  </xsd:sequence>
+</xsd:complexType>
 
 <xsd:complexType name = "ErrorTypeType">
     <xsd:simpleContent>
@@ -109,9 +105,6 @@
     </xsd:simpleContent>
 </xsd:complexType>
 
-
-</xs:schema>
-
 <!-- - - - - - - - - - - - - - - - - - - - - -->
 <!-- ErrorMessage Transaction Types    -->
 <!-- - - - - - - - - - - - - - - - - - - - - -->

From b9bd974ae0046adf74c94aa19829cede8f9641ce Mon Sep 17 00:00:00 2001
From: Terry Rankine <terry.rankine@etpartners.com.au>
Date: Mon, 16 Mar 2020 22:51:45 +0800
Subject: [PATCH 2/2] convert CommonExtensions to All extensions Add new schema
 to AllSchemas Update the list of schemas in InformationObject (this is still
 broken)

---
 Schema/AllSchemas.xsd                         |  8 ++-
 Schema/B2MML-Common.xsd                       |  2 +-
 Schema/B2MML-Extensions.xsd                   |  3 +-
 Schema/B2MML-InformationObject.xsd            | 52 ++++++++++---------
 Schema/BatchML-BatchInformationExtensions.xsd |  3 +-
 ...atchML-BatchProductionRecordExtensions.xsd |  2 +-
 Schema/BatchML-GeneralRecipeExtensions.xsd    |  2 +-
 7 files changed, 40 insertions(+), 32 deletions(-)

diff --git a/Schema/AllSchemas.xsd b/Schema/AllSchemas.xsd
index 9220946..cf5d4ff 100644
--- 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
index 4186a1a..e2c67a5 100644
--- 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
index aec2654..cccd834 100644
--- 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
index 3ef7445..9b410e2 100644
--- 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
index c83647b..e00a410 100644
--- 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
index 7d40280..1374be5 100644
--- 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
index 7b80c9e..b88aebc 100644
--- 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>