Merged V2.9 to HEAD

10561: Merged V2.2 to V2.9
      9882: Node DAO separation
   10580: Merged V2.2 to V2.9
      10576: Missing onContentDelete firing
      10577: More policies: beforeCreateNode and beforeDeleteNode when archiving nodes in hierarchy
         - Updated UsageService and TenantService to conform to the new node DAO (more separation)
         - TODO: Tenant node interceptor not present.  This must be added if Multi-Tentant features are required.
   - NodeMonitor event processing now checks that the nodes are still valid before processing.
   - onMove firing was breaking NodeMonitor.  Changed onMove to not fire when nodes are moved between stores.
   - Raised ALFCOM-1912: ClassCastException when accessing property of type ver2:versionNumber
   - Pull setFixedAcls fully into Node DAO for simpler and speedier execution


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

source/java/org/alfresco/repo/version/VersionServiceImplTest.java

@@ -51,6 +51,7 @@ import org.alfresco.service.cmr.version.VersionServiceException;
 import org.alfresco.service.cmr.version.VersionType;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.util.ApplicationContextHelper;
+import org.alfresco.util.GUID;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.context.ApplicationContext;
@@ -690,7 +691,7 @@ public class VersionServiceImplTest extends BaseVersionStoreTest
     	NodeRef root = this.dbNodeService.getRootNode(spacesStoreRef);
     	
     	HashMap<QName, Serializable> props2 = new HashMap<QName, Serializable>();
-        props2.put(ContentModel.PROP_NAME, "test.txt");
+        props2.put(ContentModel.PROP_NAME, "test-" + GUID.generate() + ".txt");
         final NodeRef nodeRef = this.dbNodeService.createNode(
                 root, 
                 ContentModel.ASSOC_CHILDREN,