Merged 1.4 to HEAD

svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4192 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4197 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4205 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4206 .
   svn resolved root\projects\repository\source\java\org\alfresco\filesys\server\config\ServerConfiguration.java
   svn revert root\projects\repository\config\alfresco\version.properties
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4219 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4224 .


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

config/alfresco/domain/hibernate-cfg.properties

@@ -12,4 +12,4 @@ hibernate.cache.use_second_level_cache=true
 hibernate.default_batch_fetch_size=1
 hibernate.jdbc.batch_size=32
 hibernate.connection.release_mode=auto
-hibernate.connection.isolation=4
+hibernate.connection.isolation=2

config/alfresco/scheduled-jobs-context.xml

@@ -40,7 +40,6 @@
         <property name="scheduler">
             <ref bean="schedulerFactory" />
         </property>
-        <!-- Try and do some indexing every minute after starting up -->
         <property name="startDelayMinutes">
             <value>1</value>
         </property>
@@ -49,38 +48,6 @@
         </property>
     </bean>
 
-    <!-- Forces the reindexing of nodes where content may have been missing before -->
-    <!--
-       This component can be triggered at intervals where asynchronous content sharing
-       between clustered servers has been set up
-    -->
-    <bean id="missingContentReindexTrigger" class="org.alfresco.util.TriggerBean">
-        <property name="jobDetail">
-            <bean class="org.springframework.scheduling.quartz.JobDetailBean">
-                <property name="jobClass">
-                    <value>org.alfresco.repo.node.index.IndexRecoveryJob</value>
-                </property>
-                <property name="jobDataAsMap">
-                    <map>
-                        <entry key="indexRecoveryComponent">
-                            <ref bean="missingContentReindexComponent" />
-                        </entry>
-                    </map>
-                </property>
-            </bean>
-        </property>
-        <property name="scheduler">
-            <ref bean="schedulerFactory" />
-        </property>
-        <!-- Give the server 5 minutes and then check for missing content -->
-        <property name="startDelayMinutes">
-            <value>5</value>
-        </property>
-        <property name="repeatCount">
-            <value>0</value>
-        </property>
-    </bean>
-
     <bean id="indexRecoveryTrigger" class="org.alfresco.util.TriggerBean">
         <property name="jobDetail">
             <bean class="org.springframework.scheduling.quartz.JobDetailBean">

config/alfresco/workflow/parallelreview_processdefinition.xml

@@ -6,14 +6,7 @@
 
     <start-state name="start">
         <task name="wf:submitParallelReviewTask" swimlane="initiator" />
-        <transition name="" to="startreview">
-            <script>
-                <variable name="wf_approveCount" access="write" />
-                <expression>
-                    wf_approveCount = 0;
-                </expression>
-            </script>
-        </transition>
+        <transition name="" to="startreview"/>
     </start-state>
 
     <node name="startreview">
@@ -21,6 +14,14 @@
             <foreach>#{bpm_assignees}</foreach>
             <var>reviewer</var>
         </action>
+        <event type="node-enter">
+            <script>
+                <variable name="wf_approveCount" access="write" />
+                <expression>
+                    wf_approveCount = 0;
+                </expression>
+            </script>
+        </event>
         <transition name="review" to="review" />
     </node>
 

config/alfresco/workflow/workflow-messages.properties

@@ -13,6 +13,10 @@ wf_workflowmodel.type.wf_submitReviewTask.title=Start Review
 wf_workflowmodel.type.wf_submitReviewTask.description=Submit documents for review & approval
 wf_workflowmodel.type.wf_reviewTask.title=Review
 wf_workflowmodel.type.wf_reviewTask.description=Review Documents to Approve or Reject them
+wf_workflowmodel.type.wf_rejectedTask.title=Rejected
+wf_workflowmodel.type.wf_rejectedTask.description=Rejected
+wf_workflowmodel.type.wf_approvedTask.title=Approved
+wf_workflowmodel.type.wf_approvedTask.description=Approved
 
 # Review & Approve Process Definitions