You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by tv...@apache.org on 2014/01/06 18:01:52 UTC

svn commit: r1555918 [4/4] - in /commons/proper/jcs/trunk/src: changes/ java/org/apache/commons/jcs/ java/org/apache/commons/jcs/access/ java/org/apache/commons/jcs/access/behavior/ java/org/apache/commons/jcs/auxiliary/ java/org/apache/commons/jcs/aux...

Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/http/server/RemoteCacheServiceAdaptorUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/http/server/RemoteCacheServiceAdaptorUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/http/server/RemoteCacheServiceAdaptorUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/http/server/RemoteCacheServiceAdaptorUnitTest.java Mon Jan  6 17:01:48 2014
@@ -25,7 +25,6 @@ import java.util.Set;
 import junit.framework.TestCase;
 
 import org.apache.commons.jcs.auxiliary.remote.MockRemoteCacheService;
-import org.apache.commons.jcs.auxiliary.remote.http.server.RemoteCacheServiceAdaptor;
 import org.apache.commons.jcs.auxiliary.remote.util.RemoteCacheRequestFactory;
 import org.apache.commons.jcs.auxiliary.remote.value.RemoteCacheRequest;
 import org.apache.commons.jcs.auxiliary.remote.value.RemoteCacheResponse;

Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/http/server/RemoteHttpCacheServiceUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/http/server/RemoteHttpCacheServiceUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/http/server/RemoteHttpCacheServiceUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/http/server/RemoteHttpCacheServiceUnitTest.java Mon Jan  6 17:01:48 2014
@@ -24,8 +24,6 @@ import java.util.HashSet;
 import junit.framework.TestCase;
 
 import org.apache.commons.jcs.auxiliary.MockCacheEventLogger;
-import org.apache.commons.jcs.auxiliary.remote.http.server.RemoteHttpCacheServerAttributes;
-import org.apache.commons.jcs.auxiliary.remote.http.server.RemoteHttpCacheService;
 import org.apache.commons.jcs.engine.CacheElement;
 import org.apache.commons.jcs.engine.control.MockCompositeCacheManager;
 

Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/http/server/RemoteHttpCacheSeviceFactoryUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/http/server/RemoteHttpCacheSeviceFactoryUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/http/server/RemoteHttpCacheSeviceFactoryUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/http/server/RemoteHttpCacheSeviceFactoryUnitTest.java Mon Jan  6 17:01:48 2014
@@ -25,9 +25,6 @@ import junit.framework.TestCase;
 
 import org.apache.commons.jcs.auxiliary.AuxiliaryCacheConfigurator;
 import org.apache.commons.jcs.auxiliary.remote.http.behavior.IRemoteHttpCacheConstants;
-import org.apache.commons.jcs.auxiliary.remote.http.server.RemoteHttpCacheServerAttributes;
-import org.apache.commons.jcs.auxiliary.remote.http.server.RemoteHttpCacheService;
-import org.apache.commons.jcs.auxiliary.remote.http.server.RemoteHttpCacheSeviceFactory;
 import org.apache.commons.jcs.engine.control.MockCompositeCacheManager;
 import org.apache.commons.jcs.engine.logging.MockCacheEventLogger;
 

Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/server/BasicRemoteCacheClientServerUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/server/BasicRemoteCacheClientServerUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/server/BasicRemoteCacheClientServerUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/server/BasicRemoteCacheClientServerUnitTest.java Mon Jan  6 17:01:48 2014
@@ -26,7 +26,6 @@ import org.apache.commons.jcs.auxiliary.
 import org.apache.commons.jcs.auxiliary.remote.MockRemoteCacheListener;
 import org.apache.commons.jcs.auxiliary.remote.RemoteCacheAttributes;
 import org.apache.commons.jcs.auxiliary.remote.RemoteCacheManager;
-import org.apache.commons.jcs.auxiliary.remote.server.RemoteCacheServer;
 import org.apache.commons.jcs.engine.CacheElement;
 import org.apache.commons.jcs.engine.behavior.ICacheElement;
 import org.apache.commons.jcs.engine.control.MockCompositeCacheManager;

Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/server/RegistryKeepAliveRunnerUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/server/RegistryKeepAliveRunnerUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/server/RegistryKeepAliveRunnerUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/server/RegistryKeepAliveRunnerUnitTest.java Mon Jan  6 17:01:48 2014
@@ -3,7 +3,6 @@ package org.apache.commons.jcs.auxiliary
 import junit.framework.TestCase;
 
 import org.apache.commons.jcs.auxiliary.MockCacheEventLogger;
-import org.apache.commons.jcs.auxiliary.remote.server.RegistryKeepAliveRunner;
 
 /** Unit tests for the registry keep alive runner. */
 public class RegistryKeepAliveRunnerUnitTest

Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheServerAttributesUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheServerAttributesUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheServerAttributesUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheServerAttributesUnitTest.java Mon Jan  6 17:01:48 2014
@@ -21,7 +21,6 @@ package org.apache.commons.jcs.auxiliary
 
 import junit.framework.TestCase;
 
-import org.apache.commons.jcs.auxiliary.remote.server.RemoteCacheServerAttributes;
 import org.apache.commons.jcs.auxiliary.remote.server.behavior.RemoteType;
 
 /**

Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheServerFactoryUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheServerFactoryUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheServerFactoryUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheServerFactoryUnitTest.java Mon Jan  6 17:01:48 2014
@@ -6,9 +6,6 @@ import java.util.Properties;
 import junit.framework.TestCase;
 
 import org.apache.commons.jcs.auxiliary.remote.behavior.IRemoteCacheConstants;
-import org.apache.commons.jcs.auxiliary.remote.server.RemoteCacheServerAttributes;
-import org.apache.commons.jcs.auxiliary.remote.server.RemoteCacheServerFactory;
-import org.apache.commons.jcs.auxiliary.remote.server.TimeoutConfigurableRMIScoketFactory;
 
 /** Unit tests for the factory */
 public class RemoteCacheServerFactoryUnitTest

Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheServerStartupUtil.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheServerStartupUtil.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheServerStartupUtil.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheServerStartupUtil.java Mon Jan  6 17:01:48 2014
@@ -27,8 +27,6 @@ import java.rmi.RemoteException;
 import java.rmi.registry.LocateRegistry;
 import java.util.Properties;
 
