Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)

51903 to 54309 


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

source/java/org/alfresco/repo/cache/DefaultSimpleCache.java

@@ -127,6 +127,40 @@ public final class DefaultSimpleCache<K extends Serializable, V extends Object>
     {
         map.setCapacity(maxItems);
     }
+    
+    /**
+     * Gets the maximum number of items that the cache will hold.
+     * 
+     * @return maxItems
+     */
+    public int getMaxItems()
+    {
+        return map.capacity();
+    }
+    
+    
+    /**
+     * Retrieve the name of this cache.
+     * 
+     * @see #setCacheName(String)
+     * @return the cacheName
+     */
+    public String getCacheName()
+    {
+        return this.cacheName;
+    }
+
+    /**
+     * Since there are many cache instances, it is useful to be able to associate
+     * a name with each one.
+     * 
+     * @see #setBeanName(String)
+     * @param cacheName
+     */
+    public void setCacheName(String cacheName)
+    {
+        this.cacheName = cacheName;
+    }
 
     /**
      * Since there are many cache instances, it is useful to be able to associate