Submitted by Maria Catherine Tan patch applied with modifications git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1140869 13f79535-47bb-0310-9956-ffa450edef68tags/archiva-1.4-M1
@@ -358,6 +358,20 @@ | |||
<scope>test</scope> | |||
<version>${struts.version}</version> | |||
</dependency> | |||
<dependency> | |||
<groupId>jpox</groupId> | |||
<artifactId>jpox-ehcache</artifactId> | |||
<exclusions> | |||
<exclusion> | |||
<groupId>commons-logging</groupId> | |||
<artifactId>commons-logging</artifactId> | |||
</exclusion> | |||
<exclusion> | |||
<groupId>ehcache</groupId> | |||
<artifactId>ehcache</artifactId> | |||
</exclusion> | |||
</exclusions> | |||
</dependency> | |||
</dependencies> | |||
<build> | |||
<resources> | |||
@@ -399,7 +413,7 @@ | |||
<tasks> | |||
<mkdir dir="${basedir}/target/archiva/WEB-INF/"/> | |||
<copy todir="${basedir}/target/archiva/WEB-INF/"> | |||
<fileset dir="${basedir}/target" includes="classes/" excludes="**/struts.xml"/> | |||
<fileset dir="${basedir}/target" includes="classes/" excludes="**/struts.xml,**/ehcache.xml"/> | |||
</copy> | |||
</tasks> | |||
</configuration> | |||
@@ -530,25 +544,6 @@ | |||
<artifactId>derby</artifactId> | |||
<version>10.1.3.1</version> | |||
</dependency> | |||
<!-- Enable the following if you want JSP 2.0 or JVM version < 1.5 <dependency> | |||
<groupId>commons-logging</groupId> | |||
<artifactId>commons-logging</artifactId> | |||
<version>1.1</version> | |||
<type>jar</type> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.slf4j</groupId> | |||
<artifactId>slf4j-jcl</artifactId> | |||
<version>1.0.1</version> | |||
<type>jar</type> | |||
</dependency> | |||
<dependency> | |||
<groupId>log4j</groupId> | |||
<artifactId>log4j</artifactId> | |||
<version>1.2.14</version> | |||
<type>jar</type> | |||
</dependency> | |||
--> | |||
</dependencies> | |||
</plugin> | |||
<plugin> |
@@ -0,0 +1,74 @@ | |||
<ehcache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> | |||
<diskStore path="java.io.tmpdir" /> | |||
<!-- make default cache very short lived --> | |||
<defaultCache | |||
maxElementsInMemory="100" | |||
maxElementsOnDisk="0" | |||
eternal="false" | |||
overflowToDisk="false" | |||
timeToIdleSeconds="300" | |||
timeToLiveSeconds="600" | |||
memoryStoreEvictionPolicy="LFU" /> | |||
<!-- | |||
cache Redback classes longer to avoid a lot of SQL queries | |||
See REDBACK-227 | |||
--> | |||
<cache name="defaultJpox" | |||
maxElementsInMemory="10000" | |||
maxElementsOnDisk="0" | |||
eternal="false" | |||
overflowToDisk="false" | |||
timeToIdleSeconds="1800" | |||
timeToLiveSeconds="14400" | |||
memoryStoreEvictionPolicy="LFU" /> | |||
<cache name="org.codehaus.plexus.redback.rbac.jdo.JdoOperation" | |||
maxElementsInMemory="10000" | |||
maxElementsOnDisk="0" | |||
eternal="false" | |||
overflowToDisk="false" | |||
timeToIdleSeconds="1800" | |||
timeToLiveSeconds="14400" | |||
memoryStoreEvictionPolicy="LFU" /> | |||
<cache name="org.codehaus.plexus.redback.rbac.jdo.JdoPermission" | |||
maxElementsInMemory="10000" | |||
maxElementsOnDisk="0" | |||
eternal="false" | |||
overflowToDisk="false" | |||
timeToIdleSeconds="1800" | |||
timeToLiveSeconds="14400" | |||
memoryStoreEvictionPolicy="LFU" /> | |||
<cache name="org.codehaus.plexus.redback.rbac.jdo.JdoResource" | |||
maxElementsInMemory="10000" | |||
maxElementsOnDisk="0" | |||
eternal="false" | |||
overflowToDisk="false" | |||
timeToIdleSeconds="1800" | |||
timeToLiveSeconds="14400" | |||
memoryStoreEvictionPolicy="LFU" /> | |||
<cache name="org.codehaus.plexus.redback.rbac.jdo.JdoRole" | |||
maxElementsInMemory="10000" | |||
maxElementsOnDisk="0" | |||
eternal="false" | |||
overflowToDisk="false" | |||
timeToIdleSeconds="1800" | |||
timeToLiveSeconds="14400" | |||
memoryStoreEvictionPolicy="LFU" /> | |||
<cache name="org.codehaus.plexus.redback.rbac.jdo.JdoUserAssignment" | |||
maxElementsInMemory="10000" | |||
maxElementsOnDisk="0" | |||
eternal="false" | |||
overflowToDisk="false" | |||
timeToIdleSeconds="300" | |||
timeToLiveSeconds="600" | |||
memoryStoreEvictionPolicy="LFU" /> | |||
</ehcache> | |||
@@ -159,6 +159,12 @@ | |||
<!-- NEEDED FOR POSTGRES, But causes problems in other JDBC implementations. | |||
<prop key="org.jpox.identifier.case">PreserveCase</prop> | |||
--> | |||
<!-- cache activation --> | |||
<prop key="org.jpox.cache.level2">true</prop> | |||
<prop key="org.jpox.cache.level2.type">ehcacheclassbased</prop> | |||
<prop key="org.jpox.cache.level2.cacheName">defaultJpox</prop> | |||
<prop key="org.jpox.cache.level2.configurationFile">/ehcache.xml</prop> | |||
</props> | |||
</property> | |||
</bean> |
@@ -1133,6 +1133,11 @@ | |||
<version>1.8.3</version> | |||
<scope>test</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>jpox</groupId> | |||
<artifactId>jpox-ehcache</artifactId> | |||
<version>1.1.9</version> | |||
</dependency> | |||
</dependencies> | |||
</dependencyManagement> | |||