Merge branch 'camel-2.10.x' of https://git-wip-us.apache.org/repos/asf/camel into camel-2.10.x
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a8178b7f Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a8178b7f Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a8178b7f Branch: refs/heads/camel-2.10.x Commit: a8178b7fc8f70f95e3f5ee782e779a7f16313f9e Parents: 14769a7 a18abe0 Author: Willem Jiang <ningji...@apache.org> Authored: Wed Jul 31 12:02:13 2013 +0800 Committer: Willem Jiang <ningji...@apache.org> Committed: Wed Jul 31 12:02:13 2013 +0800 ---------------------------------------------------------------------- .../cache/DefaultCacheManagerFactory.java | 2 +- .../camel/component/cache/EHCacheUtil.java | 91 ++++++++++++++++++++ .../cache/FileCacheManagerFactory.java | 2 +- .../cache/DefaultCacheManagerFactoryTest.java | 59 +++++++++++++ .../camel/component/cache/EHCacheUtilTest.java | 54 ++++++++++++ .../src/test/resources/test-ehcache.xml | 32 +++++++ 6 files changed, 238 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
