From 4bcc1222e124064aae5de000178d7bdb545be3a7 Mon Sep 17 00:00:00 2001
From: Ben Alex <ben.alex@springsource.com>
Date: Tue, 21 Dec 2004 13:04:11 +0000
Subject: [PATCH] Modifications to support EH-CACHE upgrade (EH-CACHE appears
 to have changed the way the default cache configuration file gets handled).

---
 .classpath                                    |  2 +-
 core/src/test/resources/ehcache-failsafe.xml  | 52 +++++++++++++++++++
 .../org/acegisecurity/applicationContext.xml  |  3 ++
 doc/docbook/index.xml                         | 12 ++++-
 project.xml                                   |  2 +-
 5 files changed, 67 insertions(+), 4 deletions(-)
 create mode 100644 core/src/test/resources/ehcache-failsafe.xml

diff --git a/.classpath b/.classpath
index 5779e50219..9047d483ee 100644
--- a/.classpath
+++ b/.classpath
@@ -42,7 +42,6 @@
 	<classpathentry kind="var" path="MAVEN_REPO/commons-codec/jars/commons-codec-1.2.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/commons-collections/jars/commons-collections-3.1.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/commons-logging/jars/commons-logging-1.0.4.jar"/>
-	<classpathentry kind="var" path="MAVEN_REPO/ehcache/jars/ehcache-0.9.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/hsqldb/jars/hsqldb-1.7.3.0.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/oro/jars/oro-2.0.7.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/servletapi/jars/servletapi-2.3.jar"/>
@@ -52,5 +51,6 @@
 	<classpathentry kind="var" path="MAVEN_REPO/jboss/jars/jboss-jmx-3.2.1.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/jboss/jars/jbosssx-3.2.3.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/junit/jars/junit-3.8.1.jar"/>
+	<classpathentry kind="var" path="MAVEN_REPO/ehcache/jars/ehcache-1.1.jar"/>
 	<classpathentry kind="output" path="target/eclipseclasses"/>
 </classpath>
diff --git a/core/src/test/resources/ehcache-failsafe.xml b/core/src/test/resources/ehcache-failsafe.xml
new file mode 100644
index 0000000000..0f4b17031e
--- /dev/null
+++ b/core/src/test/resources/ehcache-failsafe.xml
@@ -0,0 +1,52 @@
+<ehcache>
+
+    <!-- Sets the path to the directory where cache .data files are created.
+
+         If the path is a Java System Property it is replaced by
+         its value in the running VM.
+
+         The following properties are translated:
+         user.home - User's home directory
+         user.dir - User's current working directory
+         java.io.tmpdir - Default temp file path -->
+    <diskStore path="java.io.tmpdir"/>
+
+
+    <!--Default Cache configuration. These will applied to caches programmatically created through
+        the CacheManager.
+
+        The following attributes are required:
+
+        maxElementsInMemory            - Sets the maximum number of objects that will be created in memory
+        eternal                        - Sets whether elements are eternal. If eternal,  timeouts are ignored and the
+                                         element is never expired.
+        overflowToDisk                 - Sets whether elements can overflow to disk when the in-memory cache
+                                         has reached the maxInMemory limit.
+
+        The following attributes are optional:
+        timeToIdleSeconds              - Sets the time to idle for an element before it expires.
+                                         i.e. The maximum amount of time between accesses before an element expires
+                                         Is only used if the element is not eternal.
+                                         Optional attribute. A value of 0 means that an Element can idle for infinity.
+                                         The default value is 0.
+        timeToLiveSeconds              - Sets the time to live for an element before it expires.
+                                         i.e. The maximum time between creation time and when an element expires.
+                                         Is only used if the element is not eternal.
+                                         Optional attribute. A value of 0 means that and Element can live for infinity.
+                                         The default value is 0.
+        diskPersistent                 - Whether the disk store persists between restarts of the Virtual Machine.
+                                         The default value is false.
+        diskExpiryThreadIntervalSeconds- The number of seconds between runs of the disk expiry thread. The default value
+                                         is 120 seconds.
+        -->
+
+    <defaultCache
+        maxElementsInMemory="10000"
+        eternal="false"
+        overflowToDisk="true"
+        timeToIdleSeconds="120"
+        timeToLiveSeconds="120"
+        diskPersistent="false"
+        diskExpiryThreadIntervalSeconds="120"
+        />
+</ehcache>
diff --git a/core/src/test/resources/org/acegisecurity/applicationContext.xml b/core/src/test/resources/org/acegisecurity/applicationContext.xml
index a59ee01240..f350e0dfeb 100644
--- a/core/src/test/resources/org/acegisecurity/applicationContext.xml
+++ b/core/src/test/resources/org/acegisecurity/applicationContext.xml
@@ -28,6 +28,9 @@
 
    <!-- Setup a cache we can use in tests of the caching layer -->
    <bean id="cacheManager" class="org.springframework.cache.ehcache.EhCacheManagerFactoryBean">
