You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2011/12/21 03:51:45 UTC
svn commit: r1221574 - in /camel/branches/camel-2.8.x: ./
components/camel-cache/src/main/java/org/apache/camel/component/cache/
components/camel-cache/src/test/java/org/apache/camel/component/cache/
Author: ningjiang
Date: Wed Dec 21 02:51:45 2011
New Revision: 1221574
URL: http://svn.apache.org/viewvc?rev=1221574&view=rev
Log:
Merged revisions 1221566 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1221566 | ningjiang | 2011-12-21 10:23:21 +0800 (Wed, 21 Dec 2011) | 1 line
CAMEL-4805 Added a FileCacheManagerFactory for user to use
........
Added:
camel/branches/camel-2.8.x/components/camel-cache/src/main/java/org/apache/camel/component/cache/FileCacheManagerFactory.java
- copied unchanged from r1221566, camel/trunk/components/camel-cache/src/main/java/org/apache/camel/component/cache/FileCacheManagerFactory.java
camel/branches/camel-2.8.x/components/camel-cache/src/test/java/org/apache/camel/component/cache/FileCacheManagerFactoyRefTest.java
- copied unchanged from r1221566, camel/trunk/components/camel-cache/src/test/java/org/apache/camel/component/cache/FileCacheManagerFactoyRefTest.java
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheManagerFactoryRefTest.java
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 21 02:51:45 2011
@@ -1 +1 @@
-/camel/trunk:1202148,1202167,1202204-1202206,1202214-1202215,1202223,1202659,1202685,1203879,1203978,1204338,1205124,1205372,1205412,1205429,1205431,1205713,1206116,1206414,1207743,1207784,1208301,1208930,1208964-1208965,1209006-1209007,1209382,1209401,1209477,1209845-1209846,1210113,1210391,1210771,1210830,1211363,1211414,1211773,1211811,1212275-1212276,1212408,1213197,1213219,1213232,1213526,1214132,1214639,1214743,1215240,1215448,1215482,1220711,1221129
+/camel/trunk:1202148,1202167,1202204-1202206,1202214-1202215,1202223,1202659,1202685,1203879,1203978,1204338,1205124,1205372,1205412,1205429,1205431,1205713,1206116,1206414,1207743,1207784,1208301,1208930,1208964-1208965,1209006-1209007,1209382,1209401,1209477,1209845-1209846,1210113,1210391,1210771,1210830,1211363,1211414,1211773,1211811,1212275-1212276,1212408,1213197,1213219,1213232,1213526,1214132,1214639,1214743,1215240,1215448,1215482,1220711,1221129,1221566
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.8.x/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheManagerFactoryRefTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheManagerFactoryRefTest.java?rev=1221574&r1=1221573&r2=1221574&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheManagerFactoryRefTest.java (original)
+++ camel/branches/camel-2.8.x/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheManagerFactoryRefTest.java Wed Dec 21 02:51:45 2011
@@ -38,11 +38,12 @@ public class CacheManagerFactoryRefTest
@Produce(uri = "direct:start")
protected ProducerTemplate producerTemplate;
- private CacheManagerFactory testingCacheManagerFactory = new TestingCacheManagerFactory();
+ protected CacheManagerFactory testingCacheManagerFactory;
@Override
protected JndiRegistry createRegistry() throws Exception {
JndiRegistry jndi = super.createRegistry();
+ testingCacheManagerFactory = new TestingCacheManagerFactory();
jndi.bind("testCacheManagerFactory", testingCacheManagerFactory);
return jndi;
}