Merged V2.2 to HEAD

8265: Added catch blocks for the permissions service access denied exception to various file/folder operations
   8286: Merged V2.1 to V2.2
      8256: Fix broken WCM workflow.
      8257: Partial fix for AWC-1850
      8283: Merged V2.1-A to V2.1
         8264: Fine-grained debug logging for exceptions causing transaction retries.
   8288: Should fix workflow problems. Hard to test since almost nothing works right now.
   8291: Added Peter's fixes to improve deployment start scripts
   8294: Update deploy script from Peter
   8298: Fix for WCM-1058:
   8300: Commented out admin dashlet (active_tasks)
   8359: Fix AR-1735: Customer-requested POI upgrade
   8367: Fix for AWC-1639
   8368: Fix for WCM-1102
   8389: Revert changes between r8072 and r8251 from Schema2XForms.java
   8401: Fix for WCM-1105
   8407: Minor typo fix


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

source/java/org/alfresco/repo/workflow/jbpm/JBPMTransactionTemplate.java

@@ -24,6 +24,7 @@
  */
 package org.alfresco.repo.workflow.jbpm;
 
+import org.alfresco.repo.domain.hibernate.SessionSizeResourceManager;
 import org.alfresco.repo.transaction.AlfrescoTransactionSupport;
 import org.alfresco.repo.transaction.TransactionListener;
 import org.alfresco.util.GUID;
@@ -115,6 +116,7 @@ public class JBPMTransactionTemplate extends JbpmTemplate
             if (context == null)
             {
                 context = super.getContext();
+                SessionSizeResourceManager.setDisableInTransaction();
                 AlfrescoTransactionSupport.bindResource(JBPM_CONTEXT_KEY, context);
                 AlfrescoTransactionSupport.bindListener(this);
     
@@ -155,24 +157,6 @@ public class JBPMTransactionTemplate extends JbpmTemplate
      * @see org.alfresco.repo.transaction.TransactionListener#beforeCommit(boolean)
      */
     public void beforeCommit(boolean readOnly)
-    {
-    }
-
-    
-    /* (non-Javadoc)
-     * @see org.alfresco.repo.transaction.TransactionListener#beforeCompletion()
-     */
-    public void beforeCompletion()
-    {
-        // TODO Auto-generated method stub
-
-    }
-
-    
-    /* (non-Javadoc)
-     * @see org.alfresco.repo.transaction.TransactionListener#afterCommit()
-     */
-    public void afterCommit()
     {
         JbpmContext context = (JbpmContext)AlfrescoTransactionSupport.getResource(JBPM_CONTEXT_KEY);
         if (context != null)
@@ -185,6 +169,22 @@ public class JBPMTransactionTemplate extends JbpmTemplate
     }
 
     
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.transaction.TransactionListener#beforeCompletion()
+     */
+    public void beforeCompletion()
+    {
+    }
+
+    
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.transaction.TransactionListener#afterCommit()
+     */
+    public void afterCommit()
+    {
+    }
+
+    
     /* (non-Javadoc)
      * @see org.alfresco.repo.transaction.TransactionListener#afterRollback()
      */