Merged V2.2 to HEAD

7575: Permission changes for AVM.
   7577: Incorporated most of the feedback provided by Kevin C earlier today
   7578: Removed directory not removed by patch
   7579: EmailServer bug fixes
         AR-1902:  Double posts when emailing to a document
         AR-1904:  Attachments via email should be allowed on forum posts
         AR-1903:  (Partial Fix) Text attachments should be treated the same way as other attachments 
   7583: Fixed WCM-961 & WCM-962: Added confirm dialog for 'Delete All Deployment Reports' and 'Release Server' actions


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

config/alfresco/ehcache-default.xml

@@ -112,16 +112,9 @@
         overflowToDisk="false"
         />
     <!-- Permission related caches -->
-    <!-- approx 1MB memory required -->
+    <!-- approx 1MB memory required -->    
     <cache 
-        name="org.alfresco.repo.domain.hibernate.DbAccessControlListImpl" 
-        maxElementsInMemory="1000"        
-        eternal="true"
-        overflowToDisk="false"
-        />
-    <!-- approx 1MB memory required -->
-    <cache 
-        name="org.alfresco.repo.domain.hibernate.DbAccessControlListImpl.entries" 
+        name="org.alfresco.repo.domain.hibernate.DbAccessControlEntryContextImpl" 
         maxElementsInMemory="1000"        
         eternal="true"
         overflowToDisk="false"
@@ -133,10 +126,31 @@
         eternal="true"
         overflowToDisk="false"
         />
-    <!-- approx 1MB memory required -->
+    <!-- approx 5MB memory required -->
     <cache 
-        name="org.alfresco.repo.domain.hibernate.DbPermissionImpl" 
-        maxElementsInMemory="500"          
+        name="org.alfresco.repo.domain.hibernate.DbAccessControlListChangeSetImpl" 
+        maxElementsInMemory="5000"        
+        eternal="true"
+        overflowToDisk="false"
+        />
+    <!-- approx 1MB memory required -->    
+    <cache 
+        name="org.alfresco.repo.domain.hibernate.DbAccessControlListImpl" 
+        maxElementsInMemory="1000"        
+        eternal="true"
+        overflowToDisk="false"
+        />
+    <!-- approx 1MB memory required -->    
+     <cache 
+        name="org.alfresco.repo.domain.hibernate.DbAccessControlListMemberImpl" 
+        maxElementsInMemory="1000"        
+        eternal="true"
+        overflowToDisk="false"
+        />
+    <!-- approx 1MB memory required -->    
+    <cache 
+        name="org.alfresco.repo.domain.hibernate.DbAuthorityAliasImpl" 
+        maxElementsInMemory="1000"        
         eternal="true"
         overflowToDisk="false"
         />
@@ -147,10 +161,10 @@
         eternal="true"
         overflowToDisk="false"
         />
-     <!-- approx 5MB memory required -->
+    <!-- approx 1MB memory required -->
     <cache 
-        name="org.alfresco.repo.domain.hibernate.DbAuthorityImpl.externalKeys" 
-        maxElementsInMemory="5000"
+        name="org.alfresco.repo.domain.hibernate.DbPermissionImpl" 
+        maxElementsInMemory="500"          
         eternal="true"
         overflowToDisk="false"
         />
@@ -173,31 +187,31 @@
         eternal="true"
         overflowToDisk="false"
         />
-	<!-- Attribute Service Caches. -->
-	<cache
-	    name="org.alfresco.repo.attributes.AttributeImpl"
-	    maxElementsInMemory="5000"
-	    eternal="true"
-	    overflowToDisk="false"
-	    />
-	<cache
-	    name="org.alfresco.repo.attributes.ListEntryImpl"
-	    maxElementsInMemory="2000"
-	    eternal="true"
-	    overflowToDisk="false"
-	    />
-	<cache
-		name="org.alfresco.repo.attributes.MapEntryImpl"
-		maxElementsInMemory="2000"
-		eternal="true"
-		overflowToDisk="false"
-		/>
-	<cache
-	    name="org.alfresco.repo.attributes.GlobalAttributeEntryImpl"
-	    maxElementsInMemory="1000"
-	    eternal="true"
-	    overflowToDisk="false"
-	    />
+    <!-- Attribute Service Caches. -->
+    <cache
+        name="org.alfresco.repo.attributes.AttributeImpl"
+        maxElementsInMemory="5000"
+        eternal="true"
+        overflowToDisk="false"
+        />
+    <cache
+        name="org.alfresco.repo.attributes.ListEntryImpl"
+        maxElementsInMemory="2000"
+        eternal="true"
+        overflowToDisk="false"
+        />
+    <cache
+        name="org.alfresco.repo.attributes.MapEntryImpl"
+        maxElementsInMemory="2000"
+        eternal="true"
+        overflowToDisk="false"
+        />
+    <cache
+        name="org.alfresco.repo.attributes.GlobalAttributeEntryImpl"
+        maxElementsInMemory="1000"
+        eternal="true"
+        overflowToDisk="false"
+        />
 
     <!-- AVM caches -->
      <cache
@@ -310,14 +324,13 @@
         maxElementsInMemory="1000"
         eternal="true"
         overflowToDisk="true"
-        />
-    <cache
-        name="org.alfresco.cache.sysAdminCache"
-        maxElementsInMemory="10"
-        eternal="true"
-        overflowToDisk="false"
         />
-        
+    <cache
+        name="org.alfresco.cache.sysAdminCache"
+        maxElementsInMemory="10"
+        eternal="true"
+        overflowToDisk="false"
+        />
         
     <!-- Web Client Config (tenant-based) -->