Author: MohReece Date: 2010-10-21 15:26:28 -0400 (Thu, 21 Oct 2010) New Revision: 6774 Added: projects/migration_tool/trunk/src/main/resources/Schemas/BPMN/BPMNDI.xsd projects/migration_tool/trunk/src/main/resources/Schemas/BPMN/DC.xsd projects/migration_tool/trunk/src/main/resources/Schemas/BPMN/DI.xsd Removed: projects/migration_tool/trunk/src/main/resources/Schemas/BPMN/DiagramDefinition.xsd projects/migration_tool/trunk/src/main/resources/Schemas/BPMN/DiagramInterchange.xsd Modified: projects/migration_tool/trunk/src/main/resources/Schemas/BPMN/BPMN20.xsd projects/migration_tool/trunk/src/main/resources/Schemas/BPMN/Semantic.xsd Log: Updated the BPMN 2.0 schemas to the Beta2 versions. Modified: projects/migration_tool/trunk/src/main/resources/Schemas/BPMN/BPMN20.xsd =================================================================== --- projects/migration_tool/trunk/src/main/resources/Schemas/BPMN/BPMN20.xsd 2010-10-21 18:22:24 UTC (rev 6773) +++ projects/migration_tool/trunk/src/main/resources/Schemas/BPMN/BPMN20.xsd 2010-10-21 19:26:28 UTC (rev 6774) @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <xsd:schema elementFormDefault="qualified" attributeFormDefault="unqualified" - xmlns="http://schema.omg.org/spec/BPMN/2.0" + xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:di="http://www.omg.com/di/1.0.0" - targetNamespace="http://schema.omg.org/spec/BPMN/2.0"> + xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" + targetNamespace="http://www.omg.org/spec/BPMN/20100524/MODEL"> - <xsd:import namespace="http://www.omg.com/di/1.0.0" schemaLocation="DiagramInterchange.xsd"/> + <xsd:import namespace="http://www.omg.org/spec/BPMN/20100524/DI" schemaLocation="BPMNDI.xsd"/> <xsd:include schemaLocation="Semantic.xsd"/> <xsd:element name="definitions" type="tDefinitions"/> @@ -14,13 +14,16 @@ <xsd:element ref="import" minOccurs="0" maxOccurs="unbounded"/> <xsd:element ref="extension" minOccurs="0" maxOccurs="unbounded"/> <xsd:element ref="rootElement" minOccurs="0" maxOccurs="unbounded"/> - <xsd:element ref="di:diagram" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element ref="bpmndi:BPMNDiagram" minOccurs="0" maxOccurs="unbounded"/> <xsd:element ref="relationship" minOccurs="0" maxOccurs="unbounded"/> </xsd:sequence> <xsd:attribute name="id" type="xsd:ID" use="optional"/> + <xsd:attribute name="name" type="xsd:string"/> <xsd:attribute name="targetNamespace" type="xsd:anyURI" use="required"/> <xsd:attribute name="expressionLanguage" type="xsd:anyURI" use="optional" default="http://www.w3.org/1999/XPath"/> <xsd:attribute name="typeLanguage" type="xsd:anyURI" use="optional" default="http://www.w3.org/2001/XMLSchema"/> + <xsd:attribute name="exporter" type="xsd:string"/> + <xsd:attribute name="exporterVersion" type="xsd:string"/> <xsd:anyAttribute namespace="##other" processContents="lax"/> </xsd:complexType> Added: projects/migration_tool/trunk/src/main/resources/Schemas/BPMN/BPMNDI.xsd =================================================================== --- projects/migration_tool/trunk/src/main/resources/Schemas/BPMN/BPMNDI.xsd (rev 0) +++ projects/migration_tool/trunk/src/main/resources/Schemas/BPMN/BPMNDI.xsd 2010-10-21 19:26:28 UTC (rev 6774) @@ -0,0 +1,100 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" targetNamespace="http://www.omg.org/spec/BPMN/20100524/DI" elementFormDefault="qualified" attributeFormDefault="unqualified"> + + <xsd:import namespace="http://www.omg.org/spec/DD/20100524/DC" schemaLocation="DC.xsd" /> + <xsd:import namespace="http://www.omg.org/spec/DD/20100524/DI" schemaLocation="DI.xsd" /> + + <xsd:element name="BPMNDiagram" type="bpmndi:BPMNDiagram" /> + <xsd:element name="BPMNPlane" type="bpmndi:BPMNPlane" /> + <xsd:element name="BPMNLabelStyle" type="bpmndi:BPMNLabelStyle" /> + <xsd:element name="BPMNShape" type="bpmndi:BPMNShape" substitutionGroup="di:DiagramElement" /> + <xsd:element name="BPMNLabel" type="bpmndi:BPMNLabel" /> + <xsd:element name="BPMNEdge" type="bpmndi:BPMNEdge" substitutionGroup="di:DiagramElement" /> + + <xsd:complexType name="BPMNDiagram"> + <xsd:complexContent> + <xsd:extension base="di:Diagram"> + <xsd:sequence> + <xsd:element ref="bpmndi:BPMNPlane" /> + <xsd:element ref="bpmndi:BPMNLabelStyle" maxOccurs="unbounded" minOccurs="0" /> + </xsd:sequence> + </xsd:extension> + </xsd:complexContent> + </xsd:complexType> + + <xsd:complexType name="BPMNPlane"> + <xsd:complexContent> + <xsd:extension base="di:Plane"> + <xsd:attribute name="bpmnElement" type="xsd:QName" /> + </xsd:extension> + </xsd:complexContent> + </xsd:complexType> + + <xsd:complexType name="BPMNEdge"> + <xsd:complexContent> + <xsd:extension base="di:LabeledEdge"> + <xsd:sequence> + <xsd:element ref="bpmndi:BPMNLabel" minOccurs="0" /> + </xsd:sequence> + <xsd:attribute name="bpmnElement" type="xsd:QName" /> + <xsd:attribute name="sourceElement" type="xsd:QName" /> + <xsd:attribute name="targetElement" type="xsd:QName" /> + <xsd:attribute name="messageVisibleKind" type="bpmndi:MessageVisibleKind" /> + </xsd:extension> + </xsd:complexContent> + </xsd:complexType> + + <xsd:complexType name="BPMNShape"> + <xsd:complexContent> + <xsd:extension base="di:LabeledShape"> + <xsd:sequence> + <xsd:element ref="bpmndi:BPMNLabel" minOccurs="0" /> + </xsd:sequence> + <xsd:attribute name="bpmnElement" type="xsd:QName" /> + <xsd:attribute name="isHorizontal" type="xsd:boolean" /> + <xsd:attribute name="isExpanded" type="xsd:boolean" /> + <xsd:attribute name="isMarkerVisible" type="xsd:boolean" /> + <xsd:attribute name="isMessageVisible" type="xsd:boolean" /> + <xsd:attribute name="participantBandKind" type="bpmndi:ParticipantBandKind" /> + <xsd:attribute name="choreographyActivityShape" type="xsd:QName"/> + </xsd:extension> + </xsd:complexContent> + </xsd:complexType> + + <xsd:complexType name="BPMNLabel"> + <xsd:complexContent> + <xsd:extension base="di:Label"> + <xsd:attribute name="labelStyle" type="xsd:QName" /> + </xsd:extension> + </xsd:complexContent> + </xsd:complexType> + + <xsd:complexType name="BPMNLabelStyle"> + <xsd:complexContent> + <xsd:extension base="di:Style"> + <xsd:sequence> + <xsd:element ref="dc:Font" /> + </xsd:sequence> + </xsd:extension> + </xsd:complexContent> + </xsd:complexType> + + <xsd:simpleType name="ParticipantBandKind"> + <xsd:restriction base="xsd:string"> + <xsd:enumeration value="top_initiating" /> + <xsd:enumeration value="middle_initiating" /> + <xsd:enumeration value="bottom_initiating" /> + <xsd:enumeration value="top_non_initiating" /> + <xsd:enumeration value="middle_non_initiating" /> + <xsd:enumeration value="bottom_non_initiating" /> + </xsd:restriction> + </xsd:simpleType> + + <xsd:simpleType name="MessageVisibleKind"> + <xsd:restriction base="xsd:string"> + <xsd:enumeration value="initiating" /> + <xsd:enumeration value="non_initiating" /> + </xsd:restriction> + </xsd:simpleType> + +</xsd:schema> Property changes on: projects/migration_tool/trunk/src/main/resources/Schemas/BPMN/BPMNDI.xsd ___________________________________________________________________ Name: svn:mime-type + text/plain Added: projects/migration_tool/trunk/src/main/resources/Schemas/BPMN/DC.xsd =================================================================== --- projects/migration_tool/trunk/src/main/resources/Schemas/BPMN/DC.xsd (rev 0) +++ projects/migration_tool/trunk/src/main/resources/Schemas/BPMN/DC.xsd 2010-10-21 19:26:28 UTC (rev 6774) @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" targetNamespace="http://www.omg.org/spec/DD/20100524/DC" elementFormDefault="qualified" attributeFormDefault="unqualified"> + + <xsd:element name="Font" type="dc:Font" /> + <xsd:element name="Point" type="dc:Point" /> + <xsd:element name="Bounds" type="dc:Bounds" /> + + <xsd:complexType name="Font"> + <xsd:attribute name="name" type="xsd:string" /> + <xsd:attribute name="size" type="xsd:double" /> + <xsd:attribute name="isBold" type="xsd:boolean" /> + <xsd:attribute name="isItalic" type="xsd:boolean" /> + <xsd:attribute name="isUnderline" type="xsd:boolean" /> + <xsd:attribute name="isStrikeThrough" type="xsd:boolean" /> + </xsd:complexType> + + <xsd:complexType name="Point"> + <xsd:attribute name="x" type="xsd:double" use="required" /> + <xsd:attribute name="y" type="xsd:double" use="required" /> + </xsd:complexType> + + <xsd:complexType name="Bounds"> + <xsd:attribute name="x" type="xsd:double" use="required" /> + <xsd:attribute name="y" type="xsd:double" use="required" /> + <xsd:attribute name="width" type="xsd:double" use="required" /> + <xsd:attribute name="height" type="xsd:double" use="required" /> + </xsd:complexType> + +</xsd:schema> Property changes on: projects/migration_tool/trunk/src/main/resources/Schemas/BPMN/DC.xsd ___________________________________________________________________ Name: svn:mime-type + text/plain Added: projects/migration_tool/trunk/src/main/resources/Schemas/BPMN/DI.xsd =================================================================== --- projects/migration_tool/trunk/src/main/resources/Schemas/BPMN/DI.xsd (rev 0) +++ projects/migration_tool/trunk/src/main/resources/Schemas/BPMN/DI.xsd 2010-10-21 19:26:28 UTC (rev 6774) @@ -0,0 +1,100 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" targetNamespace="http://www.omg.org/spec/DD/20100524/DI" elementFormDefault="qualified" attributeFormDefault="unqualified"> + + <xsd:import namespace="http://www.omg.org/spec/DD/20100524/DC" schemaLocation="DC.xsd" /> + + <xsd:element name="DiagramElement" type="di:DiagramElement" /> + <xsd:element name="Diagram" type="di:Diagram" /> + <xsd:element name="Style" type="di:Style" /> + <xsd:element name="Node" type="di:Node" /> + <xsd:element name="Edge" type="di:Edge" /> + <xsd:element name="Shape" type="di:Shape" /> + <xsd:element name="Plane" type="di:Plane" /> + <xsd:element name="LabeledEdge" type="di:LabeledEdge" /> + <xsd:element name="Label" type="di:Label" /> + <xsd:element name="LabeledShape" type="di:LabeledShape" /> + + <xsd:complexType abstract="true" name="DiagramElement"> + <xsd:sequence> + <xsd:element name="extension" minOccurs="0"> + <xsd:complexType> + <xsd:sequence> + <xsd:any namespace="##other" minOccurs="0" maxOccurs="unbounded" /> + </xsd:sequence> + </xsd:complexType> + </xsd:element> + </xsd:sequence> + <xsd:attribute name="id" type="xsd:ID" /> + <xsd:anyAttribute namespace="##other" processContents="lax" /> + </xsd:complexType> + + <xsd:complexType abstract="true" name="Diagram"> + <xsd:attribute name="name" type="xsd:string" /> + <xsd:attribute name="documentation" type="xsd:string" /> + <xsd:attribute name="resolution" type="xsd:double" /> + <xsd:attribute name="id" type="xsd:ID" /> + </xsd:complexType> + + <xsd:complexType abstract="true" name="Node"> + <xsd:complexContent> + <xsd:extension base="di:DiagramElement" /> + </xsd:complexContent> + </xsd:complexType> + + <xsd:complexType abstract="true" name="Edge"> + <xsd:complexContent> + <xsd:extension base="di:DiagramElement"> + <xsd:sequence> + <xsd:element maxOccurs="unbounded" minOccurs="2" name="waypoint" type="dc:Point" /> + </xsd:sequence> + </xsd:extension> + </xsd:complexContent> + </xsd:complexType> + + <xsd:complexType abstract="true" name="LabeledEdge"> + <xsd:complexContent> + <xsd:extension base="di:Edge" /> + </xsd:complexContent> + </xsd:complexType> + + <xsd:complexType abstract="true" name="Shape"> + <xsd:complexContent> + <xsd:extension base="di:Node"> + <xsd:sequence> + <xsd:element ref="dc:Bounds" /> + </xsd:sequence> + </xsd:extension> + </xsd:complexContent> + </xsd:complexType> + + <xsd:complexType abstract="true" name="LabeledShape"> + <xsd:complexContent> + <xsd:extension base="di:Shape" /> + </xsd:complexContent> + </xsd:complexType> + + <xsd:complexType abstract="true" name="Label"> + <xsd:complexContent> + <xsd:extension base="di:Node"> + <xsd:sequence> + <xsd:element ref="dc:Bounds" minOccurs="0" /> + </xsd:sequence> + </xsd:extension> + </xsd:complexContent> + </xsd:complexType> + + <xsd:complexType abstract="true" name="Plane"> + <xsd:complexContent> + <xsd:extension base="di:Node"> + <xsd:sequence> + <xsd:element ref="di:DiagramElement" maxOccurs="unbounded" minOccurs="0" /> + </xsd:sequence> + </xsd:extension> + </xsd:complexContent> + </xsd:complexType> + + <xsd:complexType abstract="true" name="Style"> + <xsd:attribute name="id" type="xsd:ID" /> + </xsd:complexType> + +</xsd:schema> Property changes on: projects/migration_tool/trunk/src/main/resources/Schemas/BPMN/DI.xsd ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: projects/migration_tool/trunk/src/main/resources/Schemas/BPMN/DiagramDefinition.xsd =================================================================== --- projects/migration_tool/trunk/src/main/resources/Schemas/BPMN/DiagramDefinition.xsd 2010-10-21 18:22:24 UTC (rev 6773) +++ projects/migration_tool/trunk/src/main/resources/Schemas/BPMN/DiagramDefinition.xsd 2010-10-21 19:26:28 UTC (rev 6774) @@ -1,95 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xsd:schema targetNamespace="http://www.omg.com/dd/1.0.0" xmlns:dd="http://www.omg.com/dd/1.0.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - - <xsd:element name="namedElement" type="dd:NamedElement"/> - <xsd:element name="package" type="dd:Package"/> - <xsd:element name="viewDefinition" type="dd:ViewDefinition" abstract="true"/> - <xsd:element name="nodeDefinition" type="dd:NodeDefinition" substitutionGroup="dd:viewDefinition"/> - <xsd:element name="connectorDefinition" type="dd:ConnectorDefinition" substitutionGroup="dd:viewDefinition"/> - <xsd:element name="diagramDefinition" type="dd:DiagramDefinition" substitutionGroup="dd:viewDefinition"/> - <xsd:element name="childDefinition" type="dd:ChildDefinition"/> - <xsd:element name="styleDefinition" type="dd:StyleDefinition"/> - <xsd:element name="constraint" type="dd:Constraint"/> - - <xsd:complexType abstract="true" name="NamedElement"> - <xsd:attribute name="name" type="xsd:NCName" use="required"/> - </xsd:complexType> - - <xsd:complexType name="Package"> - <xsd:complexContent> - <xsd:extension base="dd:NamedElement"> - <xsd:sequence> - <xsd:element maxOccurs="unbounded" minOccurs="0" ref="dd:viewDefinition"/> - </xsd:sequence> - <xsd:attribute name="nsURI" type="xsd:anyURI" use="required"/> - <xsd:attribute name="nsPrefix" type="xsd:NCName" use="required"/> - </xsd:extension> - </xsd:complexContent> - </xsd:complexType> - - <xsd:complexType abstract="true" name="ViewDefinition"> - <xsd:complexContent> - <xsd:extension base="dd:NamedElement"> - <xsd:sequence> - <xsd:element maxOccurs="unbounded" minOccurs="0" ref="dd:constraint"/> - <xsd:element maxOccurs="unbounded" minOccurs="0" ref="dd:styleDefinition"/> - <xsd:element maxOccurs="unbounded" minOccurs="0" ref="dd:childDefinition"/> - </xsd:sequence> - <xsd:attribute name="id" type="xsd:NCName" use="required"/> - <xsd:attribute name="abstract" type="xsd:boolean"/> - <xsd:attribute name="superDefinition" type="xsd:QName"/> - <xsd:attribute name="contextType" type="xsd:QName"/> - </xsd:extension> - </xsd:complexContent> - </xsd:complexType> - - <xsd:complexType name="NodeDefinition"> - <xsd:complexContent> - <xsd:extension base="dd:ViewDefinition"/> - </xsd:complexContent> - </xsd:complexType> - - <xsd:complexType name="ConnectorDefinition"> - <xsd:complexContent> - <xsd:extension base="dd:ViewDefinition"> - <xsd:attribute name="sourceDefinition" type="xsd:QName" use="required"/> - <xsd:attribute name="targetDefinition" type="xsd:QName" use="required"/> - </xsd:extension> - </xsd:complexContent> - </xsd:complexType> - - <xsd:complexType name="DiagramDefinition"> - <xsd:complexContent> - <xsd:extension base="dd:ViewDefinition"/> - </xsd:complexContent> - </xsd:complexType> - - <xsd:complexType name="ChildDefinition"> - <xsd:complexContent> - <xsd:extension base="dd:NamedElement"> - <xsd:attribute name="lowerBound" type="xsd:int" default="0" /> - <xsd:attribute name="upperBound" type="xsd:int" default="-1"/> - <xsd:attribute name="typeDefinition" type="xsd:QName" use="required"/> - </xsd:extension> - </xsd:complexContent> - </xsd:complexType> - - <xsd:complexType name="StyleDefinition"> - <xsd:complexContent> - <xsd:extension base="dd:NamedElement"> - <xsd:attribute name="default" type="xsd:string"/> - <xsd:attribute name="inherited" type="xsd:boolean" default="false"/> - <xsd:attribute name="type" type="xsd:QName" use="required"/> - </xsd:extension> - </xsd:complexContent> - </xsd:complexType> - - <xsd:complexType name="Constraint"> - <xsd:complexContent> - <xsd:extension base="dd:NamedElement"> - <xsd:attribute name="condition" type="xsd:string" use="required"/> - </xsd:extension> - </xsd:complexContent> - </xsd:complexType> - -</xsd:schema> \ No newline at end of file Deleted: projects/migration_tool/trunk/src/main/resources/Schemas/BPMN/DiagramInterchange.xsd =================================================================== --- projects/migration_tool/trunk/src/main/resources/Schemas/BPMN/DiagramInterchange.xsd 2010-10-21 18:22:24 UTC (rev 6773) +++ projects/migration_tool/trunk/src/main/resources/Schemas/BPMN/DiagramInterchange.xsd 2010-10-21 19:26:28 UTC (rev 6774) @@ -1,77 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xsd:schema targetNamespace="http://www.omg.com/di/1.0.0" xmlns:dd="http://www.omg.com/dd/1.0.0" xmlns:di="http://www.omg.com/di/1.0.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - - <xsd:import namespace="http://www.omg.com/dd/1.0.0" schemaLocation="DiagramDefinition.xsd"/> - - <xsd:element name="view" type="di:View"/> - <xsd:element name="diagram" type="di:Diagram" substitutionGroup="di:view"/> - <xsd:element name="node" type="di:Node" substitutionGroup="di:view"/> - <xsd:element name="connector" type="di:Connector" substitutionGroup="di:view"/> - <xsd:element name="style" type="di:Style"/> - <xsd:element name="bendpoint" type="di:Bendpoint"/> - - <xsd:complexType abstract="true" name="View"> - <xsd:sequence> - <xsd:element maxOccurs="unbounded" minOccurs="0" ref="di:style"/> - <xsd:element maxOccurs="unbounded" minOccurs="0" name="child" type="di:Node" form="qualified"/> - </xsd:sequence> - <xsd:attribute name="id" type="xsd:NCName" use="required"/> - <xsd:attribute name="context" type="xsd:anyURI"/> - <xsd:attribute name="definition" use="required"> - <xsd:simpleType> - <xsd:list itemType="xsd:QName"/> - </xsd:simpleType> - </xsd:attribute> - <xsd:attribute name="targetConnector"> - <xsd:simpleType> - <xsd:list itemType="xsd:anyURI"/> - </xsd:simpleType> - </xsd:attribute> - <xsd:attribute name="sourceConnector"> - <xsd:simpleType> - <xsd:list itemType="xsd:anyURI"/> - </xsd:simpleType> - </xsd:attribute> - </xsd:complexType> - - <xsd:complexType name="Diagram"> - <xsd:complexContent> - <xsd:extension base="di:View"> - <xsd:sequence> - <xsd:element maxOccurs="unbounded" minOccurs="0" ref="di:connector"/> - </xsd:sequence> - </xsd:extension> - </xsd:complexContent> - </xsd:complexType> - - <xsd:complexType name="Node"> - <xsd:complexContent> - <xsd:extension base="di:View"/> - </xsd:complexContent> - </xsd:complexType> - - <xsd:complexType name="Connector"> - <xsd:complexContent> - <xsd:extension base="di:View"> - <xsd:sequence> - <xsd:element maxOccurs="unbounded" minOccurs="0" ref="di:bendpoint"/> - </xsd:sequence> - <xsd:attribute name="source" type="xsd:anyURI" use="required"/> - <xsd:attribute name="target" type="xsd:anyURI" use="required"/> - </xsd:extension> - </xsd:complexContent> - </xsd:complexType> - - <xsd:complexType name="Style"> - <xsd:attribute name="name" type="xsd:NCName" use="required"/> - <xsd:attribute name="value" type="xsd:string" use="required"/> - </xsd:complexType> - - <xsd:complexType name="Bendpoint"> - <xsd:attribute name="sourceX" type="xsd:int" use="required"/> - <xsd:attribute name="sourceY" type="xsd:int" use="required"/> - <xsd:attribute name="targetX" type="xsd:int" use="required"/> - <xsd:attribute name="targetY" type="xsd:int" use="required"/> - </xsd:complexType> - -</xsd:schema> \ No newline at end of file Modified: projects/migration_tool/trunk/src/main/resources/Schemas/BPMN/Semantic.xsd =================================================================== --- projects/migration_tool/trunk/src/main/resources/Schemas/BPMN/Semantic.xsd 2010-10-21 18:22:24 UTC (rev 6773) +++ projects/migration_tool/trunk/src/main/resources/Schemas/BPMN/Semantic.xsd 2010-10-21 19:26:28 UTC (rev 6774) @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <xsd:schema elementFormDefault="qualified" attributeFormDefault="unqualified" - xmlns="http://schema.omg.org/spec/BPMN/2.0" + xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:xsd="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://schema.omg.org/spec/BPMN/2.0"> + targetNamespace="http://www.omg.org/spec/BPMN/20100524/MODEL"> <xsd:element name="activity" type="tActivity"/> <xsd:complexType name="tActivity" abstract="true"> @@ -13,7 +13,7 @@ <xsd:element ref="property" minOccurs="0" maxOccurs="unbounded"/> <xsd:element ref="dataInputAssociation" minOccurs="0" maxOccurs="unbounded"/> <xsd:element ref="dataOutputAssociation" minOccurs="0" maxOccurs="unbounded"/> - <xsd:element ref="activityResource" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element ref="resourceRole" minOccurs="0" maxOccurs="unbounded"/> <xsd:element ref="loopCharacteristics" minOccurs="0"/> </xsd:sequence> <xsd:attribute name="isForCompensation" type="xsd:boolean" default="false"/> @@ -24,19 +24,6 @@ </xsd:complexContent> </xsd:complexType> - <xsd:element name="activityResource" type="tActivityResource"/> - <xsd:complexType name="tActivityResource"> - <xsd:complexContent> - <xsd:extension base="tBaseElement"> - <xsd:sequence> - <xsd:element ref="resourceAssignmentExpression" minOccurs="0" maxOccurs="1"/> - <xsd:element ref="resourceParameterBinding" minOccurs="0" maxOccurs="unbounded"/> - </xsd:sequence> - <xsd:attribute name="resourceRef" type="xsd:QName" use="required"/> - </xsd:extension> - </xsd:complexContent> - </xsd:complexType> - <xsd:element name="adHocSubProcess" type="tAdHocSubProcess" substitutionGroup="flowElement"/> <xsd:complexType name="tAdHocSubProcess"> <xsd:complexContent> @@ -52,8 +39,8 @@ <xsd:simpleType name="tAdHocOrdering"> <xsd:restriction base="xsd:string"> - <xsd:enumeration value="parallel"/> - <xsd:enumeration value="sequential"/> + <xsd:enumeration value="Parallel"/> + <xsd:enumeration value="Sequential"/> </xsd:restriction> </xsd:simpleType> @@ -69,10 +56,9 @@ <xsd:complexContent> <xsd:extension base="tBaseElement"> <xsd:sequence> - <xsd:element name="from" type="tBaseElementWithMixedContent" minOccurs="1" maxOccurs="1"/> - <xsd:element name="to" type="tBaseElementWithMixedContent" minOccurs="1" maxOccurs="1"/> + <xsd:element name="from" type="tExpression" minOccurs="1" maxOccurs="1"/> + <xsd:element name="to" type="tExpression" minOccurs="1" maxOccurs="1"/> </xsd:sequence> - <xsd:attribute name="language" type="xsd:anyURI"/> </xsd:extension> </xsd:complexContent> </xsd:complexType> @@ -83,16 +69,16 @@ <xsd:extension base="tArtifact"> <xsd:attribute name="sourceRef" type="xsd:QName" use="required"/> <xsd:attribute name="targetRef" type="xsd:QName" use="required"/> - <xsd:attribute name="associationDirection" type="tAssociationDirection" default="none"/> + <xsd:attribute name="associationDirection" type="tAssociationDirection" default="None"/> </xsd:extension> </xsd:complexContent> </xsd:complexType> <xsd:simpleType name="tAssociationDirection"> <xsd:restriction base="xsd:string"> - <xsd:enumeration value="none"/> - <xsd:enumeration value="one"/> - <xsd:enumeration value="both"/> + <xsd:enumeration value="None"/> + <xsd:enumeration value="One"/> + <xsd:enumeration value="Both"/> </xsd:restriction> </xsd:simpleType> @@ -107,7 +93,7 @@ <xsd:complexType name="tBaseElement" abstract="true"> <xsd:sequence> <xsd:element ref="documentation" minOccurs="0" maxOccurs="unbounded"/> - <xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element ref="extensionElements" minOccurs="0" maxOccurs="1" /> </xsd:sequence> <xsd:attribute name="id" type="xsd:ID" use="optional"/> <xsd:anyAttribute namespace="##other" processContents="lax"/> @@ -117,8 +103,7 @@ <xsd:complexType name="tBaseElementWithMixedContent" abstract="true" mixed="true"> <xsd:sequence> <xsd:element ref="documentation" minOccurs="0" maxOccurs="unbounded"/> - <xsd:element ref="category" minOccurs="0" maxOccurs="unbounded"/> - <xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element ref="extensionElements" minOccurs="0" maxOccurs="1" /> </xsd:sequence> <xsd:attribute name="id" type="xsd:ID" use="optional"/> <xsd:anyAttribute namespace="##other" processContents="lax"/> @@ -137,7 +122,9 @@ <xsd:element name="businessRuleTask" type="tBusinessRuleTask" substitutionGroup="flowElement"/> <xsd:complexType name="tBusinessRuleTask"> <xsd:complexContent> - <xsd:extension base="tTask"/> + <xsd:extension base="tTask"> + <xsd:attribute name="implementation" type="tImplementation" default="##unspecified"/> + </xsd:extension> </xsd:complexContent> </xsd:complexType> @@ -164,14 +151,14 @@ </xsd:complexContent> </xsd:complexType> - <xsd:element name="callChoreographyActivity" type="tCallChoreographyActivity" substitutionGroup="flowElement"/> - <xsd:complexType name="tCallChoreographyActivity"> + <xsd:element name="callChoreography" type="tCallChoreography" substitutionGroup="flowElement"/> + <xsd:complexType name="tCallChoreography"> <xsd:complexContent> <xsd:extension base="tChoreographyActivity"> <xsd:sequence> <xsd:element ref="participantAssociation" minOccurs="0" maxOccurs="unbounded"/> - </xsd:sequence> - <xsd:attribute name="calledElement" type="xsd:QName" use="optional"/> + </xsd:sequence> + <xsd:attribute name="calledChoreographyRef" type="xsd:QName" use="optional"/> </xsd:extension> </xsd:complexContent> </xsd:complexType> @@ -183,7 +170,7 @@ <xsd:sequence> <xsd:element ref="participantAssociation" minOccurs="0" maxOccurs="unbounded"/> </xsd:sequence> - <xsd:attribute name="calledElementRef" type="xsd:QName" use="optional"/> + <xsd:attribute name="calledCollaborationRef" type="xsd:QName" use="optional"/> </xsd:extension> </xsd:complexContent> </xsd:complexType> @@ -218,6 +205,7 @@ <xsd:sequence> <xsd:element ref="categoryValue" minOccurs="0" maxOccurs="unbounded"/> </xsd:sequence> + <xsd:attribute name="name" type="xsd:string"/> </xsd:extension> </xsd:complexContent> </xsd:complexType> @@ -230,22 +218,14 @@ </xsd:extension> </xsd:complexContent> </xsd:complexType> - - <xsd:element name="choreography" type="tChoreography" substitutionGroup="rootElement"/> + + <xsd:element name="choreography" type="tChoreography" substitutionGroup="collaboration"/> <xsd:complexType name="tChoreography"> <xsd:complexContent> - <xsd:extension base="tCallableElement"> + <xsd:extension base="tCollaboration"> <xsd:sequence> <xsd:element ref="flowElement" minOccurs="0" maxOccurs="unbounded"/> - <xsd:element ref="artifact" minOccurs="0" maxOccurs="unbounded"/> - <xsd:element ref="messageFlow" minOccurs="0" maxOccurs="unbounded"/> - <xsd:element ref="participant" minOccurs="0" maxOccurs="unbounded"/> - <xsd:element ref="conversation" minOccurs="0" maxOccurs="unbounded"/> - <xsd:element ref="conversationAssociation" minOccurs="0" maxOccurs="unbounded"/> - <xsd:element ref="messageFlowAssociation" minOccurs="0" maxOccurs="unbounded"/> - <xsd:element ref="participantAssociation" minOccurs="0" maxOccurs="unbounded"/> </xsd:sequence> - <xsd:attribute name="isClosed" type="xsd:boolean" default="false"/> </xsd:extension> </xsd:complexContent> </xsd:complexType> @@ -256,31 +236,30 @@ <xsd:extension base="tFlowNode"> <xsd:sequence> <xsd:element name="participantRef" type="xsd:QName" minOccurs="2" maxOccurs="unbounded"/> + <xsd:element ref="correlationKey" minOccurs="0" maxOccurs="unbounded"/> </xsd:sequence> <xsd:attribute name="initiatingParticipantRef" type="xsd:QName" use="required"/> + <xsd:attribute name="loopType" type="tChoreographyLoopType" default="None"/> </xsd:extension> </xsd:complexContent> </xsd:complexType> - <xsd:element name="choreographySubProcess" type="tChoreographySubProcess" substitutionGroup="flowElement"/> - <xsd:complexType name="tChoreographySubProcess"> - <xsd:complexContent> - <xsd:extension base="tChoreographyActivity"> - <xsd:sequence> - <xsd:element ref="flowElement" minOccurs="0" maxOccurs="unbounded"/> - <xsd:element ref="artifact" minOccurs="0" maxOccurs="unbounded"/> - </xsd:sequence> - </xsd:extension> - </xsd:complexContent> - </xsd:complexType> - + <xsd:simpleType name="tChoreographyLoopType"> + <xsd:restriction base="xsd:string"> + <xsd:enumeration value="None"/> + <xsd:enumeration value="Standard"/> + <xsd:enumeration value="MultiInstanceSequential"/> + <xsd:enumeration value="MultiInstanceParallel"/> + </xsd:restriction> + </xsd:simpleType> + <xsd:element name="choreographyTask" type="tChoreographyTask" substitutionGroup="flowElement"/> <xsd:complexType name="tChoreographyTask"> <xsd:complexContent> <xsd:extension base="tChoreographyActivity"> <xsd:sequence> - <xsd:element name="messageFlowRef" type="xsd:QName" minOccurs="1" maxOccurs="unbounded"/> - </xsd:sequence> + <xsd:element name="messageFlowRef" type="xsd:QName" minOccurs="1" maxOccurs="2"/> + </xsd:sequence> </xsd:extension> </xsd:complexContent> </xsd:complexType> @@ -293,30 +272,20 @@ <xsd:element ref="participant" minOccurs="0" maxOccurs="unbounded"/> <xsd:element ref="messageFlow" minOccurs="0" maxOccurs="unbounded"/> <xsd:element ref="artifact" minOccurs="0" maxOccurs="unbounded"/> - <xsd:element ref="conversation" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element ref="conversationNode" minOccurs="0" maxOccurs="unbounded"/> <xsd:element ref="conversationAssociation" minOccurs="0" maxOccurs="unbounded"/> <xsd:element ref="participantAssociation" minOccurs="0" maxOccurs="unbounded"/> <xsd:element ref="messageFlowAssociation" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element ref="correlationKey" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="choreographyRef" type="xsd:QName" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element ref="conversationLink" minOccurs="0" maxOccurs="unbounded"/> </xsd:sequence> <xsd:attribute name="name" type="xsd:string"/> <xsd:attribute name="isClosed" type="xsd:boolean" default="false"/> - <xsd:attribute name="choreographyRef" type="xsd:QName" use="optional"/> </xsd:extension> </xsd:complexContent> </xsd:complexType> - - <xsd:element name="communication" type="tCommunication" substitutionGroup="conversationNode"/> - <xsd:complexType name="tCommunication"> - <xsd:complexContent> - <xsd:extension base="tConversationNode"> - <xsd:sequence> - <xsd:element name="messageFlowRef" type="xsd:QName" minOccurs="0" maxOccurs="unbounded"/> - </xsd:sequence> - <xsd:attribute name="correlationKeyRef" type="xsd:QName" use="optional"/> - </xsd:extension> - </xsd:complexContent> - </xsd:complexType> - + <xsd:element name="compensateEventDefinition" type="tCompensateEventDefinition" substitutionGroup="eventDefinition"/> <xsd:complexType name="tCompensateEventDefinition"> <xsd:complexContent> @@ -344,7 +313,7 @@ <xsd:complexContent> <xsd:extension base="tGateway"> <xsd:sequence> - <xsd:element name="activationCondition" type="tExpression" minOccurs="0" maxOccurs="1"/> + <xsd:element name="activationCondition" type="tExpression" minOccurs="0" maxOccurs="1"/> </xsd:sequence> <xsd:attribute name="default" type="xsd:IDREF"/> </xsd:extension> @@ -361,20 +330,11 @@ </xsd:extension> </xsd:complexContent> </xsd:complexType> - - <xsd:element name="conversation" type="tConversation" substitutionGroup="rootElement"/> + + <xsd:element name="conversation" type="tConversation" substitutionGroup="conversationNode"/> <xsd:complexType name="tConversation"> <xsd:complexContent> - <xsd:extension base="tCallableElement"> - <xsd:sequence> - <xsd:element ref="conversationNode" minOccurs="0" maxOccurs="unbounded"/> - <xsd:element ref="participant" minOccurs="0" maxOccurs="unbounded"/> - <xsd:element ref="artifact" minOccurs="0" maxOccurs="unbounded"/> - <xsd:element ref="messageFlow" minOccurs="0" maxOccurs="unbounded"/> - <xsd:element name="messageFlowRef" type="xsd:QName" minOccurs="0" maxOccurs="unbounded"/> - <xsd:element ref="correlationKey" minOccurs="0" maxOccurs="unbounded"/> - </xsd:sequence> - </xsd:extension> + <xsd:extension base="tConversationNode"/> </xsd:complexContent> </xsd:complexType> @@ -382,21 +342,31 @@ <xsd:complexType name="tConversationAssociation"> <xsd:complexContent> <xsd:extension base="tBaseElement"> - <xsd:sequence> - <xsd:element name="messageFlowRef" type="xsd:QName" minOccurs="0" maxOccurs="unbounded"/> - </xsd:sequence> - <xsd:attribute name="conversationRef" type="xsd:QName"/> - <xsd:attribute name="correlationKeyRef" type="xsd:QName"/> + <xsd:attribute name="innerConversationNodeRef" type="xsd:QName" use="required"/> + <xsd:attribute name="outerConversationNodeRef" type="xsd:QName" use="required"/> </xsd:extension> </xsd:complexContent> </xsd:complexType> + <xsd:element name="conversationLink" type="tConversationLink"/> + <xsd:complexType name="tConversationLink"> + <xsd:complexContent> + <xsd:extension base="tBaseElement"> + <xsd:attribute name="name" type="xsd:string" use="optional"/> + <xsd:attribute name="sourceRef" type="xsd:QName" use="required"/> + <xsd:attribute name="targetRef" type="xsd:QName" use="required"/> + </xsd:extension> + </xsd:complexContent> + </xsd:complexType> + <xsd:element name="conversationNode" type="tConversationNode"/> <xsd:complexType name="tConversationNode" abstract="true"> <xsd:complexContent> <xsd:extension base="tBaseElement"> <xsd:sequence> <xsd:element name="participantRef" type="xsd:QName" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="messageFlowRef" type="xsd:QName" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element ref="correlationKey" minOccurs="0" maxOccurs="unbounded"/> </xsd:sequence> <xsd:attribute name="name" type="xsd:string"/> </xsd:extension> @@ -410,6 +380,7 @@ <xsd:sequence> <xsd:element name="correlationPropertyRef" type="xsd:QName" minOccurs="0" maxOccurs="unbounded"/> </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="optional"/> </xsd:extension> </xsd:complexContent> </xsd:complexType> @@ -421,6 +392,8 @@ <xsd:sequence> <xsd:element ref="correlationPropertyRetrievalExpression" minOccurs="1" maxOccurs="unbounded"/> </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="optional"/> + <xsd:attribute name="type" type="xsd:QName"/> </xsd:extension> </xsd:complexContent> </xsd:complexType> @@ -456,17 +429,18 @@ <xsd:sequence> <xsd:element ref="correlationPropertyBinding" minOccurs="0" maxOccurs="unbounded"/> </xsd:sequence> - <xsd:attribute name="process" type="xsd:QName" use="required"/> <xsd:attribute name="correlationKeyRef" type="xsd:QName" use="required"/> </xsd:extension> </xsd:complexContent> </xsd:complexType> <xsd:element name="dataAssociation" type="tDataAssociation" /> - <xsd:complexType name="tDataAssociation" abstract="true"> + <xsd:complexType name="tDataAssociation"> <xsd:complexContent> <xsd:extension base="tBaseElement"> <xsd:sequence> + <xsd:element name="sourceRef" type="xsd:IDREF" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="targetRef" type="xsd:IDREF" minOccurs="1" maxOccurs="1"/> <xsd:element name="transformation" type="tFormalExpression" minOccurs="0" maxOccurs="1"/> <xsd:element ref="assignment" minOccurs="0" maxOccurs="unbounded"/> </xsd:sequence> @@ -491,12 +465,7 @@ <xsd:element name="dataInputAssociation" type="tDataInputAssociation" /> <xsd:complexType name="tDataInputAssociation"> <xsd:complexContent> - <xsd:extension base="tDataAssociation"> - <xsd:sequence> - <xsd:element name="sourceRef" type="xsd:QName" minOccurs="1" maxOccurs="unbounded"/> - <xsd:element name="targetRef" type="xsd:QName" minOccurs="1" maxOccurs="1"/> - </xsd:sequence> - </xsd:extension> + <xsd:extension base="tDataAssociation"/> </xsd:complexContent> </xsd:complexType> @@ -513,6 +482,19 @@ </xsd:complexContent> </xsd:complexType> + <xsd:element name="dataObjectReference" type="tDataObjectReference" substitutionGroup="flowElement"/> + <xsd:complexType name="tDataObjectReference"> + <xsd:complexContent> + <xsd:extension base="tFlowElement"> + <xsd:sequence> + <xsd:element ref="dataState" minOccurs="0" maxOccurs="1"/> + </xsd:sequence> + <xsd:attribute name="itemSubjectRef" type="xsd:QName"/> + <xsd:attribute name="dataObjectRef" type="xsd:IDREF"/> + </xsd:extension> + </xsd:complexContent> + </xsd:complexType> + <xsd:element name="dataOutput" type="tDataOutput" /> <xsd:complexType name="tDataOutput"> <xsd:complexContent> @@ -530,12 +512,7 @@ <xsd:element name="dataOutputAssociation" type="tDataOutputAssociation" /> <xsd:complexType name="tDataOutputAssociation"> <xsd:complexContent> - <xsd:extension base="tDataAssociation"> - <xsd:sequence> - <xsd:element name="sourceRef" type="xsd:QName" minOccurs="1" maxOccurs="unbounded"/> - <xsd:element name="targetRef" type="xsd:QName" minOccurs="1" maxOccurs="1"/> - </xsd:sequence> - </xsd:extension> + <xsd:extension base="tDataAssociation"/> </xsd:complexContent> </xsd:complexType> @@ -582,6 +559,7 @@ <xsd:any namespace="##any" processContents="lax" minOccurs="0"/> </xsd:sequence> <xsd:attribute name="id" type="xsd:ID" use="optional"/> + <xsd:attribute name="textFormat" type="xsd:string" default="text/plain"/> </xsd:complexType> <xsd:element name="endEvent" type="tEndEvent" substitutionGroup="flowElement"/> @@ -602,6 +580,8 @@ <xsd:complexType name="tError"> <xsd:complexContent> <xsd:extension base="tRootElement"> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="errorCode" type="xsd:string"/> <xsd:attribute name="structureRef" type="xsd:QName"/> </xsd:extension> </xsd:complexContent> @@ -611,7 +591,6 @@ <xsd:complexType name="tErrorEventDefinition"> <xsd:complexContent> <xsd:extension base="tEventDefinition"> - <xsd:attribute name="errorCode" type="xsd:string"/> <xsd:attribute name="errorRef" type="xsd:QName"/> </xsd:extension> </xsd:complexContent> @@ -621,6 +600,8 @@ <xsd:complexType name="tEscalation"> <xsd:complexContent> <xsd:extension base="tRootElement"> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="escalationCode" type="xsd:string"/> <xsd:attribute name="structureRef" type="xsd:QName"/> </xsd:extension> </xsd:complexContent> @@ -630,7 +611,6 @@ <xsd:complexType name="tEscalationEventDefinition"> <xsd:complexContent> <xsd:extension base="tEventDefinition"> - <xsd:attribute name="escalationCode" type="xsd:string"/> <xsd:attribute name="escalationRef" type="xsd:QName"/> </xsd:extension> </xsd:complexContent> @@ -639,7 +619,11 @@ <xsd:element name="event" type="tEvent" substitutionGroup="flowElement"/> <xsd:complexType name="tEvent" abstract="true"> <xsd:complexContent> - <xsd:extension base="tFlowNode"/> + <xsd:extension base="tFlowNode"> + <xsd:sequence> + <xsd:element ref="property" minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + </xsd:extension> </xsd:complexContent> </xsd:complexType> @@ -692,6 +676,13 @@ <xsd:attribute name="mustUnderstand" type="xsd:boolean" use="optional" default="false"/> </xsd:complexType> + <xsd:element name="extensionElements" type="tExtensionElements" /> + <xsd:complexType name="tExtensionElements"> + <xsd:sequence> + <xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" /> + </xsd:sequence> + </xsd:complexType> + <xsd:element name="flowElement" type="tFlowElement"/> <xsd:complexType name="tFlowElement" abstract="true"> <xsd:complexContent> @@ -719,7 +710,7 @@ </xsd:complexType> <xsd:element name="formalExpression" type="tFormalExpression" substitutionGroup="expression"/> - <xsd:complexType name="tFormalExpression" mixed="true"> + <xsd:complexType name="tFormalExpression"> <xsd:complexContent> <xsd:extension base="tExpression"> <xsd:attribute name="language" type="xsd:anyURI" use="optional"/> @@ -732,50 +723,41 @@ <xsd:complexType name="tGateway"> <xsd:complexContent> <xsd:extension base="tFlowNode"> - <xsd:attribute name="gatewayDirection" type="tGatewayDirection" default="unspecified"/> + <xsd:attribute name="gatewayDirection" type="tGatewayDirection" default="Unspecified"/> </xsd:extension> </xsd:complexContent> </xsd:complexType> <xsd:simpleType name="tGatewayDirection"> <xsd:restriction base="xsd:string"> - <xsd:enumeration value="unspecified"/> - <xsd:enumeration value="converging"/> - <xsd:enumeration value="diverging"/> - <xsd:enumeration value="mixed"/> + <xsd:enumeration value="Unspecified"/> + <xsd:enumeration value="Converging"/> + <xsd:enumeration value="Diverging"/> + <xsd:enumeration value="Mixed"/> </xsd:restriction> </xsd:simpleType> <xsd:element name="globalBusinessRuleTask" type="tGlobalBusinessRuleTask" substitutionGroup="rootElement"/> <xsd:complexType name="tGlobalBusinessRuleTask"> <xsd:complexContent> - <xsd:extension base="tGlobalTask"/> + <xsd:extension base="tGlobalTask"> + <xsd:attribute name="implementation" type="tImplementation" default="##unspecified"/> + </xsd:extension> </xsd:complexContent> </xsd:complexType> - - <xsd:element name="globalChoreographyTask" type="tGlobalChoreographyTask" substitutionGroup="rootElement"/> + + <xsd:element name="globalChoreographyTask" type="tGlobalChoreographyTask" substitutionGroup="choreography"/> <xsd:complexType name="tGlobalChoreographyTask"> <xsd:complexContent> - <xsd:extension base="tCallableElement"> - <xsd:sequence> - <xsd:element ref="participant" minOccurs="0" maxOccurs="unbounded"/> - <xsd:element ref="messageFlow" minOccurs="0" maxOccurs="unbounded"/> - </xsd:sequence> + <xsd:extension base="tChoreography"> <xsd:attribute name="initiatingParticipantRef" type="xsd:QName"/> </xsd:extension> </xsd:complexContent> - </xsd:complexType> - - <xsd:element name="globalCommunication" type="tGlobalCommunication" substitutionGroup="rootElement"/> - <xsd:complexType name="tGlobalCommunication"> + </xsd:complexType> + <xsd:element name="globalConversation" type="tGlobalConversation" substitutionGroup="collaboration"/> + <xsd:complexType name="tGlobalConversation"> <xsd:complexContent> - <xsd:extension base="tCallableElement"> - <xsd:sequence> - <xsd:element ref="participant" minOccurs="0" maxOccurs="unbounded"/> - <xsd:element ref="messageFlow" minOccurs="0" maxOccurs="unbounded"/> - <xsd:element ref="correlationKey" minOccurs="0" maxOccurs="unbounded"/> - </xsd:sequence> - </xsd:extension> + <xsd:extension base="tCollaboration"/> </xsd:complexContent> </xsd:complexType> @@ -803,7 +785,7 @@ <xsd:complexContent> <xsd:extension base="tCallableElement"> <xsd:sequence> - <xsd:element ref="performer" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element ref="resourceRole" minOccurs="0" maxOccurs="unbounded"/> </xsd:sequence> </xsd:extension> </xsd:complexContent> @@ -816,7 +798,7 @@ <xsd:sequence> <xsd:element ref="rendering" minOccurs="0" maxOccurs="unbounded"/> </xsd:sequence> - <xsd:attribute name="implementation" type="tUserTaskImplementation" default="unspecified"/> + <xsd:attribute name="implementation" type="tImplementation" default="##unspecified"/> </xsd:extension> </xsd:complexContent> </xsd:complexType> @@ -825,7 +807,7 @@ <xsd:complexType name="tGroup"> <xsd:complexContent> <xsd:extension base="tArtifact"> - <xsd:attribute name="categoryRef" type="xsd:QName" use="optional"/> + <xsd:attribute name="categoryValueRef" type="xsd:QName" use="optional"/> </xsd:extension> </xsd:complexContent> </xsd:complexType> @@ -837,6 +819,17 @@ </xsd:complexContent> </xsd:complexType> + <xsd:simpleType name="tImplementation"> + <xsd:union memberTypes="xsd:anyURI"> + <xsd:simpleType> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="##unspecified" /> + <xsd:enumeration value="##WebService" /> + </xsd:restriction> + </xsd:simpleType> + </xsd:union> + </xsd:simpleType> + <xsd:element name="implicitThrowEvent" type="tImplicitThrowEvent" substitutionGroup="flowElement"/> <xsd:complexType name="tImplicitThrowEvent"> <xsd:complexContent> @@ -876,6 +869,7 @@ <xsd:element ref="operation" minOccurs="1" maxOccurs="unbounded"/> </xsd:sequence> <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="implementationRef" type="xsd:QName"/> </xsd:extension> </xsd:complexContent> </xsd:complexType> @@ -943,11 +937,11 @@ <xsd:extension base="tBaseElement"> <xsd:sequence> <xsd:element name="partitionElement" type="tBaseElement" minOccurs="0" maxOccurs="1"/> - <xsd:element name="flowElementRef" type="xsd:IDREF" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="flowNodeRef" type="xsd:IDREF" minOccurs="0" maxOccurs="unbounded"/> <xsd:element name="childLaneSet" type="tLaneSet" minOccurs="0" maxOccurs="1"/> </xsd:sequence> <xsd:attribute name="name" type="xsd:string"/> - <xsd:attribute name="partitionElementRef" type="xsd:IDREF"/> + <xsd:attribute name="partitionElementRef" type="xsd:QName"/> </xsd:extension> </xsd:complexContent> </xsd:complexType> @@ -959,6 +953,7 @@ <xsd:sequence> <xsd:element ref="lane" minOccurs="0" maxOccurs="unbounded"/> </xsd:sequence> + <xsd:attribute name="name" type="xsd:string"/> </xsd:extension> </xsd:complexContent> </xsd:complexType> @@ -967,6 +962,10 @@ <xsd:complexType name="tLinkEventDefinition"> <xsd:complexContent> <xsd:extension base="tEventDefinition"> + <xsd:sequence> + <xsd:element name="source" type="xsd:QName" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="target" type="xsd:QName" minOccurs="0" maxOccurs="1"/> + </xsd:sequence> <xsd:attribute name="name" type="xsd:string" use="required"/> </xsd:extension> </xsd:complexContent> @@ -991,7 +990,7 @@ <xsd:complexContent> <xsd:extension base="tRootElement"> <xsd:attribute name="name" type="xsd:string"/> - <xsd:attribute name="structureRef" type="xsd:QName"/> + <xsd:attribute name="itemRef" type="xsd:QName"/> </xsd:extension> </xsd:complexContent> </xsd:complexType> @@ -1043,15 +1042,15 @@ <xsd:extension base="tLoopCharacteristics"> <xsd:sequence> <xsd:element name="loopCardinality" type="tExpression" minOccurs="0" maxOccurs="1"/> - <xsd:element name="loopDataInput" type="tDataInput" minOccurs="0" maxOccurs="1"/> - <xsd:element name="loopDataOutput" type="tDataOutput" minOccurs="0" maxOccurs="1"/> - <xsd:element name="inputDataItem" type="tProperty" minOccurs="0" maxOccurs="1"/> - <xsd:element name="outputDataItem" type="tProperty" minOccurs="0" maxOccurs="1"/> + <xsd:element name="loopDataInputRef" type="xsd:QName" minOccurs="0" maxOccurs="1"/> + <xsd:element name="loopDataOutputRef" type="xsd:QName" minOccurs="0" maxOccurs="1"/> + <xsd:element name="inputDataItem" type="tDataInput" minOccurs="0" maxOccurs="1"/> + <xsd:element name="outputDataItem" type="tDataOutput" minOccurs="0" maxOccurs="1"/> <xsd:element ref="complexBehaviorDefinition" minOccurs="0" maxOccurs="unbounded"/> <xsd:element name="completionCondition" type="tExpression" minOccurs="0" maxOccurs="1"/> </xsd:sequence> <xsd:attribute name="isSequential" type="xsd:boolean" default="false"/> - <xsd:attribute name="behavior" type="tMultiInstanceFlowCondition" default="all"/> + <xsd:attribute name="behavior" type="tMultiInstanceFlowCondition" default="All"/> <xsd:attribute name="oneBehaviorEventRef" type="xsd:QName" use="optional"/> <xsd:attribute name="noneBehaviorEventRef" type="xsd:QName" use="optional"/> </xsd:extension> @@ -1060,12 +1059,12 @@ <xsd:simpleType name="tMultiInstanceFlowCondition"> <xsd:restriction base="xsd:string"> - <xsd:enumeration value="none"/> - <xsd:enumeration value="one"/> - <xsd:enumeration value="all"/> - <xsd:enumeration value="complex"/> + <xsd:enumeration value="None"/> + <xsd:enumeration value="One"/> + <xsd:enumeration value="All"/> + <xsd:enumeration value="Complex"/> </xsd:restriction> - </xsd:simpleType> + </xsd:simpleType> <xsd:element name="operation" type="tOperation"/> <xsd:complexType name="tOperation"> @@ -1077,6 +1076,7 @@ <xsd:element name="errorRef" type="xsd:QName" minOccurs="0" maxOccurs="unbounded"/> </xsd:sequence> <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="implementationRef" type="xsd:QName"/> </xsd:extension> </xsd:complexContent> </xsd:complexType> @@ -1113,8 +1113,6 @@ <xsd:element ref="participantMultiplicity" minOccurs="0" maxOccurs="1"/> </xsd:sequence> <xsd:attribute name="name" type="xsd:string"/> - <xsd:attribute name="partnerRoleRef" type="xsd:QName" use="optional"/> - <xsd:attribute name="partnerEntityRef" type="xsd:QName" use="optional"/> <xsd:attribute name="processRef" type="xsd:QName" use="optional"/> </xsd:extension> </xsd:complexContent> @@ -1136,8 +1134,8 @@ <xsd:complexType name="tParticipantMultiplicity"> <xsd:complexContent> <xsd:extension base="tBaseElement"> - <xsd:attribute name="minimum" type="xsd:int"/> - <xsd:attribute name="maximum" type="xsd:int"/> + <xsd:attribute name="minimum" type="xsd:int" default="0"/> + <xsd:attribute name="maximum" type="xsd:int" default="1"/> </xsd:extension> </xsd:complexContent> </xsd:complexType> @@ -1146,6 +1144,9 @@ <xsd:complexType name="tPartnerEntity"> <xsd:complexContent> <xsd:extension base="tRootElement"> + <xsd:sequence> + <xsd:element name="participantRef" type="xsd:QName" minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> <xsd:attribute name="name" type="xsd:string"/> </xsd:extension> </xsd:complexContent> @@ -1155,15 +1156,18 @@ <xsd:complexType name="tPartnerRole"> <xsd:complexContent> <xsd:extension base="tRootElement"> + <xsd:sequence> + <xsd:element name="participantRef" type="xsd:QName" minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> <xsd:attribute name="name" type="xsd:string"/> </xsd:extension> </xsd:complexContent> </xsd:complexType> - <xsd:element name="performer" type="tPerformer" substitutionGroup="activityResource"/> + <xsd:element name="performer" type="tPerformer" substitutionGroup="resourceRole"/> <xsd:complexType name="tPerformer"> <xsd:complexContent> - <xsd:extension base="tActivityResource"/> + <xsd:extension base="tResourceRole"/> </xsd:complexContent> </xsd:complexType> @@ -1185,10 +1189,13 @@ <xsd:element ref="laneSet" minOccurs="0" maxOccurs="unbounded"/> <xsd:element ref="flowElement" minOccurs="0" maxOccurs="unbounded"/> <xsd:element ref="artifact" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element ref="resourceRole" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element ref="correlationSubscription" minOccurs="0" maxOccurs="unbounded"/> <xsd:element name="supports" type="xsd:QName" minOccurs="0" maxOccurs="unbounded"/> </xsd:sequence> - <xsd:attribute name="processType" type="tProcessType" default="none"/> + <xsd:attribute name="processType" type="tProcessType" default="None"/> <xsd:attribute name="isClosed" type="xsd:boolean" default="false"/> + <xsd:attribute name="isExecutable" type="xsd:boolean"/> <xsd:attribute name="definitionalCollaborationRef" type="xsd:QName" use="optional"/> </xsd:extension> </xsd:complexContent> @@ -1196,10 +1203,9 @@ <xsd:simpleType name="tProcessType"> <xsd:restriction base="xsd:string"> - <xsd:enumeration value="none"/> - <xsd:enumeration value="executable"/> - <xsd:enumeration value="non-executable"/> - <xsd:enumeration value="public"/> + <xsd:enumeration value="None"/> + <xsd:enumeration value="Public"/> + <xsd:enumeration value="Private"/> </xsd:restriction> </xsd:simpleType> @@ -1220,7 +1226,7 @@ <xsd:complexType name="tReceiveTask"> <xsd:complexContent> <xsd:extension base="tTask"> - <xsd:attribute name="implementation" type="tServiceImplementation" default="WebService"/> + <xsd:attribute name="implementation" type="tImplementation" default="##WebService"/> <xsd:attribute name="instantiate" type="xsd:boolean" default="false"/> <xsd:attribute name="messageRef" type="xsd:QName" use="optional"/> <xsd:attribute name="operationRef" type="xsd:QName" use="optional"/> @@ -1244,10 +1250,10 @@ <xsd:simpleType name="tRelationshipDirection"> <xsd:restriction base="xsd:string"> - <xsd:enumeration value="none"/> - <xsd:enumeration value="forward"/> - <xsd:enumeration value="backward"/> - <xsd:enumeration value="both"/> + <xsd:enumeration value="None"/> + <xsd:enumeration value="Forward"/> + <xsd:enumeration value="Backward"/> + <xsd:enumeration value="Both"/> </xsd:restriction> </xsd:simpleType> @@ -1304,6 +1310,22 @@ </xsd:complexContent> </xsd:complexType> + <xsd:element name="resourceRole" type="tResourceRole"/> + <xsd:complexType name="tResourceRole"> + <xsd:complexContent> + <xsd:extension base="tBaseElement"> + <xsd:choice> + <xsd:sequence> + <xsd:element name="resourceRef" type="xsd:QName"/> + <xsd:element ref="resourceParameterBinding" minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:element ref="resourceAssignmentExpression" minOccurs="0" maxOccurs="1"/> + </xsd:choice> + <xsd:attribute name="name" type="xsd:string"/> + </xsd:extension> + </xsd:complexContent> + </xsd:complexType> + <xsd:element name="rootElement" type="tRootElement"/> <xsd:complexType name="tRootElement" abstract="true"> <xsd:complexContent> @@ -1318,7 +1340,7 @@ <xsd:sequence> <xsd:element ref="script" minOccurs="0" maxOccurs="1"/> </xsd:sequence> - <xsd:attribute name="scriptLanguage" type="xsd:anyURI"/> + <xsd:attribute name="scriptFormat" type="xsd:string"/> </xsd:extension> </xsd:complexContent> </xsd:complexType> @@ -1334,7 +1356,7 @@ <xsd:complexType name="tSendTask"> <xsd:complexContent> <xsd:extension base="tTask"> - <xsd:attribute name="implementation" type="tServiceImplementation" default="WebService"/> + <xsd:attribute name="implementation" type="tImplementation" default="##WebService"/> <xsd:attribute name="messageRef" type="xsd:QName" use="optional"/> <xsd:attribute name="operationRef" type="xsd:QName" use="optional"/> </xsd:extension> @@ -1350,7 +1372,7 @@ </xsd:sequence> <xsd:attribute name="sourceRef" type="xsd:IDREF" use="required"/> <xsd:attribute name="targetRef" type="xsd:IDREF" use="required"/> - <xsd:attribute name="isImmediate" type="xsd:boolean" default="true"/> + <xsd:attribute name="isImmediate" type="xsd:boolean" use="optional"/> </xsd:extension> </xsd:complexContent> </xsd:complexType> @@ -1359,20 +1381,12 @@ <xsd:complexType name="tServiceTask"> <xsd:complexContent> <xsd:extension base="tTask"> - <xsd:attribute name="implementation" type="tServiceImplementation" default="WebService"/> + <xsd:attribute name="implementation" type="tImplementation" default="##WebService"/> <xsd:attribute name="operationRef" type="xsd:QName" use="optional"/> </xsd:extension> </xsd:complexContent> </xsd:complexType> - <xsd:simpleType name="tServiceImplementation"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="WebService"/> - <xsd:enumeration value="Other"/> - <xsd:enumeration value="Unspecified"/> - </xsd:restriction> - </xsd:simpleType> - <xsd:element name="signal" type="tSignal" substitutionGroup="rootElement"/> <xsd:complexType name="tSignal"> <xsd:complexContent> @@ -1409,20 +1423,30 @@ <xsd:complexType name="tStartEvent"> <xsd:complexContent> <xsd:extension base="tCatchEvent"> - <xsd:attribute name="isInterrupting" type="xsd:boolean" default="false"/> + <xsd:attribute name="isInterrupting" type="xsd:boolean" default="true"/> </xsd:extension> </xsd:complexContent> </xsd:complexType> + <xsd:element name="subChoreography" type="tSubChoreography" substitutionGroup="flowElement"/> + <xsd:complexType name="tSubChoreography"> + <xsd:complexContent> + <xsd:extension base="tChoreographyActivity"> + <xsd:sequence> + <xsd:element ref="flowElement" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element ref="artifact" minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + </xsd:extension> + </xsd:complexContent> + </xsd:complexType> + <xsd:element name="subConversation" type="tSubConversation" substitutionGroup="conversationNode"/> <xsd:complexType name="tSubConversation"> <xsd:complexContent> <xsd:extension base="tConversationNode"> <xsd:sequence> <xsd:element ref="conversationNode" minOccurs="0" maxOccurs="unbounded"/> - <xsd:element ref="artifact" minOccurs="0" maxOccurs="unbounded"/> </xsd:sequence> - <xsd:attribute name="correlationKeyRef" type="xsd:QName" use="optional"/> </xsd:extension> </xsd:complexContent> </xsd:complexType> @@ -1432,6 +1456,7 @@ <xsd:complexContent> <xsd:extension base="tActivity"> <xsd:sequence> + <xsd:element ref="laneSet" minOccurs="0" maxOccurs="unbounded"/> <xsd:element ref="flowElement" minOccurs="0" maxOccurs="unbounded"/> <xsd:element ref="artifact" minOccurs="0" maxOccurs="unbounded"/> </xsd:sequence> @@ -1461,6 +1486,7 @@ <xsd:sequence> <xsd:element ref="text" minOccurs="0" maxOccurs="1"/> </xsd:sequence> + <xsd:attribute name="textFormat" type="xsd:string" default="text/plain"/> </xsd:extension> </xsd:complexContent> </xsd:complexType> @@ -1493,6 +1519,7 @@ <xsd:extension base="tEventDefinition"> <xsd:choice> <xsd:element name="timeDate" type="tExpression" minOccurs="0" maxOccurs="1"/> + <xsd:element name="timeDuration" type="tExpression" minOccurs="0" maxOccurs="1"/> <xsd:element name="timeCycle" type="tExpression" minOccurs="0" maxOccurs="1"/> </xsd:choice> </xsd:extension> @@ -1502,20 +1529,24 @@ <xsd:element name="transaction" type="tTransaction" substitutionGroup="flowElement"/> <xsd:complexType name="tTransaction"> <xsd:complexContent> - <xsd:extension base="tActivity"> - <xsd:attribute name="method" type="tTransactionMethod" default="compensate"/> + <xsd:extension base="tSubProcess"> + <xsd:attribute name="method" type="tTransactionMethod" default="##Compensate"/> </xsd:extension> </xsd:complexContent> </xsd:complexType> <xsd:simpleType name="tTransactionMethod"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="compensate"/> - <xsd:enumeration value="image"/> - <xsd:enumeration value="store"/> - </xsd:restriction> - </xsd:simpleType> - + <xsd:union memberTypes="xsd:anyURI"> + <xsd:simpleType> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="##Compensate" /> + <xsd:enumeration value="##Image" /> + <xsd:enumeration value="##Store" /> + </xsd:restriction> + </xsd:simpleType> + </xsd:union> + </xsd:simpleType> + <xsd:element name="userTask" type="tUserTask" substitutionGroup="flowElement"/> <xsd:complexType name="tUserTask"> <xsd:complexContent> @@ -1523,18 +1554,9 @@ <xsd:sequence> <xsd:element ref="rendering" minOccurs="0" maxOccurs="unbounded"/> </xsd:sequence> - <xsd:attribute name="implementation" type="tUserTaskImplementation" default="unspecified"/> + <xsd:attribute name="implementation" type="tImplementation" default="##unspecified"/> </xsd:extension> </xsd:complexContent> </xsd:complexType> - <xsd:simpleType name="tUserTaskImplementation"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="unspecified"/> - <xsd:enumeration value="other"/> - <xsd:enumeration value="webService"/> - <xsd:enumeration value="humanTaskWebService"/> - </xsd:restriction> - </xsd:simpleType> - </xsd:schema> \ No newline at end of file