I'm still not 100% successful on the unit test every time. Hmmn.
> -----Original Message-----
> From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]
> Sent: Tuesday, May 14, 2002 1:45 PM
> To: [EMAIL PROTECTED]
> Subject: cvs commit: jakarta-turbine-jcs/src/test/org/apache/jcs
> TestDiskCache.java
>
> jtaylor 02/05/14 10:44:40
>
> Modified: . build.xml
> src/java/org/apache/jcs/auxiliary/disk
> AbstractDiskCache.java
> src/java/org/apache/jcs/engine/control Cache.java
> src/test/org/apache/jcs TestDiskCache.java
> Log:
> Made disk cache removals immediate
>
> Also some tweaks to build.xml
>
> Revision Changes Path
> 1.6 +5 -5 jakarta-turbine-jcs/build.xml
>
> Index: build.xml
> ===================================================================
> RCS file: /home/cvs/jakarta-turbine-jcs/build.xml,v
> retrieving revision 1.5
> retrieving revision 1.6
> diff -u -r1.5 -r1.6
> --- build.xml 19 Apr 2002 08:27:09 -0000 1.5
> +++ build.xml 14 May 2002 17:44:39 -0000 1.6
> @@ -21,7 +21,7 @@
>
> <!-- Copy test config files to the test build dir -->
>
> - <copy todir="target/classes">
> + <copy todir="target/test-classes">
> <fileset dir="src/test-conf"/>
> </copy>
>
> @@ -51,7 +51,7 @@
> </target>
>
> <target
> - name="maven:install-jar" depends="jcs:test-prepare">
> + name="maven:install-jar">
> <ant antfile="${maven.home}/build-maven.xml" target="install-jar"/>
> </target>
>
> @@ -71,7 +71,7 @@
> </target>
>
> <target
> - name="maven:run-singletest">
> + name="maven:run-singletest" depends="jcs:test-prepare">
> <ant antfile="${maven.home}/build-test.xml" target="run-
> singletest"/>
> </target>
>
> @@ -86,7 +86,7 @@
> </target>
>
> <target
> - name="maven:dist">
> + name="maven:dist" depends="jcs:test-prepare">
> <ant antfile="${maven.home}/build-maven.xml" target="dist"/>
> </target>
>
> @@ -106,7 +106,7 @@
> </target>
>
> <target
> - name="maven:compile">
> + name="maven:compile" depends="jcs:test-prepare">
> <ant antfile="${maven.home}/build-maven.xml" target="compile"/>
> </target>
>
>
>
>
> 1.4 +5 -23 jakarta-turbine-
> jcs/src/java/org/apache/jcs/auxiliary/disk/AbstractDiskCache.java
>
> Index: AbstractDiskCache.java
> ===================================================================
> RCS file: /home/cvs/jakarta-turbine-
> jcs/src/java/org/apache/jcs/auxiliary/disk/AbstractDiskCache.java,v
> retrieving revision 1.3
> retrieving revision 1.4
> diff -u -r1.3 -r1.4
> --- AbstractDiskCache.java 10 Apr 2002 15:00:59 -0000 1.3
> +++ AbstractDiskCache.java 14 May 2002 17:44:40 -0000 1.4
> @@ -87,7 +87,7 @@
> *
> * @author <a href="mailto:[EMAIL PROTECTED]";>Aaron Smuts</a>
> * @author <a href="mailto:[EMAIL PROTECTED]";>James Taylor</a>
> - * @version $Id: AbstractDiskCache.java,v 1.3 2002/04/10 15:00:59
> jtaylor Exp $
> + * @version $Id: AbstractDiskCache.java,v 1.4 2002/05/14 17:44:40
> jtaylor Exp $
> */
> public abstract class AbstractDiskCache implements AuxiliaryCache,
> Serializable
> {
> @@ -258,18 +258,9 @@
>
> purgatory.remove( key );
>
> - // Queue removal for persistent store
> + // Remove from persistent store immediately
>
> - try
> - {
> - cacheEventQueue.addRemoveEvent( key );
> - }
> - catch ( IOException e )
> - {
> - log.error( e );
> -
> - cacheEventQueue.destroy();
> - }
> + doRemove( key );
>
> return false;
> }
> @@ -283,18 +274,9 @@
>
> purgatory = new Hashtable();
>
> - // Queue a remove all for the persistent store
> + // Remove all from persistent store immediately
>
> - try
> - {
> - cacheEventQueue.addRemoveAllEvent();
> - }
> - catch ( IOException e )
> - {
> - log.error( e );
> -
> - cacheEventQueue.destroy();
> - }
> + doRemoveAll();
> }
>
> /**
>
>
>
> 1.10 +3 -3 jakarta-turbine-
> jcs/src/java/org/apache/jcs/engine/control/Cache.java
>
> Index: Cache.java
> ===================================================================
> RCS file: /home/cvs/jakarta-turbine-
> jcs/src/java/org/apache/jcs/engine/control/Cache.java,v
> retrieving revision 1.9
> retrieving revision 1.10
> diff -u -r1.9 -r1.10
> --- Cache.java 14 May 2002 16:43:18 -0000 1.9
> +++ Cache.java 14 May 2002 17:44:40 -0000 1.10
> @@ -92,7 +92,7 @@
> *@author <a href="mailto:[EMAIL PROTECTED]";>Aaron Smuts</a>
> *@author <a href="mailto:[EMAIL PROTECTED]";>James Taylor</a>
> *@created May 13, 2002
> - *@version $Id: Cache.java,v 1.9 2002/05/14 16:43:18 asmuts Exp $
> + *@version $Id: Cache.java,v 1.10 2002/05/14 17:44:40 jtaylor Exp $
> */
> public class Cache
> implements ICache, ICompositeCache, Serializable
> @@ -678,9 +678,9 @@
> if ( maxLifeSeconds != -1
> && ( now - createTime ) > ( maxLifeSeconds * 1000
> ) )
> {
> - if ( log.isInfoEnabled() )
> + if ( log.isDebugEnabled() )
> {
> - log.info( "Exceeded maxLife: " +
> element.getKey() );
> + log.debug( "Exceeded maxLife: " +
> element.getKey() );
> }
>
> remove( key );
>
>
>
> 1.4 +2 -20 jakarta-turbine-
> jcs/src/test/org/apache/jcs/TestDiskCache.java
>
> Index: TestDiskCache.java
> ===================================================================
> RCS file: /home/cvs/jakarta-turbine-
> jcs/src/test/org/apache/jcs/TestDiskCache.java,v
> retrieving revision 1.3
> retrieving revision 1.4
> diff -u -r1.3 -r1.4
> --- TestDiskCache.java 26 Apr 2002 16:11:17 -0000 1.3
> +++ TestDiskCache.java 14 May 2002 17:44:40 -0000 1.4
> @@ -64,7 +64,7 @@
> * regions for thre threads.
> *
> * @author <a href="mailto:[EMAIL PROTECTED]";>James Taylor</a>
> - * @version $Id: TestDiskCache.java,v 1.3 2002/04/26 16:11:17 jmcnally
> Exp $
> + * @version $Id: TestDiskCache.java,v 1.4 2002/05/14 17:44:40 jtaylor
> Exp $
> */
> public class TestDiskCache extends TestCase
> {
> @@ -135,24 +135,6 @@
> JCS.setConfigFilename( "/TestDiskCache.ccf" );
> }
>
> -// /**
> -// * Tests the region which uses the indexed disk cache
> -// */
> -// public void testIndexedDiskCache()
> -// throws Exception
> -// {
> -// runTestForRegion( "indexedRegion" );
> -// }
> -//
> -// /**
> -// * Tests the region which uses the indexed disk cache
> -// */
> -// public void testIndexedDiskCache2()
> -// throws Exception
> -// {
> -// runTestForRegion( "indexedRegion2" );
> -// }
> -
> /**
> * Adds items to cache, gets them, and removes them. The item count
> is more
> * than the size of the memory cache, so items should spool to
> disk.
> @@ -186,7 +168,7 @@
>
> for ( int i = 0; i <= items; i++ )
> {
> - jcs.destroy( i + ":key" );
> + jcs.remove( i + ":key" );
> }
>
> // Verify removal
>
>
>
>
> --
> To unsubscribe, e-mail: <mailto:turbine-jcs-dev-
> [EMAIL PROTECTED]>
> For additional commands, e-mail: <mailto:turbine-jcs-dev-
> [EMAIL PROTECTED]>
