Updated Branches: refs/heads/master efe77bbdd -> 8c57bd4d2
Upgrade to Ehcache 2.7.0 which is already an OSGi bundle out-of-the-box (no need for a SMX bundle anymore). Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8c57bd4d Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8c57bd4d Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8c57bd4d Branch: refs/heads/master Commit: 8c57bd4d204e9ecb2bcb54e5733e5b322ac9f710 Parents: efe77bb Author: Babak Vahdat <[email protected]> Authored: Fri May 31 19:37:15 2013 +0200 Committer: Babak Vahdat <[email protected]> Committed: Fri May 31 19:37:15 2013 +0200 ---------------------------------------------------------------------- components/camel-cache/pom.xml | 4 ++-- .../camel/component/cache/CacheProducerTest.java | 7 ++++--- .../component/cache/CacheRegistryRefTest.java | 9 ++++----- parent/pom.xml | 10 +++++----- .../karaf/features/src/main/resources/features.xml | 2 +- 5 files changed, 16 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/8c57bd4d/components/camel-cache/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-cache/pom.xml b/components/camel-cache/pom.xml index fd53652..9bcb27c 100755 --- a/components/camel-cache/pom.xml +++ b/components/camel-cache/pom.xml @@ -51,8 +51,8 @@ <artifactId>camel-core</artifactId> </dependency> <dependency> - <groupId>org.apache.servicemix.bundles</groupId> - <artifactId>org.apache.servicemix.bundles.ehcache</artifactId> + <groupId>net.sf.ehcache</groupId> + <artifactId>ehcache</artifactId> </dependency> <dependency> <groupId>xalan</groupId> http://git-wip-us.apache.org/repos/asf/camel/blob/8c57bd4d/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheProducerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheProducerTest.java b/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheProducerTest.java index 9277f21..3e624be 100755 --- a/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheProducerTest.java +++ b/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheProducerTest.java @@ -23,7 +23,6 @@ import java.util.concurrent.TimeUnit; import net.sf.ehcache.Cache; import net.sf.ehcache.CacheException; import net.sf.ehcache.Element; -import net.sf.ehcache.ElementEvictionData; import org.apache.camel.EndpointInject; import org.apache.camel.Exchange; @@ -35,6 +34,7 @@ import org.apache.camel.component.BaseCacheTest; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.converter.IOConverter; import org.apache.camel.util.IOHelper; +import org.apache.camel.util.ReflectionHelper; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -689,10 +689,11 @@ public class CacheProducerTest extends BaseCacheTest { LOG.debug("------------Beginning CacheProducer Check An Element Does Not Exist After Expiry Test---------------"); sendOriginalFile(); - // Alter the cache element so it appears "expired" (without having to wait for it to happen) + // simulate the cache element to appear as "expired" (without having to wait for it to happen) + // however as there's no public API to do so we're forced to make use of the reflection API here Cache testCache = cache.getCacheManagerFactory().getInstance().getCache("TestCache1"); Element element = testCache.getQuiet("Ralph_Waldo_Emerson"); - element.getElementEvictionData().setCreationTime(System.currentTimeMillis() - 10000); + ReflectionHelper.setField(Element.class.getDeclaredField("creationTime"), element, System.currentTimeMillis() - 10000); testCache.putQuiet(element); // Check that the element is not found when expired http://git-wip-us.apache.org/repos/asf/camel/blob/8c57bd4d/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheRegistryRefTest.java ---------------------------------------------------------------------- diff --git a/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheRegistryRefTest.java b/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheRegistryRefTest.java index 364ccf3..d635f13 100644 --- a/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheRegistryRefTest.java +++ b/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheRegistryRefTest.java @@ -104,9 +104,8 @@ public class CacheRegistryRefTest extends BaseCacheTest { //Expecting 1 loader to be configured via spring assertEquals("configuredLoaderRegistry size", 1, configuredLoaderRegistry.size()); - //Expecting 2 listeners- one added by us: TestCacheEventListener and - //one added by ehcache by cfg file. - assertEquals("Number of registered listeners", 2, ehcacheEventListners.size()); + //Expecting 1 listener added by us: TestCacheEventListener + assertEquals("Number of registered listeners", 1, ehcacheEventListners.size()); assertEquals("Number of registered loaders", 1, cacheLoaders.size()); @@ -132,7 +131,7 @@ public class CacheRegistryRefTest extends BaseCacheTest { } } - public class TestLoader implements CacheLoaderWrapper { + public static class TestLoader implements CacheLoaderWrapper { protected Ehcache cache; private Status status; @@ -196,7 +195,7 @@ public class CacheRegistryRefTest extends BaseCacheTest { } //Test event lister that will help us to count put method invocations. - public class TestCacheEventListener implements CacheEventListener { + public static class TestCacheEventListener implements CacheEventListener { private int numberOfPuts; @Override http://git-wip-us.apache.org/repos/asf/camel/blob/8c57bd4d/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 56416cd..25318b7 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -115,7 +115,7 @@ <dozer-version>5.4.0</dozer-version> <easymock-version>3.1</easymock-version> <eclipse-equinox-common-version>3.3.0-v20070426</eclipse-equinox-common-version> - <ehcache-bundle-version>2.6.5_1</ehcache-bundle-version> + <ehcache-version>2.7.0</ehcache-version> <!-- The 0.20 bundle is flawed, see SMX4-1372 --> <elasticsearch-bundle-version>0.19.10_1</elasticsearch-bundle-version> <elasticsearch-version>0.20.5</elasticsearch-version> @@ -1771,11 +1771,11 @@ <version>${openjpa-version}</version> </dependency> - <!-- optional EHCache --> + <!-- optional Ehcache --> <dependency> - <groupId>org.apache.servicemix.bundles</groupId> - <artifactId>org.apache.servicemix.bundles.ehcache</artifactId> - <version>${ehcache-bundle-version}</version> + <groupId>net.sf.ehcache</groupId> + <artifactId>ehcache</artifactId> + <version>${ehcache-version}</version> </dependency> <!-- Hadoop, Hbase --> http://git-wip-us.apache.org/repos/asf/camel/blob/8c57bd4d/platforms/karaf/features/src/main/resources/features.xml ---------------------------------------------------------------------- diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml index 094b3e0..ef87c06 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -148,7 +148,7 @@ </feature> <feature name='camel-cache' version='${project.version}' resolver='(obr)' start-level='50'> <feature version='${project.version}'>camel-core</feature> - <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ehcache/${ehcache-bundle-version}</bundle> + <bundle dependency='true'>mvn:net.sf.ehcache/ehcache/${ehcache-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle> <bundle>mvn:org.apache.camel/camel-cache/${project.version}</bundle> </feature>
