From d60a57af5e8016841151e777e4ba9871d4ee0aa4 Mon Sep 17 00:00:00 2001
From: Derek Hulley <derek.hulley@alfresco.com>
Date: Fri, 12 Mar 2010 19:24:58 +0000
Subject: [PATCH] Merged BRANCHES/V3.2 to HEAD:    19181: Merged V3.1 to V3.2  
       18999: Merged DEV/BELARUS/V3.1-2010_02_05 to V3.1 (with modifications) 
           18972: Upgrade EHCache to 1.7.x (latest)         19069: Use
 compatible slf4j API and implementation libraries

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19268 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../repo/cache/EhCacheManagerFactoryBean.java     |  2 +-
 .../org/alfresco/repo/cache/EhCacheTracerJob.java | 15 +++++++++------
 .../cache/InternalEhCacheManagerFactoryBean.java  |  4 ++--
 .../filefolder/loader/AbstractLoaderThread.java   |  2 +-
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/source/java/org/alfresco/repo/cache/EhCacheManagerFactoryBean.java b/source/java/org/alfresco/repo/cache/EhCacheManagerFactoryBean.java
index 3b44934227..4993cccd95 100644
--- a/source/java/org/alfresco/repo/cache/EhCacheManagerFactoryBean.java
+++ b/source/java/org/alfresco/repo/cache/EhCacheManagerFactoryBean.java
@@ -66,7 +66,7 @@ public class EhCacheManagerFactoryBean implements FactoryBean, InitializingBean,
         {
             URL configUrl = this.configLocation.getURL();
             logger.info("Initializing EHCache CacheManager using URL: " + configLocation);
-            this.cacheManager = new CacheManager(configUrl);
+            this.cacheManager = CacheManager.create(configUrl);
         }
         catch (IOException e)
         {
diff --git a/source/java/org/alfresco/repo/cache/EhCacheTracerJob.java b/source/java/org/alfresco/repo/cache/EhCacheTracerJob.java
index 15e482c2e4..c6f5c9f5c1 100644
--- a/source/java/org/alfresco/repo/cache/EhCacheTracerJob.java
+++ b/source/java/org/alfresco/repo/cache/EhCacheTracerJob.java
@@ -29,6 +29,7 @@ import net.sf.ehcache.CacheException;
 import net.sf.ehcache.CacheManager;
 import net.sf.ehcache.Element;
 import net.sf.ehcache.Status;
+import net.sf.ehcache.statistics.LiveCacheStatistics;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -188,10 +189,11 @@ public class EhCacheTracerJob implements Job
             size = count > 0 ? (long) ((double)size * ((double)keys.size()/(double)count)) : 0L;
             
             sizeMB = (double)size/1024.0/1024.0;
-            maxSize = cache.getMaxElementsInMemory();
+            LiveCacheStatistics statistics = cache.getLiveCacheStatistics();
+            maxSize = cache.getCacheConfiguration().getMaxElementsInMemory();
             currentSize = cache.getMemoryStoreSize();
-            hitCount = cache.getHitCount();
-            missCount = cache.getMissCountNotFound();
+            hitCount = statistics.getCacheHitCount();
+            missCount = statistics.getCacheMissCount();
             percentageFull = (double)currentSize / (double)maxSize * 100.0;
             estMaxSize = size / (double) currentSize * (double) maxSize;
         }
@@ -220,10 +222,11 @@ public class EhCacheTracerJob implements Job
         public String toString()
         {
             double sizeMB = (double)getSize()/1024.0/1024.0;
-            long maxSize = cache.getMaxElementsInMemory();
+            LiveCacheStatistics statistics = cache.getLiveCacheStatistics();
+            long maxSize = cache.getCacheConfiguration().getMaxElementsInMemory();
             long currentSize = cache.getMemoryStoreSize();
-            long hitCount = cache.getHitCount();
-            long totalMissCount = cache.getMissCountNotFound() + cache.getMissCountExpired();
+            long hitCount = statistics.getCacheHitCount();
+            long totalMissCount = statistics.getCacheMissCount() + statistics.getCacheMissCountExpired();
             double hitRatio = (double)hitCount / (double)(totalMissCount + hitCount) * 100.0;
             double percentageFull = (double)currentSize / (double)maxSize * 100.0;
             double estMaxSize = sizeMB / (double) currentSize * (double) maxSize;
diff --git a/source/java/org/alfresco/repo/cache/InternalEhCacheManagerFactoryBean.java b/source/java/org/alfresco/repo/cache/InternalEhCacheManagerFactoryBean.java
index a21cc70e00..9870453e32 100644
--- a/source/java/org/alfresco/repo/cache/InternalEhCacheManagerFactoryBean.java
+++ b/source/java/org/alfresco/repo/cache/InternalEhCacheManagerFactoryBean.java
@@ -99,7 +99,7 @@ public class InternalEhCacheManagerFactoryBean implements FactoryBean<CacheManag
             try
             {
                 URL configUrl = ResourceUtils.getURL(CUSTOM_CONFIGURATION_FILE);
-                InternalEhCacheManagerFactoryBean.cacheManager = new CacheManager(configUrl);
+                InternalEhCacheManagerFactoryBean.cacheManager = CacheManager.create(configUrl);
             }
             catch (FileNotFoundException e)
             {
@@ -109,7 +109,7 @@ public class InternalEhCacheManagerFactoryBean implements FactoryBean<CacheManag
                 {
                     throw new AlfrescoRuntimeException("Missing default cache config: " + DEFAULT_CONFIGURATION_FILE);
                 }
-                InternalEhCacheManagerFactoryBean.cacheManager = new CacheManager(configUrl);
+                InternalEhCacheManagerFactoryBean.cacheManager = CacheManager.create(configUrl);
                 defaultLocation = true;
             }
             // done
diff --git a/source/java/org/alfresco/repo/model/filefolder/loader/AbstractLoaderThread.java b/source/java/org/alfresco/repo/model/filefolder/loader/AbstractLoaderThread.java
index 75a18b70f8..d2d033ccde 100644
--- a/source/java/org/alfresco/repo/model/filefolder/loader/AbstractLoaderThread.java
+++ b/source/java/org/alfresco/repo/model/filefolder/loader/AbstractLoaderThread.java
@@ -62,7 +62,7 @@ public abstract class AbstractLoaderThread extends Thread
     {
         System.setProperty(CacheManager.ENABLE_SHUTDOWN_HOOK_PROPERTY, "TRUE");
         URL url = LoaderUploadThread.class.getResource("/org/alfresco/repo/model/filefolder/loader/loader-ehcache.xml");
-        CacheManager cacheManager = new CacheManager(url);
+        CacheManager cacheManager = CacheManager.create(url);
         Cache cache = cacheManager.getCache("org.alfresco.LoaderUploadThread.PathCache");
 
         pathCache = new EhCacheAdapter<String, NodeRef>();