Author: olamy
Date: Fri Nov 22 03:47:22 2013
New Revision: 1544410
URL: http://svn.apache.org/r1544410
Log:
upgrade to ehcache 2.7.4
Modified:
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/pom.xml
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/main/java/org/apache/archiva/redback/components/cache/ehcache/EhcacheCache.java
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/test/resources/spring-context.xml
archiva/redback/redback-components/trunk/spring-cache/spring-cache-test/src/main/java/org/apache/archiva/redback/components/cache/test/AbstractCacheTestCase.java
archiva/redback/redback-components/trunk/spring-cache/spring-cache-test/src/main/java/org/apache/archiva/redback/components/cache/test/examples/wine/Wine.java
Modified:
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/pom.xml?rev=1544410&r1=1544409&r2=1544410&view=diff
==============================================================================
---
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/pom.xml
(original)
+++
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/pom.xml
Fri Nov 22 03:47:22 2013
@@ -45,8 +45,8 @@
<dependencies>
<dependency>
<groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache-core</artifactId>
- <version>2.6.5</version>
+ <artifactId>ehcache</artifactId>
+ <version>2.7.4</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
Modified:
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/main/java/org/apache/archiva/redback/components/cache/ehcache/EhcacheCache.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/main/java/org/apache/archiva/redback/components/cache/ehcache/EhcacheCache.java?rev=1544410&r1=1544409&r2=1544410&view=diff
==============================================================================
---
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/main/java/org/apache/archiva/redback/components/cache/ehcache/EhcacheCache.java
(original)
+++
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/main/java/org/apache/archiva/redback/components/cache/ehcache/EhcacheCache.java
Fri Nov 22 03:47:22 2013
@@ -52,7 +52,8 @@ public class EhcacheCache<V, T>
{
public void clear()
{
- ehcache.clearStatistics();
+ // TODO not supported anymore
+ //ehcache.getStatistics().clearStatistics();
}
public double getCacheHitRate()
@@ -70,22 +71,24 @@ public class EhcacheCache<V, T>
public long getCacheHits()
{
- return ehcache.getStatistics().getCacheHits();
+ return ehcache.getStatistics().cacheHitCount();//.getCacheHits();
}
public long getCacheMiss()
{
- return ehcache.getStatistics().getCacheMisses();
+ return ehcache.getStatistics().cacheMissCount();//
.getCacheMisses();
}
public long getSize()
{
- return ehcache.getMemoryStoreSize() + ehcache.getDiskStoreSize();
+ //
+ return ehcache.getStatistics().getSize();
}
public long getInMemorySize()
{
- return ehcache.calculateInMemorySize();
+ return ehcache.getStatistics().getLocalHeapSize();
+ //return ehcache.calculateInMemorySize();
}
}
@@ -203,7 +206,7 @@ public class EhcacheCache<V, T>
}
else
{
- log.warn( "skip duplicate cache " + getName() );
+ log.warn( "skip duplicate cache {}", getName() );
cacheManager = CacheManager.getCacheManager( getName() );
}
}
@@ -257,7 +260,8 @@ public class EhcacheCache<V, T>
ehcache = new Cache( cacheConfiguration );
cacheManager.addCache( ehcache );
- ehcache.setStatisticsEnabled( statisticsEnabled );
+ // TODO not supported anymore?
+ //ehcache.setStatisticsEnabled( statisticsEnabled );
}
}
Modified:
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/test/resources/spring-context.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/test/resources/spring-context.xml?rev=1544410&r1=1544409&r2=1544410&view=diff
==============================================================================
---
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/test/resources/spring-context.xml
(original)
+++
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/test/resources/spring-context.xml
Fri Nov 22 03:47:22 2013
@@ -46,8 +46,8 @@
<property name="memoryEvictionPolicy" value="LRU"/>
<property name="name" value="alwaysrefresh"/>
<property name="overflowToDisk" value="false"/>
- <property name="timeToIdleSeconds" value="-1"/>
- <property name="timeToLiveSeconds" value="-1"/>
+ <property name="timeToIdleSeconds" value="0"/>
+ <property name="timeToLiveSeconds" value="1"/>
</bean>
<bean name="cache#neverrefresh"
class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache">
@@ -59,8 +59,8 @@
<property name="memoryEvictionPolicy" value="LRU"/>
<property name="name" value="neverrefresh"/>
<property name="overflowToDisk" value="false"/>
- <property name="timeToIdleSeconds" value="-1"/>
- <property name="timeToLiveSeconds" value="-1"/>
+ <property name="timeToIdleSeconds" value="0"/>
+ <property name="timeToLiveSeconds" value="0"/>
</bean>
<bean name="cache#onesecondrefresh"
class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache">
Modified:
archiva/redback/redback-components/trunk/spring-cache/spring-cache-test/src/main/java/org/apache/archiva/redback/components/cache/test/AbstractCacheTestCase.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-cache/spring-cache-test/src/main/java/org/apache/archiva/redback/components/cache/test/AbstractCacheTestCase.java?rev=1544410&r1=1544409&r2=1544410&view=diff
==============================================================================
---
archiva/redback/redback-components/trunk/spring-cache/spring-cache-test/src/main/java/org/apache/archiva/redback/components/cache/test/AbstractCacheTestCase.java
(original)
+++
archiva/redback/redback-components/trunk/spring-cache/spring-cache-test/src/main/java/org/apache/archiva/redback/components/cache/test/AbstractCacheTestCase.java
Fri Nov 22 03:47:22 2013
@@ -172,6 +172,7 @@ public abstract class AbstractCacheTestC
String key = wine.getName();
Cache<String,Wine> cache = this.getAlwaysRefresCache();
cache.put( key, wine );
+ Thread.sleep( 1001 );
assertNull( cache.get( key ) );
}
Modified:
archiva/redback/redback-components/trunk/spring-cache/spring-cache-test/src/main/java/org/apache/archiva/redback/components/cache/test/examples/wine/Wine.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-cache/spring-cache-test/src/main/java/org/apache/archiva/redback/components/cache/test/examples/wine/Wine.java?rev=1544410&r1=1544409&r2=1544410&view=diff
==============================================================================
---
archiva/redback/redback-components/trunk/spring-cache/spring-cache-test/src/main/java/org/apache/archiva/redback/components/cache/test/examples/wine/Wine.java
(original)
+++
archiva/redback/redback-components/trunk/spring-cache/spring-cache-test/src/main/java/org/apache/archiva/redback/components/cache/test/examples/wine/Wine.java
Fri Nov 22 03:47:22 2013
@@ -59,4 +59,13 @@ public class Wine
this.name = name;
}
+ @Override
+ public String toString()
+ {
+ final StringBuilder sb = new StringBuilder( "Wine{" );
+ sb.append( "name='" ).append( name ).append( '\'' );
+ sb.append( ", localisation='" ).append( localisation ).append( '\'' );
+ sb.append( '}' );
+ return sb.toString();
+ }
}
