From 12fac88aafa4df4ac7fc5a35489826ef19d673b1 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Wed, 1 Feb 2012 15:44:29 +0100
Subject: [PATCH] update ehcache to version 2.5.1

---
 pom.xml                                               |  2 +-
 .../src/main/java/sonia/scm/cache/EhCacheManager.java | 11 +++++++++++
 .../src/test/java/sonia/scm/cache/EhCacheTest.java    |  2 +-
 .../web/security/ChainAuthenticationManagerTest.java  |  3 ++-
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 598103e7ce..d3d5b5c5ae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -431,7 +431,7 @@
     <servlet.version>2.5</servlet.version>
     <guice.version>3.0</guice.version>
     <jersey.version>1.11</jersey.version>
-    <ehcache.version>2.4.6</ehcache.version>
+    <ehcache.version>2.5.1</ehcache.version>
     <freemarker.version>2.3.18</freemarker.version>
     <jetty.version>7.5.4.v20111024</jetty.version>
     <logback.version>1.0.0</logback.version>
diff --git a/scm-webapp/src/main/java/sonia/scm/cache/EhCacheManager.java b/scm-webapp/src/main/java/sonia/scm/cache/EhCacheManager.java
index 840e5cd8e7..8228ef698e 100644
--- a/scm-webapp/src/main/java/sonia/scm/cache/EhCacheManager.java
+++ b/scm-webapp/src/main/java/sonia/scm/cache/EhCacheManager.java
@@ -71,6 +71,17 @@ public class EhCacheManager implements CacheManager
       new net.sf.ehcache.CacheManager(EhCacheManager.class.getResource(CONFIG));
   }
 
+  /**
+   * This constructor is only for unit tests
+   *
+   *
+   * @param cacheManager
+   */
+  public EhCacheManager(net.sf.ehcache.CacheManager cacheManager)
+  {
+    this.cacheManager = cacheManager;
+  }
+
   //~--- methods --------------------------------------------------------------
 
   /**
diff --git a/scm-webapp/src/test/java/sonia/scm/cache/EhCacheTest.java b/scm-webapp/src/test/java/sonia/scm/cache/EhCacheTest.java
index cfd783d5c8..dc1925e5ab 100644
--- a/scm-webapp/src/test/java/sonia/scm/cache/EhCacheTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/cache/EhCacheTest.java
@@ -68,7 +68,7 @@ public class EhCacheTest
   @Before
   public void before()
   {
-    cm = new EhCacheManager();
+    cm = new EhCacheManager(net.sf.ehcache.CacheManager.create());
     cache = cm.getCache(String.class, String.class, "test");
   }
 
diff --git a/scm-webapp/src/test/java/sonia/scm/web/security/ChainAuthenticationManagerTest.java b/scm-webapp/src/test/java/sonia/scm/web/security/ChainAuthenticationManagerTest.java
index 0db93edd45..566ef54504 100644
--- a/scm-webapp/src/test/java/sonia/scm/web/security/ChainAuthenticationManagerTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/web/security/ChainAuthenticationManagerTest.java
@@ -283,7 +283,8 @@ public class ChainAuthenticationManagerTest extends AbstractTestBase
   //~--- fields ---------------------------------------------------------------
 
   /** Field description */
-  private CacheManager cacheManager = new EhCacheManager();
+  private CacheManager cacheManager =
+    new EhCacheManager(net.sf.ehcache.CacheManager.create());
 
   /** Field description */
   private ChainAuthenticatonManager manager;