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
This commit is contained in:
Derek Hulley
2009-03-12 14:01:59 +00:00
parent 0746698410
commit be54a05c8e
6 changed files with 48 additions and 11 deletions

View File

@@ -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"/>

View File

@@ -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"/>