+      <property name="configLocation">
+         <value>classpath:/ehcache-failsafe.xml</value>
+      </property>
    </bean>  
 
    <bean id="eHCacheBackend" class="org.springframework.cache.ehcache.EhCacheFactoryBean">
diff --git a/doc/docbook/index.xml b/doc/docbook/index.xml
index 4d311f36fa..490c9b10c7 100644
--- a/doc/docbook/index.xml
+++ b/doc/docbook/index.xml
@@ -1211,7 +1211,11 @@ public aspect DomainObjectInstanceSecurityAspect implements InitializingBean {
   &lt;property name="userCache"&gt;&lt;ref bean="userCache"/&gt;&lt;/property&gt;
 &lt;/bean&gt;
 
-&lt;bean id="cacheManager" class="org.springframework.cache.ehcache.EhCacheManagerFactoryBean"/&gt;
+&lt;bean id="cacheManager" class="org.springframework.cache.ehcache.EhCacheManagerFactoryBean"&gt;
+  &lt;property name="configLocation"&gt;
+    &lt;value&gt;classpath:/ehcache-failsafe.xml&lt;/value&gt;
+  &lt;/property&gt;
+&lt;/bean&gt;
     
 &lt;bean id="userCacheBackend" class="org.springframework.cache.ehcache.EhCacheFactoryBean"&gt;
   &lt;property name="cacheManager"&gt;
@@ -3414,7 +3418,11 @@ $CATALINA_HOME/bin/startup.sh</programlisting></para>
   &lt;!-- &lt;property name="trustStore"&gt;&lt;value&gt;/some/path/to/your/lib/security/cacerts&lt;/value&gt;&lt;/property&gt; --&gt;
 &lt;/bean&gt;
 
-&lt;bean id="cacheManager" class="org.springframework.cache.ehcache.EhCacheManagerFactoryBean"/&gt;
+&lt;bean id="cacheManager" class="org.springframework.cache.ehcache.EhCacheManagerFactoryBean"&gt;
+  &lt;property name="configLocation"&gt;
+    &lt;value&gt;classpath:/ehcache-failsafe.xml&lt;/value&gt;
+  &lt;/property&gt;
+&lt;/bean&gt;
     
 &lt;bean id="ticketCacheBackend" class="org.springframework.cache.ehcache.EhCacheFactoryBean"&gt;
   &lt;property name="cacheManager"&gt;
diff --git a/project.xml b/project.xml
index 06cb790e3d..9496499dbe 100644
--- a/project.xml
+++ b/project.xml
@@ -137,7 +137,7 @@
     <dependency>
       <groupId>ehcache</groupId>
       <artifactId>ehcache</artifactId>
-      <version>0.9</version>
+      <version>1.1</version>
       <type>jar</type>
       <url>http://ehcache.sourceforge.net</url>
       <properties>