Merged V3.1 to HEAD

12982: Merged V3.0 to V3.1
      12921: Merged V2.2 to V3.0
         12524: Fix ETWOTWO-974: Submit Action Queue (...)
         12687: Add missing workflow to bootstrap (follow on from 12524)
   ___________________________________________________________________
   Modified: svn:mergeinfo
      Merged /alfresco/BRANCHES/V3.0:r12921
      Merged /alfresco/BRANCHES/V2.2:r12524,12687
      Merged /alfresco/BRANCHES/V3.1:r12982


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13545 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

config/alfresco/workflow/submit_processdefinition.xml

@@ -214,15 +214,38 @@
         <transition name="" to="end" />
     </task-node>
 
-    <task-node name="submitted">
-        <event type="node-enter">
-           <action class="org.alfresco.repo.avm.wf.AVMSubmitPackageHandler"/>
-           <action class="org.alfresco.repo.avm.wf.AVMDeployHandler"/>
-        </event>
-        <task name="wcmwf:submittedTask" swimlane="initiator" />
+    <task-node name="submitted" end-tasks="true">
+        <task name="wcmwf:submittedTask" swimlane="initiator">
+            <timer duedate="5 seconds" transition="">
+                <action class="org.alfresco.repo.workflow.jbpm.AlfrescoJavaScript">
+                    <script>
+                        logger.log("WCM Submit Process: Triggering submit for " + bpm_workflowDescription);
+                    </script>
+                </action>
+            </timer>
+
+	        <event type="task-end">
+	            <action class="org.alfresco.repo.workflow.jbpm.AlfrescoJavaScript">
+	                <script>
+	                    logger.log("WCM Submit Process: Start submit for " + bpm_workflowDescription + " (by " + person.properties.userName + ")");
+	                </script>
+	            </action>
+	
+	            <action class="org.alfresco.repo.avm.wf.AVMSubmitPackageHandler"/>
+	            <action class="org.alfresco.repo.avm.wf.AVMDeployHandler"/>
+	           
+	            <action class="org.alfresco.repo.workflow.jbpm.AlfrescoJavaScript">
+	                <script>
+                        logger.log("WCM Submit Process: End submit for " + bpm_workflowDescription + " (by " + person.properties.userName + ")");
+	                </script>
+	            </action>
+	        </event>
+
+        </task>
         <transition name="" to="end" />
     </task-node>
 
+
     <!--                 -->
     <!-- End the Process -->
     <!--                 -->

config/alfresco/workflow/submitdirect_processdefinition.xml

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- Workflow to support direct submit to staging sandbox -->
+
+<process-definition xmlns="urn:jbpm.org:jpdl-3.1" name="wcmwf:submitdirect">
+
+    <swimlane name="initiator"/>
+
+    <!--              -->
+    <!-- Start Review -->
+    <!--              -->
+
+    <start-state name="start">
+        <task name="wcmwf:submitDirectTask" swimlane="initiator"/>
+        <transition name="" to="submitted"/>
+    </start-state>
+    
+    <task-node name="submitted" end-tasks="true">
+        <task name="wcmwf:submittedDirectTask" swimlane="initiator">
+            <timer duedate="5 seconds" transition="">
+                <action class="org.alfresco.repo.workflow.jbpm.AlfrescoJavaScript">
+                    <script>
+                        logger.log("WCM Submit Process: Triggering submit for " + bpm_workflowDescription);
+                    </script>
+                </action>
+            </timer>
+
+	        <event type="task-end">
+	            <action class="org.alfresco.repo.workflow.jbpm.AlfrescoJavaScript">
+	                <script>
+	                    logger.log("WCM Submit Process: Start submit for " + bpm_workflowDescription + " (by " + person.properties.userName + ")");
+	                </script>
+	            </action>
+	
+	            <action class="org.alfresco.repo.avm.wf.AVMSubmitPackageHandler"/>
+	            <action class="org.alfresco.repo.avm.wf.AVMDeployHandler"/>
+	           
+	            <action class="org.alfresco.repo.workflow.jbpm.AlfrescoJavaScript">
+	                <script>
+                        logger.log("WCM Submit Process: End submit for " + bpm_workflowDescription + " (by " + person.properties.userName + ")");
+	                </script>
+	            </action>
+	        </event>
+
+        </task>
+        <transition name="" to="end" />
+    </task-node>
+
+    <!--                 -->
+    <!-- End the Process -->
+    <!--                 -->
+
+    <end-state name="end"/>
+    
+    <event type="process-end">
+        <action class="org.alfresco.repo.avm.wf.AVMRemoveAllSrcWebappsHandler"/>
+        <action class="org.alfresco.repo.avm.wf.AVMReleaseTestServerHandler"/>
+        <action class="org.alfresco.repo.avm.wf.AVMRemoveWFStoreHandler"/>
+    </event>
+
+</process-definition>

