- fix avm submit flags (conflicts, older are ignored and overwritten)

- fix cosmetic issue in parallel review task (use to say it was a serial review)

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

config/alfresco/workflow/submit_processdefinition.xml

@@ -19,9 +19,11 @@
             <script>
                <variable name="wcmwf_reviewerCnt" access="write"/>
                <variable name="wcmwf_approveCnt" access="write"/>
+               <variable name="wcmwf_reviewType" access="write"/>
                <expression>
                   wcmwf_reviewerCnt = bpm_assignees.size();
                   wcmwf_approveCnt = 0;
+                  wcmwf_reviewType = wcmwf_submitReviewType;
                </expression>
             </script>
         </event>

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

@@ -28,6 +28,8 @@ wcmwf_workflowmodel.type.wcmwf_approvedTask.description=Approved
 
 wcmwf_workflowmodel.property.wcmwf_reviewType.title=Type of Review
 wcmwf_workflowmodel.property.wcmwf_reviewType.description=Serial or parallel review
+wcmwf_workflowmodel.property.wcmwf_submitReviewType.title=Type of Review
+wcmwf_workflowmodel.property.wcmwf_submitReviewType.description=Serial or parallel review
 wcmwf_workflowmodel.property.wcmwf_fromPath.title=Source Folder Path
 wcmwf_workflowmodel.property.wcmwf_fromPath.description=Folder Path where items have been submitted from
 wcmwf_workflowmodel.property.wcmwf_label.title=Submission Label

config/alfresco/workflow/wcmWorkflowModel.xml

@@ -48,39 +48,49 @@
 
       <type name="wcmwf:submitReviewTask">
          <parent>wcmwf:startTask</parent>
+         <properties>
+            <property name="wcmwf:submitReviewType">
+               <title>Serial or Parallel Review</title>
+               <type>d:text</type>
+               <mandatory>true</mandatory>
+               <default>Serial</default>
+               <constraints>
+                  <constraint ref="wcmwf:reviewType" />
+               </constraints>
+            </property>
+         </properties>
          <mandatory-aspects>
-            <aspect>wcmwf:reviewType</aspect>
-            <aspect>wcmwf:submission</aspect>
             <aspect>bpm:assignees</aspect>
+            <aspect>wcmwf:submission</aspect>
          </mandatory-aspects>
       </type>
 
       <type name="wcmwf:reviewTask">
          <parent>wcmwf:workflowTask</parent>
          <mandatory-aspects>
-            <aspect>wcmwf:submission</aspect>
             <!-- One or more reviewers - this is here to allow view of all reviewers -->
             <!-- in the review task -->
-            <aspect>wcmwf:reviewType</aspect>
             <aspect>bpm:assignees</aspect>
+            <aspect>wcmwf:submission</aspect>
+            <aspect>wcmwf:reviewType</aspect>
          </mandatory-aspects>
       </type>
 
       <type name="wcmwf:rejectedTask">
          <parent>wcmwf:workflowTask</parent>
          <mandatory-aspects>
-            <aspect>wcmwf:reviewType</aspect>
             <aspect>bpm:assignees</aspect>
-            <aspect>wcmwf:reviewStats</aspect>
+            <aspect>wcmwf:reviewType</aspect>
+            <aspect>wcmwf:reviewInfo</aspect>
          </mandatory-aspects>
       </type>
 
       <type name="wcmwf:approvedTask">
          <parent>wcmwf:workflowTask</parent>
          <mandatory-aspects>
-            <aspect>wcmwf:reviewType</aspect>
             <aspect>bpm:assignees</aspect>
-            <aspect>wcmwf:reviewStats</aspect>
+            <aspect>wcmwf:reviewType</aspect>
+            <aspect>wcmwf:reviewInfo</aspect>
          </mandatory-aspects>
       </type>
 
@@ -107,10 +117,9 @@
       <aspect name="wcmwf:reviewType">
          <properties>
             <property name="wcmwf:reviewType">
-               <title>Serial or Parallel Review</title>
+               <title>Review Type</title>
                <type>d:text</type>
                <mandatory>true</mandatory>
-               <default>Serial</default>
                <constraints>
                   <constraint ref="wcmwf:reviewType" />
                </constraints>
@@ -118,7 +127,7 @@
          </properties>
       </aspect>
 
-      <aspect name="wcmwf:reviewStats">
+      <aspect name="wcmwf:reviewInfo">
          <properties>
             <property name="wcmwf:reviewerCnt">
                <title>Reviewer Count</title>

source/java/org/alfresco/repo/avm/wf/AVMSubmitPackageHandler.java

@@ -3,6 +3,7 @@ package org.alfresco.repo.avm.wf;
 import java.io.Serializable;
 import java.util.List;
 
+import org.alfresco.repo.avm.AVMDAOs;
 import org.alfresco.repo.avm.AVMNodeConverter;
 import org.alfresco.repo.workflow.jbpm.JBPMNode;
 import org.alfresco.repo.workflow.jbpm.JBPMSpringActionHandler;
@@ -60,12 +61,13 @@ public class AVMSubmitPackageHandler extends JBPMSpringActionHandler implements
         AVMNodeDescriptor pkgDesc = fAVMService.lookup(pkgPath.getFirst(), pkgPath.getSecond());
         String targetPath = pkgDesc.getIndirection();
 		List<AVMDifference> diff = fAVMSyncService.compare(pkgPath.getFirst(), pkgPath.getSecond(), -1, targetPath, null);
-        fAVMSyncService.update(diff, null, true, true, false, false, tag, description);
+        fAVMSyncService.update(diff, null, false, false, true, true, tag, description);
 
         // flatten source folder where changes were submitted from
         String from = (String)executionContext.getContextInstance().getVariable("wcmwf_fromPath");
         if (from != null && from.length() > 0)
         {
+            AVMDAOs.Instance().fAVMNodeDAO.flush();
             fAVMSyncService.flatten(from, targetPath);
         }
     }