From be54a05c8ef3f28ae2c18f024233eb40885d027f Mon Sep 17 00:00:00 2001
From: Derek Hulley <derek.hulley@alfresco.com>
Date: Thu, 12 Mar 2009 14:01:59 +0000
Subject: [PATCH] Merged V3.1 to HEAD    12984: Sharepoint: Build fix after
 recent change to SiteService and bumped module version to 1.1    12997:
 (RECORD ONLY - Already merged) Added home property to start scripts; updated
 readmes; updated installers    13140: Merged V3.0 to V3.1       13138 Merged
 V2.2 to V3.0          13133: Fix ETWOTWO-1078: wcm submit does not complete
 when using Oracle    13146: Merged V3.0 to V3.1       13052: CIFS throws a
 NullPointerException if a non-relative path is received for a folder search.
 JLAN-69    13147: Updated svn:mergeinfo    13151: (RECORD ONLY) Changed labs
 -> enterprise for distribution bundles    13157: Partial fix for
 ETHREEOH-1277 - fixes usage of Application.getMessage()   
 ___________________________________________________________________   
 Modified: svn:mergeinfo       Merged /alfresco/BRANCHES/V3.0:r13052,13138    
   Merged /alfresco/BRANCHES/V2.2:r13133       Merged
 /alfresco/BRANCHES/V3.1:r12984,12997,13140,13146-13147,13151,13154,13157

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13603 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../alfresco/patch/patch-services-context.xml | 23 +++++++++++++++++++
 config/alfresco/version.properties            |  2 +-
 .../workflow/submit_processdefinition.xml     |  4 ++--
 .../submitdirect_processdefinition.xml        |  4 ++--
 .../repo/i18n/MessageServiceImpl.java         | 15 +++++++++---
 .../jbpm/AlfrescoJobExecutorThread.java       | 11 ++++++---
 6 files changed, 48 insertions(+), 11 deletions(-)

diff --git a/config/alfresco/patch/patch-services-context.xml b/config/alfresco/patch/patch-services-context.xml
index f56f936a80..a7bb7cbd12 100644
--- a/config/alfresco/patch/patch-services-context.xml
+++ b/config/alfresco/patch/patch-services-context.xml
@@ -1670,5 +1670,28 @@
             </list>
         </property>
     </bean>
+
+    <!--  Redeploy both direct and indirect submit processes for Oracle handling of empty transition names -->
+    <bean id="patch.redeploySubmitProcess7" class="org.alfresco.repo.admin.patch.impl.GenericWorkflowPatch" parent="basePatch" >
+        <property name="id"><value>patch.redeploySubmitProcess7</value></property>
+        <property name="description"><value>patch.redeploySubmitProcess.description</value></property>
+        <property name="fixesFromSchema"><value>0</value></property>
+        <property name="fixesToSchema"><value>2003</value></property>
+        <property name="targetSchema"><value>2004</value></property>
+        <property name="workflowDefinitions">
+            <list>
+               <props>
+                    <prop key="engineId">jbpm</prop>
+                    <prop key="location">alfresco/workflow/submit_processdefinition.xml</prop>
+                    <prop key="mimetype">text/xml</prop>
+               </props>
+               <props>
+                    <prop key="engineId">jbpm</prop>
+                    <prop key="location">alfresco/workflow/submitdirect_processdefinition.xml</prop>
+                    <prop key="mimetype">text/xml</prop>
+               </props>
+            </list>
+        </property>
+    </bean>
     
 </beans>
diff --git a/config/alfresco/version.properties b/config/alfresco/version.properties
index 56abc32227..e5dc1ccebe 100644
--- a/config/alfresco/version.properties
+++ b/config/alfresco/version.properties
@@ -19,4 +19,4 @@ version.build=@build-number@
 
 # Schema number
 
-version.schema=2003
+version.schema=2004
diff --git a/config/alfresco/workflow/submit_processdefinition.xml b/config/alfresco/workflow/submit_processdefinition.xml
index 9dafd0ceee..fefb5d1585 100644
--- a/config/alfresco/workflow/submit_processdefinition.xml
+++ b/config/alfresco/workflow/submit_processdefinition.xml
@@ -216,7 +216,7 @@
 
     <task-node name="submitted" end-tasks="true">
         <task name="wcmwf:submittedTask" swimlane="initiator">
-            <timer duedate="5 seconds" transition="">
+            <timer duedate="5 seconds" transition="onsubmit">
                 <action class="org.alfresco.repo.workflow.jbpm.AlfrescoJavaScript">
                     <script>
                         logger.log("WCM Submit Process: Triggering submit for " + bpm_workflowDescription);
