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 [3/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/access/TestCacheAccess.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/access/TestCacheAccess.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/access/TestCacheAccess.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/access/TestCacheAccess.java Mon Jan 6 17:01:48 2014
@@ -46,7 +46,10 @@ public class TestCacheAccess
private final static Log log = LogFactory.getLog( TestCacheAccess.class );
/** cache instance to use in testing */
- private JCS<String, String> cache_control = null;
+ private CacheAccess<String, String> cache_control = null;
+
+ /** cache instance to use in testing */
+ private GroupCacheAccess<String, String> group_cache_control = null;
/** do we use system.out.println to print out debug data? */
private static boolean isSysOut = false;
@@ -65,6 +68,7 @@ public class TestCacheAccess
try
{
cache_control = JCS.getInstance( regionName );
+ group_cache_control = JCS.getGroupCacheInstance( regionName );
}
catch ( Exception e )
{
@@ -365,7 +369,7 @@ public class TestCacheAccess
long n_start = System.currentTimeMillis();
try
{
- Object obj = cache_control.getFromGroup( key, group );
+ Object obj = group_cache_control.getFromGroup( key, group );
if ( show && obj != null )
{
p( obj.toString() );
@@ -422,7 +426,7 @@ public class TestCacheAccess
{
for ( int a = 0; a < num; a++ )
{
- Object obj = cache_control.getFromGroup( "keygr" + a, group );
+ Object obj = group_cache_control.getFromGroup( "keygr" + a, group );
if ( show && obj != null )
{
p( obj.toString() );
@@ -470,7 +474,7 @@ public class TestCacheAccess
else
{
long n_start = System.currentTimeMillis();
- cache_control.putInGroup( key, group, "data from putg ----asdfasfas-asfasfas-asfas in group " + group );
+ group_cache_control.putInGroup( key, group, "data from putg ----asdfasfas-asfasfas-asfas in group " + group );
long n_end = System.currentTimeMillis();
p( "---put " + key + " in group " + group + " in " + String.valueOf( n_end - n_start ) + " millis ---" );
}
@@ -510,7 +514,7 @@ public class TestCacheAccess
long n_start = System.currentTimeMillis();
for ( int a = 0; a < num; a++ )
{
- cache_control.putInGroup( "keygr" + a, group, "data " + a
+ group_cache_control.putInGroup( "keygr" + a, group, "data " + a
+ " from putag ----asdfasfas-asfasfas-asfas in group " + group );
}
long n_end = System.currentTimeMillis();
@@ -951,7 +955,7 @@ public class TestCacheAccess
*/
public void getAttributeNames( String groupName )
{
- Iterator<String> iter = cache_control.getGroupKeys( groupName ).iterator();
+ Iterator<String> iter = group_cache_control.getGroupKeys( groupName ).iterator();
while ( iter.hasNext() )
{
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/admin/AdminBeanUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/admin/AdminBeanUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/admin/AdminBeanUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/admin/AdminBeanUnitTest.java Mon Jan 6 17:01:48 2014
@@ -24,9 +24,7 @@ import java.util.List;
import junit.framework.TestCase;
import org.apache.commons.jcs.JCS;
-import org.apache.commons.jcs.admin.CacheElementInfo;
-import org.apache.commons.jcs.admin.CacheRegionInfo;
-import org.apache.commons.jcs.admin.JCSAdminBean;
+import org.apache.commons.jcs.access.CacheAccess;
/**
* Test the admin bean that is used by the JCSAdmin.jsp
@@ -48,7 +46,7 @@ public class AdminBeanUnitTest
throws Exception
{
String regionName = "myRegion";
- JCS<String, String> cache = JCS.getInstance( regionName );
+ CacheAccess<String, String> cache = JCS.getInstance( regionName );
cache.put( "key", "value" );
@@ -84,7 +82,7 @@ public class AdminBeanUnitTest
throws Exception
{
String regionName = "myRegion";
- JCS<String, String> cache = JCS.getInstance( regionName );
+ CacheAccess<String, String> cache = JCS.getInstance( regionName );
// clear the region
cache.clear();
@@ -114,7 +112,7 @@ public class AdminBeanUnitTest
JCSAdminBean admin = new JCSAdminBean();
String regionName = "myRegion";
- JCS<String, String> cache = JCS.getInstance( regionName );
+ CacheAccess<String, String> cache = JCS.getInstance( regionName );
// clear the region
cache.clear();
@@ -148,7 +146,7 @@ public class AdminBeanUnitTest
JCSAdminBean admin = new JCSAdminBean();
String regionName = "myRegion";
- JCS<String, String> cache = JCS.getInstance( regionName );
+ CacheAccess<String, String> cache = JCS.getInstance( regionName );
String key = "myKey";
cache.put( key, "value" );
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/admin/CountingStreamUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/admin/CountingStreamUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/admin/CountingStreamUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/admin/CountingStreamUnitTest.java Mon Jan 6 17:01:48 2014
@@ -19,8 +19,6 @@ package org.apache.commons.jcs.admin;
* under the License.
*/
-import org.apache.commons.jcs.admin.CountingOnlyOutputStream;
-
import junit.framework.TestCase;
/**
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/AuxiliaryCacheConfiguratorUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/AuxiliaryCacheConfiguratorUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/AuxiliaryCacheConfiguratorUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/AuxiliaryCacheConfiguratorUnitTest.java Mon Jan 6 17:01:48 2014
@@ -4,7 +4,6 @@ import java.util.Properties;
import junit.framework.TestCase;
-import org.apache.commons.jcs.auxiliary.AuxiliaryCacheConfigurator;
import org.apache.commons.jcs.engine.behavior.IElementSerializer;
import org.apache.commons.jcs.engine.control.MockElementSerializer;
import org.apache.commons.jcs.engine.logging.MockCacheEventLogger;
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/MockAuxiliaryCache.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/MockAuxiliaryCache.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/MockAuxiliaryCache.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/MockAuxiliaryCache.java Mon Jan 6 17:01:48 2014
@@ -25,8 +25,6 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Set;
-import org.apache.commons.jcs.auxiliary.AbstractAuxiliaryCache;
-import org.apache.commons.jcs.auxiliary.AuxiliaryCacheAttributes;
import org.apache.commons.jcs.engine.CacheStatus;
import org.apache.commons.jcs.engine.behavior.ICacheElement;
import org.apache.commons.jcs.engine.stats.behavior.IStats;
@@ -156,22 +154,11 @@ public class MockAuxiliaryCache<K extend
}
/**
- * @param group
- * @return null
- * @throws IOException
- */
- public Set<K> getGroupKeys( String group )
- throws IOException
- {
- return null;
- }
-
- /**
- * @return null
- * @throws IOException
+ * Return the keys in this cache.
+ * <p>
+ * @see org.apache.commons.jcs.auxiliary.disk.AbstractDiskCache#getKeySet()
*/
- public Set<String> getGroupNames()
- throws IOException
+ public Set<K> getKeySet() throws IOException
{
return null;
}
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/MockAuxiliaryCacheAttributes.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/MockAuxiliaryCacheAttributes.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/MockAuxiliaryCacheAttributes.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/MockAuxiliaryCacheAttributes.java Mon Jan 6 17:01:48 2014
@@ -1,7 +1,5 @@
package org.apache.commons.jcs.auxiliary;
-import org.apache.commons.jcs.auxiliary.AbstractAuxiliaryCacheAttributes;
-import org.apache.commons.jcs.auxiliary.AuxiliaryCacheAttributes;
/** For testing. */
public class MockAuxiliaryCacheAttributes
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/MockAuxiliaryCacheFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/MockAuxiliaryCacheFactory.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/MockAuxiliaryCacheFactory.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/MockAuxiliaryCacheFactory.java Mon Jan 6 17:01:48 2014
@@ -2,9 +2,6 @@ package org.apache.commons.jcs.auxiliary
import java.io.Serializable;
-import org.apache.commons.jcs.auxiliary.AuxiliaryCache;
-import org.apache.commons.jcs.auxiliary.AuxiliaryCacheAttributes;
-import org.apache.commons.jcs.auxiliary.AuxiliaryCacheFactory;
import org.apache.commons.jcs.engine.behavior.ICompositeCacheManager;
import org.apache.commons.jcs.engine.behavior.IElementSerializer;
import org.apache.commons.jcs.engine.logging.behavior.ICacheEventLogger;
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/AbstractDiskCacheUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/AbstractDiskCacheUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/AbstractDiskCacheUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/AbstractDiskCacheUnitTest.java Mon Jan 6 17:01:48 2014
@@ -5,6 +5,7 @@ import java.io.Serializable;
import java.io.StringWriter;
import java.util.Collections;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.Map;
import java.util.Set;
@@ -12,7 +13,6 @@ import junit.framework.TestCase;
import org.apache.commons.jcs.TestLogConfigurationUtil;
import org.apache.commons.jcs.auxiliary.AuxiliaryCacheAttributes;
-import org.apache.commons.jcs.auxiliary.disk.AbstractDiskCache;
import org.apache.commons.jcs.auxiliary.disk.behavior.IDiskCacheAttributes;
import org.apache.commons.jcs.auxiliary.disk.indexed.IndexedDiskCacheAttributes;
import org.apache.commons.jcs.engine.CacheElement;
@@ -185,22 +185,14 @@ public class AbstractDiskCacheUnitTest
}
/**
- * @param groupName
- * @return Collections.EMPTY_SET
- */
- @Override
- public Set<K> getGroupKeys(String groupName)
- {
- return Collections.emptySet();
- }
-
- /**
- * @return Collections.EMPTY_SET
+ * Return the keys in this cache.
+ * <p>
+ * @see org.apache.commons.jcs.auxiliary.disk.AbstractDiskCache#getKeySet()
*/
@Override
- public Set<String> getGroupNames()
+ public Set<K> getKeySet() throws IOException
{
- return Collections.emptySet();
+ return new HashSet<K>(map.keySet());
}
/**
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/LRUMapJCSUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/LRUMapJCSUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/LRUMapJCSUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/LRUMapJCSUnitTest.java Mon Jan 6 17:01:48 2014
@@ -5,7 +5,6 @@ import java.io.StringWriter;
import junit.framework.TestCase;
import org.apache.commons.jcs.TestLogConfigurationUtil;
-import org.apache.commons.jcs.auxiliary.disk.LRUMapJCS;
/** Unit tests for the LRUMapJCS implementation. */
public class LRUMapJCSUnitTest
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/PurgatoryElementUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/PurgatoryElementUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/PurgatoryElementUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/PurgatoryElementUnitTest.java Mon Jan 6 17:01:48 2014
@@ -2,7 +2,6 @@ package org.apache.commons.jcs.auxiliary
import junit.framework.TestCase;
-import org.apache.commons.jcs.auxiliary.disk.PurgatoryElement;
import org.apache.commons.jcs.engine.CacheElement;
import org.apache.commons.jcs.engine.ElementAttributes;
import org.apache.commons.jcs.engine.behavior.ICacheElement;
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCacheConcurrentUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCacheConcurrentUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCacheConcurrentUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCacheConcurrentUnitTest.java Mon Jan 6 17:01:48 2014
@@ -28,6 +28,7 @@ import junit.framework.Test;
import junit.framework.TestCase;
import org.apache.commons.jcs.JCS;
+import org.apache.commons.jcs.access.CacheAccess;
import org.apache.commons.jcs.engine.behavior.ICacheElement;
/**
@@ -147,7 +148,7 @@ public class BlockDiskCacheConcurrentUni
public void runTestForRegion( String region )
throws Exception
{
- JCS<String, String> jcs = JCS.getInstance( region );
+ CacheAccess<String, String> jcs = JCS.getInstance( region );
// Add items to cache
for ( int i = 0; i <= items; i++ )
@@ -208,7 +209,7 @@ public class BlockDiskCacheConcurrentUni
public void runTestForRegionInRange( String region, int start, int end )
throws Exception
{
- JCS<String, String> jcs = JCS.getInstance( region );
+ CacheAccess<String, String> jcs = JCS.getInstance( region );
// Add items to cache
for ( int i = start; i <= end; i++ )
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCacheKeyStoreUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCacheKeyStoreUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCacheKeyStoreUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCacheKeyStoreUnitTest.java Mon Jan 6 17:01:48 2014
@@ -19,10 +19,6 @@ package org.apache.commons.jcs.auxiliary
* under the License.
*/
-import org.apache.commons.jcs.auxiliary.disk.block.BlockDiskCache;
-import org.apache.commons.jcs.auxiliary.disk.block.BlockDiskCacheAttributes;
-import org.apache.commons.jcs.auxiliary.disk.block.BlockDiskKeyStore;
-
import junit.framework.TestCase;
/**
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCacheManagerUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCacheManagerUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCacheManagerUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCacheManagerUnitTest.java Mon Jan 6 17:01:48 2014
@@ -4,9 +4,6 @@ import junit.framework.TestCase;
import org.apache.commons.jcs.auxiliary.AuxiliaryCache;
import org.apache.commons.jcs.auxiliary.MockCacheEventLogger;
-import org.apache.commons.jcs.auxiliary.disk.block.BlockDiskCache;
-import org.apache.commons.jcs.auxiliary.disk.block.BlockDiskCacheAttributes;
-import org.apache.commons.jcs.auxiliary.disk.block.BlockDiskCacheManager;
import org.apache.commons.jcs.engine.behavior.IElementSerializer;
import org.apache.commons.jcs.engine.control.MockElementSerializer;
import org.apache.commons.jcs.engine.logging.behavior.ICacheEventLogger;
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCacheRandomConcurrentTestUtil.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCacheRandomConcurrentTestUtil.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCacheRandomConcurrentTestUtil.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCacheRandomConcurrentTestUtil.java Mon Jan 6 17:01:48 2014
@@ -22,6 +22,7 @@ package org.apache.commons.jcs.auxiliary
import junit.framework.TestCase;
import org.apache.commons.jcs.JCS;
+import org.apache.commons.jcs.access.CacheAccess;
import org.apache.commons.jcs.access.TestCacheAccess;
/**
@@ -64,7 +65,7 @@ public class BlockDiskCacheRandomConcurr
// make sure a simple put then get works
// this may fail if the other tests are flooding the disk cache
- JCS<String, String> jcs = JCS.getInstance( region );
+ CacheAccess<String, String> jcs = JCS.getInstance( region );
String key = "testKey" + testNum;
String data = "testData" + testNum;
jcs.put( key, data );
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCacheSameRegionConcurrentUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCacheSameRegionConcurrentUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCacheSameRegionConcurrentUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCacheSameRegionConcurrentUnitTest.java Mon Jan 6 17:01:48 2014
@@ -28,6 +28,7 @@ import junit.framework.Test;
import junit.framework.TestCase;
import org.apache.commons.jcs.JCS;
+import org.apache.commons.jcs.access.CacheAccess;
import org.apache.commons.jcs.engine.behavior.ICacheElement;
/**
@@ -135,7 +136,7 @@ public class BlockDiskCacheSameRegionCon
public void runTestForRegion( String region, int start, int end )
throws Exception
{
- JCS<String, String> jcs = JCS.getInstance( region );
+ CacheAccess<String, String> jcs = JCS.getInstance( region );
// Add items to cache
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCacheSteadyLoadTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCacheSteadyLoadTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCacheSteadyLoadTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCacheSteadyLoadTest.java Mon Jan 6 17:01:48 2014
@@ -25,6 +25,7 @@ import java.util.Random;
import junit.framework.TestCase;
import org.apache.commons.jcs.JCS;
+import org.apache.commons.jcs.access.CacheAccess;
import org.apache.commons.jcs.auxiliary.disk.DiskTestObject;
import org.apache.commons.jcs.utils.timing.ElapsedTimer;
@@ -66,7 +67,7 @@ public class BlockDiskCacheSteadyLoadTes
int runs = 1000;
int upperKB = 50;
- JCS<String, DiskTestObject> jcs = JCS.getInstance( ( numPerRun / 2 ) + "aSecond" );
+ CacheAccess<String, DiskTestObject> jcs = JCS.getInstance( ( numPerRun / 2 ) + "aSecond" );
ElapsedTimer timer = new ElapsedTimer();
int numToGet = numPerRun * ( runs / 10 );
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCacheUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCacheUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCacheUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCacheUnitTest.java Mon Jan 6 17:01:48 2014
@@ -6,9 +6,6 @@ import java.util.Map;
import junit.framework.TestCase;
-import org.apache.commons.jcs.auxiliary.disk.block.BlockDisk;
-import org.apache.commons.jcs.auxiliary.disk.block.BlockDiskCache;
-import org.apache.commons.jcs.auxiliary.disk.block.BlockDiskCacheAttributes;
import org.apache.commons.jcs.engine.CacheElement;
import org.apache.commons.jcs.engine.behavior.ICacheElement;
import org.apache.commons.jcs.utils.serialization.StandardSerializer;
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskElementDescriptorUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskElementDescriptorUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskElementDescriptorUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskElementDescriptorUnitTest.java Mon Jan 6 17:01:48 2014
@@ -19,8 +19,6 @@ package org.apache.commons.jcs.auxiliary
* under the License.
*/
-import org.apache.commons.jcs.auxiliary.disk.block.BlockDiskElementDescriptor;
-
import junit.framework.TestCase;
/**
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskUnitTest.java Mon Jan 6 17:01:48 2014
@@ -24,7 +24,6 @@ import java.util.Random;
import junit.framework.TestCase;
-import org.apache.commons.jcs.auxiliary.disk.block.BlockDisk;
import org.apache.commons.jcs.utils.serialization.StandardSerializer;
/**
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/block/HugeQuantityBlockDiskCacheLoadTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/block/HugeQuantityBlockDiskCacheLoadTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/block/HugeQuantityBlockDiskCacheLoadTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/block/HugeQuantityBlockDiskCacheLoadTest.java Mon Jan 6 17:01:48 2014
@@ -22,6 +22,7 @@ package org.apache.commons.jcs.auxiliary
import junit.framework.TestCase;
import org.apache.commons.jcs.JCS;
+import org.apache.commons.jcs.access.CacheAccess;
import org.apache.commons.jcs.utils.timing.ElapsedTimer;
import org.apache.commons.jcs.utils.timing.SleepUtil;
@@ -58,7 +59,7 @@ public class HugeQuantityBlockDiskCacheL
long initialMemory = measureMemoryUse();
System.out.println( "Before getting JCS: " + initialMemory );
- JCS<String, String> jcs = JCS.getInstance( region );
+ CacheAccess<String, String> jcs = JCS.getInstance( region );
jcs.clear();
try
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/file/FileDiskCacheFactoryUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/file/FileDiskCacheFactoryUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/file/FileDiskCacheFactoryUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/file/FileDiskCacheFactoryUnitTest.java Mon Jan 6 17:01:48 2014
@@ -3,9 +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.disk.file.FileDiskCache;
-import org.apache.commons.jcs.auxiliary.disk.file.FileDiskCacheAttributes;
-import org.apache.commons.jcs.auxiliary.disk.file.FileDiskCacheFactory;
import org.apache.commons.jcs.engine.behavior.ICompositeCacheManager;
import org.apache.commons.jcs.engine.behavior.IElementSerializer;
import org.apache.commons.jcs.engine.control.MockCompositeCacheManager;
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/file/FileDiskCacheUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/file/FileDiskCacheUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/file/FileDiskCacheUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/file/FileDiskCacheUnitTest.java Mon Jan 6 17:01:48 2014
@@ -4,8 +4,6 @@ import java.io.File;
import junit.framework.TestCase;
-import org.apache.commons.jcs.auxiliary.disk.file.FileDiskCache;
-import org.apache.commons.jcs.auxiliary.disk.file.FileDiskCacheAttributes;
import org.apache.commons.jcs.engine.CacheElement;
import org.apache.commons.jcs.engine.CacheStatus;
import org.apache.commons.jcs.engine.behavior.ICacheElement;
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/indexed/DiskTestObjectUtil.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/indexed/DiskTestObjectUtil.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/indexed/DiskTestObjectUtil.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/indexed/DiskTestObjectUtil.java Mon Jan 6 17:01:48 2014
@@ -24,7 +24,6 @@ import java.io.Serializable;
import java.util.Random;
import org.apache.commons.jcs.auxiliary.disk.DiskTestObject;
-import org.apache.commons.jcs.auxiliary.disk.indexed.IndexedDisk;
import org.apache.commons.jcs.engine.CacheElement;
import org.apache.commons.jcs.engine.behavior.ICacheElement;
import org.apache.commons.jcs.utils.serialization.StandardSerializer;
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/indexed/HugeQuantityIndDiskCacheLoadTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/indexed/HugeQuantityIndDiskCacheLoadTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/indexed/HugeQuantityIndDiskCacheLoadTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/indexed/HugeQuantityIndDiskCacheLoadTest.java Mon Jan 6 17:01:48 2014
@@ -22,6 +22,7 @@ package org.apache.commons.jcs.auxiliary
import junit.framework.TestCase;
import org.apache.commons.jcs.JCS;
+import org.apache.commons.jcs.access.CacheAccess;
/**
* Put a few hundred thousand entries in the disk cache.
@@ -50,7 +51,7 @@ public class HugeQuantityIndDiskCacheLoa
int items = 300000;
String region = "testCache1";
- JCS<String, String> jcs = JCS.getInstance( region );
+ CacheAccess<String, String> jcs = JCS.getInstance( region );
try
{
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/indexed/IndexDiskCacheUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/indexed/IndexDiskCacheUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/indexed/IndexDiskCacheUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/indexed/IndexDiskCacheUnitTest.java Mon Jan 6 17:01:48 2014
@@ -28,10 +28,6 @@ import junit.framework.TestCase;
import org.apache.commons.jcs.auxiliary.MockCacheEventLogger;
import org.apache.commons.jcs.auxiliary.disk.DiskTestObject;
-import org.apache.commons.jcs.auxiliary.disk.indexed.IndexedDisk;
-import org.apache.commons.jcs.auxiliary.disk.indexed.IndexedDiskCache;
-import org.apache.commons.jcs.auxiliary.disk.indexed.IndexedDiskCacheAttributes;
-import org.apache.commons.jcs.auxiliary.disk.indexed.IndexedDiskElementDescriptor;
import org.apache.commons.jcs.engine.CacheElement;
import org.apache.commons.jcs.engine.ElementAttributes;
import org.apache.commons.jcs.engine.behavior.ICacheElement;
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheConcurrentUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheConcurrentUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheConcurrentUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheConcurrentUnitTest.java Mon Jan 6 17:01:48 2014
@@ -28,6 +28,7 @@ import junit.framework.Test;
import junit.framework.TestCase;
import org.apache.commons.jcs.JCS;
+import org.apache.commons.jcs.access.CacheAccess;
import org.apache.commons.jcs.engine.behavior.ICacheElement;
/**
@@ -140,7 +141,7 @@ public class IndexedDiskCacheConcurrentU
public void runTestForRegion( String region )
throws Exception
{
- JCS<String, String> jcs = JCS.getInstance( region );
+ CacheAccess<String, String> jcs = JCS.getInstance( region );
// Add items to cache
for ( int i = 0; i <= items; i++ )
@@ -201,7 +202,7 @@ public class IndexedDiskCacheConcurrentU
public void runTestForRegionInRange( String region, int start, int end )
throws Exception
{
- JCS<String, String> jcs = JCS.getInstance( region );
+ CacheAccess<String, String> jcs = JCS.getInstance( region );
// Add items to cache
for ( int i = start; i <= end; i++ )
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheDefragPerformanceTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheDefragPerformanceTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheDefragPerformanceTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheDefragPerformanceTest.java Mon Jan 6 17:01:48 2014
@@ -26,6 +26,7 @@ import java.util.Random;
import junit.framework.TestCase;
import org.apache.commons.jcs.JCS;
+import org.apache.commons.jcs.access.CacheAccess;
/**
* This is for manually testing the defrag process.
@@ -74,7 +75,7 @@ public class IndexedDiskCacheDefragPerfo
throws Exception
{
JCS.setConfigFilename( "/TestDiskCacheDefragPerformance.ccf" );
- JCS<Integer, Tile> jcs = JCS.getInstance( "defrag" );
+ CacheAccess<Integer, Tile> jcs = JCS.getInstance( "defrag" );
Tile tile;
System.out.println( "Cache Defrag Test" );
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheKeyStoreUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheKeyStoreUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheKeyStoreUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheKeyStoreUnitTest.java Mon Jan 6 17:01:48 2014
@@ -21,8 +21,6 @@ package org.apache.commons.jcs.auxiliary
import junit.framework.TestCase;
-import org.apache.commons.jcs.auxiliary.disk.indexed.IndexedDiskCache;
-import org.apache.commons.jcs.auxiliary.disk.indexed.IndexedDiskCacheAttributes;
import org.apache.commons.jcs.engine.CacheElement;
import org.apache.commons.jcs.engine.ElementAttributes;
import org.apache.commons.jcs.engine.behavior.ICacheElement;
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheManagerUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheManagerUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheManagerUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheManagerUnitTest.java Mon Jan 6 17:01:48 2014
@@ -5,9 +5,6 @@ import java.io.IOException;
import junit.framework.TestCase;
import org.apache.commons.jcs.auxiliary.MockCacheEventLogger;
-import org.apache.commons.jcs.auxiliary.disk.indexed.IndexedDiskCache;
-import org.apache.commons.jcs.auxiliary.disk.indexed.IndexedDiskCacheAttributes;
-import org.apache.commons.jcs.auxiliary.disk.indexed.IndexedDiskCacheManager;
import org.apache.commons.jcs.engine.CacheElement;
import org.apache.commons.jcs.engine.behavior.ICacheElement;
import org.apache.commons.jcs.engine.control.MockElementSerializer;
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheNoMemoryUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheNoMemoryUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheNoMemoryUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheNoMemoryUnitTest.java Mon Jan 6 17:01:48 2014
@@ -28,6 +28,7 @@ import junit.framework.Test;
import junit.framework.TestCase;
import org.apache.commons.jcs.JCS;
+import org.apache.commons.jcs.access.CacheAccess;
import org.apache.commons.jcs.engine.behavior.ICacheElement;
/**
@@ -127,7 +128,7 @@ public class IndexedDiskCacheNoMemoryUni
public void runTestForRegion( String region )
throws Exception
{
- JCS<String, String> jcs = JCS.getInstance( region );
+ CacheAccess<String, String> jcs = JCS.getInstance( region );
// Add items to cache
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheOptimizationUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheOptimizationUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheOptimizationUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheOptimizationUnitTest.java Mon Jan 6 17:01:48 2014
@@ -22,8 +22,6 @@ package org.apache.commons.jcs.auxiliary
import junit.framework.TestCase;
import org.apache.commons.jcs.auxiliary.disk.DiskTestObject;
-import org.apache.commons.jcs.auxiliary.disk.indexed.IndexedDiskCache;
-import org.apache.commons.jcs.auxiliary.disk.indexed.IndexedDiskCacheAttributes;
import org.apache.commons.jcs.engine.behavior.ICacheElement;
import org.apache.commons.jcs.utils.timing.SleepUtil;
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheRandomConcurrentTestUtil.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheRandomConcurrentTestUtil.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheRandomConcurrentTestUtil.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheRandomConcurrentTestUtil.java Mon Jan 6 17:01:48 2014
@@ -22,6 +22,7 @@ package org.apache.commons.jcs.auxiliary
import junit.framework.TestCase;
import org.apache.commons.jcs.JCS;
+import org.apache.commons.jcs.access.CacheAccess;
import org.apache.commons.jcs.access.TestCacheAccess;
/**
@@ -65,7 +66,7 @@ public class IndexedDiskCacheRandomConcu
// make sure a simple put then get works
// this may fail if the other tests are flooding the disk cache
- JCS<String, String> jcs = JCS.getInstance( region );
+ CacheAccess<String, String> jcs = JCS.getInstance( region );
String key = "testKey" + testNum;
String data = "testData" + testNum;
jcs.put( key, data );
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheSameRegionConcurrentUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheSameRegionConcurrentUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheSameRegionConcurrentUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheSameRegionConcurrentUnitTest.java Mon Jan 6 17:01:48 2014
@@ -28,6 +28,7 @@ import junit.framework.Test;
import junit.framework.TestCase;
import org.apache.commons.jcs.JCS;
+import org.apache.commons.jcs.access.CacheAccess;
import org.apache.commons.jcs.engine.behavior.ICacheElement;
/**
@@ -162,7 +163,7 @@ public class IndexedDiskCacheSameRegionC
public void runTestForRegion( String region, int start, int end )
throws Exception
{
- JCS<String, String> jcs = JCS.getInstance( region );
+ CacheAccess<String, String> jcs = JCS.getInstance( region );
// Add items to cache
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheSteadyLoadTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheSteadyLoadTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheSteadyLoadTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCacheSteadyLoadTest.java Mon Jan 6 17:01:48 2014
@@ -25,6 +25,7 @@ import java.util.Random;
import junit.framework.TestCase;
import org.apache.commons.jcs.JCS;
+import org.apache.commons.jcs.access.CacheAccess;
import org.apache.commons.jcs.auxiliary.disk.DiskTestObject;
import org.apache.commons.jcs.utils.timing.ElapsedTimer;
@@ -66,7 +67,7 @@ public class IndexedDiskCacheSteadyLoadT
int runs = 1000;
int upperKB = 50;
- JCS<String, DiskTestObject> jcs = JCS.getInstance( ( numPerRun / 2 ) + "aSecond" );
+ CacheAccess<String, DiskTestObject> jcs = JCS.getInstance( ( numPerRun / 2 ) + "aSecond" );
ElapsedTimer timer = new ElapsedTimer();
int numToGet = numPerRun * ( runs / 10 );
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheManagerUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheManagerUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheManagerUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheManagerUnitTest.java Mon Jan 6 17:01:48 2014
@@ -3,9 +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.disk.jdbc.JDBCDiskCache;
-import org.apache.commons.jcs.auxiliary.disk.jdbc.JDBCDiskCacheAttributes;
-import org.apache.commons.jcs.auxiliary.disk.jdbc.JDBCDiskCacheManager;
import org.apache.commons.jcs.engine.behavior.IElementSerializer;
import org.apache.commons.jcs.engine.control.CompositeCacheManager;
import org.apache.commons.jcs.engine.control.MockElementSerializer;
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCachePoolAccessManagerUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCachePoolAccessManagerUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCachePoolAccessManagerUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCachePoolAccessManagerUnitTest.java Mon Jan 6 17:01:48 2014
@@ -4,10 +4,6 @@ import java.sql.Connection;
import java.sql.DriverManager;
import java.util.Properties;
-import org.apache.commons.jcs.auxiliary.disk.jdbc.JDBCDiskCachePoolAccess;
-import org.apache.commons.jcs.auxiliary.disk.jdbc.JDBCDiskCachePoolAccessAttributes;
-import org.apache.commons.jcs.auxiliary.disk.jdbc.JDBCDiskCachePoolAccessManager;
-
import junit.framework.TestCase;
/** Unit tests for the pool manager */
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheRemovalUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheRemovalUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheRemovalUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheRemovalUnitTest.java Mon Jan 6 17:01:48 2014
@@ -28,6 +28,7 @@ import java.util.Properties;
import junit.framework.TestCase;
import org.apache.commons.jcs.JCS;
+import org.apache.commons.jcs.access.CacheAccess;
/** Tests for the removal functionality. */
public class JDBCDiskCacheRemovalUnitTest
@@ -63,7 +64,7 @@ public class JDBCDiskCacheRemovalUnitTes
String region = "testCache1";
String data = "adfadsfasfddsafasasd";
- JCS<String, String> jcs = JCS.getInstance( region );
+ CacheAccess<String, String> jcs = JCS.getInstance( region );
// DO WORK
jcs.put( keyPart1 + ":" + keyPart2, data );
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheSharedPoolUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheSharedPoolUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheSharedPoolUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheSharedPoolUnitTest.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.engine.behavior.ICacheElement;
/**
@@ -85,7 +86,7 @@ public class JDBCDiskCacheSharedPoolUnit
public void runTestForRegion( String region, int items )
throws Exception
{
- JCS<String, String> jcs = JCS.getInstance( region );
+ CacheAccess<String, String> jcs = JCS.getInstance( region );
System.out.println( "BEFORE PUT \n" + jcs.getStats() );
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheShrinkUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheShrinkUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheShrinkUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheShrinkUnitTest.java Mon Jan 6 17:01:48 2014
@@ -28,6 +28,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.access.exception.CacheException;
import org.apache.commons.jcs.utils.timing.SleepUtil;
@@ -83,7 +84,7 @@ public class JDBCDiskCacheShrinkUnitTest
String regionExpire = "expire1Second";
int items = 200;
- JCS<String, String> jcsExpire = JCS.getInstance( regionExpire );
+ CacheAccess<String, String> jcsExpire = JCS.getInstance( regionExpire );
System.out.println( "BEFORE PUT \n" + jcsExpire.getStats() );
@@ -120,7 +121,7 @@ public class JDBCDiskCacheShrinkUnitTest
String region = "expire100Second";
int items = 200;
- JCS<String, String> jcs = JCS.getInstance( region );
+ CacheAccess<String, String> jcs = JCS.getInstance( region );
System.out.println( "BEFORE PUT \n" + jcs.getStats() );
@@ -172,7 +173,7 @@ public class JDBCDiskCacheShrinkUnitTest
String region = "eternal";
int items = 200;
- JCS<String, String> jcs = JCS.getInstance( region );
+ CacheAccess<String, String> jcs = JCS.getInstance( region );
System.out.println( "BEFORE PUT \n" + jcs.getStats() );
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheUnitTest.java Mon Jan 6 17:01:48 2014
@@ -29,11 +29,7 @@ import java.util.Set;
import junit.framework.TestCase;
import org.apache.commons.jcs.JCS;
-import org.apache.commons.jcs.auxiliary.disk.jdbc.JDBCDiskCache;
-import org.apache.commons.jcs.auxiliary.disk.jdbc.JDBCDiskCacheAttributes;
-import org.apache.commons.jcs.auxiliary.disk.jdbc.JDBCDiskCachePoolAccess;
-import org.apache.commons.jcs.auxiliary.disk.jdbc.JDBCDiskCachePoolAccessManager;
-import org.apache.commons.jcs.auxiliary.disk.jdbc.TableState;
+import org.apache.commons.jcs.access.CacheAccess;
import org.apache.commons.jcs.engine.behavior.ICacheElement;
import org.apache.commons.jcs.engine.control.MockCompositeCacheManager;
@@ -89,7 +85,7 @@ public class JDBCDiskCacheUnitTest
public void runTestForRegion( String region, int items )
throws Exception
{
- JCS<String, String> jcs = JCS.getInstance( region );
+ CacheAccess<String, String> jcs = JCS.getInstance( region );
System.out.println( "BEFORE PUT \n" + jcs.getStats() );
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/jdbc/hsql/HSQLDiskCacheConcurrentUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/jdbc/hsql/HSQLDiskCacheConcurrentUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/jdbc/hsql/HSQLDiskCacheConcurrentUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/jdbc/hsql/HSQLDiskCacheConcurrentUnitTest.java Mon Jan 6 17:01:48 2014
@@ -28,6 +28,7 @@ import junit.framework.Test;
import junit.framework.TestCase;
import org.apache.commons.jcs.JCS;
+import org.apache.commons.jcs.access.CacheAccess;
import org.apache.commons.jcs.engine.behavior.ICacheElement;
/**
@@ -123,7 +124,7 @@ public class HSQLDiskCacheConcurrentUnit
public void runTestForRegion( String region )
throws Exception
{
- JCS<String, String> jcs = JCS.getInstance( region );
+ CacheAccess<String, String> jcs = JCS.getInstance( region );
// Add items to cache
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/jdbc/hsql/HSQLDiskCacheUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/jdbc/hsql/HSQLDiskCacheUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/jdbc/hsql/HSQLDiskCacheUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/jdbc/hsql/HSQLDiskCacheUnitTest.java Mon Jan 6 17:01:48 2014
@@ -26,6 +26,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.engine.behavior.ICacheElement;
@@ -58,7 +59,7 @@ public class HSQLDiskCacheUnitTest
String region = "testBasicPutRemove";
- JCS<String, String> jcs = JCS.getInstance( region );
+ CacheAccess<String, String> jcs = JCS.getInstance( region );
// Add items to cache
@@ -121,7 +122,7 @@ public class HSQLDiskCacheUnitTest
throws CacheException, InterruptedException
{
String region = "removeAllAllowed";
- JCS<String, String> jcs = JCS.getInstance( region );
+ CacheAccess<String, String> jcs = JCS.getInstance( region );
int items = 20;
@@ -161,7 +162,7 @@ public class HSQLDiskCacheUnitTest
throws CacheException, InterruptedException
{
String region = "noRemoveAll";
- JCS<String, String> jcs = JCS.getInstance( region );
+ CacheAccess<String, String> jcs = JCS.getInstance( region );
int items = 20;
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/MySQLDiskCacheHsqlBackedUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/MySQLDiskCacheHsqlBackedUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/MySQLDiskCacheHsqlBackedUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/MySQLDiskCacheHsqlBackedUnitTest.java Mon Jan 6 17:01:48 2014
@@ -31,6 +31,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.engine.behavior.ICacheElement;
/**
@@ -96,7 +97,7 @@ public class MySQLDiskCacheHsqlBackedUni
public void runTestForRegion( String region, int items )
throws Exception
{
- JCS<String, String> jcs = JCS.getInstance( region );
+ CacheAccess<String, String> jcs = JCS.getInstance( region );
//System.out.println( "BEFORE PUT \n" + jcs.getStats() );
// Add items to cache
@@ -157,7 +158,7 @@ public class MySQLDiskCacheHsqlBackedUni
// SETUP
int items = 200;
String region = "testCache2";
- JCS<String, String> jcs = JCS.getInstance( region );
+ CacheAccess<String, String> jcs = JCS.getInstance( region );
System.out.println( "BEFORE PUT \n" + jcs.getStats() );
// DO WORK
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/MySQLDiskCacheManagerUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/MySQLDiskCacheManagerUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/MySQLDiskCacheManagerUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/MySQLDiskCacheManagerUnitTest.java Mon Jan 6 17:01:48 2014
@@ -3,9 +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.disk.jdbc.mysql.MySQLDiskCache;
-import org.apache.commons.jcs.auxiliary.disk.jdbc.mysql.MySQLDiskCacheAttributes;
-import org.apache.commons.jcs.auxiliary.disk.jdbc.mysql.MySQLDiskCacheManager;
import org.apache.commons.jcs.engine.behavior.IElementSerializer;
import org.apache.commons.jcs.engine.control.CompositeCacheManager;
import org.apache.commons.jcs.engine.control.MockElementSerializer;
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/MySQLDiskCacheUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/MySQLDiskCacheUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/MySQLDiskCacheUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/MySQLDiskCacheUnitTest.java Mon Jan 6 17:01:48 2014
@@ -22,8 +22,6 @@ package org.apache.commons.jcs.auxiliary
import junit.framework.TestCase;
import org.apache.commons.jcs.auxiliary.disk.jdbc.TableState;
-import org.apache.commons.jcs.auxiliary.disk.jdbc.mysql.MySQLDiskCache;
-import org.apache.commons.jcs.auxiliary.disk.jdbc.mysql.MySQLDiskCacheAttributes;
import org.apache.commons.jcs.engine.control.CompositeCacheManager;
/**
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/MySQLTableOptimizerManualTester.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/MySQLTableOptimizerManualTester.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/MySQLTableOptimizerManualTester.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/MySQLTableOptimizerManualTester.java Mon Jan 6 17:01:48 2014
@@ -23,8 +23,6 @@ import junit.framework.TestCase;
import org.apache.commons.jcs.auxiliary.disk.jdbc.JDBCDiskCachePoolAccessFactory;
import org.apache.commons.jcs.auxiliary.disk.jdbc.TableState;
-import org.apache.commons.jcs.auxiliary.disk.jdbc.mysql.MySQLDiskCacheAttributes;
-import org.apache.commons.jcs.auxiliary.disk.jdbc.mysql.MySQLTableOptimizer;
/**
* Hand run tests for the MySQL table optimizer.
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/util/ScheduleParserUtilUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/util/ScheduleParserUtilUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/util/ScheduleParserUtilUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/util/ScheduleParserUtilUnitTest.java Mon Jan 6 17:01:48 2014
@@ -21,9 +21,6 @@ package org.apache.commons.jcs.auxiliary
import java.util.Date;
-import org.apache.commons.jcs.auxiliary.disk.jdbc.mysql.util.ScheduleFormatException;
-import org.apache.commons.jcs.auxiliary.disk.jdbc.mysql.util.ScheduleParser;
-
import junit.framework.TestCase;
/**
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/lateral/LateralCacheNoWaitFacadeUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/lateral/LateralCacheNoWaitFacadeUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/lateral/LateralCacheNoWaitFacadeUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/lateral/LateralCacheNoWaitFacadeUnitTest.java Mon Jan 6 17:01:48 2014
@@ -2,10 +2,6 @@ package org.apache.commons.jcs.auxiliary
import junit.framework.TestCase;
-import org.apache.commons.jcs.auxiliary.lateral.LateralCache;
-import org.apache.commons.jcs.auxiliary.lateral.LateralCacheAttributes;
-import org.apache.commons.jcs.auxiliary.lateral.LateralCacheNoWait;
-import org.apache.commons.jcs.auxiliary.lateral.LateralCacheNoWaitFacade;
import org.apache.commons.jcs.auxiliary.lateral.behavior.ILateralCacheAttributes;
/**
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPConcurrentRandomTestUtil.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPConcurrentRandomTestUtil.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPConcurrentRandomTestUtil.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPConcurrentRandomTestUtil.java Mon Jan 6 17:01:48 2014
@@ -24,8 +24,7 @@ import java.util.Random;
import junit.framework.TestCase;
import org.apache.commons.jcs.JCS;
-import org.apache.commons.jcs.auxiliary.lateral.socket.tcp.LateralTCPService;
-import org.apache.commons.jcs.auxiliary.lateral.socket.tcp.TCPLateralCacheAttributes;
+import org.apache.commons.jcs.access.CacheAccess;
import org.apache.commons.jcs.engine.CacheElement;
import org.apache.commons.jcs.engine.behavior.ICacheElement;
@@ -77,7 +76,7 @@ public class LateralTCPConcurrentRandomT
{
boolean show = true;//false;
- JCS<String, String> cache = JCS.getInstance( region );
+ CacheAccess<String, String> cache = JCS.getInstance( region );
TCPLateralCacheAttributes lattr2 = new TCPLateralCacheAttributes();
lattr2.setTcpListenerPort( 1103 );
@@ -151,7 +150,7 @@ public class LateralTCPConcurrentRandomT
throw e;
}
- JCS<String, String> jcs = JCS.getInstance( region );
+ CacheAccess<String, String> jcs = JCS.getInstance( region );
String key = "testKey" + testNum;
String data = "testData" + testNum;
jcs.put( key, data );
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPDiscoveryListenerUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPDiscoveryListenerUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPDiscoveryListenerUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPDiscoveryListenerUnitTest.java Mon Jan 6 17:01:48 2014
@@ -9,9 +9,6 @@ import org.apache.commons.jcs.auxiliary.
import org.apache.commons.jcs.auxiliary.lateral.LateralCacheNoWait;
import org.apache.commons.jcs.auxiliary.lateral.LateralCacheNoWaitFacade;
import org.apache.commons.jcs.auxiliary.lateral.behavior.ILateralCacheAttributes;
-import org.apache.commons.jcs.auxiliary.lateral.socket.tcp.LateralTCPCacheManager;
-import org.apache.commons.jcs.auxiliary.lateral.socket.tcp.LateralTCPDiscoveryListener;
-import org.apache.commons.jcs.auxiliary.lateral.socket.tcp.TCPLateralCacheAttributes;
import org.apache.commons.jcs.auxiliary.lateral.socket.tcp.behavior.ITCPLateralCacheAttributes;
import org.apache.commons.jcs.engine.behavior.ICompositeCacheManager;
import org.apache.commons.jcs.engine.behavior.IElementSerializer;
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPFilterRemoveHashCodeUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPFilterRemoveHashCodeUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPFilterRemoveHashCodeUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPFilterRemoveHashCodeUnitTest.java Mon Jan 6 17:01:48 2014
@@ -24,8 +24,7 @@ import java.io.Serializable;
import junit.framework.TestCase;
import org.apache.commons.jcs.JCS;
-import org.apache.commons.jcs.auxiliary.lateral.socket.tcp.LateralTCPService;
-import org.apache.commons.jcs.auxiliary.lateral.socket.tcp.TCPLateralCacheAttributes;
+import org.apache.commons.jcs.access.CacheAccess;
import org.apache.commons.jcs.engine.CacheElement;
import org.apache.commons.jcs.engine.behavior.ICacheElement;
@@ -87,7 +86,7 @@ public class LateralTCPFilterRemoveHashC
public void runTestForRegion( String region, int numOps, int testNum )
throws Exception
{
- JCS<String, Serializable> cache = JCS.getInstance( region );
+ CacheAccess<String, Serializable> cache = JCS.getInstance( region );
Thread.sleep( 100 );
@@ -147,7 +146,7 @@ public class LateralTCPFilterRemoveHashC
* e.toString() ); e.printStackTrace( System.out ); throw e; }
*/
- JCS<String, String> jcs = JCS.getInstance( region );
+ CacheAccess<String, String> jcs = JCS.getInstance( region );
String key = "testKey" + testNum;
String data = "testData" + testNum;
jcs.put( key, data );
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPIssueRemoveOnPutUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPIssueRemoveOnPutUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPIssueRemoveOnPutUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPIssueRemoveOnPutUnitTest.java Mon Jan 6 17:01:48 2014
@@ -24,8 +24,7 @@ import java.util.Random;
import junit.framework.TestCase;
import org.apache.commons.jcs.JCS;
-import org.apache.commons.jcs.auxiliary.lateral.socket.tcp.LateralTCPService;
-import org.apache.commons.jcs.auxiliary.lateral.socket.tcp.TCPLateralCacheAttributes;
+import org.apache.commons.jcs.access.CacheAccess;
import org.apache.commons.jcs.engine.CacheElement;
import org.apache.commons.jcs.engine.behavior.ICacheElement;
@@ -83,7 +82,7 @@ public class LateralTCPIssueRemoveOnPutU
{
String region = "region1";
- JCS<String, String> cache = JCS.getInstance( region );
+ CacheAccess<String, String> cache = JCS.getInstance( region );
Thread.sleep( 100 );
@@ -130,7 +129,7 @@ public class LateralTCPIssueRemoveOnPutU
boolean show = true;// false;
- JCS<String, String> cache = JCS.getInstance( region );
+ CacheAccess<String, String> cache = JCS.getInstance( region );
Thread.sleep( 100 );
@@ -187,7 +186,7 @@ public class LateralTCPIssueRemoveOnPutU
throw e;
}
- JCS<String, String> jcs = JCS.getInstance( region );
+ CacheAccess<String, String> jcs = JCS.getInstance( region );
String key = "testKey" + testNum;
String data = "testData" + testNum;
jcs.put( key, data );
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/TestTCPLateralUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/TestTCPLateralUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/TestTCPLateralUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/TestTCPLateralUnitTest.java Mon Jan 6 17:01:48 2014
@@ -28,10 +28,6 @@ import org.apache.commons.jcs.JCS;
import org.apache.commons.jcs.auxiliary.lateral.LateralCacheAttributes;
import org.apache.commons.jcs.auxiliary.lateral.LateralCommand;
import org.apache.commons.jcs.auxiliary.lateral.LateralElementDescriptor;
-import org.apache.commons.jcs.auxiliary.lateral.socket.tcp.LateralTCPListener;
-import org.apache.commons.jcs.auxiliary.lateral.socket.tcp.LateralTCPSender;
-import org.apache.commons.jcs.auxiliary.lateral.socket.tcp.LateralTCPService;
-import org.apache.commons.jcs.auxiliary.lateral.socket.tcp.TCPLateralCacheAttributes;
import org.apache.commons.jcs.engine.CacheElement;
import org.apache.commons.jcs.engine.behavior.ICacheElement;
import org.apache.commons.jcs.engine.behavior.ICompositeCacheManager;
@@ -280,7 +276,7 @@ public class TestTCPLateralUnitTest
}
/**
- * Create a listener. Add an element to the listeners cache. Setup a service. Try to get group keys from
+ * Create a listener. Add an element to the listeners cache. Setup a service. Try to get keys from
* the service.
* <p>
* @throws Exception
@@ -317,7 +313,7 @@ public class TestTCPLateralUnitTest
SleepUtil.sleepAtLeast( 500 );
// DO WORK
- Set<GroupAttrName<String>> result = service.getGroupKeys("test", "group");
+ Set<GroupAttrName<String>> result = service.getKeySet("test");
// SleepUtil.sleepAtLeast( 5000000 );
@@ -325,64 +321,6 @@ public class TestTCPLateralUnitTest
System.out.println( "testSendAndReceived, result = " + result );
assertNotNull( "Result should not be null.", result );
assertEquals( "Didn't get the correct object", "key", result.toArray()[0] );
-
- result = service.getGroupKeys("test", "");
- System.out.println( "testSendAndReceived, result = " + result );
- assertTrue("List should be empty", result.size() == 0);
- }
-
- /**
- * Create a listener. Add an element to the listeners cache. Setup a service. Try to get group names from
- * the service.
- * <p>
- * @throws Exception
- */
- public void testGetGroupNames_SendAndReceived() throws Exception
- {
- // SETUP
- // setup a listener
- TCPLateralCacheAttributes lattr = new TCPLateralCacheAttributes();
- lattr.setTcpListenerPort( 1157 );
- MockCompositeCacheManager cacheMgr = new MockCompositeCacheManager();
- CompositeCache<GroupAttrName<String>, String> cache = cacheMgr.getCache( "test" );
- System.out.println( "mock cache = " + cache );
-
- // get the listener started
- // give it our mock cache manager
- LateralTCPListener.getInstance( lattr, cacheMgr );
-
- // add the item to the listeners cache
- GroupAttrName<String> groupKey = new GroupAttrName<String>(new GroupId("test", "group"), "key");
- ICacheElement<GroupAttrName<String>, String> element =
- new CacheElement<GroupAttrName<String>, String>( "test", groupKey, "value1" );
- cache.update( element );
-
- groupKey = new GroupAttrName<String>(new GroupId("test", "group2"), "key2");
- element = new CacheElement<GroupAttrName<String>, String>( "test", groupKey, "value2" );
- cache.update( element );
-
- // setup a service to talk to the listener started above.
- TCPLateralCacheAttributes lattr2 = new TCPLateralCacheAttributes();
- lattr2.setTcpListenerPort( 1156 );
- lattr2.setTcpServer( "localhost:1157" );
-
- LateralTCPService<GroupAttrName<String>, String> service =
- new LateralTCPService<GroupAttrName<String>, String>( lattr2 );
- service.setListenerId( 123469 );
-
- SleepUtil.sleepAtLeast( 500 );
-
- // DO WORK
- Set<String> result = service.getGroupNames("test");
-
- // SleepUtil.sleepAtLeast( 5000000 );
-
- // VERIFY
- System.out.println( "testSendAndReceived, result = " + result );
- assertNotNull( "Result should not be null.", result );
- assertTrue( "Size is wrong" , result.size() == 2);
- assertTrue( "Didn't get the correct object", result.contains("group"));
- assertTrue( "Didn't get the correct object", result.contains("group2"));
}
/**
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/MockRemoteCacheClient.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/MockRemoteCacheClient.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/MockRemoteCacheClient.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/MockRemoteCacheClient.java Mon Jan 6 17:01:48 2014
@@ -29,7 +29,6 @@ import java.util.Set;
import org.apache.commons.jcs.auxiliary.AbstractAuxiliaryCache;
import org.apache.commons.jcs.auxiliary.AuxiliaryCacheAttributes;
-import org.apache.commons.jcs.auxiliary.remote.RemoteCacheAttributes;
import org.apache.commons.jcs.auxiliary.remote.behavior.IRemoteCacheClient;
import org.apache.commons.jcs.auxiliary.remote.behavior.IRemoteCacheListener;
import org.apache.commons.jcs.engine.CacheStatus;
@@ -198,18 +197,9 @@ public class MockRemoteCacheClient<K ext
}
/**
- * @param group
* @return null
*/
- public Set<K> getGroupKeys( String group )
- {
- return null;
- }
-
- /**
- * @return null
- */
- public Set<String> getGroupNames()
+ public Set<K> getKeySet( )
{
return null;
}
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/MockRemoteCacheService.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/MockRemoteCacheService.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/MockRemoteCacheService.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/MockRemoteCacheService.java Mon Jan 6 17:01:48 2014
@@ -75,24 +75,14 @@ public class MockRemoteCacheService<K ex
/**
* @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/auxiliary/remote/RemoteCacheListenerUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/RemoteCacheListenerUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/RemoteCacheListenerUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/RemoteCacheListenerUnitTest.java Mon Jan 6 17:01:48 2014
@@ -21,8 +21,6 @@ package org.apache.commons.jcs.auxiliary
import junit.framework.TestCase;
-import org.apache.commons.jcs.auxiliary.remote.RemoteCacheAttributes;
-import org.apache.commons.jcs.auxiliary.remote.RemoteCacheListener;
import org.apache.commons.jcs.auxiliary.remote.behavior.IRemoteCacheAttributes;
import org.apache.commons.jcs.engine.CacheElementSerialized;
import org.apache.commons.jcs.engine.ElementAttributes;
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWaitUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWaitUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWaitUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWaitUnitTest.java Mon Jan 6 17:01:48 2014
@@ -26,7 +26,6 @@ import java.util.Set;
import junit.framework.TestCase;
-import org.apache.commons.jcs.auxiliary.remote.RemoteCacheNoWait;
import org.apache.commons.jcs.engine.CacheElement;
import org.apache.commons.jcs.engine.CacheStatus;
import org.apache.commons.jcs.engine.behavior.ICacheElement;
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/RemoteCacheUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/RemoteCacheUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/RemoteCacheUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/RemoteCacheUnitTest.java Mon Jan 6 17:01:48 2014
@@ -25,8 +25,6 @@ import java.util.Map;
import junit.framework.TestCase;
import org.apache.commons.jcs.auxiliary.MockCacheEventLogger;
-import org.apache.commons.jcs.auxiliary.remote.RemoteCache;
-import org.apache.commons.jcs.auxiliary.remote.RemoteCacheAttributes;
import org.apache.commons.jcs.auxiliary.remote.behavior.IRemoteCacheAttributes;
import org.apache.commons.jcs.engine.CacheElement;
import org.apache.commons.jcs.engine.ZombieCacheServiceNonLocal;
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/RemoteUtilsUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/RemoteUtilsUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/RemoteUtilsUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/RemoteUtilsUnitTest.java Mon Jan 6 17:01:48 2014
@@ -21,8 +21,6 @@ package org.apache.commons.jcs.auxiliary
import java.rmi.RemoteException;
-import org.apache.commons.jcs.auxiliary.remote.RemoteUtils;
-
import junit.framework.TestCase;
/**
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/TestRemoteCache.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/TestRemoteCache.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/TestRemoteCache.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/TestRemoteCache.java Mon Jan 6 17:01:48 2014
@@ -22,11 +22,9 @@ package org.apache.commons.jcs.auxiliary
import junit.framework.TestCase;
import org.apache.commons.jcs.JCS;
+import org.apache.commons.jcs.access.CacheAccess;
import org.apache.commons.jcs.auxiliary.AuxiliaryCache;
import org.apache.commons.jcs.auxiliary.MockCacheEventLogger;
-import org.apache.commons.jcs.auxiliary.remote.RemoteCacheAttributes;
-import org.apache.commons.jcs.auxiliary.remote.RemoteCacheManager;
-import org.apache.commons.jcs.auxiliary.remote.RemoteUtils;
import org.apache.commons.jcs.auxiliary.remote.server.RemoteCacheServerFactory;
import org.apache.commons.jcs.engine.CacheElement;
import org.apache.commons.jcs.engine.behavior.ICompositeCacheManager;
@@ -83,7 +81,7 @@ public class TestRemoteCache
log.info( "testSimpleSend" );
System.out.println( "testSimpleSend" );
- JCS<String, String> cache = JCS.getInstance( "testCache" );
+ CacheAccess<String, String> cache = JCS.getInstance( "testCache" );
log.info( "cache = " + cache );
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheClientUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheClientUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheClientUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheClientUnitTest.java Mon Jan 6 17:01:48 2014
@@ -27,8 +27,6 @@ import java.util.Set;
import junit.framework.TestCase;
-import org.apache.commons.jcs.auxiliary.remote.http.client.RemoteHttpCacheAttributes;
-import org.apache.commons.jcs.auxiliary.remote.http.client.RemoteHttpCacheClient;
import org.apache.commons.jcs.auxiliary.remote.value.RemoteCacheResponse;
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/auxiliary/remote/http/client/RemoteHttpCacheDispatcherUniTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheDispatcherUniTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheDispatcherUniTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheDispatcherUniTest.java Mon Jan 6 17:01:48 2014
@@ -2,8 +2,6 @@ package org.apache.commons.jcs.auxiliary
import junit.framework.TestCase;
-import org.apache.commons.jcs.auxiliary.remote.http.client.RemoteHttpCacheAttributes;
-import org.apache.commons.jcs.auxiliary.remote.http.client.RemoteHttpCacheDispatcher;
import org.apache.commons.jcs.auxiliary.remote.value.RemoteCacheRequest;
import org.apache.commons.jcs.auxiliary.remote.value.RemoteRequestType;
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheManagerUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheManagerUnitTest.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheManagerUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheManagerUnitTest.java Mon Jan 6 17:01:48 2014
@@ -22,9 +22,6 @@ package org.apache.commons.jcs.auxiliary
import junit.framework.TestCase;
import org.apache.commons.jcs.auxiliary.AuxiliaryCache;
-import org.apache.commons.jcs.auxiliary.remote.http.client.RemoteHttpCacheAttributes;
-import org.apache.commons.jcs.auxiliary.remote.http.client.RemoteHttpCacheClient;
-import org.apache.commons.jcs.auxiliary.remote.http.client.RemoteHttpCacheManager;
import org.apache.commons.jcs.auxiliary.remote.http.client.behavior.IRemoteHttpCacheClient;
import org.apache.commons.jcs.engine.behavior.ICompositeCacheManager;
import org.apache.commons.jcs.engine.behavior.IElementSerializer;
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheManualTester.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheManualTester.java?rev=1555918&r1=1555917&r2=1555918&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheManualTester.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheManualTester.java Mon Jan 6 17:01:48 2014
@@ -22,6 +22,7 @@ package org.apache.commons.jcs.auxiliary
import junit.framework.TestCase;
import org.apache.commons.jcs.JCS;
+import org.apache.commons.jcs.access.CacheAccess;
/** Manual tester for a JCS instance configured to use the http client. */
public class RemoteHttpCacheManualTester
@@ -46,7 +47,7 @@ public class RemoteHttpCacheManualTester
public void testSimpleLoad()
throws Exception
{
- JCS<String, String> jcs = JCS.getInstance( "testCache1" );
+ CacheAccess<String, String> jcs = JCS.getInstance( "testCache1" );
jcs.put( "TestKey", "TestValue" );