jtaylor 02/05/23 08:55:28
Modified: src/java/org/apache/jcs/auxiliary/lateral/socket/tcp
LateralTCPListener.java
src/java/org/apache/jcs/auxiliary/remote
RemoteCacheListener.java
src/java/org/apache/jcs/auxiliary/remote/group
RemoteGroupCacheListener.java
src/java/org/apache/jcs/auxiliary/remote/server
RemoteCacheServer.java
RemoteCacheServerListener.java
src/java/org/apache/jcs/engine CacheListeners.java
src/java/org/apache/jcs/engine/control CompositeCache.java
CompositeCacheConfigurator.java
CompositeCacheManager.java
src/java/org/apache/jcs/engine/control/group GroupCache.java
GroupCacheHub.java
src/java/org/apache/jcs/engine/memory MemoryCache.java
src/java/org/apache/jcs/engine/memory/behavior
IMemoryCache.java
src/java/org/apache/jcs/engine/memory/lru
LRUMemoryCache.java
src/java/org/apache/jcs/engine/memory/mru
MRUMemoryCache.java
Removed: src/java/org/apache/jcs/engine/behavior ICacheHub.java
ICompositeCache.java
Log:
Got rid of the ICompositeCache and ICacheHub interfaces in favor of using
CompositeCache itself. Saves a lot of casting and try catch blocks and makes
the core nature of the CompositeCache more clear.
Revision Changes Path
1.4 +4 -4
jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/lateral/socket/tcp/LateralTCPListener.java
Index: LateralTCPListener.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/lateral/socket/tcp/LateralTCPListener.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LateralTCPListener.java 23 May 2002 15:22:22 -0000 1.3
+++ LateralTCPListener.java 23 May 2002 15:55:27 -0000 1.4
@@ -71,14 +71,14 @@
import org.apache.jcs.auxiliary.lateral.behavior.ILateralCacheAttributes;
import org.apache.jcs.auxiliary.lateral.behavior.ILateralCacheListener;
import org.apache.jcs.engine.behavior.ICacheElement;
-import org.apache.jcs.engine.behavior.ICompositeCache;
+import org.apache.jcs.engine.control.CompositeCache;
import org.apache.jcs.engine.control.CompositeCacheManager;
/**
* Listens for connections from other TCP lateral caches and handles them.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Aaron Smuts</a>
- * @version $Id: LateralTCPListener.java,v 1.3 2002/05/23 15:22:22 jtaylor Exp $
+ * @version $Id: LateralTCPListener.java,v 1.4 2002/05/23 15:55:27 jtaylor Exp $
*/
public class LateralTCPListener
implements ILateralCacheListener, Serializable
@@ -265,7 +265,7 @@
/**
* Gets the cacheManager attribute of the LateralCacheTCPListener object
*/
- protected ICompositeCache getCache( String name )
+ protected CompositeCache getCache( String name )
{
if ( cacheMgr == null )
{
@@ -277,7 +277,7 @@
}
}
- return ( ICompositeCache ) cacheMgr.getCache( name );
+ return cacheMgr.getCache( name );
}
// ---------------------------------------------------------- inner classes
1.6 +1 -5
jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/remote/RemoteCacheListener.java
Index: RemoteCacheListener.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/remote/RemoteCacheListener.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- RemoteCacheListener.java 23 May 2002 15:22:22 -0000 1.5
+++ RemoteCacheListener.java 23 May 2002 15:55:27 -0000 1.6
@@ -14,13 +14,9 @@
import org.apache.jcs.engine.behavior.ICache;
import org.apache.jcs.engine.behavior.ICacheElement;
-import org.apache.jcs.engine.behavior.ICacheManager;
-import org.apache.jcs.engine.behavior.ICompositeCache;
import org.apache.jcs.engine.control.CompositeCache;
-
import org.apache.jcs.engine.control.CompositeCacheManager;
-import org.apache.jcs.engine.CacheConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -205,7 +201,7 @@
}
getCacheManager();
- ICompositeCache cache = ( ICompositeCache ) cacheMgr.getCache(
cb.getCacheName() );
+ CompositeCache cache = cacheMgr.getCache( cb.getCacheName() );
cache.localUpdate( cb );
}
1.6 +3 -7
jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/remote/group/RemoteGroupCacheListener.java
Index: RemoteGroupCacheListener.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/remote/group/RemoteGroupCacheListener.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- RemoteGroupCacheListener.java 23 May 2002 15:22:22 -0000 1.5
+++ RemoteGroupCacheListener.java 23 May 2002 15:55:27 -0000 1.6
@@ -16,9 +16,7 @@
import org.apache.jcs.auxiliary.remote.behavior.IRemoteCacheConstants;
import org.apache.jcs.auxiliary.remote.behavior.IRemoteCacheListener;
-import org.apache.jcs.engine.behavior.ICache;
import org.apache.jcs.engine.behavior.ICacheElement;
-import org.apache.jcs.engine.behavior.ICompositeCache;
import org.apache.jcs.engine.control.group.GroupAttrName;
import org.apache.jcs.engine.control.group.GroupAttrName;
@@ -26,19 +24,17 @@
import org.apache.jcs.engine.control.group.GroupCache;
import org.apache.jcs.engine.control.group.GroupCache;
import org.apache.jcs.engine.control.group.GroupCache;
+
+import org.apache.jcs.engine.control.CompositeCache;
import org.apache.jcs.engine.control.CompositeCacheManager;
-import org.apache.jcs.engine.CacheConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-// remove
-
/**
* Description of the Class
*
* @author asmuts
- * @created January 15, 2002
*/
public class RemoteGroupCacheListener extends RemoteCacheListener implements
IRemoteCacheListener, IRemoteCacheConstants, Serializable
{
@@ -141,7 +137,7 @@
}
getCacheManager();
- ICompositeCache cache = ( ICompositeCache ) cacheMgr.getCache(
irca.getCacheName() );
+ CompositeCache cache = cacheMgr.getCache( irca.getCacheName() );
cache.localUpdate( cb );
}
1.8 +6 -8
jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/remote/server/RemoteCacheServer.java
Index: RemoteCacheServer.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/remote/server/RemoteCacheServer.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- RemoteCacheServer.java 23 May 2002 15:22:22 -0000 1.7
+++ RemoteCacheServer.java 23 May 2002 15:55:27 -0000 1.8
@@ -25,14 +25,12 @@
import org.apache.jcs.engine.CacheEventQueue;
import org.apache.jcs.engine.CacheListeners;
-import org.apache.jcs.engine.CacheConstants;
-import org.apache.jcs.engine.behavior.ICache;
import org.apache.jcs.engine.behavior.ICacheElement;
import org.apache.jcs.engine.behavior.ICacheEventQueue;
import org.apache.jcs.engine.behavior.ICacheListener;
-import org.apache.jcs.engine.behavior.ICompositeCache;
+import org.apache.jcs.engine.control.CompositeCache;
import org.apache.jcs.engine.control.CompositeCacheManager;
import org.apache.commons.logging.Log;
@@ -259,7 +257,7 @@
{
try
{
- ICompositeCache c = ( ICompositeCache ) cacheDesc.cache;
+ CompositeCache c = ( CompositeCache ) cacheDesc.cache;
//TODO; make this a bit less of a hack
// If the source of this request was from a cluster, then
@@ -298,7 +296,7 @@
// UPDATE LOCALS IF A REQUEST COMES FROM A CLUSTER
// IF LOCAL CLUSTER CONSISTENCY IS CONFIGURED
- ICompositeCache cache = ( ICompositeCache ) cacheDesc.cache;
+
if ( !fromCluster || ( fromCluster &&
rcsa.getLocalClusterConsistency() ) )
{
@@ -413,7 +411,7 @@
}
else
{
- ICompositeCache c = ( ICompositeCache ) cacheDesc.cache;
+ CompositeCache c = ( CompositeCache ) cacheDesc.cache;
return c.localGet( key );
}
@@ -454,7 +452,7 @@
boolean removeSuccess = false;
// No need to notify if it was not cached.
- ICompositeCache c = ( ICompositeCache ) cacheDesc.cache;
+ CompositeCache c = ( CompositeCache ) cacheDesc.cache;
if ( fromCluster )
{
@@ -478,7 +476,7 @@
// UPDATE LOCALS IF A REQUEST COMES FROM A CLUSTER
// IF LOCAL CLUSTER CONSISTENCY IS CONFIGURED
- ICompositeCache cache = ( ICompositeCache ) cacheDesc.cache;
+
if ( !fromCluster || ( fromCluster &&
rcsa.getLocalClusterConsistency() ) )
{
1.6 +2 -4
jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/remote/server/RemoteCacheServerListener.java
Index: RemoteCacheServerListener.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/remote/server/RemoteCacheServerListener.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- RemoteCacheServerListener.java 23 May 2002 15:22:22 -0000 1.5
+++ RemoteCacheServerListener.java 23 May 2002 15:55:27 -0000 1.6
@@ -14,12 +14,9 @@
import org.apache.jcs.engine.behavior.ICache;
import org.apache.jcs.engine.behavior.ICacheElement;
-import org.apache.jcs.engine.behavior.ICacheManager;
-import org.apache.jcs.engine.behavior.ICompositeCache;
import org.apache.jcs.engine.control.CompositeCache;
import org.apache.jcs.engine.control.CompositeCacheManager;
-import org.apache.jcs.engine.CacheConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -187,7 +184,8 @@
log.debug( "puts = " + puts );
}
}
- ICompositeCache cache = ( ICompositeCache ) cacheMgr.getCache(
irca.getCacheName() );
+
+ CompositeCache cache = cacheMgr.getCache( irca.getCacheName() );
cache.localUpdate( cb );
}
1.2 +1 -2
jakarta-turbine-jcs/src/java/org/apache/jcs/engine/CacheListeners.java
Index: CacheListeners.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/engine/CacheListeners.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CacheListeners.java 7 Apr 2002 16:55:26 -0000 1.1
+++ CacheListeners.java 23 May 2002 15:55:27 -0000 1.2
@@ -3,8 +3,7 @@
import java.util.Hashtable;
import java.util.Map;
-import org.apache.jcs.engine.behavior.ICache;
-import org.apache.jcs.engine.behavior.ICompositeCache;
+import org.apache.jcs.engine.behavior.ICache;;
/**
* Used to associates a set of [cache listener to cache event queue] for a
1.2 +2 -3
jakarta-turbine-jcs/src/java/org/apache/jcs/engine/control/CompositeCache.java
Index: CompositeCache.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/engine/control/CompositeCache.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CompositeCache.java 23 May 2002 15:22:22 -0000 1.1
+++ CompositeCache.java 23 May 2002 15:55:27 -0000 1.2
@@ -69,7 +69,6 @@
import org.apache.jcs.engine.behavior.ICache;
import org.apache.jcs.engine.behavior.ICacheElement;
import org.apache.jcs.engine.behavior.ICacheType;
-import org.apache.jcs.engine.behavior.ICompositeCache;
import org.apache.jcs.engine.behavior.ICompositeCacheAttributes;
import org.apache.jcs.engine.behavior.IElementAttributes;
@@ -91,10 +90,10 @@
*
*@author <a href="mailto:[EMAIL PROTECTED]";>Aaron Smuts</a>
*@author <a href="mailto:[EMAIL PROTECTED]";>James Taylor</a>
- *@version $Id: CompositeCache.java,v 1.1 2002/05/23 15:22:22 jtaylor Exp $
+ *@version $Id: CompositeCache.java,v 1.2 2002/05/23 15:55:27 jtaylor Exp $
*/
public class CompositeCache
- implements ICache, ICompositeCache, Serializable
+ implements ICache, Serializable
{
private final static Log log = LogFactory.getLog( CompositeCache.class );
1.6 +4 -4
jakarta-turbine-jcs/src/java/org/apache/jcs/engine/control/CompositeCacheConfigurator.java
Index: CompositeCacheConfigurator.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/engine/control/CompositeCacheConfigurator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CompositeCacheConfigurator.java 23 May 2002 15:22:22 -0000 1.5
+++ CompositeCacheConfigurator.java 23 May 2002 15:55:27 -0000 1.6
@@ -173,7 +173,7 @@
}
/** Create cache region. */
- protected ICache parseRegion( Properties props,
+ protected CompositeCache parseRegion( Properties props,
String regName,
String value )
{
@@ -181,7 +181,7 @@
}
/** */
- protected ICache parseRegion( Properties props,
+ protected CompositeCache parseRegion( Properties props,
String regName,
String value,
ICompositeCacheAttributes cca )
@@ -190,7 +190,7 @@
}
/** */
- protected ICache parseRegion( Properties props,
+ protected CompositeCache parseRegion( Properties props,
String regName,
String value,
ICompositeCacheAttributes cca,
@@ -244,7 +244,7 @@
IElementAttributes ea = parseElementAttributes( props, regName,
regionPrefix );
- ICache cache = null;
+ CompositeCache cache = null;
if ( regionPrefix.equals( SYSTEM_REGION_PREFIX ) )
{
//cache = ccMgr.createSystemCache( regName, auxCaches, cca, new
ElementAttributes() );
1.4 +20 -25
jakarta-turbine-jcs/src/java/org/apache/jcs/engine/control/CompositeCacheManager.java
Index: CompositeCacheManager.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/engine/control/CompositeCacheManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CompositeCacheManager.java 23 May 2002 15:22:22 -0000 1.3
+++ CompositeCacheManager.java 23 May 2002 15:55:27 -0000 1.4
@@ -3,7 +3,6 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.Serializable;
-import java.rmi.NotBoundException;
import java.util.Enumeration;
import java.util.Hashtable;
import java.util.Iterator;
@@ -18,14 +17,13 @@
import org.apache.jcs.engine.CompositeCacheAttributes;
import org.apache.jcs.engine.ElementAttributes;
import org.apache.jcs.engine.CacheConstants;
-import org.apache.jcs.engine.behavior.ICache;
+import org.apache.jcs.engine.behavior.ICacheType;
import org.apache.jcs.engine.behavior.ICompositeCacheAttributes;
import org.apache.jcs.engine.behavior.IElementAttributes;
-import org.apache.jcs.engine.behavior.ICacheHub;
/** Manages a composite cache. */
public class CompositeCacheManager
- implements ICacheHub, IRemoteCacheConstants, Serializable
+ implements IRemoteCacheConstants, Serializable
{
private final static Log log =
LogFactory.getLog( CompositeCacheManager.class );
@@ -272,20 +270,20 @@
}
/** Gets the cache attribute of the CacheHub object */
- public ICache getCache( String cacheName )
+ public CompositeCache getCache( String cacheName )
{
return getCache( cacheName, this.defaultCacheAttr.copy() );
}
/** Gets the cache attribute of the CacheHub object */
- public ICache getCache( String cacheName, ICompositeCacheAttributes cattr )
+ public CompositeCache getCache( String cacheName, ICompositeCacheAttributes
cattr )
{
cattr.setCacheName( cacheName );
return getCache( cattr, this.defaultElementAttr );
}
/** Gets the cache attribute of the CacheHub object */
- public ICache getCache( String cacheName,
+ public CompositeCache getCache( String cacheName,
ICompositeCacheAttributes cattr,
IElementAttributes attr )
{
@@ -294,7 +292,7 @@
}
/** Gets the cache attribute of the CacheHub object */
- public ICache getCache( ICompositeCacheAttributes cattr )
+ public CompositeCache getCache( ICompositeCacheAttributes cattr )
{
return getCache( cattr, this.defaultElementAttr );
}
@@ -307,30 +305,27 @@
* defaults if none are specified. We might want to create separate method
* for creating/getting. . .
*/
- public ICache getCache( ICompositeCacheAttributes cattr,
+ public CompositeCache getCache( ICompositeCacheAttributes cattr,
IElementAttributes attr )
{
- ICache cache = ( ICache ) caches.get( cattr.getCacheName() );
+ CompositeCache cache;
- if ( cache == null )
+ synchronized ( caches )
{
- synchronized ( caches )
+ cache = ( CompositeCache ) caches.get( cattr.getCacheName() );
+ if ( cache == null )
{
- cache = ( ICache ) caches.get( cattr.getCacheName() );
- if ( cache == null )
- {
- cattr.setCacheName( cattr.getCacheName() );
+ cattr.setCacheName( cattr.getCacheName() );
- CompositeCacheConfigurator configurator =
- new CompositeCacheConfigurator( this );
+ CompositeCacheConfigurator configurator =
+ new CompositeCacheConfigurator( this );
- cache = configurator.parseRegion( this.props,
- cattr.getCacheName(),
- this.defaultAuxValues,
- cattr );
+ cache = configurator.parseRegion( this.props,
+ cattr.getCacheName(),
+ this.defaultAuxValues,
+ cattr );
- caches.put( cattr.getCacheName(), cache );
- }
+ caches.put( cattr.getCacheName(), cache );
}
}
@@ -416,7 +411,7 @@
/** */
public int getCacheType()
{
- return CACHE_HUB;
+ return ICacheType.CACHE_HUB;
}
/** */
1.9 +24 -51
jakarta-turbine-jcs/src/java/org/apache/jcs/engine/control/group/GroupCache.java
Index: GroupCache.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/engine/control/group/GroupCache.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- GroupCache.java 23 May 2002 15:22:22 -0000 1.8
+++ GroupCache.java 23 May 2002 15:55:28 -0000 1.9
@@ -62,11 +62,11 @@
import org.apache.commons.logging.LogFactory;
import org.apache.jcs.access.exception.CacheException;
import org.apache.jcs.access.exception.ObjectNotFoundException;
-import org.apache.jcs.engine.CacheConstants;
+
import org.apache.jcs.engine.CacheElement;
-import org.apache.jcs.engine.behavior.ICache;
+
import org.apache.jcs.engine.behavior.ICacheElement;
-import org.apache.jcs.engine.behavior.ICompositeCache;
+
import org.apache.jcs.engine.behavior.ICompositeCacheAttributes;
import org.apache.jcs.engine.behavior.IElementAttributes;
import org.apache.jcs.engine.control.CompositeCache;
@@ -84,7 +84,7 @@
*
* @author asmuts
*/
-public class GroupCache extends CompositeCache implements ICompositeCache
+public class GroupCache extends CompositeCache
{
private final static Log log = LogFactory.getLog( GroupCache.class );
@@ -98,7 +98,7 @@
* list will not move back and forth. The list can be maintained locally but
* the elements themselves need not be.
*/
- ICompositeCache systemGroupIdCache;
+ CompositeCache systemGroupIdCache;
/**
* Constructor for the GroupCache object
@@ -135,7 +135,7 @@
AuxiliaryCache[] auxCaches,
ICompositeCacheAttributes cattr,
IElementAttributes attr,
- ICompositeCache systemGroupIdCache )
+ CompositeCache systemGroupIdCache )
{
super( cacheName, auxCaches, cattr, attr );
if ( log.isDebugEnabled() )
@@ -201,7 +201,6 @@
* Places a read lock on the group id for a GroupAttrName get-operation.
*
* @param key The key for the element
- * @param container Should it return the CacheElement wrapper
* @return The gAN value
*/
public ICacheElement getGAN( GroupAttrName key )
@@ -213,7 +212,6 @@
* Gets the gAN attribute of the GroupCache object
*
* @param key The key for the element
- * @param container Should it return the CacheElement wrapper
* @param invocation Is the originating method call from a local source
* @return The gAN value
*/
@@ -300,13 +298,11 @@
log.debug( "getGi: got obj " + obj );
}
}
- catch ( IOException ioeg )
- {
- }
finally
{
locker.done( gid.key );
}
+
return ( ICacheElement ) obj;
}
@@ -572,8 +568,6 @@
/**
* Put an element into a group.
- *
- * @param invocation Is the originating method call from a local source
*/
public void putGAN( GroupAttrName key, Serializable val,
IElementAttributes attrE,
@@ -648,14 +642,7 @@
GroupId groupId = new GroupId( this.getCacheName(), group );
HashSet attrNameSet = null;
- //attrNameSet = (HashSet)super.get(groupId.key);
- try
- {
- attrNameSet = ( HashSet ) systemGroupIdCache.get( groupId.key );
- }
- catch ( IOException ioe )
- {
- }
+ attrNameSet = ( HashSet ) systemGroupIdCache.get( groupId.key );
if ( attrNameSet == null )
{
@@ -824,21 +811,15 @@
HashSet attrNameSet = null;
CacheElement ce = null;
- try
+ if ( invocation )
{
- if ( invocation )
- {
- // Invocation is NOT local
- ce = ( CacheElement ) systemGroupIdCache.localGet( groupId.key );
- }
- else
- {
- // Invocation is local
- ce = ( CacheElement ) systemGroupIdCache.get( groupId.key );
- }
+ // Invocation is NOT local
+ ce = ( CacheElement ) systemGroupIdCache.localGet( groupId.key );
}
- catch ( IOException ioe )
+ else
{
+ // Invocation is local
+ ce = ( CacheElement ) systemGroupIdCache.get( groupId.key );
}
// IF THE NAME SET IS FOUND
@@ -898,25 +879,20 @@
// no more attribute, so remove the name set all together,
skipLock = true.
//super.remove(groupId, invokation );
//removeGI(groupId, invokation, true );
- try
+
+ if ( log.isDebugEnabled() )
{
- if ( log.isDebugEnabled() )
- {
- log.debug( "calling systemGroupIdCache.remove(
groupId.key, EXCLUDE_REMOTE_CACHE )" );
- }
+ log.debug( "calling systemGroupIdCache.remove( groupId.key,
EXCLUDE_REMOTE_CACHE )" );
+ }
- // unlike insertion, removal should go remote if locally
invoked
- if ( invocation )
- {
- systemGroupIdCache.localRemove( groupId.key );
- }
- else
- {
- systemGroupIdCache.remove( groupId.key );
- }
+ // unlike insertion, removal should go remote if locally invoked
+ if ( invocation )
+ {
+ systemGroupIdCache.localRemove( groupId.key );
}
- catch ( IOException ioe )
+ else
{
+ systemGroupIdCache.remove( groupId.key );
}
}
}
@@ -972,9 +948,6 @@
{
ok = systemGroupIdCache.remove( groupId.key );
}
- }
- catch ( IOException ioeg )
- {
}
finally
{
1.5 +4 -8
jakarta-turbine-jcs/src/java/org/apache/jcs/engine/control/group/GroupCacheHub.java
Index: GroupCacheHub.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/engine/control/group/GroupCacheHub.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- GroupCacheHub.java 23 May 2002 15:22:22 -0000 1.4
+++ GroupCacheHub.java 23 May 2002 15:55:28 -0000 1.5
@@ -2,10 +2,6 @@
import java.io.Serializable;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.jcs.engine.behavior.ICache;
-import org.apache.jcs.engine.behavior.ICompositeCache;
import org.apache.jcs.engine.behavior.ICompositeCacheAttributes;
import org.apache.jcs.engine.behavior.IElementAttributes;
import org.apache.jcs.engine.control.CompositeCache;
@@ -33,8 +29,8 @@
ICompositeCacheAttributes cattr,
IElementAttributes attr )
{
- ICompositeCache systemGroupIdCache =
- ( ICompositeCache ) systemCaches.get( "groupIdCache" );
+ CompositeCache systemGroupIdCache =
+ ( CompositeCache ) systemCaches.get( "groupIdCache" );
return new GroupCache( cacheName, auxCaches, cattr, attr,
systemGroupIdCache );
@@ -48,8 +44,8 @@
ICompositeCacheAttributes cattr,
IElementAttributes attr )
{
- ICompositeCache systemGroupIdCache =
- ( ICompositeCache ) systemCaches.get( "groupIdCache" );
+ CompositeCache systemGroupIdCache =
+ ( CompositeCache ) systemCaches.get( "groupIdCache" );
return new GroupCache( cacheName, auxCaches, cattr, attr,
systemGroupIdCache );
1.8 +2 -3
jakarta-turbine-jcs/src/java/org/apache/jcs/engine/memory/MemoryCache.java
Index: MemoryCache.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/engine/memory/MemoryCache.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- MemoryCache.java 23 May 2002 15:22:23 -0000 1.7
+++ MemoryCache.java 23 May 2002 15:55:28 -0000 1.8
@@ -6,7 +6,6 @@
import org.apache.jcs.engine.behavior.ICacheElement;
import org.apache.jcs.engine.behavior.ICompositeCacheAttributes;
-import org.apache.jcs.engine.behavior.ICompositeCache;
import org.apache.jcs.engine.control.CompositeCache;
/**
@@ -17,7 +16,7 @@
*@author <a href="mailto:[EMAIL PROTECTED]";>Aaron Smuts</a>
*@author <a href="mailto:[EMAIL PROTECTED]";>James Taylor</a>
*@created May 13, 2002
- *@version $Id: MemoryCache.java,v 1.7 2002/05/23 15:22:23 jtaylor Exp $
+ *@version $Id: MemoryCache.java,v 1.8 2002/05/23 15:55:28 jtaylor Exp $
*/
public interface MemoryCache
{
@@ -134,6 +133,6 @@
*
*@return The cache value
*/
- public ICompositeCache getCompositeCache();
+ public CompositeCache getCompositeCache();
}
1.7 +2 -3
jakarta-turbine-jcs/src/java/org/apache/jcs/engine/memory/behavior/IMemoryCache.java
Index: IMemoryCache.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/engine/memory/behavior/IMemoryCache.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- IMemoryCache.java 23 May 2002 15:22:23 -0000 1.6
+++ IMemoryCache.java 23 May 2002 15:55:28 -0000 1.7
@@ -6,10 +6,9 @@
import java.util.Iterator;
import org.apache.jcs.engine.behavior.ICacheElement;
-import org.apache.jcs.engine.behavior.ICacheHub;
import org.apache.jcs.engine.behavior.ICacheType;
import org.apache.jcs.engine.behavior.ICompositeCacheAttributes;
-import org.apache.jcs.engine.behavior.ICompositeCache;
+import org.apache.jcs.engine.control.CompositeCache;
import org.apache.jcs.engine.memory.MemoryElementDescriptor;
import org.apache.jcs.engine.control.CompositeCache;
@@ -167,7 +166,7 @@
*
*@return The cache value
*/
- public ICompositeCache getCompositeCache();
+ public CompositeCache getCompositeCache();
}
1.11 +3 -4
jakarta-turbine-jcs/src/java/org/apache/jcs/engine/memory/lru/LRUMemoryCache.java
Index: LRUMemoryCache.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/engine/memory/lru/LRUMemoryCache.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- LRUMemoryCache.java 23 May 2002 15:22:23 -0000 1.10
+++ LRUMemoryCache.java 23 May 2002 15:55:28 -0000 1.11
@@ -13,7 +13,6 @@
import org.apache.jcs.engine.CacheElement;
import org.apache.jcs.engine.behavior.ICacheElement;
import org.apache.jcs.engine.behavior.ICompositeCacheAttributes;
-import org.apache.jcs.engine.behavior.ICompositeCache;
import org.apache.jcs.engine.behavior.IElementAttributes;
import org.apache.jcs.engine.control.CompositeCache;
import org.apache.jcs.engine.memory.MemoryCache;
@@ -34,7 +33,7 @@
*@author <a href="mailto:[EMAIL PROTECTED]";>Aaron Smuts</a>
*@author <a href="mailto:[EMAIL PROTECTED]";>James Taylor</a>
*@created May 13, 2002
- *@version $Id: LRUMemoryCache.java,v 1.10 2002/05/23 15:22:23 jtaylor Exp $
+ *@version $Id: LRUMemoryCache.java,v 1.11 2002/05/23 15:55:28 jtaylor Exp $
*/
public class LRUMemoryCache implements MemoryCache, Serializable
{
@@ -488,9 +487,9 @@
*
*@return The cache value
*/
- public ICompositeCache getCompositeCache()
+ public CompositeCache getCompositeCache()
{
- return this.cache;
+ return this.cache;
}
1.8 +3 -6
jakarta-turbine-jcs/src/java/org/apache/jcs/engine/memory/mru/MRUMemoryCache.java
Index: MRUMemoryCache.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/engine/memory/mru/MRUMemoryCache.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- MRUMemoryCache.java 23 May 2002 15:22:23 -0000 1.7
+++ MRUMemoryCache.java 23 May 2002 15:55:28 -0000 1.8
@@ -13,15 +13,12 @@
import org.apache.jcs.engine.CacheConstants;
import org.apache.jcs.engine.behavior.ICacheElement;
import org.apache.jcs.engine.behavior.ICompositeCacheAttributes;
-import org.apache.jcs.engine.behavior.ICompositeCache;
import org.apache.jcs.engine.behavior.IElementAttributes;
import org.apache.jcs.engine.control.CompositeCache;
import org.apache.jcs.engine.memory.MemoryCache;
import org.apache.jcs.engine.memory.MemoryElementDescriptor;
import org.apache.jcs.engine.memory.shrinking.ShrinkerThread;
-import org.apache.jcs.engine.behavior.ICompositeCache;
-
/**
* A SLOW AS HELL reference management system. The most recently used items move
* to the front of the list and get spooled to disk if the cache hub is
@@ -29,7 +26,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Aaron Smuts</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>James Taylor</a>
- * @version $Id: MRUMemoryCache.java,v 1.7 2002/05/23 15:22:23 jtaylor Exp $
+ * @version $Id: MRUMemoryCache.java,v 1.8 2002/05/23 15:55:28 jtaylor Exp $
*/
public class MRUMemoryCache
implements MemoryCache, Serializable
@@ -523,9 +520,9 @@
*
*@return The cache value
*/
- public ICompositeCache getCompositeCache()
+ public CompositeCache getCompositeCache()
{
- return this.cache;
+ return this.cache;
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