-import org.apache.commons.jcs.auxiliary.remote.server.RemoteCacheServer;
-import org.apache.commons.jcs.auxiliary.remote.server.RemoteCacheServerFactory;
 import org.apache.commons.jcs.utils.props.PropertyLoader;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheServerUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheServerUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheServerUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheServerUnitTest.java Mon Jan  6 17:01:48 2014
@@ -27,8 +27,6 @@ import junit.framework.TestCase;
 
 import org.apache.commons.jcs.auxiliary.MockCacheEventLogger;
 import org.apache.commons.jcs.auxiliary.remote.MockRemoteCacheListener;
-import org.apache.commons.jcs.auxiliary.remote.server.RemoteCacheServer;
-import org.apache.commons.jcs.auxiliary.remote.server.RemoteCacheServerAttributes;
 import org.apache.commons.jcs.auxiliary.remote.server.behavior.IRemoteCacheServerAttributes;
 import org.apache.commons.jcs.auxiliary.remote.server.behavior.RemoteType;
 import org.apache.commons.jcs.engine.CacheElement;

Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/server/TimeoutConfigurableRMIScoketFactoryUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/server/TimeoutConfigurableRMIScoketFactoryUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/server/TimeoutConfigurableRMIScoketFactoryUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/server/TimeoutConfigurableRMIScoketFactoryUnitTest.java Mon Jan  6 17:01:48 2014
@@ -4,8 +4,6 @@ import java.io.IOException;
 import java.net.ServerSocket;
 import java.net.Socket;
 
-import org.apache.commons.jcs.auxiliary.remote.server.TimeoutConfigurableRMIScoketFactory;
-
 import junit.framework.TestCase;
 
 /** Unit tests for the custom factory */

Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/util/RemoteCacheRequestFactoryUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/util/RemoteCacheRequestFactoryUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/util/RemoteCacheRequestFactoryUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/util/RemoteCacheRequestFactoryUnitTest.java Mon Jan  6 17:01:48 2014
@@ -6,7 +6,6 @@ import java.util.Set;
 
 import junit.framework.TestCase;
 
-import org.apache.commons.jcs.auxiliary.remote.util.RemoteCacheRequestFactory;
 import org.apache.commons.jcs.auxiliary.remote.value.RemoteCacheRequest;
 import org.apache.commons.jcs.auxiliary.remote.value.RemoteRequestType;
 import org.apache.commons.jcs.engine.CacheElement;

Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/CacheEventQueueFactoryUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/CacheEventQueueFactoryUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/CacheEventQueueFactoryUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/CacheEventQueueFactoryUnitTest.java Mon Jan  6 17:01:48 2014
@@ -3,9 +3,6 @@ package org.apache.commons.jcs.engine;
 import junit.framework.TestCase;
 
 import org.apache.commons.jcs.auxiliary.remote.MockRemoteCacheListener;
-import org.apache.commons.jcs.engine.CacheEventQueue;
-import org.apache.commons.jcs.engine.CacheEventQueueFactory;
-import org.apache.commons.jcs.engine.PooledCacheEventQueue;
 import org.apache.commons.jcs.engine.behavior.ICacheEventQueue;
 import org.apache.commons.jcs.engine.behavior.ICacheListener;
 

Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/EventQueueConcurrentLoadTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/EventQueueConcurrentLoadTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/EventQueueConcurrentLoadTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/EventQueueConcurrentLoadTest.java Mon Jan  6 17:01:48 2014
@@ -26,8 +26,6 @@ import junit.extensions.ActiveTestSuite;
 import junit.framework.Test;
 import junit.framework.TestCase;
 
-import org.apache.commons.jcs.engine.CacheElement;
-import org.apache.commons.jcs.engine.CacheEventQueue;
 import org.apache.commons.jcs.engine.behavior.ICacheElement;
 import org.apache.commons.jcs.engine.behavior.ICacheListener;
 

Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/MockCacheEventQueue.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/MockCacheEventQueue.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/MockCacheEventQueue.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/MockCacheEventQueue.java Mon Jan  6 17:01:48 2014
@@ -3,7 +3,6 @@ package org.apache.commons.jcs.engine;
 import java.io.Serializable;
 
 import org.apache.commons.jcs.auxiliary.remote.MockRemoteCacheListener;
-import org.apache.commons.jcs.engine.CacheEventQueue;
 
 /** For testing the factory */
 public class MockCacheEventQueue<K extends Serializable, V extends Serializable>

Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/MockCacheServiceNonLocal.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/MockCacheServiceNonLocal.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/MockCacheServiceNonLocal.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/MockCacheServiceNonLocal.java Mon Jan  6 17:01:48 2014
@@ -75,24 +75,14 @@ public class MockCacheServiceNonLocal<K 
 
     /**
      * @param cacheName
-     * @param groupName
      * @return empty set
      */
