Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-5 to HEAD:

20678: DAO5 branch: Preparation for merge back to HEAD 20689: Merged DAO4 to DAO5 - Removed all 'dbscripts/create/3.x/SomeDialect' and replaced with 'dbscripts/create/SomeDialect' DB create scripts are taken from latest DAO4 - TODO: FixAuthoritiesCrcValuesPatch needs query implementation in PatchDAO Merged DAO3 to DAO4 - Reapplied fixes for ALF-713 (race condition on Usages) 19350: Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-2 to BRANCHES/DEV/V3.3-DAO-REFACTOR-3: 18939: SAIL-4 :2nd stage branch for DAO refactor off HEAD rev 18898 18948: Merged V3.3-DAO-REFACTOR to V3.3-DAO-REFACTOR-2 18202: Dev branch for DAO refactor 18252: SAIL-233: QName.hbm.xml 18295: Added missing CREATE TABLE statements for QName-related code 18324: SAIL-234: Node.hbm.xml: Node aspects initial integration 18355: Added 'setValue' method to manually update the cached value 18356: MV property stressing lowered to speed test up 18357: SAIL-234: Node.hbm.xml 18376: Pulled all Alfresco-related create SQL into script 18389: SAIL-234: Permissions DAO refactor - initial checkpoint 18390: Formatting only (line-endings) 18400: SAIL-234: Node.hbm.xml 18418: SAIL-234: Node.hbm.xml: 'alf_node_assoc' CRUD 18429: SAIL-234: Node.hbm.xml: Cleaned out all Hibernate references to NodeAssocImpl 18457: SAIL-234: Permissions DAO refactor 18959: Merged DEV/V3.3-DAO-REFACTOR to DEV/V3.3-DAO-REFACTOR-2 18479: SAIL-234: Node.hbm.xml - fix updateNode (missing id when saving oldDummyNode) 18482: SAIL-235: remove Permissions.hbm.xml 18517: SAIL-235: Permissions DAO refactor 18523: SAIL-234: Node.hbm.xml 18524: SAIL-235: Permissions DAO refactor 18960: Merged DEV/V3.3-DAO-REFACTOR to DEV/V3.3-DAO-REFACTOR-2 18533: Flipped back to Windows line endings 18535: Formatting-only (eol) 18540: Formatting-only (eol) 18541: SAIL-235: Permissions DAO refactor 18543: SAIL-234: Node.hbm.xml: Start alf_store changes 18567: SAIL-235: Permissions DAO refactor 18596: SAIL-305: Alfresco DDL - formatted/rationalized and added missing indexes & fk constraints 18603: SAIL-311: Minor cleanup for schema upgrade scripts (V3.3) 18604: SAIL-311: Remove empty dirs 18619: SAIL-274: Locale.hbm.xml 18621: Added method to create default ACL 18622: SAIL-234: Node.hbm.xml: Store, Transaction, Server and some node 18624: Formatting only (eol) 18631: SAIL-235: Permissions DAO refactor 18633: SAIL-235: Permissions DAO refactor - do not expose CRUD for AceContext (or AuthorityAlias) since currently unused 18639: getLocale(Locale) should return null if it doesn't exist 18640: SAIL-234 NodeDAO: More replacement of node queries and updates 18648: SAIL-310: Create SQL script for core repo tables (All DB ports) 18651: SAIL-234 NodeDAO: Moves across stores handle presence of target deleted nodes 18961: Merged DEV/V3.3-DAO-REFACTOR to DEV/V3.3-DAO-REFACTOR-2 18658: SAIL-274 Locale DAO: Missing getValueKey() method 18662: SAIL-235: Permissions DAO refactor - further cleanup (of DbAccessControlList usage, including copyACLs) 18664: DB scripts porting for PostgreSQL finished. 18668: SAIL-234 Node DAO: Note in case Transaction Change ID is dropped from indexes 18669: SAIL-234 Node DAO: deleteNode and archive (store move) fixes 18672: DB scripts porting for Oracle finished. 18675: SAIL-235: Permissions DAO refactor 18677: DB scripts porting for DB2 finished. 18964: Merged DEV/V3.3-DAO-REFACTOR to DEV/V3.3-DAO-REFACTOR-2 18687: Execute a callback with retries 18688: SAIL-234 Node DAO: Child association creation 18690: SAIL-234 Node DAO: Comment out raw creation of stores as it breaks subsequent bootstrap checks 18691: SAIL-234 Node DAO: More replacement of alf_child_assoc handling 18713: Commented about needing a more efficient removeChildAssociation method 18714: SAIL-234 Node DAO: Replaced queries on alf_child_assoc 18715: SAIL-234 Node DAO: More alf_child_assoc query replacement 18727: SAIL-234 Node DAO: alf_child_assoc queries complete 18737: SAIL-234 Node DAO: Tweaks to newNode and implemented prependPaths 18741: SAIL-234 and SAIL-334: Moved UsageDelta Hibernate code and queries over to UsageDeltaDAO 18748: SAIL-234 Node DAO: fix NPE (EditionServiceImplTest) 18769: SAIL-234 Node DAO: alf_node_properties ground work 18786: SAIL-234 Node DAO: alf_node_properties and cm:auditable properties 18810: Added EqualsHelper.getMapComparison 18813: TransactionalCache propagates cache clears and removals during rollback 18826: SAIL-234 Node DAO: Moved over sundry references to NodeDaoService to NodeDAO 18849: SAIL-237: UsageDelta.hbm.xml - eol formatting only (including removal of unwanted svn:eol-style=native property) 18869: SAIL-234 NodeDAO: Fixed more references to 'nodeDaoService' 18895: SAIL-234 NodeDAO: Queries for alf_transaction 18899: SAIL-234 Node DAO: Fixed bean fetching for 'nodeDAO' 18909: SAIL-234 NodeDAO: Fixes to getNodeRefStatus and various txn queries 18916: SAIL-234 NodeDAO: Fixed moveNode alf_child_assoc updates 18922: SAIL-235: DAO refactoring: Permission.hbm.xml 18930: SAIL-235: DAO refactoring: Permission.hbm.xml 18932: SAIL-234 NodeDAO: Fixing up gotchas, javadocs and some naming 18933: SAIL-234 NodeDAO: Minor neatening 18935: SAIL-234 Node DAO: Caches for ID to NodeRef and StoreRef 18936: EHCache config files line endings 18938: SAIL-237: Usage DAO refactor - initial checkpoint 18945: SAIL-235: DAO refactoring: Permission.hbm.xml. Move Node. 18975: Fix for move-node ACL jiggery-pokery 19067: SAIL-4: fix VersionHistoryImpl.getSuccessors (causing VersionServiceImplTest.testGetVersionHistorySameWorkspace failure) 19068: SAIL-234: fix VersionMigratorTest.testMigrateOneVersion 19074: SAIL-237: Usage DAO - update to common iBatis mapping pattern(s) to ease DB porting 19076: SAIL-231: Activities DAO - update to common iBatis mapping pattern(s) 19077: SAIL-232: AppliedPatch DAO - minor cleanup (comments & formatting only) 19092: Merging HEAD to DEV/V3.3-DAO-REFACTOR-2 18973: Temporarily comment out AVMTestSuite and run AVM tests individually 19056: AVM unit test improvements 19097: SAIL-235: DAO refactoring: Permission.hbm.xml: Additional index to support queries to find the id and acl id for the primary children of a node. 19185: SAIL-238: Permissions DAO - (minor) update to common iBatis mapping pattern 19289: SAIL-234 NodeDAO: Node cache replaces NodeRef cache 19302: SAIL-234 Node DAO: Added cache for node properties 19318: SAIL-4: AVM DAO - (minor) update to common iBatis mapping pattern 20690: Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-4 to BRANCHES/DEV/V3.3-DAO-REFACTOR-5: 20063: (RECORD ONLY) DAO refactor branch V4 20146: Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-3 to BRANCHES/DEV/V3.3-DAO-REFACTOR-4: 19401: SAIL-234 Node DAO: Fix permission service tests (setPrimaryChildrenSharedAclId needs to invalidate nodesCache) 19428: Fixed TransactionalCache issue with null and NullValueMarker 19429: Took empty cm:content creation out of FileFolderService#createImpl 19430: SAIL-234 Node DAO: Tweaks around caching and cm:auditable 19431: SAIL-4 DAO Refactor: Exception thrown when attempting writes in read-only txn have changed 19436: SAIL-234 Node DAO: Fix NPE during cm:auditable update 19475: Allow debugging of code without stepping into trivial stuff 19476: Follow-up on 19429 by ensuring CIFS/FTP set a mimetype on the ContentWriter 19477: SAIL-234 Node DAO: Leverage DAO better for NodeService.addProperties 19478: SAIL-234 NodeDAO: Added toString() for ParentAssocsInfo (cache value for parent assocs) 19479: SAIL-234 Node DAO: Fixed for parent association and property caches 19480: Made TransactionAwareSingleton bind-key a GUID 19481: SAIL-234 Node DAO: Reinstated 100K collection property tests 19482: SAIL-234 Node DAO: Node and property cache fixes highlighted by unit tests 19483: SAIL-234 Node DAO: Start on NodeBulkLoader implementation 19595: SAIL-234 Node DAO: Fix moveNode to detect cyclic relationship prior to updating ACLs for moved tree FileFolderServiceImplTest.testETHREEOH_3088_MoveIntoSelf) 20147: Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-3 to BRANCHES/DEV/V3.3-DAO-REFACTOR-4: 19602: (RECORD ONLY) Reintegrated with HEAD up to rev 19433 19621: (RECORD ONLY) SAIL-347 19683: (RECORD ONLY) Reverse-merged 19621 for SAIL-347 19722: (RECORD ONLY) Merged /alfresco/HEAD:r19434-19721 20150: Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-3 to BRANCHES/DEV/V3.3-DAO-REFACTOR-4: 19741: Merged DEV\V3.3-DAO-REFACTOR-2 to DEV\V3.3-DAO-REFACTOR-3 19739: Extended "move" tests 19743: Fix AuditableAspectTest.testAddAspect (to allow for node modified date tolerance) 19748: Remaining part of merge from HEAD to V3.3-DAO-REFACTOR-3 19367: Merged BRANCHES/V3.2 to HEAD: 19286: Fix for ALF-626 "Using 'null' as an authority argument in clearPermissions() cause a java.lang.NullPointerException" 19755: SAIL-234 Node DAO: Fix RepoAdminServiceImplTest.testConcurrentDynamicModelDelete (handle InvalidNodeRefException after getChildAssocs) 20692: Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-4 to BRANCHES/DEV/V3.3-DAO-REFACTOR-5: - Retired all 1.3 and 1.4 upgrade scripts ... R.I.P. - Fixed CRC patch for Authorities (only tested on MySQL) - Fixed SQL patch revision numbers and bumped version schema number up 20158: Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-3 to BRANCHES/DEV/V3.3-DAO-REFACTOR-4: 19773: SQL mappings and scripts: SAIL-310, SAIL-304, SAIL-303 and SAIL-347 19774: Futher fix for SAIL-310: Sequence patch must take into account sequences created for 3.3 19851: SAIL-371 (SAIL-294) NodeDAO fallout: Fix QName and Namespace read/write handling and bean name in unit test 20183: Merged DAO3 to DAO4 19852: SAIL-370: Remove LinkValidation 19853: SAIL-239 (SAIL-294) Attributes.hbm.xml: Added ability to attach arbitrary property to unique context 19857: SAIL-373 Fallout from Permissions DAO refactor (SAIL-235) 19864: SAIL-239 (SAIL-294): Removed AttributeService RMI API 19865: More SAIL-239 (SAIL-294): Removed AttributeService RMI API 20208: DAO-refactor implementation of ALF-2712 query improvements 20209: Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-3 to BRANCHES/DEV/V3.3-DAO-REFACTOR-4: 20060: Removal of AttributeService for SAIL-239 (SAIL-294) 20348: SAIL-371 (SAIL-294): Protect collection properties during map insert and retrieval 20547: SAIL-371 (SAIL-294) Attributes.hbm.xml: implement getAttributes + fixes 20573: SAIL-371 (SAIL-294): NodeDAO: Fix unit tests and other fallout 20597: SAIL-239 Attributes.hbm.xml: WCM/AVM locking test fixes (wip) 20598: SAIL-239 Attributes.hbm.xml: WCM/AVM locking test fixes (wip) - fix AssetServiceImplTest.testSimpleLockFile NPE 20600: Fix PropertyValueDAOTest.testPropertyValue_Enum (follow-on to r20060 for SAIL-239 - which introduces ENUM prop vals) 20601: Fix UsageDAOTest.testCreateAndDeleteUsageDeltas NPE (would also affect ContentStoreCleanerScalabilityRunner) 20603: Fix CMISPropertyServiceTest.* (fallout from r20146 <- r19429 <- Took empty cm:content creation out of FileFolderService#createImpl) 20604: SAIL-371 (SAIL-294): NodeDAO: Fix unit tests - TransferServiceImplTest.* 20618: SAIL-371 (SAIL-294): NodeDAO: AuditableAspectTest (fix testCreateNodeWithAuditableProperties_ALF_2565 + add remove aspect test) 20624: SAIL-371 (SAIL-294): NodeDAO: Fix unit tests - UserUsageTest.* 20626: Fixed random keys for RuleTrigger NodeRef tracking 20635: SAIL-371 (SAIL-294): NodeDAO: Fix unit tests - PersonTest.testSplitDuplicates 20642: SAIL-371 (SAIL-294) DAO: Fixed CacheTest 20643: Removed must of the 'distribute' target's dependencies. Not for HEAD 20645: Follow-on to r20643 (Removed most of the 'distribute' target's dependencies. Not for HEAD) 20654: SAIL-371 (SAIL-294): NodeDAO: DMDeploymentTargetTest.* (do not try to remove mandatory aspects) 20655: SAIL-371 (SAIL-294): NodeDAO: Initial fix for TaggingServiceImplTest.testTagScopeUpdateViaNodePolicies (+ minor test cleanup) 20657: SAIL-371 (SAIL-294): NodeDAO: Fix unit tests - VersionMigratorTest.testMigrateOneVersion (cm:accessed not returned if null) 20658: Merged (back merge only - no merge info) BRANCHES/V3.3 to BRANCHES/DEV/V3.3-DAO-REFACTOR-4: 20090: Dynamic models: minor improvements to DictionaryModelType 20554: Improvement to model delete validation (investigating intermittent failure of RepoAdminServiceImplTest.testSimpleDynamicModelViaNodeService) 20662: SAIL-371 (SAIL-294): NodeDAO: Fix unit tests - RecordsManagementAuditServiceImplTest.* (we now ignore attempt to update 'cm:modifier' prop so update 'cm:title' prop instead) 20666: SAIL-371 (SAIL-294): NodeDAO: Fix unit tests - ADMLuceneTest.* 20668: SAIL-239 (SAIL-294) - delete WCM locks + tests (follow-on to r20060) 20674: SAIL-371 (SAIL-294) NodeDAO fallout: Cleaner and additional checks for ContentStoreCleaner 20675: SAIL-371 (SAIL-294) NodeDAO fallout: Fixed handling of ContentData git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20693 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2025-08-07 17:49:17 +00:00 · 2010-06-17 19:35:49 +00:00
parent 6e928249a5
commit 4872eb9909
470 changed files with 39121 additions and 44771 deletions
--- a/source/java/org/alfresco/repo/avm/AVMSyncServiceImpl.java
+++ b/source/java/org/alfresco/repo/avm/AVMSyncServiceImpl.java
@@ -24,9 +24,9 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.TreeMap;
+import java.util.TreeMap;

-import org.alfresco.repo.avm.util.AVMUtil;
+import org.alfresco.repo.avm.util.AVMUtil;
 import org.alfresco.repo.domain.DbAccessControlList;
 import org.alfresco.repo.domain.PropertyValue;
 import org.alfresco.repo.security.permissions.ACLCopyMode;
@@ -55,7 +55,7 @@ import org.apache.commons.logging.LogFactory;
 */
 public class AVMSyncServiceImpl implements AVMSyncService
 {
-    private static Log logger = LogFactory.getLog(AVMSyncServiceImpl.class);
+    private static Log logger = LogFactory.getLog(AVMSyncServiceImpl.class);

    /**
     * The AVMService.
@@ -112,11 +112,11 @@ public class AVMSyncServiceImpl implements AVMSyncService
                                       int dstVersion, String dstPath,
                                       NameMatcher excluder)
    {
-        long start = System.currentTimeMillis();
-        
-        if (logger.isDebugEnabled())
+        long start = System.currentTimeMillis();
+        
+        if (logger.isDebugEnabled())
        {
-            logger.debug(srcPath + " : " + dstPath);
+            logger.debug(srcPath + " : " + dstPath);
        }
        if (srcPath == null || dstPath == null)
        {
@@ -141,12 +141,12 @@ public class AVMSyncServiceImpl implements AVMSyncService
            // Invoke the recursive implementation.
            compare(srcVersion, srcDesc, dstVersion, dstDesc, result, excluder, true);
        }
-        
-        if (logger.isDebugEnabled())
-        {
-            logger.debug("Raw compare: ["+srcVersion+","+srcPath+"]["+dstVersion+","+dstPath+"]["+result.size()+"] in "+(System.currentTimeMillis()-start)+" msecs");
-        }
-        
+        
+        if (logger.isDebugEnabled())
+        {
+            logger.debug("Raw compare: ["+srcVersion+","+srcPath+"]["+dstVersion+","+dstPath+"]["+result.size()+"] in "+(System.currentTimeMillis()-start)+" msecs");
+        }
+        
        return result;
    }

@@ -161,29 +161,29 @@ public class AVMSyncServiceImpl implements AVMSyncService
                         int dstVersion, AVMNodeDescriptor dstDesc,
                         List<AVMDifference> result, NameMatcher excluder, boolean firstLevel)
    {
-        String srcPath = srcDesc.getPath();
-        String dstPath = dstDesc.getPath();
-        
-        String srcParts[] = AVMUtil.splitBase(srcPath);
-        String srcChildName = srcParts[1];
-        
-        String dstParts[] = AVMUtil.splitBase(dstPath);
-        String dstChildName = dstParts[1];
-        
-        if ((dstChildName.equalsIgnoreCase(srcChildName)) && (! dstChildName.equals(srcChildName)))
-        {
-            // specific rename 'case'
-            String dstParentPath = dstParts[0];
-            if (dstParentPath == null)
-            {
-                dstParentPath = AVMUtil.buildAVMPath(AVMUtil.getStoreName(dstPath), "");
-            }
-            dstPath = AVMUtil.extendAVMPath(dstParentPath, srcChildName);
-        }
-        
+        String srcPath = srcDesc.getPath();
+        String dstPath = dstDesc.getPath();
+        
+        String srcParts[] = AVMUtil.splitBase(srcPath);
+        String srcChildName = srcParts[1];
+        
+        String dstParts[] = AVMUtil.splitBase(dstPath);
+        String dstChildName = dstParts[1];
+        
+        if ((dstChildName.equalsIgnoreCase(srcChildName)) && (! dstChildName.equals(srcChildName)))
+        {
+            // specific rename 'case'
+            String dstParentPath = dstParts[0];
+            if (dstParentPath == null)
+            {
+                dstParentPath = AVMUtil.buildAVMPath(AVMUtil.getStoreName(dstPath), "");
+            }
+            dstPath = AVMUtil.extendAVMPath(dstParentPath, srcChildName);
+        }
+        
        // Determine how the source and destination nodes differ.
-        if (excluder != null && (excluder.matches(srcPath) ||
-                                 excluder.matches(dstPath)))
+        if (excluder != null && (excluder.matches(srcPath) ||
+                                 excluder.matches(dstPath)))
        {
            return;
        }
@@ -200,8 +200,8 @@ public class AVMSyncServiceImpl implements AVMSyncService
            case AVMDifference.OLDER :
            case AVMDifference.CONFLICT :
            {
-                result.add(new AVMDifference(srcVersion, srcPath,
-                                             dstVersion, dstPath,
+                result.add(new AVMDifference(srcVersion, srcPath,
+                                             dstVersion, dstPath,
                                             diffCode));
                return;
            }
@@ -210,7 +210,7 @@ public class AVMSyncServiceImpl implements AVMSyncService
                // First special case: source is a layered directory which points to
                // the destinations path, and we are comparing 'head' versions.
                if (srcDesc.isLayeredDirectory() &&
-                    srcDesc.getIndirection().equalsIgnoreCase(dstPath) && srcVersion < 0 && dstVersion < 0)
+                    srcDesc.getIndirection().equalsIgnoreCase(dstPath) && srcVersion < 0 && dstVersion < 0)
                {
                    // skip firstLevel (root)
                    if (! firstLevel)
@@ -223,8 +223,8 @@ public class AVMSyncServiceImpl implements AVMSyncService
                            case AVMDifference.NEWER :
                            case AVMDifference.CONFLICT :
                            {
-                                result.add(new AVMDifference(srcVersion, srcPath,
-                                                             dstVersion, dstPath,
+                                result.add(new AVMDifference(srcVersion, srcPath,
+                                                             dstVersion, dstPath,
                                                             dirDiffCode));
                                return; // short circuit
                            }
@@ -255,21 +255,21 @@ public class AVMSyncServiceImpl implements AVMSyncService
                    {
                        AVMNodeDescriptor srcChild = srcList.get(name);
                        AVMNodeDescriptor dstChild = dstList.get(name);
-                        
-                        String srcChildPath = srcChild.getPath();
-                        String dstChildPath = AVMNodeConverter.ExtendAVMPath(dstPath, name);
-                        
-                        if (excluder != null && (excluder.matches(srcChildPath) ||
-                                                 excluder.matches(dstChildPath)))
+                        
+                        String srcChildPath = srcChild.getPath();
+                        String dstChildPath = AVMNodeConverter.ExtendAVMPath(dstPath, name);
+                        
+                        if (excluder != null && (excluder.matches(srcChildPath) ||
+                                                 excluder.matches(dstChildPath)))
                        {
                            continue;
                        }
                        if (dstChild == null)
                        {
                            // A missing destination child means the source is NEWER.
-                            result.add(new AVMDifference(srcVersion, srcChildPath,
-                                                         dstVersion, dstChildPath,
-                                                         AVMDifference.NEWER));
+                            result.add(new AVMDifference(srcVersion, srcChildPath,
+                                                         dstVersion, dstChildPath,
+                                                         AVMDifference.NEWER));
                            continue;
                        }
                        // Otherwise recursively invoke.
@@ -281,7 +281,7 @@ public class AVMSyncServiceImpl implements AVMSyncService
                }
                // Second special case.  Just as above but reversed.
                if (dstDesc.isLayeredDirectory() &&
-                    dstDesc.getIndirection().equalsIgnoreCase(srcPath) && srcVersion < 0 && dstVersion < 0)
+                    dstDesc.getIndirection().equalsIgnoreCase(srcPath) && srcVersion < 0 && dstVersion < 0)
                {
                    // skip firstLevel (root)
                    if (! firstLevel)
@@ -294,8 +294,8 @@ public class AVMSyncServiceImpl implements AVMSyncService
                            case AVMDifference.NEWER :
                            case AVMDifference.CONFLICT :
                            {
-                                result.add(new AVMDifference(srcVersion, srcPath,
-                                                             dstVersion, dstPath,
+                                result.add(new AVMDifference(srcVersion, srcPath,
+                                                             dstVersion, dstPath,
                                                             dirDiffCode));
                                return; // short circuit
                            }
@@ -325,20 +325,20 @@ public class AVMSyncServiceImpl implements AVMSyncService
                    {
                        AVMNodeDescriptor dstChild = dstList.get(name);
                        AVMNodeDescriptor srcChild = srcList.get(name);
-                        
-                        String srcChildPath = AVMNodeConverter.ExtendAVMPath(srcPath, name);
-                        String dstChildPath = dstChild.getPath();
-                        
-                        if (excluder != null && (excluder.matches(srcChildPath) ||
-                                                 excluder.matches(dstChildPath)))
+                        
+                        String srcChildPath = AVMNodeConverter.ExtendAVMPath(srcPath, name);
+                        String dstChildPath = dstChild.getPath();
+                        
+                        if (excluder != null && (excluder.matches(srcChildPath) ||
+                                                 excluder.matches(dstChildPath)))
                        {
                            continue;
                        }
                        if (srcChild == null)
                        {
                            // Missing means the source is older.
-                            result.add(new AVMDifference(srcVersion, srcChildPath,
-                                                         dstVersion, dstChildPath,
+                            result.add(new AVMDifference(srcVersion, srcChildPath,
+                                                         dstVersion, dstChildPath,
                                                         AVMDifference.OLDER));
                            continue;
                        }
@@ -359,20 +359,20 @@ public class AVMSyncServiceImpl implements AVMSyncService
                {
                    AVMNodeDescriptor srcChild = srcList.get(name);
                    AVMNodeDescriptor dstChild = dstList.get(name);
-                    
-                    String srcChildPath = srcChild.getPath();
-                    String dstChildPath = AVMNodeConverter.ExtendAVMPath(dstPath, name);
-                    
-                    if (excluder != null && (excluder.matches(srcChildPath) ||
-                                             excluder.matches(dstChildPath)))
+                    
+                    String srcChildPath = srcChild.getPath();
+                    String dstChildPath = AVMNodeConverter.ExtendAVMPath(dstPath, name);
+                    
+                    if (excluder != null && (excluder.matches(srcChildPath) ||
+                                             excluder.matches(dstChildPath)))
                    {
                        continue;
                    }
                    if (dstChild == null)
                    {
                        // Not found in the destination means NEWER.
-                        result.add(new AVMDifference(srcVersion, srcChildPath,
-                                                     dstVersion, dstChildPath,
+                        result.add(new AVMDifference(srcVersion, srcChildPath,
+                                                     dstVersion, dstChildPath,
                                                     AVMDifference.NEWER));
                        continue;
                    }
@@ -388,20 +388,20 @@ public class AVMSyncServiceImpl implements AVMSyncService
                    {
                        continue;
                    }
-                    
+                    
                    AVMNodeDescriptor dstChild = dstList.get(name);
-                    
-                    String srcChildPath = AVMNodeConverter.ExtendAVMPath(srcPath, name);
-                    String dstChildPath = dstChild.getPath();
-                    
-                    if (excluder != null && (excluder.matches(srcChildPath) ||
-                                             excluder.matches(dstChildPath)))
+                    
+                    String srcChildPath = AVMNodeConverter.ExtendAVMPath(srcPath, name);
+                    String dstChildPath = dstChild.getPath();
+                    
+                    if (excluder != null && (excluder.matches(srcChildPath) ||
+                                             excluder.matches(dstChildPath)))
                    {
                        continue;
                    }
                    // An entry not found in the source is OLDER.
-                    result.add(new AVMDifference(srcVersion, srcChildPath,
-                                                 dstVersion, dstChildPath,
+                    result.add(new AVMDifference(srcVersion, srcChildPath,
+                                                 dstVersion, dstChildPath,
                                                 AVMDifference.OLDER));
                }
                break;
@@ -437,12 +437,12 @@ public class AVMSyncServiceImpl implements AVMSyncService
                       boolean overrideConflicts, boolean overrideOlder, String tag, String description)
    {
        long start = System.currentTimeMillis();
-        
+        
        Map<String, Integer> storeVersions = new HashMap<String, Integer>();
        Set<String> destStores = new HashSet<String>();
-        
-        Map<String, AVMDifference> diffsToUpdate = new TreeMap<String, AVMDifference>();
-        
+        
+        Map<String, AVMDifference> diffsToUpdate = new TreeMap<String, AVMDifference>();
+        
        for (AVMDifference diff : diffList)
        {
            if (excluder != null && (excluder.matches(diff.getSourcePath()) ||
@@ -450,26 +450,26 @@ public class AVMSyncServiceImpl implements AVMSyncService
            {
                continue;
            }
-            
+            
            if (!diff.isValid())
            {
                throw new AVMSyncException("Malformed AVMDifference.");
            }
-            
-            diffsToUpdate.put(diff.getSourcePath(), diff);
-        }
-        
-        for (AVMDifference diff : diffsToUpdate.values())
-        {
-            if (logger.isDebugEnabled())
+            
+            diffsToUpdate.put(diff.getSourcePath(), diff);
+        }
+        
+        for (AVMDifference diff : diffsToUpdate.values())
+        {
+            if (logger.isDebugEnabled())
            {
-                logger.debug("update: " + diff);
+                logger.debug("update: " + diff);
            }
            // Snapshot the source if needed.
            int version = diff.getSourceVersion();
            if (version < 0)
            {
-                String storeName = AVMUtil.getStoreName(diff.getSourcePath());
+                String storeName = AVMUtil.getStoreName(diff.getSourcePath());
                if (storeVersions.containsKey(storeName))
                {
                    // We've already snapshotted this store.
@@ -500,20 +500,20 @@ public class AVMSyncServiceImpl implements AVMSyncService
            // Keep track of stores updated so that they can all be snapshotted
            // at end of update.
            String dstPath = diff.getDestinationPath();
-            destStores.add(AVMUtil.getStoreName(dstPath));
+            destStores.add(AVMUtil.getStoreName(dstPath));
            
            dispatchUpdate(diffCode, dstParts[0], dstParts[1], excluder, srcDesc, dstDesc, 
                           ignoreConflicts, ignoreOlder, overrideConflicts, overrideOlder);
        }
-        
+        
        for (String storeName : destStores)
        {
            fAVMService.createSnapshot(storeName, tag, description);
        }
-        
-        if (logger.isDebugEnabled())
+        
+        if (logger.isDebugEnabled())
        {
-            logger.debug("Raw update: [" + diffList.size() + "] in " + (System.currentTimeMillis() - start) + " msecs");
+            logger.debug("Raw update: [" + diffList.size() + "] in " + (System.currentTimeMillis() - start) + " msecs");
        }
    }
    
@@ -531,7 +531,7 @@ public class AVMSyncServiceImpl implements AVMSyncService
            case AVMDifference.NEWER :
            {
                // You can't delete what isn't there.
-                linkIn(parentPath, name, srcDesc, excluder, dstDesc != null && !dstDesc.isDeleted(), dstDesc);
+                linkIn(parentPath, name, srcDesc, excluder, dstDesc != null && !dstDesc.isDeleted(), dstDesc);
                return;
            }
            case AVMDifference.OLDER :
@@ -539,7 +539,7 @@ public class AVMSyncServiceImpl implements AVMSyncService
                // You can force it.
                if (overrideOlder)
                {
-                    linkIn(parentPath, name, srcDesc, excluder, !dstDesc.isDeleted(), dstDesc);
+                    linkIn(parentPath, name, srcDesc, excluder, !dstDesc.isDeleted(), dstDesc);
                    return;
                }
                // You can ignore it.
@@ -555,7 +555,7 @@ public class AVMSyncServiceImpl implements AVMSyncService
                // You can force it.
                if (overrideConflicts)
                {
-                    linkIn(parentPath, name, srcDesc, excluder, true, dstDesc);
+                    linkIn(parentPath, name, srcDesc, excluder, true, dstDesc);
                    return;
                }
                // You can ignore it.
@@ -593,7 +593,7 @@ public class AVMSyncServiceImpl implements AVMSyncService
     * @param toLink The node descriptor.
     * @param removeFirst Whether to do a removeNode before linking in.
     */
-    private void linkIn(String parentPath, String name, AVMNodeDescriptor toLink, NameMatcher excluder, boolean removeFirst, AVMNodeDescriptor dstDesc)
+    private void linkIn(String parentPath, String name, AVMNodeDescriptor toLink, NameMatcher excluder, boolean removeFirst, AVMNodeDescriptor dstDesc)
    {
        // This is a delete.
        if (toLink == null)
@@ -605,9 +605,9 @@ public class AVMSyncServiceImpl implements AVMSyncService
            catch (AVMNotFoundException nfe)
            {
                // ignore
-                if (logger.isDebugEnabled())
+                if (logger.isDebugEnabled())
                {
-                    logger.debug("linkIn: Does not exist: "+parentPath+"/"+name);
+                    logger.debug("linkIn: Does not exist: "+parentPath+"/"+name);
                }
            }
            return;
@@ -624,18 +624,18 @@ public class AVMSyncServiceImpl implements AVMSyncService
            recursiveCopy(parentPath, name, toLink, excluder);
            return;
        }
-        
-        String newPath = AVMNodeConverter.ExtendAVMPath(parentPath, name);
-        
-        if (toLink.isLayeredDirectory() &&
-            toLink.isPrimary() &&
-            dstDesc == null &&
-            toLink.getIndirection().equals(newPath))
-        {
-            recursiveCopy(parentPath, name, toLink, excluder);
-            return;
-        }
-        
+        
+        String newPath = AVMNodeConverter.ExtendAVMPath(parentPath, name);
+        
+        if (toLink.isLayeredDirectory() &&
+            toLink.isPrimary() &&
+            dstDesc == null &&
+            toLink.getIndirection().equals(newPath))
+        {
+            recursiveCopy(parentPath, name, toLink, excluder);
+            return;
+        }
+        
        if (removeFirst)
        {
            if (toLink.isDirectory())
@@ -655,11 +655,9 @@ public class AVMSyncServiceImpl implements AVMSyncService
            fAVMService.link(parentPath, name, toLink);
        }
        
-        DbAccessControlList parentAcl= getACL(parentPath);
-        DbAccessControlList acl = getACL(toLink.getPath());
-        setACL(newPath, acl == null ? null : acl.getCopy(parentAcl == null ? null : parentAcl.getId(), ACLCopyMode.COPY));
+        setACL(parentPath, toLink.getPath(), newPath);
    }
-
+    
    /*
     * Get acl
     */
@@ -680,18 +678,18 @@ public class AVMSyncServiceImpl implements AVMSyncService
    /*
     * Set ACL without COW
     */
-    private void setACL(String path, DbAccessControlList acl)
+    private void setACL(String parentPath, String toCopyPath, String newPath)
    {
-        Lookup lookup = AVMRepository.GetInstance().lookup(-1, path, false);
+        DbAccessControlList parentAcl= getACL(parentPath);
+        DbAccessControlList acl = getACL(toCopyPath);
+        
+        Lookup lookup = AVMRepository.GetInstance().lookup(-1, newPath, false);
        if (lookup != null)
        {
-            AVMNode node = lookup.getCurrentNode();
-            // May be support an unwrapped getById to avoid this monkey madness
-            AVMDAOs.Instance().fAVMNodeDAO.evict(node);
-            node = AVMDAOs.Instance().fAVMNodeDAO.getByID(node.getId());
-            node.setAcl(acl);
+            AVMNode newNode = lookup.getCurrentNode();
+            newNode.copyACLs(acl, parentAcl, ACLCopyMode.COPY);
            
-            AVMDAOs.Instance().fAVMNodeDAO.update(node);
+            AVMDAOs.Instance().fAVMNodeDAO.update(newNode);
        }
        else
        {
@@ -737,10 +735,9 @@ public class AVMSyncServiceImpl implements AVMSyncService
        if (toCopy.isFile() || toCopy.isDeleted() || toCopy.isPlainDirectory())
        {
            fAVMRepository.link(parent, name, toCopy);
+            
            // needs to get the acl from the new location
-            DbAccessControlList parentAcl = getACL(parent.getPath());
-            DbAccessControlList acl = getACL(toCopy.getPath());
-            setACL(newPath, acl == null ? null : acl.getCopy(parentAcl == null ? null : parentAcl.getId(), ACLCopyMode.COPY));
+            setACL(parent.getPath(), toCopy.getPath(), newPath);
            return;
        }
        // Otherwise make a directory in the target parent, and recursiveCopy all the source
@@ -801,30 +798,30 @@ public class AVMSyncServiceImpl implements AVMSyncService
            
            if (common.isLayeredFile())
            {
-                Integer diff = compareLayeredCommonAncestor(common, srcDesc, dstDesc);
-                if (diff != null)
+                Integer diff = compareLayeredCommonAncestor(common, srcDesc, dstDesc);
+                if (diff != null)
                {
-                    return diff;
+                    return diff;
                }
            }
            
            if (srcDesc.isDeleted() && (srcDesc.getDeletedType() == AVMNodeType.LAYERED_DIRECTORY))
            {
-                Integer diff = compareLayeredCommonAncestor(common, srcDesc, dstDesc);
-                if (diff != null)
+                Integer diff = compareLayeredCommonAncestor(common, srcDesc, dstDesc);
+                if (diff != null)
                {
-                    return diff;
+                    return diff;
                }
            }
            else if (dstDesc.isDeleted() && (dstDesc.getDeletedType() == AVMNodeType.LAYERED_DIRECTORY))
            {
-                Integer diff = compareLayeredCommonAncestor(common, dstDesc, srcDesc);
-                if (diff != null)
+                Integer diff = compareLayeredCommonAncestor(common, dstDesc, srcDesc);
+                if (diff != null)
                {
-                    return diff;
+                    return diff;
                }
            }
-            
+            
            // Must be a conflict.
            return AVMDifference.CONFLICT;
        }
@@ -936,15 +933,15 @@ public class AVMSyncServiceImpl implements AVMSyncService
                return AVMDifference.NEWER;
            }
            
-            if (common.isLayeredFile())
-            {
-                Integer diff = compareLayeredCommonAncestor(common, srcDesc, dstDesc);
-                if (diff != null)
-                {
-                    return diff;
-                }
-            }
-            
+            if (common.isLayeredFile())
+            {
+                Integer diff = compareLayeredCommonAncestor(common, srcDesc, dstDesc);
+                if (diff != null)
+                {
+                    return diff;
+                }
+            }
+            
            return AVMDifference.CONFLICT;
        }
        // Destination is a plain file.
