Merged V3.2 to HEAD

17475: ETHREEOH-3295: Fix to AuthorityMigrationPatch
      - Forces transaction retry if worker thread reaches child authority before a parent authority
      - Tested on Kev's 3.1.1 repository with ~20,000 bulk loaded users and ~2,000 Share sites
      - Now completes in 5 minutes as opposed to 45
   17461: ETHREEOH-3268: Added MutableAuthenticationService.isAuthenticationCreationAllowed () to allow conditional display of external user invitation UI
   17450: ETHREEOH-2762: Correction to previous fix. Do not generate new name when working copy copied back on check in.
   17440: ETHREEOH-3295: Fixed logging in FixNameCrcValuesPatch
   17439: ETHREEOH-2762: Improved behaviour when a working copy is copied
      - Working copy aspect already removed the working copy aspect on copy
      - Now derives a new name from the node checked out from and a UUID, preserving the extension
   17438: ETHREEOH-2690: Fix sequencing of jgroups system property setting
      - declared dependency between internalEHCacheManager and jgroupsPropertySetter
   17436: ETHREEOH-3295: Further performance improvements to AuthorityMigrationPatch
      - authority created at same time as all its parent associations to save lots of reindexing, as per LDAP sync
      - multi-threaded BatchProcessor (as used by LDAP sync, FixNameCrcValuesPatch) used to process work in 2 threads in batches of 20, report progress every 100 entries and handle transaction retries
      - BatchProcessor now promoted to its own package
   17394: Fix for license issue in local enterprise builds.
      - Replace Community with Enterprise in version.properties during enterprise war building
   17365: ETHREEOH-3229: Visited and fixed all SearchService result set leaks
   17362: ETHREEOH-3254: Eliminate needless ping to LDAP server in LDAPAuthenticationComponentImpl.implementationAllowsGuestLogin()
   17348: ETHREEOH-3003: Fix NPE in Hyperic when LicenseDescriptor has null fields
   17316: Merged V3.1 to V3.2
      17315: ETHREEOH-3092: PersonService won't let you create duplicate persons anymore.
      17314: ETHREEOH-3158: Fix RepoServerMgmt to work with external authentication methods
         - AuthenticationService.getCurrentTicket / getNewTicket now call pre authentication check before issuing a new ticket, thus still allowing ticket enforcement when external authentication is in use.
      17312: ETHREEOH-3219: Enable resolution of JMX server password file path on JBoss 5
      17299: Merged V3.2 to V3.1 (Record only)
         17297: ETHREEOH-1593: Changed name of username cookie and fixed login.jsp to decode it properly
         17248: ETHREEOH-1593: alfUser cookie value should be base 64 encoded to allow for non-ASCII characters
   17297: ETHREEOH-1593: Changed name of username cookie and fixed login.jsp to decode it properly
      - thanks Kev!
   17292: ETHREEOH-1842: Ticket association with HttpSession IDs tracked so that we don't invalidate a ticket in use by multiple sessions prematurely
      - AuthenticationService validate, getCurrentTicket, etc. methods now take optional sessionId arguments
   17269: Fix failing unit test
      - reinstate original behaviour of AbstractChainingAuthenticationService.getAuthenticationEnabled()
   17268: Fix InvitationService
      - Runs as system to do privileged AuthenticationService actions


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

source/java/org/alfresco/repo/coci/WorkingCopyAspect.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2007 Alfresco Software Limited.
+ * Copyright (C) 2005-2009 Alfresco Software Limited.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -18,7 +18,7 @@
  * As a special exception to the terms and conditions of version 2.0 of 
  * the GPL, you may redistribute this Program in connection with Free/Libre 
  * and Open Source Software ("FLOSS") applications as described in Alfresco's 
- * FLOSS exception.  You should have recieved a copy of the text describing 
+ * FLOSS exception.  You should have received a copy of the text describing 
  * the FLOSS exception, and it is also available here: 
  * http://www.alfresco.com/legal/licensing"
  */