-    public Set<K> getGroupKeys( String cacheName, String groupName )
+    public Set<K> getKeySet( String cacheName )
     {
         return new HashSet<K>();
     }
 
     /**
-     * @param cacheName
-     * @return empty set
-     */
-    public Set<String> getGroupNames(String cacheName) throws IOException
-    {
-        return new HashSet<String>();
-    }
-
-    /**
      * Set the last remove key.
      * <p>
      * @param cacheName

Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/SystemPropertyUsageUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/SystemPropertyUsageUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/SystemPropertyUsageUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/SystemPropertyUsageUnitTest.java Mon Jan  6 17:01:48 2014
@@ -24,6 +24,7 @@ import java.util.Properties;
 import junit.framework.TestCase;
 
 import org.apache.commons.jcs.JCS;
+import org.apache.commons.jcs.access.CacheAccess;
 import org.apache.commons.jcs.engine.control.CompositeCacheManager;
 import org.apache.commons.jcs.utils.props.PropertyLoader;
 
@@ -46,7 +47,7 @@ public class SystemPropertyUsageUnitTest
 
         JCS.setConfigFilename( "/TestSystemPropertyUsage.ccf" );
 
-        JCS<String, String> jcs = JCS.getInstance( "someCacheNotInFile" );
+        CacheAccess<String, String> jcs = JCS.getInstance( "someCacheNotInFile" );
 
         assertEquals( "System property value is not reflected", jcs.getCacheAttributes().getMaxObjects(), Integer
             .parseInt( "6789" ) );
@@ -70,7 +71,7 @@ public class SystemPropertyUsageUnitTest
 
         mgr.configure( props, false );
 
-        JCS<String, String> jcs = JCS.getInstance( "someCacheNotInFile" );
+        CacheAccess<String, String> jcs = JCS.getInstance( "someCacheNotInFile" );
 
         assertFalse( "System property value should not be reflected",
                      jcs.getCacheAttributes().getMaxObjects() == Integer.parseInt( props

Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/ZombieCacheServiceNonLocalUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/ZombieCacheServiceNonLocalUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/ZombieCacheServiceNonLocalUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/ZombieCacheServiceNonLocalUnitTest.java Mon Jan  6 17:01:48 2014
@@ -21,8 +21,6 @@ package org.apache.commons.jcs.engine;
 
 import junit.framework.TestCase;
 
-import org.apache.commons.jcs.engine.CacheElement;
-import org.apache.commons.jcs.engine.ZombieCacheServiceNonLocal;
 import org.apache.commons.jcs.engine.behavior.ICacheElement;
 
 /**

Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/control/CacheManagerStatsUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/control/CacheManagerStatsUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/control/CacheManagerStatsUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/control/CacheManagerStatsUnitTest.java Mon Jan  6 17:01:48 2014
@@ -22,7 +22,7 @@ package org.apache.commons.jcs.engine.co
 import junit.framework.TestCase;
 
 import org.apache.commons.jcs.JCS;
-import org.apache.commons.jcs.engine.control.CompositeCacheManager;
+import org.apache.commons.jcs.access.CacheAccess;
 import org.apache.commons.jcs.engine.stats.behavior.ICacheStats;
 
 /**
@@ -40,7 +40,7 @@ public class CacheManagerStatsUnitTest
      */
     public void testSimpleGetStats() throws Exception
     {
-        JCS<String, String> cache = JCS.getInstance( "testCache1" );
+        CacheAccess<String, String> cache = JCS.getInstance( "testCache1" );
 
         // 1 miss, 1 hit, 1 put
         cache.get( "testKey" );

Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/control/CompositeCacheConfiguratorUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/control/CompositeCacheConfiguratorUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/control/CompositeCacheConfiguratorUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/control/CompositeCacheConfiguratorUnitTest.java Mon Jan  6 17:01:48 2014
@@ -9,9 +9,6 @@ import org.apache.commons.jcs.auxiliary.
 import org.apache.commons.jcs.auxiliary.MockAuxiliaryCache;
 import org.apache.commons.jcs.auxiliary.MockAuxiliaryCacheAttributes;
 import org.apache.commons.jcs.auxiliary.MockAuxiliaryCacheFactory;
-import org.apache.commons.jcs.engine.control.CompositeCache;
-import org.apache.commons.jcs.engine.control.CompositeCacheConfigurator;
-import org.apache.commons.jcs.engine.control.CompositeCacheManager;
 import org.apache.commons.jcs.engine.logging.MockCacheEventLogger;
 
 /** Unit tests for the configurator. */

Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/control/CompositeCacheDiskUsageUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/control/CompositeCacheDiskUsageUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/control/CompositeCacheDiskUsageUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/control/CompositeCacheDiskUsageUnitTest.java Mon Jan  6 17:01:48 2014
@@ -29,6 +29,7 @@ import java.util.Set;
 import junit.framework.TestCase;
 
 import org.apache.commons.jcs.JCS;
+import org.apache.commons.jcs.access.CacheAccess;
 import org.apache.commons.jcs.access.exception.CacheException;
 import org.apache.commons.jcs.auxiliary.AbstractAuxiliaryCache;
 import org.apache.commons.jcs.auxiliary.AuxiliaryCache;
@@ -38,11 +39,10 @@ import org.apache.commons.jcs.engine.Cac
 import org.apache.commons.jcs.engine.CompositeCacheAttributes;
 import org.apache.commons.jcs.engine.ElementAttributes;
 import org.apache.commons.jcs.engine.behavior.ICacheElement;
+import org.apache.commons.jcs.engine.behavior.ICacheType.CacheType;
 import org.apache.commons.jcs.engine.behavior.ICompositeCacheAttributes;
 import org.apache.commons.jcs.engine.behavior.IElementAttributes;
 import org.apache.commons.jcs.engine.behavior.IElementSerializer;
-import org.apache.commons.jcs.engine.behavior.ICacheType.CacheType;
-import org.apache.commons.jcs.engine.control.CompositeCache;
 import org.apache.commons.jcs.engine.logging.behavior.ICacheEventLogger;
 import org.apache.commons.jcs.engine.stats.behavior.IStats;
 
@@ -71,7 +71,7 @@ public class CompositeCacheDiskUsageUnit
     public void testSwapConfig()
         throws CacheException
     {
-        JCS<String, String> swap = JCS.getInstance( "Swap" );
+        CacheAccess<String, String> swap = JCS.getInstance( "Swap" );
         assertEquals( ICompositeCacheAttributes.DiskUsagePattern.SWAP, swap.getCacheAttributes()
             .getDiskUsagePattern() );
     }
@@ -84,7 +84,7 @@ public class CompositeCacheDiskUsageUnit
     public void testUpdateConfig()
         throws CacheException
     {
-        JCS<String, String> swap = JCS.getInstance( "Update" );
+        CacheAccess<String, String> swap = JCS.getInstance( "Update" );
         assertEquals( ICompositeCacheAttributes.DiskUsagePattern.UPDATE, swap.getCacheAttributes()
             .getDiskUsagePattern() );
     }
@@ -406,21 +406,10 @@ public class CompositeCacheDiskUsageUnit
         }
 
         /**
-         * @param group
          * @return null
          * @throws IOException
          */
-        public Set<K> getGroupKeys( String group )
-            throws IOException
-        {
-            return null;
-        }
-        
-        /**
-         * @return null
-         * @throws IOException
-         */
-        public Set<String> getGroupNames()
+        public Set<K> getKeySet( )
             throws IOException
         {
             return null;
@@ -496,7 +485,7 @@ public class CompositeCacheDiskUsageUnit
             return Collections.emptyMap();
         }
 
