-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
ERDi, MESA: complexType name = "WorkflowSpecificationInformationType"> CHANGE: - element name = "WorkflowSpecificationType" type = "WorkflowSpecificationTypeType" TO "WorkflowSpecificationNodeType" type = "WorkflowSpecificationNodeTypeType" ADD: - element name = "WorkflowSpecificationConnectionType" type = "WorkflowSpecificationConnectionTypeType" minOccurs = "0" maxOccurs = "unbounded"/> ERDi, MESA: complexType name = "WorkflowSpecificationType"> CHANGE: - element name = "Node" minOccurs = "0" maxOccurs = "unbounded"/> TO "WorkflowSpecificationNode" minOccurs = "1" maxOccurs = "unbounded"/> - element name = "Connection" TO "WorkflowSpecificationConnection" - element name = "WorkflowSpecificationProperty" type = "WorkflowPropertyType" TO "WorkflowSpecificationProperty" type = "WorkflowSpecificationPropertyType" - element name = "IncludesThePropertiesOf" TO "WorkflowSpecificationNodeParent" ADD: - element name = "DefinitionType", type = "DefinitionTypeType", minOccurs = "0"/> ERDi, MESA: complexType name = "WorkflowPropertyType", CHANGE: - complexType name = "WorkflowPropertyType" TO "WorkflowSpecificationPropertyType" - element name = "WorkflowProperty" TO "WorkflowSpecificationPropertyChild" DELETE: - element name = "EvaluatedPropertyReference" - element name = "TestResult" ERDI, MESA: DELETE complexType name = "WorkflowSpecificationTypeType", This is an intermediate type which simply refers to WorkflowSpecificationNodeTypeType and WorkflowSpecificationConnectionTypeType. It is simply not needed especially since these types are individually exchanged as first order objects as master data. Also, the name, WorkflowSpecificationType, is confusing since it implies that there is a type of Workflow Specification which there is not in the updated ISA-95 Part 2. ERDi, MESA: complexType name = "WorkflowSpecificationNodeType"> ADD: - element name = "Version", type = "VersionType" minOccurs = "0"/> - element name = "EffectiveFrom", type = "DateTimeType" minOccurs = "0" /> - element name = "EffectiveTo", type = "DateTimeType" minOccurs = "0" /> CHANGE: - element name = "NodeType" type = "IdentifierType" /> TO "WorkflowSpecificationNodeTypeID type = "IdentifierType" minOccurs = "0" maxOccurs = "1"/> - element name = "Property", type = "WorkflowSpecificationPropertyType" TO "WorkflowSpecifictionNodeProperty", type = "WorkflowSpecificationNodePropertyType" - element name = "IncludesThePropertiesOf" TO "WorkflowSpecificationNodeParent" ADD: - element name = "WorkMasterID", type = "IdentifierType" />, minOccurs = "0" maxOccurs = "unbounded"/> - element name = "WorkDirectiveID",type ="IdentifierType" />, minOccurs = "0" maxOccurs = "unbounded"/> ERDi, MESA: complexType name = "WorkflowSpecificationConnectionType"> CHANGE: - element name = "ConnectionType" type = "IdentifierType" /> TO "WorkflowSpecificationConnectionTypeID type = "IdentifierType" minOccurs = "0" maxOccurs = "1"/> - element name = "FromNodeID" TO "FromWSNodeID" - element name = "ToNodeID" TO "ToWSNodeID" - element name = "Property", type = "WorkflowSpecificationPropertyType" TO "WorkflowSpecifictionConnectionProperty", type = "WorkflowSpecificationConnectionPropertyType" ERDi, MESA: complexType name = "WorkflowSpecificationNodeTypeType" ADD: - element name = "Version", type = "VersionType" minOccurs = "0"/> - element name = "EffectiveFrom", type = "DateTimeType" minOccurs = "0" /> - element name = "EffectiveTo", type = "DateTimeType" minOccurs = "0" /> CHANGE: - element name = "Property", type = "WorkflowSpecificationPropertyType" TO "WorkflowSpecifictionNodeTypeProperty", type = "WorkflowSpecificationNodeTypePropertyType" ERDi, MESA: complexType name = "WorkflowSpecificationConnectionTypeType" ADD: - element name = "Version", type = "VersionType" minOccurs = "0"/> - element name = "EffectiveFrom", type = "DateTimeType" minOccurs = "0" /> - element name = "EffectiveTo", type = "DateTimeType" minOccurs = "0" /> CHANGE: - element name = "Property", type = "WorkflowSpecificationPropertyType" TO "WorkflowSpecifictionConnectionTypeProperty", type = "WorkflowSpecificationConnectionTypePropertyType"
- Loading branch information
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -112,7 +112,11 @@ | |
minOccurs = "0"/> | ||
<xsd:element name = "WorkflowSpecification" type = "WorkflowSpecificationType" | ||
minOccurs = "0" maxOccurs = "unbounded"/> | ||
<xsd:element name = "WorkflowSpecificationType" type = "WorkflowSpecificationTypeType" | ||
<xsd:element name = "WorkflowSpecificationNodeType" | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong. |
||
type = "WorkflowSpecificationNodeTypeType" | ||
minOccurs = "0" maxOccurs = "unbounded"/> | ||
<xsd:element name = "WorkflowSpecificationConnectionType" | ||
type = "WorkflowSpecificationConnectionTypeType" | ||
This comment has been minimized.
Sorry, something went wrong.
CharlieG021163
Author
Collaborator
|
||
minOccurs = "0" maxOccurs = "unbounded"/> | ||
<xsd:group ref = "Extended:WorkflowSpecificationInformation" minOccurs = "0" maxOccurs = "1"/> | ||
</xsd:sequence> | ||
|
@@ -131,74 +135,60 @@ | |
minOccurs = "0" /> | ||
<xsd:element name = "EffectiveTo" type = "DateTimeType" | ||
minOccurs = "0" /> | ||
<xsd:element name = "Node" type = "WorkflowSpecificationNodeType" | ||
minOccurs = "0" maxOccurs = "unbounded"/> | ||
<xsd:element name = "Connection" type = "WorkflowSpecificationConnectionType" | ||
minOccurs = "0" maxOccurs = "unbounded"/> | ||
<xsd:element name = "WorkflowSpecificationProperty" type = "WorkflowPropertyType" | ||
minOccurs = "0" maxOccurs = "unbounded"/> | ||
<xsd:group ref = "Extended:WorkflowSpecification" minOccurs = "0" maxOccurs = "1"/> | ||
</xsd:sequence> | ||
</xsd:complexType> | ||
|
||
|
||
<xsd:complexType name = "WorkflowSpecificationTypeType"> | ||
This comment has been minimized.
Sorry, something went wrong. |
||
<xsd:sequence> | ||
<xsd:element name = "ID" type = "IdentifierType" /> | ||
<xsd:element name = "Version" type = "VersionType" | ||
<xsd:element name = "DefinitionType" type = "DefinitionTypeType" | ||
This comment has been minimized.
Sorry, something went wrong.
CharlieG021163
Author
Collaborator
|
||
minOccurs = "0"/> | ||
<xsd:element name = "Description" type = "DescriptionType" | ||
<xsd:element name = "WorkflowSpecificationNode" type = "WorkflowSpecificationNodeType" | ||
minOccurs = "1" maxOccurs = "unbounded"/> | ||
<xsd:element name = "WorkflowSpecificationConnection" | ||
This comment has been minimized.
Sorry, something went wrong.
CharlieG021163
Author
Collaborator
|
||
type = "WorkflowSpecificationConnectionType" | ||
minOccurs = "0" maxOccurs = "unbounded"/> | ||
<xsd:element name = "EffectiveFrom" type = "DateTimeType" | ||
minOccurs = "0" /> | ||
<xsd:element name = "EffectiveTo" type = "DateTimeType" | ||
minOccurs = "0" /> | ||
<xsd:element name = "NodeType" type = "WorkflowSpecificationNodeTypeType" | ||
<xsd:element name = "WorkflowSpecificationParent" type = "IdentifierType" | ||
This comment has been minimized.
Sorry, something went wrong. |
||
minOccurs = "0" maxOccurs = "unbounded"/> | ||
<xsd:element name = "ConnectionType" type = "WorkflowSpecificationConnectionTypeType" | ||
<xsd:element name = "WorkflowSpecificationProperty" | ||
type = "WorkflowSpecificationPropertyType" | ||
This comment has been minimized.
Sorry, something went wrong.
CharlieG021163
Author
Collaborator
|
||
minOccurs = "0" maxOccurs = "unbounded"/> | ||
<xsd:group ref = "Extended:WorkflowSpecificationType" minOccurs = "0" maxOccurs = "1"/> | ||
<xsd:group ref = "Extended:WorkflowSpecification" minOccurs = "0" maxOccurs = "1"/> | ||
</xsd:sequence> | ||
</xsd:complexType> | ||
|
||
|
||
<xsd:complexType name = "WorkflowPropertyType"> | ||
<xsd:complexType name = "WorkflowSpecificationPropertyType"> | ||
This comment has been minimized.
Sorry, something went wrong.
CharlieG021163
Author
Collaborator
|
||
<xsd:sequence> | ||
<xsd:element name = "ID" type = "IdentifierType"/> | ||
<xsd:element name = "Description" type = "DescriptionType" | ||
<xsd:element name = "Description" type = "DescriptionType" | ||
minOccurs = "0" maxOccurs = "unbounded"/> | ||
<xsd:element name = "Value" type = "ValueType" | ||
minOccurs = "0" maxOccurs = "unbounded"/> | ||
<xsd:element name = "WorkflowProperty" type = "WorkflowSpecificationPropertyType" | ||
<xsd:element name = "WorkflowSpecificationPropertyChild" | ||
This comment has been minimized.
Sorry, something went wrong.
CharlieG021163
Author
Collaborator
|
||
type = "WorkflowSpecificationPropertyType" | ||
minOccurs = "0" maxOccurs = "unbounded"/> | ||
<xsd:element name = "EvaluatedPropertyReference" | ||
type = "EvaluatedPropertyReferenceType" | ||
minOccurs = "0" /> | ||
<xsd:element name = "TestResult" type = "TestResultType" | ||
This comment has been minimized.
Sorry, something went wrong.
CharlieG021163
Author
Collaborator
|
||
minOccurs = "0" maxOccurs = "unbounded"/> | ||
<xsd:group ref = "Extended:WorkflowSpecificationProperty" | ||
minOccurs = "0" maxOccurs = "1"/> | ||
</xsd:sequence> | ||
</xsd:complexType> | ||
|
||
|
||
<!-- ========================================= --> | ||
<!-- Common group for all elements ========== --> | ||
<!-- ========================================= --> | ||
|
||
|
||
<xsd:complexType name = "WorkflowSpecificationNodeType"> | ||
<xsd:sequence> | ||
<xsd:element name = "ID" type = "IdentifierType" /> | ||
<xsd:element name = "Description" type = "DescriptionType" | ||
minOccurs = "0" maxOccurs = "unbounded"/> | ||
<xsd:element name = "NodeType" type = "IdentifierType" /> | ||
<xsd:element name = "WorkflowSpecificationNodeTypeID" | ||
This comment has been minimized.
Sorry, something went wrong.
CharlieG021163
Author
Collaborator
|
||
type = "IdentifierType" | ||
minOccurs = "0" maxOccurs = "1"/> | ||
<xsd:element name = "HierarchyScope" type = "HierarchyScopeType" | ||
minOccurs = "0"/> | ||
minOccurs = "0"/> | ||
<xsd:element name = "WorkflowSpecification" type = "WorkflowSpecificationType" | ||
minOccurs = "0" maxOccurs = "1"/> | ||
<xsd:element name = "Property" type = "WorkflowSpecificationPropertyType" | ||
minOccurs = "0" maxOccurs = "1"/> | ||
<xsd:element name = "WorkMasterID" type = "IdentifierType" | ||
minOccurs = "0" maxOccurs = "unbounded"/> | ||
<xsd:element name = "WorkDirectiveID" type = "IdentifierType" | ||
This comment has been minimized.
Sorry, something went wrong.
CharlieG021163
Author
Collaborator
|
||
minOccurs = "0" maxOccurs = "unbounded"/> | ||
<xsd:element name = "IncludesThePropertiesOf" type = "IdentifierType" | ||
<xsd:element name = "WorkflowSpecifictionNodeProperty" | ||
type = "WorkflowSpecificationNodePropertyType" | ||
minOccurs = "0" maxOccurs = "unbounded"/> | ||
<xsd:element name = "WorkflowSpecificationNodeParent" | ||
type = "IdentifierType" | ||
This comment has been minimized.
Sorry, something went wrong. |
||
minOccurs = "0" maxOccurs = "unbounded"/> | ||
<xsd:group ref = "Extended:WorkflowSpecificationNode" minOccurs = "0" maxOccurs = "1"/> | ||
</xsd:sequence> | ||
|
@@ -210,12 +200,15 @@ | |
<xsd:element name = "ID" type = "IdentifierType" /> | ||
<xsd:element name = "Description" type = "DescriptionType" | ||
minOccurs = "0" maxOccurs = "unbounded"/> | ||
<xsd:element name = "ConnectionType" type = "IdentifierType" /> | ||
<xsd:element name = "FromNodeID" type = "DescriptionType" | ||
<xsd:element name = "WorkflowSpecificationConnectionTypeID" | ||
type = "IdentifierType" | ||
minOccurs = "0" maxOccurs = "1"/>/> | ||
<xsd:element name = "FromWSNodeID" type = "DescriptionType" | ||
This comment has been minimized.
Sorry, something went wrong.
CharlieG021163
Author
Collaborator
|
||
minOccurs = "0" maxOccurs = "unbounded"/> | ||
<xsd:element name = "ToNodeID" type = "DescriptionType" | ||
<xsd:element name = "ToWSNodeID" type = "DescriptionType" | ||
This comment has been minimized.
Sorry, something went wrong. |
||
minOccurs = "0" maxOccurs = "unbounded"/> | ||
<xsd:element name = "Property" type = "WorkflowSpecificationPropertyType" | ||
<xsd:element name = "WorkflowSpecificationConnectionProperty" | ||
type = "WorkflowSpecificationConnectionPropertyType" | ||
This comment has been minimized.
Sorry, something went wrong. |
||
minOccurs = "0" maxOccurs = "unbounded"/> | ||
<xsd:group ref = "Extended:WorkflowSpecificationConnection" minOccurs = "0" maxOccurs = "1"/> | ||
</xsd:sequence> | ||
|
@@ -224,9 +217,16 @@ | |
<xsd:complexType name = "WorkflowSpecificationNodeTypeType"> | ||
<xsd:sequence> | ||
<xsd:element name = "ID" type = "IdentifierType" /> | ||
<xsd:element name = "Version" type = "VersionType" | ||
minOccurs = "0"/> | ||
This comment has been minimized.
Sorry, something went wrong.
CharlieG021163
Author
Collaborator
|
||
<xsd:element name = "Description" type = "DescriptionType" | ||
minOccurs = "0" maxOccurs = "unbounded"/> | ||
<xsd:element name = "Property" type = "WorkflowSpecificationPropertyType" | ||
<xsd:element name = "EffectiveFrom" type = "DateTimeType" | ||
minOccurs = "0" /> | ||
<xsd:element name = "EffectiveTo" type = "DateTimeType" | ||
minOccurs = "0" /> | ||
<xsd:element name = "WorkflowSpecificationNodeTypeProperty" | ||
type = "WorkflowSpecificationNodeTypePropertyType" | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
CharlieG021163
Author
Collaborator
|
||
minOccurs = "0" maxOccurs = "unbounded"/> | ||
<xsd:group ref = "Extended:WorkflowSpecificationNodeType" minOccurs = "0" maxOccurs = "1"/> | ||
</xsd:sequence> | ||
|
@@ -236,15 +236,26 @@ | |
<xsd:complexType name = "WorkflowSpecificationConnectionTypeType"> | ||
<xsd:sequence> | ||
<xsd:element name = "ID" type = "IdentifierType" /> | ||
<xsd:element name = "Version" type = "VersionType" | ||
minOccurs = "0"/> | ||
This comment has been minimized.
Sorry, something went wrong.
CharlieG021163
Author
Collaborator
|
||
<xsd:element name = "Description" type = "DescriptionType" | ||
minOccurs = "0" maxOccurs = "unbounded"/> | ||
<xsd:element name = "Property" type = "WorkflowSpecificationPropertyType" | ||
<xsd:element name = "EffectiveFrom" type = "DateTimeType" | ||
minOccurs = "0" /> | ||
<xsd:element name = "EffectiveTo" type = "DateTimeType" | ||
minOccurs = "0" /> | ||
<xsd:element name = "WorkflowSpecificationConnectionTypeProperty" | ||
type = "WorkflowSpecificationConnectionTypePropertyType" | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
CharlieG021163
Author
Collaborator
|
||
minOccurs = "0" maxOccurs = "unbounded"/> | ||
<xsd:group ref = "Extended:WorkflowSpecificationConnectionType" minOccurs = "0" maxOccurs = "1"/> | ||
</xsd:sequence> | ||
</xsd:complexType> | ||
|
||
|
||
<!-- ========================================= --> | ||
<!-- Common group for all elements ========== --> | ||
<!-- ========================================= --> | ||
|
||
<xsd:complexType name = "WorkflowSpecificationPropertyType"> | ||
<xsd:sequence> | ||
<xsd:element name = "ID" type = "IdentifierType" /> | ||
|
ERDi, MESA: complexType name = "WorkflowSpecificationInformationType">
CHANGE: This is using an abstract object not defined in updated ISA-95 Part 4 and the elements make the model confusing. Aligns better to updated Workflow Specification model where WSNodeType and and WSConnectionType are independent exchanged 1st order objects.
"WorkflowSpecificationNodeType" type = "WorkflowSpecificationNodeTypeType"