@@ -246,7 +246,7 @@
 	            </action>
 	        </event>
         </task>
-        <transition name="" to="checkfailedsubmit">
+        <transition name="onsubmit" to="checkfailedsubmit">
 			<exception-handler>
                 <script>
 					<variable name="submitfailed" access="write"/>
diff --git a/config/alfresco/workflow/submitdirect_processdefinition.xml b/config/alfresco/workflow/submitdirect_processdefinition.xml
index 262d97ede0..fc55d45e08 100644
--- a/config/alfresco/workflow/submitdirect_processdefinition.xml
+++ b/config/alfresco/workflow/submitdirect_processdefinition.xml
@@ -17,7 +17,7 @@
     
     <task-node name="submitted" end-tasks="true">
         <task name="wcmwf:submittedDirectTask" swimlane="initiator">
-            <timer duedate="5 seconds" transition="">
+            <timer duedate="5 seconds" transition="onsubmit">
                 <action class="org.alfresco.repo.workflow.jbpm.AlfrescoJavaScript">
                     <script>
                         logger.log("WCM Submit Process: Triggering submit for " + bpm_workflowDescription);
@@ -47,7 +47,7 @@
 	            </action>
 	        </event>
         </task>
-        <transition name="" to="checkfailedsubmit">
+        <transition name="onsubmit" to="checkfailedsubmit">
             <exception-handler>
                 <script>
                     <variable name="submitfailed" access="write"/>
diff --git a/source/java/org/alfresco/repo/i18n/MessageServiceImpl.java b/source/java/org/alfresco/repo/i18n/MessageServiceImpl.java
index 9924b30654..b8528907ae 100644
--- a/source/java/org/alfresco/repo/i18n/MessageServiceImpl.java
+++ b/source/java/org/alfresco/repo/i18n/MessageServiceImpl.java
@@ -861,12 +861,21 @@ public class MessageServiceImpl implements MessageService
                 {
                     if ((line.length() > 0) && (line.charAt(0) != '#'))
                     {
-                        String[] splits = line.split("=");
-                        if (splits.length != 2)
+                        String[] splits = line.split("=", 2);
+                        
+                        if (splits.length == 2)
                         {
+                            properties.put(splits[0], splits[1]);
+                        }
+                        else if (splits.length == 1)
+                        {
+                            properties.put(splits[0], "");
+                        }
+                        else
+                        {
+                            logger.warn("Unexpected message properties file format: " + line);
                             throw new AlfrescoRuntimeException("Unexpected message properties file format: " + line);
                         }
-                        properties.put(splits[0], splits[1]);
                     }
                     line = br.readLine();
                 }
diff --git a/source/java/org/alfresco/repo/workflow/jbpm/AlfrescoJobExecutorThread.java b/source/java/org/alfresco/repo/workflow/jbpm/AlfrescoJobExecutorThread.java
index a1d6b3c2d7..269cbf76f2 100644
--- a/source/java/org/alfresco/repo/workflow/jbpm/AlfrescoJobExecutorThread.java
+++ b/source/java/org/alfresco/repo/workflow/jbpm/AlfrescoJobExecutorThread.java
@@ -67,6 +67,10 @@ public class AlfrescoJobExecutorThread extends JobExecutorThread
         {
             return Collections.EMPTY_LIST;
         }
+        else if (alfrescoJobExecutor.getTransactionService().isReadOnly())
+        {
+            return Collections.EMPTY_LIST;
+        }
         return alfrescoJobExecutor.getTransactionService().getRetryingTransactionHelper().doInTransaction(
             new RetryingTransactionHelper.RetryingTransactionCallback<Collection>() {
                 public Collection execute() throws Throwable
@@ -102,6 +106,10 @@ public class AlfrescoJobExecutorThread extends JobExecutorThread
         {
             return;
         }
+        else if (alfrescoJobExecutor.getTransactionService().isReadOnly())
+        {
+            return;
+        }
         alfrescoJobExecutor.getTransactionService().getRetryingTransactionHelper().doInTransaction(new TransactionJob(job));
     }
     
@@ -125,9 +133,6 @@ public class AlfrescoJobExecutorThread extends JobExecutorThread
             this.job = job;
         }
 
-        /* (non-Javadoc)
-         * @see org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback#execute()
-         */
         public Object execute() throws Throwable
         {
             AlfrescoJobExecutorThread.super.executeJob(job);