#1 TypeOs and Format

ETPartners · Mar 16, 2020 · b5bc9e7 · CharlieG021163 · Apr 15, 2020 · CharlieG021163
2 parents b516e08 + b9bd974
commit b5bc9e7
Show file tree

Hide file tree

Showing 8 changed files with 61 additions and 37 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-ErrorMessage.xsd b/Schema/B2MML-ErrorMessage.xsd
@@ -3,9 +3,13 @@
 <xsd:schema     xmlns:xsd               = "http://www.w3.org/2001/XMLSchema"
                 targetNamespace         = "http://www.mesa.org/xml/B2MML"
                 xmlns                   = "http://www.mesa.org/xml/B2MML"
+<<<<<<< HEAD
                 xmlns:Extended          = "http://www.mesa.org/xml/B2MML-AllExtensions"
                 elementFormDefault      = "qualified"
                 attributeFormDefault    = "unqualified"> 
+=======
+                xmlns:Extended          = "http://www.mesa.org/xml/B2MML-AllExtensions"> 
+>>>>>>> b9bd974ae0046adf74c94aa19829cede8f9641ce
 
 <!-- Import the Extension Schema         -->
 
@@ -18,9 +22,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 
@@ -48,13 +51,10 @@
    </xsd:documentation>
 
    <xsd:documentation> 
-
       Revision History
 
         Ver     Date            Person          Note
         ---     ----            ------          ----
-
-
 
    </xsd:documentation>
 </xsd:annotation>
@@ -77,6 +77,7 @@
 
 <xsd:complexType name = "ErrorMessageType">
   <xsd:sequence>
+<<<<<<< HEAD
     <xsd:element name = "ID"                            type = "IdentifierType"/>
     <xsd:element name = "Description"                   type = "DescriptionType"
                                                         minOccurs = "0" maxOccurs = "unbounded"/>
@@ -90,6 +91,21 @@
     <xsd:element name = "CausedBy"                      type = "ErrorMessageType" 
                                                         minOccurs = "0"/>
     <xsd:group ref = "Extended:ErrorMessage"            minOccurs = "0" maxOccurs = "1"/>
+=======
+    <xsd:element name = "ID"                          type = "IdentifierType"/>
+    <xsd:element name = "Description"                 type = "DescriptionType"
+                                                      minOccurs = "0" maxOccurs = "unbounded"/>
+    <xsd:element name = "ThrownFrom"                  type = "xsd:string"/>
+    <xsd:element name = "TimeStamp"                   type = "xsd:dateTime"/>
+    <xsd:element name = "ErrorType"                   type = "ErrorTypeType"/>
+    <xsd:element name = "ErrorCode"                   type = "xsd:string" 
+                                                      minOccurs = "0"/>
+    <xsd:element name = "ErrorDescription"            type = "xsd:string" 
+                                                      minOccurs = "0"/>
+    <xsd:element name = "CausedBy"                    type = "ErrorMessageType" 
+                                                      minOccurs = "0"/>
+    <xsd:group   ref  = "Extended:ErrorMessage"       minOccurs = "0" maxOccurs = "1"/>
+>>>>>>> b9bd974ae0046adf74c94aa19829cede8f9641ce
   </xsd:sequence>
 </xsd:complexType>
 

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>