Merged V2.1 to HEAD

6636: Temporary hack to fix build.  
   6637: Better handling of binary string bufs, disable link validation when poll interval is <= 0
   6638: Forgotten files for TXT to PDF transformer.
   6639: Fix for AWC-1541
   6641: Fix for WCM-792.
   6642: A little extra PropertyValue support for createNode, too.
   6643: Fix for WCM-791
   6644: Closure of AR-1528: Check concurrency handling of DuplicateChildNodeNameException
   6647: Fix WCM-794
   6648: WCM-656
   6650: Applied user supplied patch to fix AWC-1546 - Cannot mount AVM using CIFS on new alfresco installation.
   6651: Index tidy ups
   6654: Various minor updates for passthru authentication debugging and error handling.
   6657: Fix for WCM-799 (Some items selected for submission were not present)
   6659: Updated installers.
   6660: Partial fix to AWC-1524
   6661: Fix WCM-803
   6664: Including  hibernate-3.2.1.jar in $VIRTUAL_TOMCAT_HOME/server/lib/ 
   6665: adding an automated unit test for output path patterns.
   6668: Fixed to add shale-test-1.0.4.jar to Eclipse classpath (PHH oked)
   6681: Fixes WCM-811 - Lookup.getIndirectionPath() had a bit of a howler in it.
   6684: UncategorizedSQLException with the word 'deadlock' in the message is now cause for retrying a transaction.
   6691: Fix for WCM-813 (lock not removed when expiration date set and no workflow on web project)
   6696: Imporved SSO filters for SiteMinder etc + test filter
   6697: Support for scheduled import
   6699: Fix for the compliation target:  compile-benchmarkframework 
   6701: Fix for 1.6 JVMs (1.5 gets by with lucky ordering)


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

source/java/org/alfresco/web/bean/wcm/SubmitDialog.java

@@ -51,6 +51,7 @@ import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransacti
 import org.alfresco.repo.workflow.WorkflowModel;
 import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
 import org.alfresco.service.cmr.avm.AVMService;
+import org.alfresco.service.cmr.avm.locking.AVMLock;
 import org.alfresco.service.cmr.avm.locking.AVMLockingService;
 import org.alfresco.service.cmr.avmsync.AVMDifference;
 import org.alfresco.service.cmr.avmsync.AVMSyncService;
@@ -414,6 +415,9 @@ public class SubmitDialog extends BaseDialogBean
          String destPath = stagingPath + wrapper.getPath();
          AVMDifference diff = new AVMDifference(-1, srcPath, -1, destPath, AVMDifference.NEWER);
          diffs.add(diff);
+
+         // process the expiration date (if any)
+         processExpirationDate(srcPath);
          
          // recursively remove locks from this item
          recursivelyRemoveLocks(storeId, -1, this.avmService.lookup(-1, srcPath, true), srcPath);
@@ -426,9 +430,6 @@ public class SubmitDialog extends BaseDialogBean
          {
             this.virtUpdatePath = destPath;
          }
-         
-         // process the expiration date (if any)
-         processExpirationDate(srcPath);
       }
       
       // write changes to layer so files are marked as modified
@@ -1033,8 +1034,12 @@ public class SubmitDialog extends BaseDialogBean
                         submittedPaths.add(renditionPath);
                      }
                   }
-                  this.workflows.add(new FormWorkflowWrapper(fid.getForm().getDefaultWorkflow().getName(),
-                                                             fid.getForm().getDefaultWorkflowParameters()));
+                  WorkflowDefinition defaultWfDef = fid.getForm().getDefaultWorkflow();
+                  if (defaultWfDef != null)
+                  {
+                     this.workflows.add(new FormWorkflowWrapper(defaultWfDef.getName(), 
+                              fid.getForm().getDefaultWorkflowParameters()));
+                  }
                }
             }
          }
@@ -1045,6 +1050,9 @@ public class SubmitDialog extends BaseDialogBean
       {
          // rollback the transaction on error
          try { if (tx != null) {tx.rollback();} } catch (Exception ex) {}
+         
+         // rethrow the exception to highlight the problem
+         throw (RuntimeException)e;
       }
    }