From b4b0be82ae6d1c85bc2d2e56a908ba4edcf5e9f3 Mon Sep 17 00:00:00 2001
From: Jose Luis Osorno <joseluis.osorno@ixxus.com>
Date: Fri, 18 Oct 2019 08:15:46 +0200
Subject: [PATCH] Archetypes - Fix workflow sample

Fix workflow sample in aio and platform archetypes
---
 .../context/bootstrap-context.xml             |  5 ++++
 .../messages/workflow-messages.properties     |  5 ++++
 .../workflow/sample-process.bpmn20.xml        | 27 +++++++++++--------
 .../context/bootstrap-context.xml             |  5 ++++
 .../messages/workflow-messages.properties     |  5 ++++
 .../workflow/sample-process.bpmn20.xml        | 27 +++++++++++--------
 6 files changed, 52 insertions(+), 22 deletions(-)
 create mode 100644 archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/resources/alfresco/module/__artifactId__/messages/workflow-messages.properties
 create mode 100644 archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/__artifactId__/messages/workflow-messages.properties

diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/resources/alfresco/module/__artifactId__/context/bootstrap-context.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/resources/alfresco/module/__artifactId__/context/bootstrap-context.xml
index f0a7fa98..e0d30583 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/resources/alfresco/module/__artifactId__/context/bootstrap-context.xml
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/resources/alfresco/module/__artifactId__/context/bootstrap-context.xml
@@ -36,5 +36,10 @@
                 </props>
             </list>
         </property>
+        <property name="labels">
+            <list>
+                <value>alfresco/module/${project.artifactId}/messages/workflow-messages</value>
+            </list>
+        </property>
     </bean>
 </beans>
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/resources/alfresco/module/__artifactId__/messages/workflow-messages.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/resources/alfresco/module/__artifactId__/messages/workflow-messages.properties
new file mode 100644
index 00000000..7a7dcfa7
--- /dev/null
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/resources/alfresco/module/__artifactId__/messages/workflow-messages.properties
@@ -0,0 +1,5 @@
+#
+# Activiti My Process Workflow
+#
+my-process.workflow.title=My Process
+my-process.workflow.description=This is my custom process
\ No newline at end of file
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/resources/alfresco/module/__artifactId__/workflow/sample-process.bpmn20.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/resources/alfresco/module/__artifactId__/workflow/sample-process.bpmn20.xml
index f7890085..3d1b363a 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/resources/alfresco/module/__artifactId__/workflow/sample-process.bpmn20.xml
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/resources/alfresco/module/__artifactId__/workflow/sample-process.bpmn20.xml
@@ -1,20 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL"
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:activiti="http://activiti.org/bpmn"
-   xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC"
-   xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" typeLanguage="http://www.w3.org/2001/XMLSchema"
-   expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://www.activiti.org/test">
+<definitions
+        xmlns:activiti="http://activiti.org/bpmn"
+        xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" typeLanguage="http://www.w3.org/2001/XMLSchema"
+        expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://www.activiti.org/test">
 
    <process id="my-process">
 
-      <startEvent id="start" />
-      <sequenceFlow id="flow1" sourceRef="start" targetRef="someTask" />
-      
-      <userTask id="someTask" name="Activiti is awesome!" />
-      <sequenceFlow id="flow2" sourceRef="someTask" targetRef="end" />
+      <startEvent id="start" activiti:formKey="wf:submitAdhocTask"/>
+      <sequenceFlow id="flow1" sourceRef="start" targetRef="someTask"/>
 
-      <endEvent id="end" />
+      <userTask id="someTask" name="Activiti is awesome!" activiti:formKey="wf:adhocTask">
+         <humanPerformer>
+            <resourceAssignmentExpression>
+               <formalExpression>${bpm_assignee.properties.userName}</formalExpression>
+            </resourceAssignmentExpression>
+         </humanPerformer>
+      </userTask>
+      <sequenceFlow id="flow2" sourceRef="someTask" targetRef="end"/>
+
+      <endEvent id="end"/>
 
    </process>
 
diff --git a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/__artifactId__/context/bootstrap-context.xml b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/__artifactId__/context/bootstrap-context.xml
index f0a7fa98..e0d30583 100644
--- a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/__artifactId__/context/bootstrap-context.xml
+++ b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/__artifactId__/context/bootstrap-context.xml
@@ -36,5 +36,10 @@
                 </props>
             </list>
         </property>
+        <property name="labels">
+            <list>
+                <value>alfresco/module/${project.artifactId}/messages/workflow-messages</value>
+            </list>
+        </property>
     </bean>
 </beans>
diff --git a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/__artifactId__/messages/workflow-messages.properties b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/__artifactId__/messages/workflow-messages.properties
new file mode 100644
index 00000000..7a7dcfa7
--- /dev/null
+++ b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/__artifactId__/messages/workflow-messages.properties
@@ -0,0 +1,5 @@
+#
+# Activiti My Process Workflow
+#
+my-process.workflow.title=My Process
+my-process.workflow.description=This is my custom process
\ No newline at end of file
diff --git a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/__artifactId__/workflow/sample-process.bpmn20.xml b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/__artifactId__/workflow/sample-process.bpmn20.xml
index f7890085..3d1b363a 100644
--- a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/__artifactId__/workflow/sample-process.bpmn20.xml
+++ b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/__artifactId__/workflow/sample-process.bpmn20.xml
@@ -1,20 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL"
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:activiti="http://activiti.org/bpmn"
-   xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC"
-   xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" typeLanguage="http://www.w3.org/2001/XMLSchema"
-   expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://www.activiti.org/test">
+<definitions
+        xmlns:activiti="http://activiti.org/bpmn"
+        xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" typeLanguage="http://www.w3.org/2001/XMLSchema"
+        expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://www.activiti.org/test">
 
    <process id="my-process">
 
-      <startEvent id="start" />
-      <sequenceFlow id="flow1" sourceRef="start" targetRef="someTask" />
-      
-      <userTask id="someTask" name="Activiti is awesome!" />
-      <sequenceFlow id="flow2" sourceRef="someTask" targetRef="end" />
+      <startEvent id="start" activiti:formKey="wf:submitAdhocTask"/>
+      <sequenceFlow id="flow1" sourceRef="start" targetRef="someTask"/>
 
-      <endEvent id="end" />
+      <userTask id="someTask" name="Activiti is awesome!" activiti:formKey="wf:adhocTask">
+         <humanPerformer>
+            <resourceAssignmentExpression>
+               <formalExpression>${bpm_assignee.properties.userName}</formalExpression>
+            </resourceAssignmentExpression>
+         </humanPerformer>
+      </userTask>
+      <sequenceFlow id="flow2" sourceRef="someTask" targetRef="end"/>
+
+      <endEvent id="end"/>
 
    </process>