update ehcache to version 2.5.1

This commit is contained in:
Sebastian Sdorra
2012-02-01 15:44:29 +01:00
parent 0c38a6346a
commit 12fac88aaf
4 changed files with 15 additions and 3 deletions

View File

@@ -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>

View File

@@ -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 --------------------------------------------------------------
/**

View File

@@ -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");
}

View File

@@ -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;