Permalink
Browse files

Fixed some cache version issues

  • Loading branch information...
1 parent 3b763ec commit 4fbde162b7e8b710f1b4cfe88f3c143d22327f8a @abuijze abuijze committed Feb 18, 2014
@@ -85,13 +85,23 @@
</dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache-core</artifactId>
- <version>2.2.0</version>
+ <artifactId>ehcache</artifactId>
+ <version>2.8.0</version>
</dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache-jcache</artifactId>
- <version>1.2</version>
+ <version>1.5.0-0.5</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -55,11 +55,10 @@
<property name="waitForTasksToCompleteOnShutdown" value="true"/>
</bean>
- <!-- TODO jettro : come up with a more than default configuration for caching -->
- <bean id="ehcache" class="net.sf.ehcache.jcache.JCache">
- <constructor-arg>
- <bean class="org.springframework.cache.ehcache.EhCacheFactoryBean"/>
- </constructor-arg>
+ <bean id="ehcache" factory-bean="cacheManager" factory-method="getCache">
+ <constructor-arg value="testCache"/>
</bean>
+ <bean id="cacheManager" class="org.springframework.cache.jcache.JCacheManagerFactoryBean"/>
+
</beans>
@@ -0,0 +1,43 @@
+<!--
+ ~ Copyright (c) 2010-2012. Axon Framework
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<ehcache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://ehcache.org/ehcache.xsd">
+
+ <diskStore path="java.io.tmpdir"/>
+
+ <defaultCache
+ maxElementsInMemory="10000"
+ eternal="false"
+ timeToIdleSeconds="120"
+ timeToLiveSeconds="120"
+ overflowToDisk="true"
+ maxElementsOnDisk="10000000"
+ diskPersistent="false"
+ diskExpiryThreadIntervalSeconds="120"
+ memoryStoreEvictionPolicy="LRU"
+ />
+
+ <cache
+ eternal="false"
+ timeToLiveSeconds="30"
+ timeToIdleSeconds="15"
+ maxElementsInMemory="50"
+ name="testCache"
+ memoryStoreEvictionPolicy="LFU"
+ overflowToDisk="false"/>
+
+</ehcache>
View
@@ -29,8 +29,8 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<axon.version>2.1</axon.version>
<slf4j.version>1.6.6</slf4j.version>
- <spring.version>3.1.1.RELEASE</spring.version>
- <spring.security.version>3.1.0.RELEASE</spring.security.version>
+ <spring.version>3.2.6.RELEASE</spring.version>
+ <spring.security.version>3.2.0.RELEASE</spring.security.version>
<junit.version>4.8.1</junit.version>
<mockito.version>1.8.5</mockito.version>
<hamcrest.version>1.1</hamcrest.version>
@@ -141,6 +141,7 @@
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>
+
<!-- Testing -->
<dependency>
<groupId>junit</groupId>
@@ -190,6 +191,12 @@
</dependency>
<dependency>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ <version>1.1</version>
+ </dependency>
+
+ <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.16</version>

0 comments on commit 4fbde16

Please sign in to comment.