@@ -966,10 +963,10 @@ public class AVMSyncServiceImpl implements AVMSyncService
        
        if (common.isLayeredFile())
        {
-            Integer diff = compareLayeredCommonAncestor(common, srcDesc, dstDesc);
-            if (diff != null)
+            Integer diff = compareLayeredCommonAncestor(common, srcDesc, dstDesc);
+            if (diff != null)
            {
-                return diff;
+                return diff;
            }
        }
        
@@ -977,42 +974,42 @@ public class AVMSyncServiceImpl implements AVMSyncService
        return AVMDifference.CONFLICT;
    }
    
-    private Integer compareLayeredCommonAncestor(AVMNodeDescriptor common, AVMNodeDescriptor srcDesc, AVMNodeDescriptor dstDesc)
-    {
-        Integer diff = null;
-        
-        // check dst ancestry
-        diff = compareLayeredCommonAncestor(common, dstDesc.getId(), AVMDifference.NEWER);
-        if (diff == null)
-        {
-            // check src ancestry
-            diff = compareLayeredCommonAncestor(common, srcDesc.getId(), AVMDifference.OLDER);
-        }
-        
-        return diff;
-    }
-    
-    private Integer compareLayeredCommonAncestor(AVMNodeDescriptor common, long compareNodeId, int diffType)
-    {
-        Integer diff = null;
-        
-        AVMNode compareAncNode = AVMDAOs.Instance().fAVMNodeDAO.getByID(compareNodeId).getAncestor();
-        if (compareAncNode != null)
-        {
-            if (common.getId() == compareAncNode.getId())
-            {
-                diff = diffType;
-            }
-            else if (common.isLayeredFile())
-            {
-                // TODO review (alongside createSnapshot+COW)
-                diff = compareLayeredCommonAncestor(common, compareAncNode.getId(), diffType);
-            }
-        }
-        
-        return diff;
-    }
-    
+    private Integer compareLayeredCommonAncestor(AVMNodeDescriptor common, AVMNodeDescriptor srcDesc, AVMNodeDescriptor dstDesc)
+    {
+        Integer diff = null;
+        
+        // check dst ancestry
+        diff = compareLayeredCommonAncestor(common, dstDesc.getId(), AVMDifference.NEWER);
+        if (diff == null)
+        {
+            // check src ancestry
+            diff = compareLayeredCommonAncestor(common, srcDesc.getId(), AVMDifference.OLDER);
+        }
+        
+        return diff;
+    }
+    
+    private Integer compareLayeredCommonAncestor(AVMNodeDescriptor common, long compareNodeId, int diffType)
+    {
+        Integer diff = null;
+        
+        AVMNode compareAncNode = AVMDAOs.Instance().fAVMNodeDAO.getByID(compareNodeId).getAncestor();
+        if (compareAncNode != null)
+        {
+            if (common.getId() == compareAncNode.getId())
+            {
+                diff = diffType;
+            }
+            else if (common.isLayeredFile())
+            {
+                // TODO review (alongside createSnapshot+COW)
+                diff = compareLayeredCommonAncestor(common, compareAncNode.getId(), diffType);
+            }
+        }
+        
+        return diff;
+    }
+    
    // compare node properties
    private int compareNodeProps(AVMNodeDescriptor srcDesc, AVMNodeDescriptor dstDesc)
    {
@@ -1219,8 +1216,8 @@ public class AVMSyncServiceImpl implements AVMSyncService
     */
    public void flatten(String layerPath, String underlyingPath)
    {
-        long start = System.currentTimeMillis();
-        
+        long start = System.currentTimeMillis();
+        
        if (layerPath == null || underlyingPath == null)
        {
            throw new AVMBadArgumentException("Illegal null path.");
@@ -1235,12 +1232,12 @@ public class AVMSyncServiceImpl implements AVMSyncService
        {
            throw new AVMNotFoundException("Not found: " + underlyingPath);
        }
-        
-        flatten(layerNode, underlyingNode);
-        
-        if (logger.isDebugEnabled())
+        
+        flatten(layerNode, underlyingNode);
+        
+        if (logger.isDebugEnabled())
        {
-            logger.debug("Raw flatten: " + layerNode + " " + underlyingNode + " in " + (System.currentTimeMillis() - start) + " msecs");
+            logger.debug("Raw flatten: " + layerNode + " " + underlyingNode + " in " + (System.currentTimeMillis() - start) + " msecs");
        }
    }

@@ -1251,9 +1248,9 @@ public class AVMSyncServiceImpl implements AVMSyncService
     */
    private boolean flatten(AVMNodeDescriptor layer, AVMNodeDescriptor underlying)
    {
-        if (logger.isDebugEnabled())
+        if (logger.isDebugEnabled())
        {
-            logger.debug("flatten: " + layer + " " + underlying);
+            logger.debug("flatten: " + layer + " " + underlying);
        }
        if (!layer.isLayeredDirectory())
        {
@@ -1269,7 +1266,7 @@ public class AVMSyncServiceImpl implements AVMSyncService
        {
            return false;
        }
-        
+        
        Map<String, AVMNodeDescriptor> layerListing =
            fAVMService.getDirectoryListingDirect(-1, layer.getPath(), true);
        // If the layer is empty (directly, that is) we're done.
@@ -1277,29 +1274,29 @@ public class AVMSyncServiceImpl implements AVMSyncService
        {
            return true;
        }
-        
+        
        // Grab the listing
        Map<String, AVMNodeDescriptor> underListing =
            fAVMService.getDirectoryListing(underlying, true);
-        
+        
        boolean flattened = true;
        for (String name : layerListing.keySet())
        {
            AVMNodeDescriptor topNode = layerListing.get(name);
            AVMNodeDescriptor bottomNode = underListing.get(name);
-            
-            if (logger.isTraceEnabled())
-            {
-                logger.trace("Trying to flatten out: " + name);
-            }
-            
+            
+            if (logger.isTraceEnabled())
+            {
+                logger.trace("Trying to flatten out: " + name);
+            }
+            
            if (bottomNode == null)
            {
-                if (logger.isTraceEnabled())
-                {
-                    logger.trace("Can't flatten (no bottomNode): " + name);
-                }
-                
+                if (logger.isTraceEnabled())
+                {
+                    logger.trace("Can't flatten (no bottomNode): " + name);
+                }
+                
                flattened = false;
                continue;
            }
@@ -1307,38 +1304,38 @@ public class AVMSyncServiceImpl implements AVMSyncService
            if (topNode.getId() == bottomNode.getId())
            {
                fAVMRepository.flatten(layer.getPath(), name);
-                
-                if (logger.isTraceEnabled())
-                {
-                    logger.trace("Identity flattened: " + name);
-                }
+                
+                if (logger.isTraceEnabled())
+                {
+                    logger.trace("Identity flattened: " + name);
+                }
            }
            else
            {
-                if (bottomNode.isLayeredDirectory())
-                {
-                    AVMNodeDescriptor lookup = fAVMService.lookup(bottomNode.getIndirectionVersion(), bottomNode.getIndirection());
-                    if (lookup == null)
-                    {
-                        if (logger.isDebugEnabled())
-                        {
-                            logger.debug("Can't flatten (no bottomNode indirection): " + name);
-                        }
-                        
-                        flattened = false;
-                        continue;
-                    }
-                }
-                
+                if (bottomNode.isLayeredDirectory())
+                {
+                    AVMNodeDescriptor lookup = fAVMService.lookup(bottomNode.getIndirectionVersion(), bottomNode.getIndirection());
+                    if (lookup == null)
+                    {
+                        if (logger.isDebugEnabled())
+                        {
+                            logger.debug("Can't flatten (no bottomNode indirection): " + name);
+                        }
+                        
+                        flattened = false;
+                        continue;
+                    }
+                }
+                
                // Otherwise recursively flatten the children.
                if (flatten(topNode, bottomNode))
                {
                    fAVMRepository.flatten(layer.getPath(), name);
-                    
-                    if (logger.isTraceEnabled())
-                    {
-                        logger.trace("Recursively flattened: " + name);
-                    }
+                    
+                    if (logger.isTraceEnabled())
+                    {
+                        logger.trace("Recursively flattened: " + name);
+                    }
                }
                else
                {
@@ -1348,7 +1345,7 @@ public class AVMSyncServiceImpl implements AVMSyncService
        }
        return flattened;
    }
-    
+    
    /**
     * Takes a layer, deletes it and recreates it pointing at the same underlying
     * node. Any changes in the layer are lost (except to history if the layer has been
@@ -1360,8 +1357,8 @@ public class AVMSyncServiceImpl implements AVMSyncService
     */
    public void resetLayer(String layerPath)
    {
-        long start = System.currentTimeMillis();
-        
+        long start = System.currentTimeMillis();
+        
        AVMNodeDescriptor desc = fAVMService.lookup(-1, layerPath);
        if (desc == null)
        {
@@ -1373,11 +1370,11 @@ public class AVMSyncServiceImpl implements AVMSyncService
        {
            fAVMRepository.flatten(layerPath, name);
        }
-        
-        if (logger.isDebugEnabled())
-        {
-            logger.debug("Raw resetLayer: " + layerPath + " in " + (System.currentTimeMillis() - start) + " msecs");
-        }
+        
+        if (logger.isDebugEnabled())
+        {
+            logger.debug("Raw resetLayer: " + layerPath + " in " + (System.currentTimeMillis() - start) + " msecs");
+        }
    }

    /**