Addition of "submitted" aspect to items submitted for web site review.

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

config/alfresco/avm-services-context.xml

@@ -172,7 +172,7 @@
 	<bean id="createVersionTxnListener" class="org.alfresco.repo.avm.CreateVersionTxnListener"/>
 	
 	<bean id="purgeVersionTxnListener" class="org.alfresco.repo.avm.PurgeVersionTxnListener"/>
-
+
 	<bean id="avmRepository" class="org.alfresco.repo.avm.AVMRepository">
 		<property name="nodeIssuer">
 			<ref bean="nodeIssuer"/>
@@ -262,6 +262,12 @@
             <value>${avm.remote.port}</value>
         </property>
     </bean>
+
+    <bean id="AVMSubmittedAspect" class="org.alfresco.repo.avm.wf.AVMSubmittedAspect">
+        <property name="avmService">
+            <ref bean="AVMService"/>
+        </property>
+    </bean>
 
 	<!-- NameMatcher beans for filtering what shows up as different in compares. -->
 	

config/alfresco/workflow/submit_processdefinition.xml

@@ -14,8 +14,15 @@
     <start-state name="start">
         <task name="wcmwf:submitReviewTask" swimlane="initiator"/>
         <transition name="" to="serialorparallel"/>
-        
-        <event type="node-leave">
+    </start-state>
+
+
+    <!--                                      -->
+    <!-- Split into Serial or Parallel Review -->
+    <!--                                      -->
+
+    <decision name="serialorparallel">
+       <event type="node-enter">
             <script>
                <variable name="wcmwf_reviewerCnt" access="write"/>
                <variable name="wcmwf_approveCnt" access="write"/>
@@ -26,15 +33,8 @@
                   wcmwf_reviewType = wcmwf_submitReviewType;
                </expression>
             </script>
-        </event>
-    </start-state>
+       </event>
 
-
-    <!--                                      -->
-    <!-- Split into Serial or Parallel Review -->
-    <!--                                      -->
-
-    <decision name="serialorparallel">
        <transition name="serial" to="submitserialreview" />
        <transition name="parallel" to="submitparallelreview">
           <condition>#{wcmwf_reviewType == "Parallel"}</condition>
@@ -119,10 +119,12 @@
     <!--                -->
 
     <decision name="endreview">
-       <transition name="rejected" to="rejected" />
+       <transition name="rejected" to="rejected">
+           <action class="org.alfresco.repo.avm.wf.AVMClearSubmittedHandler"/>
+       </transition>
        <transition name="approved" to="approved">
-         <condition>#{wcmwf_approveCnt == wcmwf_reviewerCnt}</condition>
-         <action class="org.alfresco.repo.avm.wf.AVMSubmitPackageHandler"/>
+           <condition>#{wcmwf_approveCnt == wcmwf_reviewerCnt}</condition>
+           <action class="org.alfresco.repo.avm.wf.AVMSubmitPackageHandler"/>
        </transition>
     </decision>   
 
@@ -142,5 +144,9 @@
     <!--                 -->
 
     <end-state name="end"/>
+    
+    <event type="process-end">
+        <action class="org.alfresco.repo.avm.wf.AVMClearSubmittedHandler"/>
+    </event>
 
 </process-definition>

config/alfresco/workflow/wcmWorkflowModel.xml

@@ -142,6 +142,16 @@
          </properties>
       </aspect>
    
+      <aspect name="wcmwf:submitted">
+         <properties>
+            <property name="wcmwf:workflowInstanceId">
+               <title>Workflow Instance Id</title>
+               <type>d:text</type>
+               <mandatory>true</mandatory>
+            </property>
+         </properties>
+      </aspect>
+
    </aspects>
 
 </model>