svn commit: r1310227 - in /camel/trunk: components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheRoutesManagementTest.java parent/pom.xml

[davsclaus]

Author: davsclaus
Date: Fri Apr  6 08:38:12 2012
New Revision: 1310227

URL: http://svn.apache.org/viewvc?rev=1310227&view=rev
Log:
CAMEL-5144: Upgrade to ehcache 2.5.1

Modified:
    
camel/trunk/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheRoutesManagementTest.java
    camel/trunk/parent/pom.xml

Modified: 
camel/trunk/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheRoutesManagementTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheRoutesManagementTest.java?rev=1310227&r1=1310226&r2=1310227&view=diff
==============================================================================
--- 
camel/trunk/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheRoutesManagementTest.java
 (original)
+++ 
camel/trunk/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheRoutesManagementTest.java
 Fri Apr  6 08:38:12 2012
@@ -45,7 +45,7 @@ public class CacheRoutesManagementTest e
     @Produce(uri = "direct:route2")
     protected ProducerTemplate producerTemplate2;
 
-    private TestingCacheManagerFactory cmfRef = new 
TestingCacheManagerFactory("ehcache_test.xml");
+    private TestingCacheManagerFactory cmfRef = new 
TestingCacheManagerFactory();
 
     private Processor templateProcessor = new Processor() {
         public void process(Exchange exchange) throws Exception {
@@ -112,20 +112,15 @@ public class CacheRoutesManagementTest e
     }
 
     public class TestingCacheManagerFactory extends CacheManagerFactory {
-        private String xmlName;
 
         //Only for testing purpose, normally not needed
         private CacheManager cacheManager;
 
-        public TestingCacheManagerFactory(String xmlName) {
-            this.xmlName = xmlName;
-        }
-
         @Override
         protected synchronized CacheManager createCacheManagerInstance() {
             //Singleton- only for testing purpose, normally not needed
             if (cacheManager == null) {
-                cacheManager = 
CacheManager.create(getClass().getResourceAsStream(xmlName));
+                cacheManager = CacheManager.create();
             }
 
             return cacheManager;

Modified: camel/trunk/parent/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1310227&r1=1310226&r2=1310227&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Fri Apr  6 08:38:12 2012
@@ -67,7 +67,7 @@
     <dnsjava-version>2.1.1</dnsjava-version>
     <dozer-version>5.3.2</dozer-version>
     <easymock-version>3.0</easymock-version>
-    <ehcache-bundle-version>2.4.3_1</ehcache-bundle-version>
+    <ehcache-bundle-version>2.5.1_1</ehcache-bundle-version>
     <flatpack-version>3.2.0_2</flatpack-version>
     <fop-version>1.0</fop-version>
     <ftpserver-version>1.0.6</ftpserver-version>