Merged V2.1 to HEAD

6454: Remove edit & upload actions from WCM submit parallel review task.
         Serial review task still allows edit & upload.
         Schema version number up to 103 and changed patch accordingly


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

config/alfresco/patch/patch-services-context.xml

@@ -971,4 +971,22 @@
         </property>
     </bean>
 
+    <bean id="patch.redeploySubmitProcess2" class="org.alfresco.repo.admin.patch.impl.GenericWorkflowPatch" parent="basePatch" >
+        <property name="id"><value>patch.redeploySubmitProcess</value></property>
+        <property name="description"><value>patch.redeploySubmitProcess.description</value></property>
+        <property name="fixesFromSchema"><value>0</value></property>
+        <property name="fixesToSchema"><value>102</value></property>
+        <property name="targetSchema"><value>103</value></property>
+        <property name="workflowDefinitions">
+            <list>
+               <props>
+                    <!-- WCM workflow definition -->
+                    <prop key="engineId">jbpm</prop>
+                    <prop key="location">alfresco/workflow/submit_processdefinition.xml</prop>
+                    <prop key="mimetype">text/xml</prop>
+               </props>
+            </list>
+        </property>
+    </bean>
+
 </beans>

config/alfresco/version.properties

@@ -19,4 +19,4 @@ version.build=@build-number@
 
 # Schema number
 
-version.schema=102
+version.schema=103

config/alfresco/workflow/submit_processdefinition.xml

@@ -125,7 +125,7 @@
     </node>
 
     <task-node name="parallelreview">
-        <task name="wcmwf:reviewTask">
+        <task name="wcmwf:parallelReviewTask">
            <assignment class="org.alfresco.repo.workflow.jbpm.AlfrescoAssignment">
               <actor>#{reviewer}</actor>
            </assignment>

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

@@ -36,6 +36,8 @@ 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
 wcmwf_workflowmodel.type.wcmwf_reviewTask.description=Review Documents to approve or reject them
+wcmwf_workflowmodel.type.wcmwf_parallelReviewTask.title=Review
+wcmwf_workflowmodel.type.wcmwf_parallelReviewTask.description=Review Documents to approve or reject them
 wcmwf_workflowmodel.type.wcmwf_rejectedTask.title=Rejected
 wcmwf_workflowmodel.type.wcmwf_rejectedTask.description=Rejected
 wcmwf_workflowmodel.type.wcmwf_approvedTask.title=Approved

config/alfresco/workflow/wcmWorkflowModel.xml

@@ -108,7 +108,23 @@
         <aspect>wcmwf:reviewType</aspect>
       </mandatory-aspects>
     </type>
-
+
+    <type name="wcmwf:parallelReviewTask">
+      <parent>wcmwf:workflowTask</parent>
+      <overrides>
+        <property name="bpm:packageItemActionGroup">
+          <default>review_wcm_package_item_actions</default>
+        </property>
+      </overrides>
+      <mandatory-aspects>
+        <!-- One or more reviewers - this is here to allow view of all reviewers -->
+        <!-- in the review task -->
+        <aspect>bpm:assignees</aspect>
+        <aspect>wcmwf:submission</aspect>
+        <aspect>wcmwf:reviewType</aspect>
+      </mandatory-aspects>
+    </type>
+    
     <type name="wcmwf:rejectedTask">
       <parent>wcmwf:workflowTask</parent>
       <overrides>