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 04:26:33 UTC
svn commit: r1221588 - in /camel/branches/camel-2.7.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 03:26:33 2011
New Revision: 1221588

URL: http://svn.apache.org/viewvc?rev=1221588&view=rev
Log:
Merged revisions 1221574 via svnmerge from 
https://svn.apache.org/repos/asf/camel/branches/camel-2.8.x

................
  r1221574 | ningjiang | 2011-12-21 10:51:45 +0800 (Wed, 21 Dec 2011) | 9 lines
  
  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.7.x/components/camel-cache/src/main/java/org/apache/camel/component/cache/FileCacheManagerFactory.java
      - copied unchanged from r1221574, camel/branches/camel-2.8.x/components/camel-cache/src/main/java/org/apache/camel/component/cache/FileCacheManagerFactory.java
    camel/branches/camel-2.7.x/components/camel-cache/src/test/java/org/apache/camel/component/cache/FileCacheManagerFactoyRefTest.java
      - copied unchanged from r1221574, camel/branches/camel-2.8.x/components/camel-cache/src/test/java/org/apache/camel/component/cache/FileCacheManagerFactoyRefTest.java
Modified:
    camel/branches/camel-2.7.x/   (props changed)
    camel/branches/camel-2.7.x/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheManagerFactoryRefTest.java

Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 21 03:26:33 2011
@@ -1,2 +1,2 @@
-/camel/branches/camel-2.8.x:1170965,1171400,1174571,1175323,1176329,1176787,1177397,1177946,1177949,1180598,1187226,1189704,1199138,1199732,1199766,1199807,1200867,1201638-1201639,1202171,1202222,1202662,1204355,1205709,1208933,1210779,1210916,1211366,1211774,1211814,1213201,1213531,1214058,1214648,1220717
-/camel/trunk:1146608,1146903,1147216,1170956,1171396,1174565,1175321,1176274,1176781-1176782,1177394,1177945,1177948,1180597,1187221,1189693,1199137,1199703,1199739,1199804,1200861,1201623,1201637,1202167,1202215,1202659,1204338,1205412,1208930,1210771,1210830,1211363,1211773,1211811,1213197,1213219,1213526,1214639,1220711
+/camel/branches/camel-2.8.x:1170965,1171400,1174571,1175323,1176329,1176787,1177397,1177946,1177949,1180598,1187226,1189704,1199138,1199732,1199766,1199807,1200867,1201638-1201639,1202171,1202222,1202662,1204355,1205709,1208933,1210779,1210916,1211366,1211774,1211814,1213201,1213531,1214058,1214648,1220717,1221574
+/camel/trunk:1146608,1146903,1147216,1170956,1171396,1174565,1175321,1176274,1176781-1176782,1177394,1177945,1177948,1180597,1187221,1189693,1199137,1199703,1199739,1199804,1200861,1201623,1201637,1202167,1202215,1202659,1204338,1205412,1208930,1210771,1210830,1211363,1211773,1211811,1213197,1213219,1213526,1214639,1220711,1221566

Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: camel/branches/camel-2.7.x/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheManagerFactoryRefTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheManagerFactoryRefTest.java?rev=1221588&r1=1221587&r2=1221588&view=diff
==============================================================================
--- camel/branches/camel-2.7.x/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheManagerFactoryRefTest.java (original)
+++ camel/branches/camel-2.7.x/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheManagerFactoryRefTest.java Wed Dec 21 03:26:33 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;
     }