Merged V3.1 to HEAD

12992: Merged V3.0 to V3.1
      12930: Merged V2.2 to V3.0
         12713: Fix one part of ETWOTWO-975 (submit conflicts silently fail)
   ___________________________________________________________________
   Modified: svn:mergeinfo
      Merged /alfresco/BRANCHES/V3.0:r12930
      Merged /alfresco/BRANCHES/V2.2:r12713
      Merged /alfresco/BRANCHES/V3.1:r12992


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

config/alfresco/workflow/submit_processdefinition.xml

@@ -225,6 +225,11 @@
             </timer>
 
 	        <event type="task-end">
+                <script>
+                   <variable name="submitfailed" access="write"/>
+                   <expression>submitfailed = false;</expression>
+                </script>
+	        
 	            <action class="org.alfresco.repo.workflow.jbpm.AlfrescoJavaScript">
 	                <script>
 	                    logger.log("WCM Submit Process: Start submit for " + bpm_workflowDescription + " (by " + person.properties.userName + ")");
@@ -240,11 +245,33 @@
 	                </script>
 	            </action>
 	        </event>
-
         </task>
-        <transition name="" to="end" />
+        <transition name="" to="checkfailedsubmit">
+			<exception-handler>
+                <script>
+					<variable name="submitfailed" access="write"/>
+					<expression>
+                        logger.log("WCM Submit Process: Submit failed for " + bpm_workflowDescription + " (by " + person.properties.userName + ")");
+						submitfailed = true;
+					</expression>
+				</script>
+			</exception-handler>
+        </transition>
     </task-node>
 
+    <decision name="checkfailedsubmit">
+        <transition name="failure" to="submitfailed">
+           <condition>#{submitfailed == true}</condition>
+        </transition>
+        <transition name="success" to="end">
+           <condition>#{submitfailed == false}</condition>
+        </transition>
+    </decision>
+
+    <task-node name="submitfailed">
+        <task name="wcmwf:submitfailedTask" swimlane="initiator"/>
+        <transition name="" to="end"/>
+    </task-node>
 
     <!--                 -->
     <!-- End the Process -->

config/alfresco/workflow/submitdirect_processdefinition.xml

@@ -26,6 +26,11 @@
             </timer>
 
 	        <event type="task-end">
+	            <script>
+	               <variable name="submitfailed" access="write"/>
+	               <expression>submitfailed = false;</expression>
+	            </script>
+	        
 	            <action class="org.alfresco.repo.workflow.jbpm.AlfrescoJavaScript">
 	                <script>
 	                    logger.log("WCM Submit Process: Start submit for " + bpm_workflowDescription + " (by " + person.properties.userName + ")");
@@ -41,9 +46,32 @@
 	                </script>
 	            </action>
 	        </event>
-
         </task>
-        <transition name="" to="end" />
+        <transition name="" to="checkfailedsubmit">
+            <exception-handler>
+                <script>
+                    <variable name="submitfailed" access="write"/>
+                    <expression>
+                        logger.log("WCM Submit Process: Submit failed for " + bpm_workflowDescription + " (by " + person.properties.userName + ")");
+                        submitfailed = true;
+                    </expression>
+                </script>
+            </exception-handler>
+        </transition>
+    </task-node>
+
+    <decision name="checkfailedsubmit">
+        <transition name="failure" to="submitfailed">
+           <condition>#{submitfailed == true}</condition>
+        </transition>
+        <transition name="success" to="end">
+           <condition>#{submitfailed == false}</condition>
+        </transition>
+    </decision>
+
+    <task-node name="submitfailed">
+        <task name="wcmwf:submitfailedTask" swimlane="initiator"/>
+        <transition name="" to="end"/>
     </task-node>
 
     <!--                 -->

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

@@ -55,6 +55,8 @@ wcmwf_workflowmodel.type.wcmwf_submitpendingTask.title=Submission Pending
 wcmwf_workflowmodel.type.wcmwf_submitpendingTask.description=Submission Pending
 wcmwf_workflowmodel.type.wcmwf_submitcancelledTask.title=Submission Aborted
 wcmwf_workflowmodel.type.wcmwf_submitcancelledTask.description=Submission Aborted
+wcmwf_workflowmodel.type.wcmwf_submitfailedTask.title=Submission Failed
+wcmwf_workflowmodel.type.wcmwf_submitfailedTask.description=Submission Failed
 
 wcmwf_workflowmodel.property.wcmwf_reviewType.title=Type of Review
 wcmwf_workflowmodel.property.wcmwf_reviewType.description=Serial or parallel review

config/alfresco/workflow/wcmWorkflowModel.xml

@@ -172,6 +172,13 @@
       </mandatory-aspects>
     </type>
 
+    <type name="wcmwf:submitfailedTask">
+      <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>