config/alfresco/workflow/wcm-workflow-messages.properties

@@ -27,11 +27,16 @@ wcmwf_submit.node.submitpending.transition.cancel.description=Abort Submission
 wcmwf_submit.node.submitpending.transition.launch.title=Submit Now
 wcmwf_submit.node.submitpending.transition.launch.description=Submit Now
 
+wcmwf_submitdirect.workflow.title=Web Site Submission (Direct)
+wcmwf_submitdirect.workflow.description=Submit changes direct to staging sandbox
+
 
 # Submit Task Definitions
 
 wcmwf_workflowmodel.type.wcmwf_submitReviewTask.title=Web Site Submission
 wcmwf_workflowmodel.type.wcmwf_submitReviewTask.description=Submit changes for approval
+wcmwf_workflowmodel.type.wcmwf_submitDirectTask.title=Web Site Submission (Direct)
+wcmwf_workflowmodel.type.wcmwf_submitDirectTask.description=Submit changes direct to staging sandbox
 wcmwf_workflowmodel.type.wcmwf_verifyBrokenLinksTask.title=Verify Broken Links
 wcmwf_workflowmodel.type.wcmwf_verifyBrokenLinksTask.description=Verify links that do not point to a live resource
 wcmwf_workflowmodel.type.wcmwf_reviewTask.title=Review
@@ -44,6 +49,8 @@ wcmwf_workflowmodel.type.wcmwf_approvedTask.title=Approved
 wcmwf_workflowmodel.type.wcmwf_approvedTask.description=Approved
 wcmwf_workflowmodel.type.wcmwf_submittedTask.title=Submitted
 wcmwf_workflowmodel.type.wcmwf_submittedTask.description=Submitted
+wcmwf_workflowmodel.type.wcmwf_submittedDirectTask.title=Submitted
+wcmwf_workflowmodel.type.wcmwf_submittedDirectTask.description=Submitted
 wcmwf_workflowmodel.type.wcmwf_submitpendingTask.title=Submission Pending
 wcmwf_workflowmodel.type.wcmwf_submitpendingTask.description=Submission Pending
 wcmwf_workflowmodel.type.wcmwf_submitcancelledTask.title=Submission Aborted

config/alfresco/workflow/wcmWorkflowModel.xml

@@ -66,21 +66,17 @@
           </constraints>
         </property>
       </properties>
-      <associations>
-        <association name="wcmwf:webproject">
-          <source>
-            <mandatory>false</mandatory>
-            <many>false</many>
-          </source>
-          <target>
-            <class>wca:webfolder</class>
-            <mandatory>true</mandatory>
-            <many>false</many>
-          </target>
-        </association>
-      </associations>
       <mandatory-aspects>
         <aspect>bpm:assignees</aspect>
+        <aspect>wcmwf:webproject</aspect>
+        <aspect>wcmwf:submission</aspect>
+      </mandatory-aspects>
+    </type>
+
+    <type name="wcmwf:submitDirectTask">
+      <parent>wcmwf:startTask</parent>
+      <mandatory-aspects>
+        <aspect>wcmwf:webproject</aspect>
         <aspect>wcmwf:submission</aspect>
       </mandatory-aspects>
     </type>
@@ -169,8 +165,15 @@
       </mandatory-aspects>
     </type>
 
-   <!-- NOTE: kept for backwards compatibility only - for v2.0 wcm submit process definition -->
-   <type name="wcmwf:approvedTask">
+    <type name="wcmwf:submittedDirectTask">
+      <parent>wcmwf:workflowTask</parent>
+      <mandatory-aspects>
+        <aspect>wcmwf:submission</aspect>
+      </mandatory-aspects>
+    </type>
+
+    <!-- NOTE: kept for backwards compatibility only - for v2.0 wcm submit process definition -->
+    <type name="wcmwf:approvedTask">
       <parent>wcmwf:workflowTask</parent>
       <mandatory-aspects>
         <aspect>bpm:assignees</aspect>
@@ -221,6 +224,22 @@
 
   <aspects>
     
+    <aspect name="wcmwf:webproject">
+      <associations>
+        <association name="wcmwf:webproject">
+          <source>
+            <mandatory>false</mandatory>
+            <many>false</many>
+          </source>
+          <target>
+            <class>wca:webfolder</class>
+            <mandatory>true</mandatory>
+            <many>false</many>
+          </target>
+        </association>
+      </associations>
+    </aspect>    
+    
     <aspect name="wcmwf:submission">
       <properties>
         <property name="wcmwf:fromPath">