-		
+
     }
 
 }

Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/control/CompositeCacheUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/control/CompositeCacheUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/control/CompositeCacheUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/control/CompositeCacheUnitTest.java Mon Jan  6 17:01:48 2014
@@ -30,10 +30,9 @@ import org.apache.commons.jcs.engine.Cac
 import org.apache.commons.jcs.engine.CompositeCacheAttributes;
 import org.apache.commons.jcs.engine.ElementAttributes;
 import org.apache.commons.jcs.engine.behavior.ICacheElement;
+import org.apache.commons.jcs.engine.behavior.ICacheType.CacheType;
 import org.apache.commons.jcs.engine.behavior.ICompositeCacheAttributes;
 import org.apache.commons.jcs.engine.behavior.IElementAttributes;
-import org.apache.commons.jcs.engine.behavior.ICacheType.CacheType;
-import org.apache.commons.jcs.engine.control.CompositeCache;
 import org.apache.commons.jcs.engine.memory.MockMemoryCache;
 
 /**

Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/control/MockCompositeCacheManager.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/control/MockCompositeCacheManager.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/control/MockCompositeCacheManager.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/control/MockCompositeCacheManager.java Mon Jan  6 17:01:48 2014
@@ -25,7 +25,6 @@ import java.util.Properties;
 import org.apache.commons.jcs.engine.CompositeCacheAttributes;
 import org.apache.commons.jcs.engine.ElementAttributes;
 import org.apache.commons.jcs.engine.behavior.ICompositeCacheManager;
-import org.apache.commons.jcs.engine.control.CompositeCache;
 
 /** For testing. */
 public class MockCompositeCacheManager

Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/control/event/SimpleEventHandlingUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/control/event/SimpleEventHandlingUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/control/event/SimpleEventHandlingUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/control/event/SimpleEventHandlingUnitTest.java Mon Jan  6 17:01:48 2014
@@ -22,6 +22,7 @@ package org.apache.commons.jcs.engine.co
 import junit.framework.TestCase;
 
 import org.apache.commons.jcs.JCS;
+import org.apache.commons.jcs.access.CacheAccess;
 import org.apache.commons.jcs.engine.behavior.IElementAttributes;
 import org.apache.commons.jcs.engine.control.event.behavior.ElementEventType;
 import org.apache.commons.jcs.engine.control.event.behavior.IElementEvent;
@@ -56,7 +57,7 @@ public class SimpleEventHandlingUnitTest
         // SETUP
         MyEventHandler meh = new MyEventHandler();
 
-        JCS<String, String> jcs = JCS.getInstance( "WithDisk" );
+        CacheAccess<String, String> jcs = JCS.getInstance( "WithDisk" );
         // this should add the event handler to all items as they are created.
         IElementAttributes attributes = jcs.getDefaultElementAttributes();
         attributes.addElementEventHandler( meh );
