User Assignment Added: responsibleParty and Person

PROCEED-Labs · Feb 7, 2025 · 935b0fa · 935b0fa
1 parent e313c9b
commit 935b0fa
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 63 deletions.
diff --git a/public/xsd/Test_BPMN_XML.bpmn b/public/xsd/Test_BPMN_XML.bpmn
@@ -41,34 +41,6 @@
         - the 'xsi:schemaLocation' will not be considered by the tools
         - but it will be considered by VSCode Addon "Xml Complete": https://marketplace.visualstudio.com/items?itemName=rogalmic.vscode-xml-complete
     -->
-<resource id="regionalManager" name="Regional Manager">
-    <extensionElements>
-       <proceed:roles>
-            <proceed:role>(cn=Administrator,ou=Groups,dc=example,dc=org)</proceed:role>
-        </proceed:roles>
-        <proceed:users>
-            <proceed:user>
-                <proceed:name>Testuser1</proceed:name>
-                <proceed:id>234640868</proceed:id>
-                <proceed:password>e1NTSEF9QjU0VXNmQWhJN1dQZ3FvbDVSQ1l5RHUzTlVqa1luVVhYV2ljbmc9PQ=</proceed:password>
-                <proceed:clientid>client1</proceed:clientid>
-                <proceed:clientsecret>27d4e246-0563-4e6c-8325-27bc6e596139</proceed:clientsecret>
-                <proceed:provider>http://localhost:8082/auth/realms/master/protocol/openid-connect/token</proceed:provider>
-                <proceed:origin>(uid=234640868,ou=People,dc=example,dc=org)</proceed:origin>
-            </proceed:user>
-            <proceed:user>
-                <proceed:name>TestUser2</proceed:name>
-                <proceed:id>635890982</proceed:id>
-                <proceed:password>e1NTSEF9QjU0VXNmQWhJN1dQZ3FvbDVSQ1l5RHUzTlVqa1luVVhYV2ljbmc9PQ=</proceed:password>
-                <proceed:clientid>client1</proceed:clientid>
-                <proceed:clientsecret>27d4e246-0563-4e6c-8325-27bc6e596139</proceed:clientsecret>
-                <proceed:provider>http://localhost:8082/auth/realms/master/protocol/openid-connect/token</proceed:provider>
-                <proceed:origin>(uid=635890982,ou=People,dc=example,dc=org)</proceed:origin>
-            </proceed:user>
-        </proceed:users>
-    </extensionElements>
-</resource>
-
 
 
 <process id="_09abb321-f819-480a-9827-66264d17b4df" name="PROCEED Main Process" processType="Private" isExecutable="true" proceed:deploymentMethod="static">
@@ -185,9 +157,33 @@
                 </proceed:hardConstraints>
             </proceed:processConstraints>
         </extensionElements>
-        <potentialOwner>
-            <resourceRef>regionalManager</resourceRef>
+
+
+
+        <proceed:responsibleParty name="Martha Mustermann">
+            <resourceAssignmentExpression>
+                <expression>user=e8a328cb-b7ef-4d92-9d0c-ad69b188f7b0</expression>
+            </resourceAssignmentExpression>
+        </proceed:responsibleParty>
+
+        <proceed:responsibleParty name="Production">
+            <resourceAssignmentExpression>
+                <expression>role=b59d1952-45f7-4654-953e-06d18b9bb0ac</expression>
+            </resourceAssignmentExpression>
+        </proceed:responsibleParty>
+
+
+        <potentialOwner name="Max Mustermann">
+            <resourceAssignmentExpression>
+                <expression>user=a77500e0-ba49-4408-b12c-26a70420e7cb</expression>
+            </resourceAssignmentExpression>
         </potentialOwner>
+        <potentialOwner name="Administrators">
+            <resourceAssignmentExpression>
+                <expression>role=f9a3b839-ed22-4949-b9aa-e6cd24e6f401</expression>
+            </resourceAssignmentExpression>
+        </potentialOwner>
+
 
     </userTask>
 

diff --git a/public/xsd/XSD-PROCEED.xsd b/public/xsd/XSD-PROCEED.xsd
@@ -64,17 +64,29 @@
     </xsd:sequence>
   </xsd:complexType>
 
-
 
-  <!-- Resources with no semantic specification about the exact role -->
+
+  <!-- Resources with no semantic specification about the exact role, used for visual icons inside <process> -->
+  <xsd:element name="responsibleParty" type="tResponsibleParty" substitutionGroup="bpmn:resourceRole" />
+  <xsd:complexType name="tResponsibleParty">
+    <xsd:complexContent>
+      <xsd:extension base="bpmn:tResourceRole">
+        <!-- "name" attribute is inherited from type tResourceRole -->
+      </xsd:extension>
+    </xsd:complexContent>
+  </xsd:complexType>
+
+
+
+  <!-- Resources with no semantic specification about the exact role, used for visual icons inside <process> -->
   <xsd:element name="genericResource" type="tGenericResource" substitutionGroup="bpmn:resourceRole" />
   <xsd:complexType name="tGenericResource">
     <xsd:complexContent>
-			<xsd:extension base="bpmn:tResourceRole">
+      <xsd:extension base="bpmn:tResourceRole">
         <!-- "name" attribute is inherited from type tResourceRole -->
         <xsd:attribute name="iconType" type="xsd:string" />
       </xsd:extension>
-		</xsd:complexContent>
+    </xsd:complexContent>
   </xsd:complexType>
 
   <!-- The material/tools used in a task -->
@@ -253,35 +265,6 @@
   </xsd:complexType>
 
 
-  <!-- Alessandro: Users and Roles -->
-  <xsd:element name="roles" type="tRoles"/>
-  <xsd:complexType name="tRoles">
-    <xsd:sequence>
-      <xsd:element name="role" type="xsd:string"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:element name="users" type="tUsers"/>
-  <xsd:complexType name="tUsers">
-    <xsd:sequence>
-      <xsd:element ref="user" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:element name="user" type="tUser" />
-  <xsd:complexType name="tUser">
-    <xsd:sequence>
-      <xsd:element type="xsd:string" name="name"/>
-      <xsd:element type="xsd:int" name="id"/>
-      <xsd:element type="xsd:string" name="password"/>
-      <xsd:element type="xsd:string" name="clientid"/>
-      <xsd:element type="xsd:string" name="clientsecret"/>
-      <xsd:element type="xsd:anyURI" name="provider"/>
-      <xsd:element type="xsd:string" name="origin"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-
   <!--
     __________________________________________
     Definitions for hard and soft constraints