Merged DEV/DEREK_2.1 to HEAD

- Removed Node.parentAssocs mapping
 - Added parentAssocs transactional cache to NodeDAO
 - Added concurrency detection to TransactionalCache
 - Fixed cluster sample config


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

config/alfresco/extension/ehcache-custom.xml.sample.cluster

@@ -176,25 +176,6 @@
                                 replicateAsynchronously = false"/>
 
 
-    </cache>
-
-    <cache
-        name="org.alfresco.repo.domain.hibernate.NodeImpl.parentAssocs"
-        maxElementsInMemory="10000"
-        eternal="true"
-        timeToIdleSeconds="0"
-        timeToLiveSeconds="0"
-        overflowToDisk="false">
-
-            <cacheEventListenerFactory
-                    class="net.sf.ehcache.distribution.RMICacheReplicatorFactory"
-                    properties="replicatePuts = false,
-                                replicateUpdates = true,
-                                replicateRemovals = true,
-                                replicateUpdatesViaCopy = false,
-                                replicateAsynchronously = false"/>
-                                
-
     </cache>
 
     <cache
@@ -434,6 +415,23 @@
 
     <!-- Non-Hibernate -->
     
+    <cache
+        name="org.alfresco.cache.parentAssocsCache"
+        maxElementsInMemory="10000"
+        eternal="true"
+        overflowToDisk="false">
+
+            <cacheEventListenerFactory
+                    class="net.sf.ehcache.distribution.RMICacheReplicatorFactory"
+                    properties="replicatePuts = false,
+                                replicateUpdates = true,
+                                replicateRemovals = true,
+                                replicateUpdatesViaCopy = false,
+                                replicateAsynchronously = false"/>
+
+
+    </cache>
+
     <cache
         name="org.alfresco.cache.userToAuthorityCache"
         maxElementsInMemory="10000"