@@ -86,7 +87,7 @@ public class SimpleEventHandlingUnitTest
     public void testSpoolNoDiskEvent()
         throws Exception
     {
-        JCS<String, String> jcs = JCS.getInstance( "NoDisk" );
+        CacheAccess<String, String> jcs = JCS.getInstance( "NoDisk" );
 
         MyEventHandler meh = new MyEventHandler();
 
@@ -119,7 +120,7 @@ public class SimpleEventHandlingUnitTest
     {
         MyEventHandler meh = new MyEventHandler();
 
-        JCS<String, String> jcs = JCS.getInstance( "DiskButNotAllowed" );
+        CacheAccess<String, String> jcs = JCS.getInstance( "DiskButNotAllowed" );
         // this should add the event handler to all items as they are created.
         IElementAttributes attributes = jcs.getDefaultElementAttributes();
         attributes.addElementEventHandler( meh );
@@ -149,7 +150,7 @@ public class SimpleEventHandlingUnitTest
     {
         MyEventHandler meh = new MyEventHandler();
 
-        JCS<String, String> jcs = JCS.getInstance( "DiskButNotAllowed" );
+        CacheAccess<String, String> jcs = JCS.getInstance( "DiskButNotAllowed" );
         // this should add the event handler to all items as they are created.
         //IElementAttributes attributes = jcs.getDefaultElementAttributes();
         //attributes.addElementEventHandler( meh );

Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/logging/CacheEventLoggerDebugLoggerUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/logging/CacheEventLoggerDebugLoggerUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/logging/CacheEventLoggerDebugLoggerUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/logging/CacheEventLoggerDebugLoggerUnitTest.java Mon Jan  6 17:01:48 2014
@@ -4,7 +4,6 @@ import java.io.StringWriter;
 
 import junit.framework.TestCase;
 
-import org.apache.commons.jcs.engine.logging.CacheEventLoggerDebugLogger;
 import org.apache.commons.jcs.engine.logging.behavior.ICacheEvent;
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;

Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/logging/MockCacheEventLogger.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/logging/MockCacheEventLogger.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/logging/MockCacheEventLogger.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/logging/MockCacheEventLogger.java Mon Jan  6 17:01:48 2014
@@ -2,7 +2,6 @@ package org.apache.commons.jcs.engine.lo
 
 import java.io.Serializable;
 
-import org.apache.commons.jcs.engine.logging.CacheEvent;
 import org.apache.commons.jcs.engine.logging.behavior.ICacheEvent;
 import org.apache.commons.jcs.engine.logging.behavior.ICacheEventLogger;
 

Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/match/KeyMatcherPatternImpllUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/match/KeyMatcherPatternImpllUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/match/KeyMatcherPatternImpllUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/match/KeyMatcherPatternImpllUnitTest.java Mon Jan  6 17:01:48 2014
@@ -3,8 +3,6 @@ package org.apache.commons.jcs.engine.ma
 import java.util.HashSet;
 import java.util.Set;
 
-import org.apache.commons.jcs.engine.match.KeyMatcherPatternImpl;
-
 import junit.framework.TestCase;
 
 /** Unit tests for the key matcher. */

Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/memory/fifo/FIFOMemoryCacheUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/memory/fifo/FIFOMemoryCacheUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/memory/fifo/FIFOMemoryCacheUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/memory/fifo/FIFOMemoryCacheUnitTest.java Mon Jan  6 17:01:48 2014
@@ -9,7 +9,6 @@ import org.apache.commons.jcs.engine.Com
 import org.apache.commons.jcs.engine.ElementAttributes;
 import org.apache.commons.jcs.engine.behavior.ICompositeCacheAttributes;
 import org.apache.commons.jcs.engine.control.CompositeCache;
-import org.apache.commons.jcs.engine.memory.fifo.FIFOMemoryCache;
 
 /** Unit tests for the fifo implementation. */
 public class FIFOMemoryCacheUnitTest

Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/memory/lru/LHMLRUMemoryCacheConcurrentUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/memory/lru/LHMLRUMemoryCacheConcurrentUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/memory/lru/LHMLRUMemoryCacheConcurrentUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/memory/lru/LHMLRUMemoryCacheConcurrentUnitTest.java Mon Jan  6 17:01:48 2014
@@ -31,7 +31,6 @@ import org.apache.commons.jcs.engine.Cac
 import org.apache.commons.jcs.engine.behavior.ICacheElement;
 import org.apache.commons.jcs.engine.control.CompositeCache;
 import org.apache.commons.jcs.engine.control.CompositeCacheManager;
-import org.apache.commons.jcs.engine.memory.lru.LRUMemoryCache;
 
 /**
  * Test which exercises the LRUMemory cache. This one uses three different

Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/memory/lru/LHMLRUMemoryCacheUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/memory/lru/LHMLRUMemoryCacheUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/memory/lru/LHMLRUMemoryCacheUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/memory/lru/LHMLRUMemoryCacheUnitTest.java Mon Jan  6 17:01:48 2014
@@ -26,12 +26,12 @@ import java.util.Set;
 import junit.framework.TestCase;
 
 import org.apache.commons.jcs.JCS;
+import org.apache.commons.jcs.access.CacheAccess;
 import org.apache.commons.jcs.access.exception.CacheException;
 import org.apache.commons.jcs.engine.CacheElement;
 import org.apache.commons.jcs.engine.behavior.ICacheElement;
 import org.apache.commons.jcs.engine.control.CompositeCache;
 import org.apache.commons.jcs.engine.control.CompositeCacheManager;
-import org.apache.commons.jcs.engine.memory.lru.LHMLRUMemoryCache;
 
 /**
  * Tests for the test LHMLRU implementation.
@@ -57,7 +57,7 @@ public class LHMLRUMemoryCacheUnitTest
     public void testLoadFromCCF()
         throws CacheException
     {
-        JCS<String, String> cache = JCS.getInstance( "testPutGet" );
+        CacheAccess<String, String> cache = JCS.getInstance( "testPutGet" );
         String memoryCacheName = cache.getCacheAttributes().getMemoryCacheName();
         assertTrue( "Cache name should have LHMLRU in it.", memoryCacheName.indexOf( "LHMLRUMemoryCache" ) != -1 );
     }
@@ -70,7 +70,7 @@ public class LHMLRUMemoryCacheUnitTest
     public void testPutGetThroughHub()
         throws CacheException
     {
-        JCS<String, String> cache = JCS.getInstance( "testPutGetThroughHub" );
+        CacheAccess<String, String> cache = JCS.getInstance( "testPutGetThroughHub" );
 
         int max = cache.getCacheAttributes().getMaxObjects();
         int items = max * 2;
@@ -123,7 +123,7 @@ public class LHMLRUMemoryCacheUnitTest
     public void testPutGetThroughHubTwice()
         throws CacheException
     {
-        JCS<String, String> cache = JCS.getInstance( "testPutGetThroughHub" );
+        CacheAccess<String, String> cache = JCS.getInstance( "testPutGetThroughHub" );
 
         int max = cache.getCacheAttributes().getMaxObjects();
         int items = max * 2;
@@ -163,7 +163,7 @@ public class LHMLRUMemoryCacheUnitTest
     public void testPutRemoveThroughHub()
         throws CacheException
     {
-        JCS<String, String> cache = JCS.getInstance( "testPutGetThroughHub" );
+        CacheAccess<String, String> cache = JCS.getInstance( "testPutGetThroughHub" );
 
         int max = cache.getCacheAttributes().getMaxObjects();
         int items = max * 2;
@@ -194,7 +194,7 @@ public class LHMLRUMemoryCacheUnitTest
     public void testClearThroughHub()
         throws CacheException
     {
-        JCS<String, String> cache = JCS.getInstance( "testPutGetThroughHub" );
+        CacheAccess<String, String> cache = JCS.getInstance( "testPutGetThroughHub" );
 
         int max = cache.getCacheAttributes().getMaxObjects();
         int items = max * 2;
@@ -222,7 +222,7 @@ public class LHMLRUMemoryCacheUnitTest
     public void testGetStatsThroughHub()
         throws CacheException
     {
-        JCS<String, String> cache = JCS.getInstance( "testGetStatsThroughHub" );
+        CacheAccess<String, String> cache = JCS.getInstance( "testGetStatsThroughHub" );
 
         int max = cache.getCacheAttributes().getMaxObjects();
         int items = max * 2;
@@ -279,7 +279,7 @@ public class LHMLRUMemoryCacheUnitTest
     public void testRemovePartialThroughHub()
         throws CacheException
     {
-        JCS<String, String> cache = JCS.getInstance( "testGetStatsThroughHub" );
+        CacheAccess<String, String> cache = JCS.getInstance( "testGetStatsThroughHub" );
 
         int max = cache.getCacheAttributes().getMaxObjects();
         int items = max / 2;

Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/memory/lru/LRUMemoryCacheConcurrentUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/memory/lru/LRUMemoryCacheConcurrentUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/memory/lru/LRUMemoryCacheConcurrentUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/memory/lru/LRUMemoryCacheConcurrentUnitTest.java Mon Jan  6 17:01:48 2014
@@ -31,7 +31,6 @@ import org.apache.commons.jcs.engine.Cac
 import org.apache.commons.jcs.engine.behavior.ICacheElement;
 import org.apache.commons.jcs.engine.control.CompositeCache;
 import org.apache.commons.jcs.engine.control.CompositeCacheManager;
-import org.apache.commons.jcs.engine.memory.lru.LRUMemoryCache;
 
 /**
  * Test which exercises the LRUMemory cache. This one uses three different

Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/memory/mru/LRUvsMRUPerformanceTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/memory/mru/LRUvsMRUPerformanceTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/memory/mru/LRUvsMRUPerformanceTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/memory/mru/LRUvsMRUPerformanceTest.java Mon Jan  6 17:01:48 2014
@@ -22,8 +22,8 @@ package org.apache.commons.jcs.engine.me
 import junit.framework.TestCase;
 
 import org.apache.commons.jcs.JCS;
+import org.apache.commons.jcs.access.CacheAccess;
 import org.apache.commons.jcs.engine.memory.lru.LRUMemoryCache;
-import org.apache.commons.jcs.engine.memory.mru.MRUMemoryCache;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -94,8 +94,8 @@ public class LRUvsMRUPerformanceTest
         {
 
             JCS.setConfigFilename( "/TestMRUCache.ccf" );
-            JCS<String, String> cache = JCS.getInstance( "lruDefined" );
-            JCS<String, String> mru = JCS.getInstance( "mruDefined" );
+            CacheAccess<String, String> cache = JCS.getInstance( "lruDefined" );
+            CacheAccess<String, String> mru = JCS.getInstance( "mruDefined" );
 
             System.out.println( "LRU = " + cache );
 

Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/memory/mru/MRUMemoryCacheUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/memory/mru/MRUMemoryCacheUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/memory/mru/MRUMemoryCacheUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/memory/mru/MRUMemoryCacheUnitTest.java Mon Jan  6 17:01:48 2014
@@ -26,12 +26,12 @@ import java.util.Set;
 import junit.framework.TestCase;
 
 import org.apache.commons.jcs.JCS;
+import org.apache.commons.jcs.access.CacheAccess;
 import org.apache.commons.jcs.access.exception.CacheException;
 import org.apache.commons.jcs.engine.CacheElement;
 import org.apache.commons.jcs.engine.behavior.ICacheElement;
 import org.apache.commons.jcs.engine.control.CompositeCache;
 import org.apache.commons.jcs.engine.control.CompositeCacheManager;
-import org.apache.commons.jcs.engine.memory.mru.MRUMemoryCache;
 
 /**
  * Tests for the test MRU implementation.
@@ -57,7 +57,7 @@ public class MRUMemoryCacheUnitTest
     public void testLoadFromCCF()
         throws CacheException
     {
-        JCS<String, String> cache = JCS.getInstance( "testPutGet" );
+        CacheAccess<String, String> cache = JCS.getInstance( "testPutGet" );
         String memoryCacheName = cache.getCacheAttributes().getMemoryCacheName();
         assertTrue( "Cache name should have MRU in it.", memoryCacheName.indexOf( "MRUMemoryCache" ) != -1 );
     }
@@ -70,7 +70,7 @@ public class MRUMemoryCacheUnitTest
     public void testPutGetThroughHub()
         throws CacheException
     {
-        JCS<String, String> cache = JCS.getInstance( "testPutGetThroughHub" );
+        CacheAccess<String, String> cache = JCS.getInstance( "testPutGetThroughHub" );
 
         int max = cache.getCacheAttributes().getMaxObjects();
         int items = max * 2;
@@ -123,7 +123,7 @@ public class MRUMemoryCacheUnitTest
     public void testPutGetThroughHubTwice()
         throws CacheException
     {
-        JCS<String, String> cache = JCS.getInstance( "testPutGetThroughHub" );
+        CacheAccess<String, String> cache = JCS.getInstance( "testPutGetThroughHub" );
 
         int max = cache.getCacheAttributes().getMaxObjects();
         int items = max * 2;
@@ -163,7 +163,7 @@ public class MRUMemoryCacheUnitTest
     public void testPutRemoveThroughHub()
         throws CacheException
     {
-        JCS<String, String> cache = JCS.getInstance( "testPutGetThroughHub" );
+        CacheAccess<String, String> cache = JCS.getInstance( "testPutGetThroughHub" );
 
         int max = cache.getCacheAttributes().getMaxObjects();
         int items = max * 2;
@@ -194,7 +194,7 @@ public class MRUMemoryCacheUnitTest
     public void testClearThroughHub()
         throws CacheException
     {
-        JCS<String, String> cache = JCS.getInstance( "testPutGetThroughHub" );
+        CacheAccess<String, String> cache = JCS.getInstance( "testPutGetThroughHub" );
 
         int max = cache.getCacheAttributes().getMaxObjects();
         int items = max * 2;
@@ -222,7 +222,7 @@ public class MRUMemoryCacheUnitTest
     public void testGetStatsThroughHub()
         throws CacheException
     {
-        JCS<String, String> cache = JCS.getInstance( "testGetStatsThroughHub" );
+        CacheAccess<String, String> cache = JCS.getInstance( "testGetStatsThroughHub" );
 
         int max = cache.getCacheAttributes().getMaxObjects();
         int items = max * 2;
@@ -279,7 +279,7 @@ public class MRUMemoryCacheUnitTest
     public void testRemovePartialThroughHub()
         throws CacheException
     {
-        JCS<String, String> cache = JCS.getInstance( "testGetStatsThroughHub" );
+        CacheAccess<String, String> cache = JCS.getInstance( "testGetStatsThroughHub" );
 
         int max = cache.getCacheAttributes().getMaxObjects();
         int items = max / 2;

Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/memory/shrinking/ShrinkerThreadUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/memory/shrinking/ShrinkerThreadUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/memory/shrinking/ShrinkerThreadUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/memory/shrinking/ShrinkerThreadUnitTest.java Mon Jan  6 17:01:48 2014
@@ -29,7 +29,6 @@ import org.apache.commons.jcs.engine.Ele
 import org.apache.commons.jcs.engine.behavior.ICacheElement;
 import org.apache.commons.jcs.engine.control.event.ElementEventHandlerMockImpl;
 import org.apache.commons.jcs.engine.memory.MockMemoryCache;
-import org.apache.commons.jcs.engine.memory.shrinking.ShrinkerThread;
 
 /**
  * This tests the functionality of the shrinker thread.

Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/access/JCSWorkerUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/access/JCSWorkerUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/access/JCSWorkerUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/access/JCSWorkerUnitTest.java Mon Jan  6 17:01:48 2014
@@ -19,10 +19,6 @@ package org.apache.commons.jcs.utils.acc
  * under the License.
  */
 
-import org.apache.commons.jcs.utils.access.AbstractJCSWorkerHelper;
-import org.apache.commons.jcs.utils.access.JCSWorker;
-import org.apache.commons.jcs.utils.access.JCSWorkerHelper;
-
 import junit.framework.TestCase;
 
 /**

Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/date/DateFormatterUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/date/DateFormatterUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/date/DateFormatterUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/date/DateFormatterUnitTest.java Mon Jan  6 17:01:48 2014
@@ -3,8 +3,6 @@ package org.apache.commons.jcs.utils.dat
 import java.util.Calendar;
 import java.util.Date;
 
-import org.apache.commons.jcs.utils.date.DateFormatter;
-
 import junit.framework.TestCase;
 
 /** Simple tests for the date formatter utility. */

Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/date/ThreadSafeSimpleDateFormatUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/date/ThreadSafeSimpleDateFormatUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/date/ThreadSafeSimpleDateFormatUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/date/ThreadSafeSimpleDateFormatUnitTest.java Mon Jan  6 17:01:48 2014
@@ -8,7 +8,6 @@ import java.util.Random;
 
 import junit.framework.TestCase;
 
-import org.apache.commons.jcs.utils.date.ThreadSafeSimpleDateFormat;
 import org.apache.commons.jcs.utils.timing.SleepUtil;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/discovery/MockDiscoveryListener.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/discovery/MockDiscoveryListener.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/discovery/MockDiscoveryListener.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/discovery/MockDiscoveryListener.java Mon Jan  6 17:01:48 2014
@@ -22,7 +22,6 @@ package org.apache.commons.jcs.utils.dis
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.jcs.utils.discovery.DiscoveredService;
 import org.apache.commons.jcs.utils.discovery.behavior.IDiscoveryListener;
 
 /** Mock listener, for testing. */

Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/discovery/UDPDiscoverySenderUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/discovery/UDPDiscoverySenderUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/discovery/UDPDiscoverySenderUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/discovery/UDPDiscoverySenderUnitTest.java Mon Jan  6 17:01:48 2014
@@ -21,10 +21,6 @@ package org.apache.commons.jcs.utils.dis
 
 import java.util.ArrayList;
 
-import org.apache.commons.jcs.utils.discovery.UDPDiscoveryMessage;
-import org.apache.commons.jcs.utils.discovery.UDPDiscoveryReceiver;
-import org.apache.commons.jcs.utils.discovery.UDPDiscoverySender;
-
 import junit.framework.TestCase;
 
 /**

Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/discovery/UDPDiscoveryServiceUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/discovery/UDPDiscoveryServiceUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/discovery/UDPDiscoveryServiceUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/discovery/UDPDiscoveryServiceUnitTest.java Mon Jan  6 17:01:48 2014
@@ -24,9 +24,6 @@ import java.util.ArrayList;
 import junit.framework.TestCase;
 
 import org.apache.commons.jcs.auxiliary.MockCacheEventLogger;
-import org.apache.commons.jcs.utils.discovery.DiscoveredService;
-import org.apache.commons.jcs.utils.discovery.UDPDiscoveryAttributes;
-import org.apache.commons.jcs.utils.discovery.UDPDiscoveryService;
 
 /** Unit tests for the service. */
 public class UDPDiscoveryServiceUnitTest

Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/discovery/UDPDiscoveryUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/discovery/UDPDiscoveryUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/discovery/UDPDiscoveryUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/discovery/UDPDiscoveryUnitTest.java Mon Jan  6 17:01:48 2014
@@ -24,10 +24,6 @@ import java.util.ArrayList;
 import junit.framework.TestCase;
 
 import org.apache.commons.jcs.auxiliary.MockCacheEventLogger;
-import org.apache.commons.jcs.utils.discovery.UDPDiscoveryAttributes;
-import org.apache.commons.jcs.utils.discovery.UDPDiscoveryReceiver;
-import org.apache.commons.jcs.utils.discovery.UDPDiscoverySender;
-import org.apache.commons.jcs.utils.discovery.UDPDiscoveryService;
 import org.apache.commons.jcs.utils.timing.SleepUtil;
 
 /**

Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/key/KeyGeneratorUtilUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/key/KeyGeneratorUtilUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/key/KeyGeneratorUtilUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/key/KeyGeneratorUtilUnitTest.java Mon Jan  6 17:01:48 2014
@@ -7,7 +7,6 @@ import java.util.Date;
 import junit.framework.TestCase;
 
 import org.apache.commons.jcs.utils.date.DateFormatter;
-import org.apache.commons.jcs.utils.key.KeyGeneratorUtil;
 import org.apache.commons.jcs.utils.timing.SleepUtil;
 
 /**

Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/net/AddressUtilUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/net/AddressUtilUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/net/AddressUtilUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/net/AddressUtilUnitTest.java Mon Jan  6 17:01:48 2014
@@ -1,7 +1,5 @@
 package org.apache.commons.jcs.utils.net;
 
-import org.apache.commons.jcs.utils.net.AddressUtil;
-
 import junit.framework.TestCase;
 
 /**

Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/net/HostNameUtilUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/net/HostNameUtilUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/net/HostNameUtilUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/net/HostNameUtilUnitTest.java Mon Jan  6 17:01:48 2014
@@ -2,8 +2,6 @@ package org.apache.commons.jcs.utils.net
 
 import java.net.UnknownHostException;
 
-import org.apache.commons.jcs.utils.net.HostNameUtil;
-
 import junit.framework.TestCase;
 
 /** Tests for the host name util. */

Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/serialization/CompressingSerializerUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/serialization/CompressingSerializerUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/serialization/CompressingSerializerUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/serialization/CompressingSerializerUnitTest.java Mon Jan  6 17:01:48 2014
@@ -21,8 +21,6 @@ package org.apache.commons.jcs.utils.ser
 
 import java.io.IOException;
 
-import org.apache.commons.jcs.utils.serialization.CompressingSerializer;
-
 import junit.framework.TestCase;
 
 /**

Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/serialization/SerializationConversionUtilUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/serialization/SerializationConversionUtilUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/serialization/SerializationConversionUtilUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/serialization/SerializationConversionUtilUnitTest.java Mon Jan  6 17:01:48 2014
@@ -29,8 +29,6 @@ import org.apache.commons.jcs.engine.beh
 import org.apache.commons.jcs.engine.behavior.ICacheElementSerialized;
 import org.apache.commons.jcs.engine.behavior.IElementAttributes;
 import org.apache.commons.jcs.engine.behavior.IElementSerializer;
-import org.apache.commons.jcs.utils.serialization.SerializationConversionUtil;
-import org.apache.commons.jcs.utils.serialization.StandardSerializer;
 
 /**
  * Tests the serialization conversion util.

Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/serialization/StandardSerializerUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/serialization/StandardSerializerUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/serialization/StandardSerializerUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/serialization/StandardSerializerUnitTest.java Mon Jan  6 17:01:48 2014
@@ -19,8 +19,6 @@ package org.apache.commons.jcs.utils.ser
  * under the License.
  */
 
-import org.apache.commons.jcs.utils.serialization.StandardSerializer;
-
 import junit.framework.TestCase;
 
 /**

Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/struct/BoundedQueueUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/struct/BoundedQueueUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/struct/BoundedQueueUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/struct/BoundedQueueUnitTest.java Mon Jan  6 17:01:48 2014
@@ -19,8 +19,6 @@ package org.apache.commons.jcs.utils.str
  * under the License.
  */
 
-import org.apache.commons.jcs.utils.struct.BoundedQueue;
-
 import junit.framework.TestCase;
 
 /**

Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/struct/DoubleLinkedListUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/struct/DoubleLinkedListUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/struct/DoubleLinkedListUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/struct/DoubleLinkedListUnitTest.java Mon Jan  6 17:01:48 2014
@@ -5,8 +5,6 @@ import java.io.StringWriter;
 import junit.framework.TestCase;
 
 import org.apache.commons.jcs.TestLogConfigurationUtil;
-import org.apache.commons.jcs.utils.struct.DoubleLinkedList;
-import org.apache.commons.jcs.utils.struct.DoubleLinkedListNode;
 
 /** Unit tests for the double linked list. */
 public class DoubleLinkedListUnitTest

Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/struct/JCSvsCommonsLRUMapPerformanceTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/struct/JCSvsCommonsLRUMapPerformanceTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/struct/JCSvsCommonsLRUMapPerformanceTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/struct/JCSvsCommonsLRUMapPerformanceTest.java Mon Jan  6 17:01:48 2014
@@ -26,7 +26,6 @@ import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
 import org.apache.commons.jcs.JCSvsHashtablePerformanceTest;
-import org.apache.commons.jcs.utils.struct.LRUMap;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/struct/LRUMapConcurrentTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/struct/LRUMapConcurrentTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/struct/LRUMapConcurrentTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/struct/LRUMapConcurrentTest.java Mon Jan  6 17:01:48 2014
@@ -21,8 +21,6 @@ package org.apache.commons.jcs.utils.str
 
 import java.util.Iterator;
 
-import org.apache.commons.jcs.utils.struct.LRUMap;
-
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;

Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/struct/LRUMapConcurrentUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/struct/LRUMapConcurrentUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/struct/LRUMapConcurrentUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/struct/LRUMapConcurrentUnitTest.java Mon Jan  6 17:01:48 2014
@@ -21,8 +21,6 @@ package org.apache.commons.jcs.utils.str
 
 import java.util.Iterator;
 
-import org.apache.commons.jcs.utils.struct.LRUMap;
-
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;

Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/struct/LRUMapPerformanceTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/struct/LRUMapPerformanceTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/struct/LRUMapPerformanceTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/struct/LRUMapPerformanceTest.java Mon Jan  6 17:01:48 2014
@@ -26,7 +26,6 @@ import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
 import org.apache.commons.jcs.JCSvsHashtablePerformanceTest;
-import org.apache.commons.jcs.utils.struct.LRUMap;
 
 /**
  * This ensures that the jcs version of the LRU map is as fast as the commons

Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/struct/LRUMapUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/struct/LRUMapUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/struct/LRUMapUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/struct/LRUMapUnitTest.java Mon Jan  6 17:01:48 2014
@@ -23,8 +23,6 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
-import org.apache.commons.jcs.utils.struct.LRUMap;
-
 import junit.framework.TestCase;
 
 /**

Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/struct/SingleLinkedListUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/struct/SingleLinkedListUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/struct/SingleLinkedListUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/struct/SingleLinkedListUnitTest.java Mon Jan  6 17:01:48 2014
@@ -19,8 +19,6 @@ package org.apache.commons.jcs.utils.str
  * under the License.
  */
 
-import org.apache.commons.jcs.utils.struct.SingleLinkedList;
-
 import junit.framework.TestCase;
 
 /**

Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/struct/SortedPrefArrayUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/struct/SortedPrefArrayUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/struct/SortedPrefArrayUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/struct/SortedPrefArrayUnitTest.java Mon Jan  6 17:01:48 2014
@@ -19,8 +19,6 @@ package org.apache.commons.jcs.utils.str
  * under the License.
  */
 
-import org.apache.commons.jcs.utils.struct.SortedPreferentialArray;
-
 import junit.framework.TestCase;
 
 /**

Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/threadpool/ThreadPoolManagerUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/threadpool/ThreadPoolManagerUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/threadpool/ThreadPoolManagerUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/threadpool/ThreadPoolManagerUnitTest.java Mon Jan  6 17:01:48 2014
@@ -25,8 +25,6 @@ import java.util.concurrent.ThreadPoolEx
 import junit.framework.TestCase;
 
 import org.apache.commons.jcs.utils.props.PropertyLoader;
-import org.apache.commons.jcs.utils.threadpool.PoolConfiguration;
-import org.apache.commons.jcs.utils.threadpool.ThreadPoolManager;
 import org.apache.commons.jcs.utils.threadpool.PoolConfiguration.WhenBlockedPolicy;
 
 /**

Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/threadpool/ThreadPoolUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/threadpool/ThreadPoolUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/threadpool/ThreadPoolUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/threadpool/ThreadPoolUnitTest.java Mon Jan  6 17:01:48 2014
@@ -21,8 +21,6 @@ package org.apache.commons.jcs.utils.thr
 
 import java.util.concurrent.ThreadPoolExecutor;
 
-import org.apache.commons.jcs.utils.threadpool.ThreadPoolManager;
-
 import junit.framework.TestCase;
 
 /**

Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/zip/CompressionUtilUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/zip/CompressionUtilUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/zip/CompressionUtilUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/zip/CompressionUtilUnitTest.java Mon Jan  6 17:01:48 2014
@@ -23,8 +23,6 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.zip.GZIPOutputStream;
 
-import org.apache.commons.jcs.utils.zip.CompressionUtil;
-
 import junit.framework.TestCase;
 
 /** Unit tests for the compression util */