@@ -42,6 +42,7 @@ import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
+import org.alfresco.util.GUID;
 
 public class WorkingCopyAspect implements CopyServicePolicies.OnCopyNodePolicy
 {    
@@ -60,6 +61,11 @@ public class WorkingCopyAspect implements CopyServicePolicies.OnCopyNodePolicy
      */
     private LockService lockService;
     
+    /**
+     * The working copy aspect copy behaviour callback.
+     * */
+    private WorkingCopyAspectCopyBehaviourCallback workingCopyAspectCopyBehaviourCallback = new WorkingCopyAspectCopyBehaviourCallback();
+    
     /**
      * Sets the policy component
      * 
@@ -142,7 +148,7 @@ public class WorkingCopyAspect implements CopyServicePolicies.OnCopyNodePolicy
      */
     public CopyBehaviourCallback getCopyCallback(QName classRef, CopyDetails copyDetails)
     {
-        return WorkingCopyAspectCopyBehaviourCallback.instance;
+        return this.workingCopyAspectCopyBehaviourCallback;
     }
 
     /**
@@ -153,10 +159,8 @@ public class WorkingCopyAspect implements CopyServicePolicies.OnCopyNodePolicy
      * @author Derek Hulley
      * @since 3.2
      */
-    private static class WorkingCopyAspectCopyBehaviourCallback extends DefaultCopyBehaviourCallback
+    private class WorkingCopyAspectCopyBehaviourCallback extends DefaultCopyBehaviourCallback
     {
-        private static WorkingCopyAspectCopyBehaviourCallback instance = new WorkingCopyAspectCopyBehaviourCallback();
-        
         /**
          * Disallows copying of the {@link ContentModel#ASPECT_WORKING_COPY <b>cm:workingCopy</b>} aspect.
          */
@@ -177,8 +181,8 @@ public class WorkingCopyAspect implements CopyServicePolicies.OnCopyNodePolicy
          * Prevents copying off the {@link ContentModel#PROP_NAME <b>cm:name</b>} property.
          */
         @Override
-        public Map<QName, Serializable> getCopyProperties(
-                QName classQName, CopyDetails copyDetails, Map<QName, Serializable> properties)
+        public Map<QName, Serializable> getCopyProperties(QName classQName, CopyDetails copyDetails,
+                Map<QName, Serializable> properties)
         {
             if (classQName.equals(ContentModel.ASPECT_WORKING_COPY))
             {
@@ -186,7 +190,32 @@ public class WorkingCopyAspect implements CopyServicePolicies.OnCopyNodePolicy
             }
             else if (copyDetails.getSourceNodeAspectQNames().contains(ContentModel.ASPECT_WORKING_COPY))
             {
-                properties.remove(ContentModel.PROP_NAME);
+                // Generate a new name for a new copy of a working copy
+                String newName = null;
+
+                // This is a copy of a working copy to a new node (not a check in). Try to derive a new name from the
+                // node it is checked out from
+                if (copyDetails.isTargetNodeIsNew() && copyDetails.getSourceNodeAspectQNames().contains(ContentModel.ASPECT_COPIEDFROM))
+                {
+                    NodeRef checkedOutFrom = (NodeRef) copyDetails.getSourceNodeProperties().get(
+                            ContentModel.PROP_COPY_REFERENCE);
+                    if (nodeService.exists(checkedOutFrom))
+                    {
+                        String oldName = (String) nodeService.getProperty(checkedOutFrom, ContentModel.PROP_NAME);
+                        int extIndex = oldName.lastIndexOf('.');
+                        newName = extIndex == -1 ? oldName + "_" + GUID.generate() : oldName.substring(0, extIndex)
+                                + "_" + GUID.generate() + oldName.substring(extIndex);
+                    }
+                }
+
+                if (newName == null)
+                {
+                    properties.remove(ContentModel.PROP_NAME);
+                }
+                else
+                {
+                    properties.put(ContentModel.PROP_NAME, newName);
+                }
                 return properties;
             }
             else