Modified: jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/server/RemoteCacheServer.java URL: http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/server/RemoteCacheServer.java?rev=240226&r1=240225&r2=240226&view=diff ============================================================================== --- jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/server/RemoteCacheServer.java (original) +++ jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/server/RemoteCacheServer.java Fri Aug 26 05:47:59 2005 @@ -833,7 +833,8 @@ } Map eventQMap = cacheDesc.eventQMap; cleanupEventQMap( eventQMap ); - + + //synchronized ( listenerId ) synchronized ( ICacheListener.class ) { long id = 0;
Modified: jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/server/RemoteCacheServerFactory.java URL: http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/server/RemoteCacheServerFactory.java?rev=240226&r1=240225&r2=240226&view=diff ============================================================================== --- jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/server/RemoteCacheServerFactory.java (original) +++ jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/server/RemoteCacheServerFactory.java Fri Aug 26 05:47:59 2005 @@ -30,6 +30,7 @@ import org.apache.jcs.auxiliary.remote.behavior.IRemoteCacheConstants; import org.apache.jcs.auxiliary.remote.behavior.IRemoteCacheServiceAdmin; import org.apache.jcs.engine.behavior.ICacheServiceAdmin; +import org.apache.jcs.utils.props.PropertyLoader; /** * Provides remote cache services. @@ -54,6 +55,11 @@ /** * Starts up the remote cache server on this JVM, and binds it to the * registry on the given host and port. + * @param host + * @param port + * @param propFile + * @throws IOException + * @throws NotBoundException */ public static void startup( String host, int port, String propFile ) throws IOException, NotBoundException @@ -79,7 +85,8 @@ rcsa.setConfigFileName( propFile ); Properties prop = RemoteUtils.loadProps( propFile ); - + //Properties prop = PropertyLoader.loadProperties( propFile ); + String servicePortStr = prop.getProperty( REMOTE_CACHE_SERVICE_PORT ); int servicePort = -1; try @@ -188,6 +195,7 @@ * * @param args * The command line arguments + * @throws Exception */ public static void main( String[] args ) throws Exception Modified: jakarta/jcs/trunk/src/java/org/apache/jcs/engine/CacheEventQueue.java URL: http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/java/org/apache/jcs/engine/CacheEventQueue.java?rev=240226&r1=240225&r2=240226&view=diff ============================================================================== --- jakarta/jcs/trunk/src/java/org/apache/jcs/engine/CacheEventQueue.java (original) +++ jakarta/jcs/trunk/src/java/org/apache/jcs/engine/CacheEventQueue.java Fri Aug 26 05:47:59 2005 @@ -460,7 +460,7 @@ { Node next = null; - AbstractCacheEvent event = null; + CacheEventQueue.AbstractCacheEvent event = null; } /** Modified: jakarta/jcs/trunk/src/java/org/apache/jcs/engine/PooledCacheEventQueue.java URL: http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/java/org/apache/jcs/engine/PooledCacheEventQueue.java?rev=240226&r1=240225&r2=240226&view=diff ============================================================================== --- jakarta/jcs/trunk/src/java/org/apache/jcs/engine/PooledCacheEventQueue.java (original) +++ jakarta/jcs/trunk/src/java/org/apache/jcs/engine/PooledCacheEventQueue.java Fri Aug 26 05:47:59 2005 @@ -62,7 +62,7 @@ // time to wait for an event before snuffing the background thread // if the queue is empty. // make configurable later - private static int waitToDieMillis = 10000; + private int waitToDieMillis = 10000; private ICacheListener listener; @@ -373,7 +373,7 @@ elems.add( se ); // get an array and put them in the Stats object - IStatElement[] ses = (IStatElement[]) elems.toArray( new StatElement[0] ); + IStatElement[] ses = (IStatElement[]) elems.toArray( new StatElement[elems.size()] ); stats.setStatElements( ses ); return stats; Modified: jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICache.java URL: http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICache.java?rev=240226&r1=240225&r2=240226&view=diff ============================================================================== --- jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICache.java (original) +++ jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICache.java Fri Aug 26 05:47:59 2005 @@ -30,35 +30,49 @@ public interface ICache extends ICacheType { - /** Puts an item to the cache. */ + /** Puts an item to the cache. + * @param ce + * @throws IOException*/ public void update( ICacheElement ce ) throws IOException; - /** Gets an item from the cache. */ + /** Gets an item from the cache. + * @param key + * @return + * @throws IOException*/ public ICacheElement get( Serializable key ) throws IOException; - /** Removes an item from the cache. */ + /** Removes an item from the cache. + * @param key + * @return + * @throws IOException*/ public boolean remove( Serializable key ) throws IOException; - /** Removes all cached items from the cache. */ + /** Removes all cached items from the cache. + * @throws IOException*/ public void removeAll() throws IOException; - /** Prepares for shutdown. */ + /** Prepares for shutdown. + * @throws IOException*/ public void dispose() throws IOException; - /** Returns the current cache size. */ + /** Returns the current cache size. + * @return*/ public int getSize(); - /** Returns the cache status. */ + /** Returns the cache status. + * @return*/ public int getStatus(); - /** Returns the cache stats. */ + /** Returns the cache stats. + * @return*/ public String getStats(); - /** Returns the cache name. */ + /** Returns the cache name. + * @return*/ public String getCacheName(); } Modified: jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheEventQueue.java URL: http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheEventQueue.java?rev=240226&r1=240225&r2=240226&view=diff ============================================================================== --- jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheEventQueue.java (original) +++ jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheEventQueue.java Fri Aug 26 05:47:59 2005 @@ -51,6 +51,7 @@ * * @param ce * The feature to be added to the PutEvent attribute + * @throws IOException */ public void addPutEvent( ICacheElement ce ) throws IOException; @@ -61,6 +62,7 @@ * * @param key * The feature to be added to the RemoveEvent attribute + * @throws IOException */ public void addRemoveEvent( Serializable key ) throws IOException; @@ -68,6 +70,7 @@ /** * Adds a feature to the RemoveAllEvent attribute of the ICacheEventQueue * object + * @throws IOException */ public void addRemoveAllEvent() throws IOException; @@ -75,6 +78,7 @@ /** * Adds a feature to the DisposeEvent attribute of the ICacheEventQueue * object + * @throws IOException */ public void addDisposeEvent() throws IOException; Modified: jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheListener.java URL: http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheListener.java?rev=240226&r1=240225&r2=240226&view=diff ============================================================================== --- jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheListener.java (original) +++ jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheListener.java Fri Aug 26 05:47:59 2005 @@ -29,19 +29,28 @@ */ public interface ICacheListener { - /** Notifies the subscribers for a cache entry update. */ + /** Notifies the subscribers for a cache entry update. + * @param item + * @throws IOException*/ public void handlePut( ICacheElement item ) throws IOException; - /** Notifies the subscribers for a cache entry removal. */ + /** Notifies the subscribers for a cache entry removal. + * @param cacheName + * @param key + * @throws IOException*/ public void handleRemove( String cacheName, Serializable key ) throws IOException; - /** Notifies the subscribers for a cache remove-all. */ + /** Notifies the subscribers for a cache remove-all. + * @param cacheName + * @throws IOException*/ public void handleRemoveAll( String cacheName ) throws IOException; - /** Notifies the subscribers for freeing up the named cache. */ + /** Notifies the subscribers for freeing up the named cache. + * @param cacheName + * @throws IOException*/ public void handleDispose( String cacheName ) throws IOException; @@ -57,6 +66,7 @@ * * @param id * The new listenerId value + * @throws IOException */ public void setListenerId( long id ) throws IOException; @@ -65,6 +75,7 @@ * Gets the listenerId attribute of the ICacheListener object * * @return The listenerId value + * @throws IOException */ public long getListenerId() throws IOException; Modified: jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheManager.java URL: http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheManager.java?rev=240226&r1=240225&r2=240226&view=diff ============================================================================== --- jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheManager.java (original) +++ jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheManager.java Fri Aug 26 05:47:59 2005 @@ -26,6 +26,7 @@ /** * methods to get a cache region from a maanger + * @param cacheName * * @return The cache value */ Modified: jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheObserver.java URL: http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheObserver.java?rev=240226&r1=240225&r2=240226&view=diff ============================================================================== --- jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheObserver.java (original) +++ jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheObserver.java Fri Aug 26 05:47:59 2005 @@ -18,8 +18,6 @@ import java.io.IOException; -import org.apache.jcs.engine.behavior.ICacheListener; - /** * Used to register interest in receiving cache changes. <br> * <br> @@ -37,6 +35,7 @@ * the specified cache. * @param obj * object to notify for cache changes. + * @throws IOException */ public void addCacheListener( String cacheName, ICacheListener obj ) throws IOException; @@ -48,15 +47,18 @@ * * @param obj * object to notify for all cache changes. + * @throws IOException */ public void addCacheListener( ICacheListener obj ) throws IOException; /** * Unsubscribes from the specified cache. + * @param cacheName * * @param obj * existing subscriber. + * @throws IOException */ public void removeCacheListener( String cacheName, ICacheListener obj ) throws IOException; @@ -66,6 +68,7 @@ * * @param obj * existing subscriber. + * @throws IOException */ public void removeCacheListener( ICacheListener obj ) throws IOException; Modified: jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheRestore.java URL: http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheRestore.java?rev=240226&r1=240225&r2=240226&view=diff ============================================================================== --- jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheRestore.java (original) +++ jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheRestore.java Fri Aug 26 05:47:59 2005 @@ -22,7 +22,11 @@ */ public interface ICacheRestore { - /** Description of the Method */ + /** + * Tries to fix the cache, returns true if successful. + * + * @return true if fixed + */ public boolean canFix(); /** Description of the Method */ Modified: jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheService.java URL: http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheService.java?rev=240226&r1=240225&r2=240226&view=diff ============================================================================== --- jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheService.java (original) +++ jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheService.java Fri Aug 26 05:47:59 2005 @@ -32,30 +32,46 @@ */ public interface ICacheService { - /** Puts a cache item to the cache. */ + /** Puts a cache item to the cache. + * @param item + * @throws ObjectExistsException + * @throws IOException*/ public void update( ICacheElement item ) throws ObjectExistsException, IOException; /** * Returns a cache bean from the specified cache; or null if the key does * not exist. + * @param cacheName + * @param key + * @return + * @throws ObjectNotFoundException + * @throws IOException */ public ICacheElement get( String cacheName, Serializable key ) throws ObjectNotFoundException, IOException; - /** Removes the given key from the specified cache. */ + /** Removes the given key from the specified cache. + * @param cacheName + * @param key + * @throws IOException*/ public void remove( String cacheName, Serializable key ) throws IOException; - /** Remove all keys from the sepcified cache. */ + /** Remove all keys from the sepcified cache. + * @param cacheName + * @throws IOException*/ public void removeAll( String cacheName ) throws IOException; - /** Frees the specified cache. */ + /** Frees the specified cache. + * @param cacheName + * @throws IOException*/ public void dispose( String cacheName ) throws IOException; - /** Frees all caches. */ + /** Frees all caches. + * @throws IOException*/ public void release() throws IOException; } Modified: jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheServiceAdmin.java URL: http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheServiceAdmin.java?rev=240226&r1=240225&r2=240226&view=diff ============================================================================== --- jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheServiceAdmin.java (original) +++ jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICacheServiceAdmin.java Fri Aug 26 05:47:59 2005 @@ -29,15 +29,20 @@ * Gets the stats attribute of the ICacheServiceAdmin object * * @return The stats value + * @throws IOException */ public String getStats() throws IOException; - /** Description of the Method */ + /** Description of the Method + * @throws IOException*/ public void shutdown() throws IOException; - /** Description of the Method */ + /** Description of the Method + * @param host + * @param port + * @throws IOException*/ public void shutdown( String host, int port ) throws IOException; } Modified: jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICompositeCacheAttributes.java URL: http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICompositeCacheAttributes.java?rev=240226&r1=240225&r2=240226&view=diff ============================================================================== --- jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICompositeCacheAttributes.java (original) +++ jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICompositeCacheAttributes.java Fri Aug 26 05:47:59 2005 @@ -176,7 +176,7 @@ * If UseMemoryShrinker is true the memory cache should auto-expire elements * to reclaim space. This sets the maximum number of items to spool per run. * - * @param seconds + * @param maxSpoolPerRun * The new maxSpoolPerRun value */ public void setMaxSpoolPerRun( int maxSpoolPerRun ); Modified: jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICompositeCacheManager.java URL: http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICompositeCacheManager.java?rev=240226&r1=240225&r2=240226&view=diff ============================================================================== --- jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICompositeCacheManager.java (original) +++ jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/ICompositeCacheManager.java Fri Aug 26 05:47:59 2005 @@ -25,6 +25,11 @@ */ public interface ICompositeCacheManager { - /** Gets the cache attribute of the CacheHub object */ + /** + * Gets the cache attribute of the CacheHub object + * + * @param cacheName + * @return + */ public abstract CompositeCache getCache( String cacheName ); } Modified: jakarta/jcs/trunk/src/java/org/apache/jcs/engine/control/CompositeCacheManager.java URL: http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/java/org/apache/jcs/engine/control/CompositeCacheManager.java?rev=240226&r1=240225&r2=240226&view=diff ============================================================================== --- jakarta/jcs/trunk/src/java/org/apache/jcs/engine/control/CompositeCacheManager.java (original) +++ jakarta/jcs/trunk/src/java/org/apache/jcs/engine/control/CompositeCacheManager.java Fri Aug 26 05:47:59 2005 @@ -87,6 +87,7 @@ * the instance it will attempt to configure it with the default * configuration. If you want to configure from your own source, use * [EMAIL PROTECTED] #getUnconfiguredInstance}and then call [EMAIL PROTECTED] #configure} + * @return */ public static synchronized CompositeCacheManager getInstance() { @@ -123,6 +124,7 @@ /** * Get a CacheHub instance which is not configured. If an instance already * exists, it will be returned. + * @return */ public static synchronized CompositeCacheManager getUnconfiguredInstance() { Modified: jakarta/jcs/trunk/src/java/org/apache/jcs/engine/control/event/ElementEventQueue.java URL: http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/java/org/apache/jcs/engine/control/event/ElementEventQueue.java?rev=240226&r1=240225&r2=240226&view=diff ============================================================================== --- jakarta/jcs/trunk/src/java/org/apache/jcs/engine/control/event/ElementEventQueue.java (original) +++ jakarta/jcs/trunk/src/java/org/apache/jcs/engine/control/event/ElementEventQueue.java Fri Aug 26 05:47:59 2005 @@ -117,6 +117,7 @@ * The IElementEventHandler * @param event * The IElementEventHandler IElementEvent event + * @throws IOException */ public void addElementEvent( IElementEventHandler hand, IElementEvent event ) throws IOException @@ -210,7 +211,7 @@ { Node next = null; - AbstractElementEventRunner event = null; + ElementEventQueue.AbstractElementEventRunner event = null; } /** @@ -320,8 +321,8 @@ /** * Constructor for the PutEvent object - * - * @param ice + * @param hand + * @param event * @exception IOException */ ElementEventRunner( IElementEventHandler hand, IElementEvent event ) Modified: jakarta/jcs/trunk/src/java/org/apache/jcs/engine/stats/CacheStats.java URL: http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/java/org/apache/jcs/engine/stats/CacheStats.java?rev=240226&r1=240225&r2=240226&view=diff ============================================================================== --- jakarta/jcs/trunk/src/java/org/apache/jcs/engine/stats/CacheStats.java (original) +++ jakarta/jcs/trunk/src/java/org/apache/jcs/engine/stats/CacheStats.java Fri Aug 26 05:47:59 2005 @@ -82,6 +82,7 @@ /** * This returns data about the auxiliaries, such as hit count. Only the * composite cache knows what the hit count across all auxiliaries is. + * @return IStatElement[] */ public IStatElement[] getStatElements() { Added: jakarta/jcs/trunk/src/test-conf/TestHSQLDiskCache.ccf URL: http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/test-conf/TestHSQLDiskCache.ccf?rev=240226&view=auto ============================================================================== --- jakarta/jcs/trunk/src/test-conf/TestHSQLDiskCache.ccf (added) +++ jakarta/jcs/trunk/src/test-conf/TestHSQLDiskCache.ccf Fri Aug 26 05:47:59 2005 @@ -0,0 +1,23 @@ +# Cache configuration for the 'TestHSQLDiskCache' test. The memory cache has a +# a maximum of 100 objects, so objects should get pushed into the disk cache + +jcs.default=HDC +jcs.default.cacheattributes=org.apache.jcs.engine.CompositeCacheAttributes +jcs.default.cacheattributes.MaxObjects=100 +jcs.default.cacheattributes.MemoryCacheName=org.apache.jcs.engine.memory.lru.LRUMemoryCache +jcs.default.cacheattributes.UseMemoryShrinker=false +jcs.default.cacheattributes.MaxMemoryIdleTimeSeconds=3600 +jcs.default.cacheattributes.ShrinkerIntervalSeconds=60 +jcs.default.elementattributes=org.apache.jcs.engine.ElementAttributes +jcs.default.elementattributes.IsEternal=false +jcs.default.elementattributes.MaxLifeSeconds=700 +jcs.default.elementattributes.IdleTime=1800 +jcs.default.elementattributes.IsSpool=true +jcs.default.elementattributes.IsRemote=true +jcs.default.elementattributes.IsLateral=true + +##### AUXILIARY CACHES +# HSQL Disk Cache -- too slow as is +jcs.auxiliary.HDC=org.apache.jcs.auxiliary.disk.hsql.HSQLCacheFactory +jcs.auxiliary.HDC.attributes=org.apache.jcs.auxiliary.disk.hsql.HSQLCacheAttributes +jcs.auxiliary.HDC.attributes.DiskPath=target/test-sandbox/hsql-disk-cache Added: jakarta/jcs/trunk/src/test-conf/TestJispDiskCache.ccf URL: http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/test-conf/TestJispDiskCache.ccf?rev=240226&view=auto ============================================================================== --- jakarta/jcs/trunk/src/test-conf/TestJispDiskCache.ccf (added) +++ jakarta/jcs/trunk/src/test-conf/TestJispDiskCache.ccf Fri Aug 26 05:47:59 2005 @@ -0,0 +1,24 @@ +# Cache configuration for the 'TestHSQLDiskCache' test. The memory cache has a +# a maximum of 100 objects, so objects should get pushed into the disk cache + +jcs.default=JDC +jcs.default.cacheattributes=org.apache.jcs.engine.CompositeCacheAttributes +jcs.default.cacheattributes.MaxObjects=100 +jcs.default.cacheattributes.MemoryCacheName=org.apache.jcs.engine.memory.lru.LRUMemoryCache +jcs.default.cacheattributes.UseMemoryShrinker=false +jcs.default.cacheattributes.MaxMemoryIdleTimeSeconds=3600 +jcs.default.cacheattributes.ShrinkerIntervalSeconds=60 +jcs.default.elementattributes=org.apache.jcs.engine.ElementAttributes +jcs.default.elementattributes.IsEternal=false +jcs.default.elementattributes.MaxLifeSeconds=700 +jcs.default.elementattributes.IdleTime=1800 +jcs.default.elementattributes.IsSpool=true +jcs.default.elementattributes.IsRemote=true +jcs.default.elementattributes.IsLateral=true + +##### AUXILIARY CACHES +# JISP Disk Cache -- save memory with disk key storage +jcs.auxiliary.JDC=org.apache.jcs.auxiliary.disk.jisp.JISPCacheFactory +jcs.auxiliary.JDC.attributes=org.apache.jcs.auxiliary.disk.jisp.JISPCacheAttributes +jcs.auxiliary.JDC.attributes.DiskPath=target/test-sandbox/jjisp-disk-cache +jcs.auxiliary.JDC.attributes.ClearOnStart=false \ No newline at end of file Added: jakarta/jcs/trunk/src/test-conf/TestRemoteClient.ccf URL: http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/test-conf/TestRemoteClient.ccf?rev=240226&view=auto ============================================================================== --- jakarta/jcs/trunk/src/test-conf/TestRemoteClient.ccf (added) +++ jakarta/jcs/trunk/src/test-conf/TestRemoteClient.ccf Fri Aug 26 05:47:59 2005 @@ -0,0 +1,30 @@ +############################################################## +################## DEFAULT CACHE REGION ##################### +# sets the default aux value for any non configured caches +jcs.default=RC +jcs.default.cacheattributes=org.apache.jcs.engine.CompositeCacheAttributes +jcs.default.cacheattributes.MaxObjects=200001 +jcs.default.cacheattributes.MemoryCacheName=org.apache.jcs.engine.memory.lru.LRUMemoryCache +jcs.default.cacheattributes.UseMemoryShrinker=true +jcs.default.cacheattributes.MaxMemoryIdleTimeSeconds=3600 +jcs.default.cacheattributes.ShrinkerIntervalSeconds=60 +jcs.default.elementattributes=org.apache.jcs.engine.ElementAttributes +jcs.default.elementattributes.IsEternal=false +jcs.default.elementattributes.MaxLifeSeconds=700 +jcs.default.elementattributes.IdleTime=1800 +jcs.default.elementattributes.IsSpool=true +jcs.default.elementattributes.IsRemote=true +jcs.default.elementattributes.IsLateral=true + + +jcs.auxiliary.RC=org.apache.jcs.auxiliary.remote.RemoteCacheFactory +jcs.auxiliary.RC.attributes=org.apache.jcs.auxiliary.remote.RemoteCacheAttributes +jcs.auxiliary.RC.attributes.FailoverServers=localhost:1101 +jcs.auxiliary.RC.attributes.LocalPort=1201 +jcs.auxiliary.RC.attributes.RemoveUponRemotePut=false +#jcs.auxiliary.RC.attributes.RemoteServiceName=RemoteCache +#-1 means no timeout, this is the default +# if the timeout is -1, no threadpool will be used. +jcs.auxiliary.RC.attributes.GetTimeoutMillis=-1 +#jcs.auxiliary.RC.attributes.ThreadPoolName=remote_cache_client +#jcs.auxiliary.RC.attributes.GetOnly=false \ No newline at end of file Added: jakarta/jcs/trunk/src/test-conf/TestRemoteServer.ccf URL: http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/test-conf/TestRemoteServer.ccf?rev=240226&view=auto ============================================================================== --- jakarta/jcs/trunk/src/test-conf/TestRemoteServer.ccf (added) +++ jakarta/jcs/trunk/src/test-conf/TestRemoteServer.ccf Fri Aug 26 05:47:59 2005 @@ -0,0 +1,28 @@ +############################################################## +################## REMOTE SERVER CONFIG ##################### +# Registry used to register and provide the IRmiCacheService service. +registry.host=localhost +registry.port=1101 +# call back port to local caches. +remote.cache.service.port=1101 +# cluster setting +remote.cluster.LocalClusterConsistency=true + +############################################################## +################## DEFAULT CACHE REGION ##################### +# sets the default aux value for any non configured caches +jcs.default= +jcs.default.cacheattributes=org.apache.jcs.engine.CompositeCacheAttributes +jcs.default.cacheattributes.MaxObjects=200000 +jcs.default.cacheattributes.MemoryCacheName=org.apache.jcs.engine.memory.lru.LRUMemoryCache +jcs.default.cacheattributes.UseMemoryShrinker=true +jcs.default.cacheattributes.MaxMemoryIdleTimeSeconds=3600 +jcs.default.cacheattributes.ShrinkerIntervalSeconds=60 +jcs.default.cacheattributes.ShrinkerIntervalSeconds=60 +jcs.default.elementattributes=org.apache.jcs.engine.ElementAttributes +jcs.default.elementattributes.IsEternal=false +jcs.default.elementattributes.MaxLifeSeconds=7000 +jcs.default.elementattributes.IdleTime=1800 +jcs.default.elementattributes.IsSpool=true +jcs.default.elementattributes.IsRemote=true +jcs.default.elementattributes.IsLateral=true \ No newline at end of file Modified: jakarta/jcs/trunk/src/test-conf/log4j.properties URL: http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/test-conf/log4j.properties?rev=240226&r1=240225&r2=240226&view=diff ============================================================================== --- jakarta/jcs/trunk/src/test-conf/log4j.properties (original) +++ jakarta/jcs/trunk/src/test-conf/log4j.properties Fri Aug 26 05:47:59 2005 @@ -2,9 +2,10 @@ log4j.category.org.apache.jcs=INFO log4j.category.org.apache.jcs.config=INFO +log4j.category.org.apache.jcs.engine.DEBUG log4j.category.org.apache.jcs.engine.CacheEventQueueFactory=DEBUG -log4j.category.org.apache.jcs.auxiliary.disk=INFO -log4j.category.org.apache.jcs.auxiliary.remote=INFO +log4j.category.org.apache.jcs.auxiliary.disk=DEBUG +log4j.category.org.apache.jcs.auxiliary.remote=DEBUG log4j.category.org.apache.jcs.auxiliary.lateral=INFO log4j.category.org.apache.jcs.utils.threadpool=INFO Added: jakarta/jcs/trunk/src/test/org/apache/jcs/auxiliary/disk/hsql/TestHSQLDiskCache.java URL: http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/test/org/apache/jcs/auxiliary/disk/hsql/TestHSQLDiskCache.java?rev=240226&view=auto ============================================================================== --- jakarta/jcs/trunk/src/test/org/apache/jcs/auxiliary/disk/hsql/TestHSQLDiskCache.java (added) +++ jakarta/jcs/trunk/src/test/org/apache/jcs/auxiliary/disk/hsql/TestHSQLDiskCache.java Fri Aug 26 05:47:59 2005 @@ -0,0 +1,159 @@ +package org.apache.jcs.auxiliary.disk.hsql; + +/* + * Copyright 2001-2004 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License") + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import org.apache.jcs.JCS; + +import junit.extensions.ActiveTestSuite; +import junit.framework.Test; +import junit.framework.TestCase; + +/** + * Test which exercises the indexed disk cache. This one uses three different + * regions for thre threads. + * + * @version $Id: TestDiskCache.java 224346 2005-06-04 02:01:59Z asmuts $ + */ +public class TestHSQLDiskCache + extends TestCase +{ + /** + * Number of items to cache, twice the configured maxObjects for the memory + * cache regions. + */ + private static int items = 1; + + /** + * Constructor for the TestDiskCache object. + * + * @param testName + */ + public TestHSQLDiskCache( String testName ) + { + super( testName ); + } + + /** + * Main method passes this test to the text test runner. + * + * @param args + */ + public static void main( String args[] ) + { + String[] testCaseName = { TestHSQLDiskCache.class.getName() }; + junit.textui.TestRunner.main( testCaseName ); + } + + /** + * A unit test suite for JUnit + * + * @return The test suite + */ + public static Test suite() + { + ActiveTestSuite suite = new ActiveTestSuite(); + + suite.addTest( new TestHSQLDiskCache( "testHSQLDsikCache1" ) + { + public void runTest() + throws Exception + { + this.runTestForRegion( "indexedRegion1" ); + } + } ); +/* + suite.addTest( new TestHSQLDiskCache( "testHSQLDsikCache2" ) + { + public void runTest() + throws Exception + { + this.runTestForRegion( "indexedRegion2" ); + } + } ); + + suite.addTest( new TestHSQLDiskCache( "testHSQLDsikCache3" ) + { + public void runTest() + throws Exception + { + this.runTestForRegion( "indexedRegion3" ); + } + } ); +*/ + return suite; + } + + /** + * Test setup + */ + public void setUp() + { + JCS.setConfigFilename( "/TestHSQLDiskCache.ccf" ); + } + + /** + * Adds items to cache, gets them, and removes them. The item count is more + * than the size of the memory cache, so items should spool to disk. + * + * @param region + * Name of the region to access + * + * @exception Exception + * If an error occurs + */ + public void runTestForRegion( String region ) + throws Exception + { + JCS jcs = JCS.getInstance( region ); + + // Add items to cache + + for ( int i = 0; i <= items; i++ ) + { + jcs.put( i + ":key", region + " data " + i ); + } + + System.out.println( jcs.getStats() ); + + //Thread.sleep( 1000 ); + + //System.out.println( jcs.getStats() ); + + // Test that all items are in cache + + for ( int i = 0; i <= items; i++ ) + { + String value = (String) jcs.get( i + ":key" ); + + assertEquals( "key = [" + i + ":key] value = [" + value + "]", region + " data " + i, value ); + } + + // Remove all the items + + for ( int i = 0; i <= items; i++ ) + { + jcs.remove( i + ":key" ); + } + + // Verify removal + + for ( int i = 0; i <= items; i++ ) + { + assertNull( "Removed key should be null: " + i + ":key", jcs.get( i + ":key" ) ); + } + } +} Added: jakarta/jcs/trunk/src/test/org/apache/jcs/auxiliary/disk/jisp/TestJispDiskCache.java URL: http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/test/org/apache/jcs/auxiliary/disk/jisp/TestJispDiskCache.java?rev=240226&view=auto ============================================================================== --- jakarta/jcs/trunk/src/test/org/apache/jcs/auxiliary/disk/jisp/TestJispDiskCache.java (added) +++ jakarta/jcs/trunk/src/test/org/apache/jcs/auxiliary/disk/jisp/TestJispDiskCache.java Fri Aug 26 05:47:59 2005 @@ -0,0 +1,159 @@ +package org.apache.jcs.auxiliary.disk.jisp; + +/* + * Copyright 2001-2004 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License") + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import org.apache.jcs.JCS; + +import junit.extensions.ActiveTestSuite; +import junit.framework.Test; +import junit.framework.TestCase; + +/** + * Test which exercises the indexed disk cache. This one uses three different + * regions for thre threads. + * + * @version $Id: TestDiskCache.java 224346 2005-06-04 02:01:59Z asmuts $ + */ +public class TestJispDiskCache + extends TestCase +{ + /** + * Number of items to cache, twice the configured maxObjects for the memory + * cache regions. + */ + private static int items = 1000; + + /** + * Constructor for the TestDiskCache object. + * + * @param testName + */ + public TestJispDiskCache( String testName ) + { + super( testName ); + } + + /** + * Main method passes this test to the text test runner. + * + * @param args + */ + public static void main( String args[] ) + { + String[] testCaseName = { TestJispDiskCache.class.getName() }; + junit.textui.TestRunner.main( testCaseName ); + } + + /** + * A unit test suite for JUnit + * + * @return The test suite + */ + public static Test suite() + { + ActiveTestSuite suite = new ActiveTestSuite(); + + suite.addTest( new TestJispDiskCache( "testJispDsikCache1" ) + { + public void runTest() + throws Exception + { + this.runTestForRegion( "indexedRegion1" ); + } + } ); + + suite.addTest( new TestJispDiskCache( "testJispDsikCache2" ) + { + public void runTest() + throws Exception + { + this.runTestForRegion( "indexedRegion2" ); + } + } ); + + suite.addTest( new TestJispDiskCache( "testJispDsikCache3" ) + { + public void runTest() + throws Exception + { + this.runTestForRegion( "indexedRegion3" ); + } + } ); + + return suite; + } + + /** + * Test setup + */ + public void setUp() + { + JCS.setConfigFilename( "/TestJispDiskCache.ccf" ); + } + + /** + * Adds items to cache, gets them, and removes them. The item count is more + * than the size of the memory cache, so items should spool to disk. + * + * @param region + * Name of the region to access + * + * @exception Exception + * If an error occurs + */ + public void runTestForRegion( String region ) + throws Exception + { + JCS jcs = JCS.getInstance( region ); + + // Add items to cache + + for ( int i = 0; i <= items; i++ ) + { + jcs.put( i + ":key", region + " data " + i ); + } + + System.out.println( jcs.getStats() ); + + Thread.sleep( 1000 ); + + //System.out.println( jcs.getStats() ); + + // Test that all items are in cache + + for ( int i = 0; i <= items; i++ ) + { + String value = (String) jcs.get( i + ":key" ); + + assertEquals( "key = [" + i + ":key] value = [" + value + "]", region + " data " + i, value ); + } + + // Remove all the items + + for ( int i = 0; i <= items; i++ ) + { + jcs.remove( i + ":key" ); + } + + // Verify removal + + for ( int i = 0; i <= items; i++ ) + { + assertNull( "Removed key should be null: " + i + ":key", jcs.get( i + ":key" ) ); + } + } +} Modified: jakarta/jcs/trunk/src/test/org/apache/jcs/auxiliary/lateral/socket/tcp/TestTCPLateral.java URL: http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/test/org/apache/jcs/auxiliary/lateral/socket/tcp/TestTCPLateral.java?rev=240226&r1=240225&r2=240226&view=diff ============================================================================== --- jakarta/jcs/trunk/src/test/org/apache/jcs/auxiliary/lateral/socket/tcp/TestTCPLateral.java (original) +++ jakarta/jcs/trunk/src/test/org/apache/jcs/auxiliary/lateral/socket/tcp/TestTCPLateral.java Fri Aug 26 05:47:59 2005 @@ -58,7 +58,7 @@ // send to the listener LateralTCPSender lur = new LateralTCPSender( lac ); - int numMes = 1000; + int numMes = 10; for ( int i = 0; i < numMes; i++ ) { String message = "adsfasasfasfasdasf"; @@ -89,7 +89,7 @@ //.getInstance( lattr, cacheMgr ); //LateralCacheNoWait nwait1 = (LateralCacheNoWait)lcMgr1.getCache( // "test" ); - AuxiliaryCache nowait1 = fact.createCache( lattr, cacheMgr ); + //AuxiliaryCache nowait1 = fact.createCache( lattr, cacheMgr ); //nowait1.update( ); Modified: jakarta/jcs/trunk/src/test/org/apache/jcs/auxiliary/lateral/socket/tcp/discovery/MockLateralCache.java URL: http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/test/org/apache/jcs/auxiliary/lateral/socket/tcp/discovery/MockLateralCache.java?rev=240226&r1=240225&r2=240226&view=diff ============================================================================== --- jakarta/jcs/trunk/src/test/org/apache/jcs/auxiliary/lateral/socket/tcp/discovery/MockLateralCache.java (original) +++ jakarta/jcs/trunk/src/test/org/apache/jcs/auxiliary/lateral/socket/tcp/discovery/MockLateralCache.java Fri Aug 26 05:47:59 2005 @@ -27,9 +27,6 @@ super( cattr ); } - // generalize this, use another interface - private ILateralCacheAttributes cattr; - /* * (non-Javadoc) * Added: jakarta/jcs/trunk/src/test/org/apache/jcs/auxiliary/remote/TestRemoteCache.java URL: http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/test/org/apache/jcs/auxiliary/remote/TestRemoteCache.java?rev=240226&view=auto ============================================================================== --- jakarta/jcs/trunk/src/test/org/apache/jcs/auxiliary/remote/TestRemoteCache.java (added) +++ jakarta/jcs/trunk/src/test/org/apache/jcs/auxiliary/remote/TestRemoteCache.java Fri Aug 26 05:47:59 2005 @@ -0,0 +1,115 @@ +package org.apache.jcs.auxiliary.remote; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.jcs.JCS; +import org.apache.jcs.auxiliary.AuxiliaryCache; +import org.apache.jcs.auxiliary.lateral.LateralElementDescriptor; +import org.apache.jcs.auxiliary.remote.server.RemoteCacheServerFactory; +import org.apache.jcs.engine.CacheElement; +import org.apache.jcs.engine.behavior.ICompositeCacheManager; +import org.apache.jcs.engine.control.CompositeCache; +import org.apache.jcs.engine.control.CompositeCacheManager; +import org.apache.jcs.engine.control.CompositeCacheManagerMockImpl; + +import junit.framework.TestCase; + +/** + * @author asmuts + */ +public class TestRemoteCache + extends TestCase +{ + + private final static Log log = LogFactory.getLog( TestRemoteCache.class ); + + + public TestRemoteCache() + { + super(); + try + { + System.out.println( "main> creating registry on the localhost" ); + RemoteUtils.createRegistry( 1101 ); + + RemoteCacheServerFactory.startup( "localhost", 1101, "/TestRemoteServer.ccf" ); + + } + catch ( Exception e ) + { + e.printStackTrace(); + } + } + + /** + * Test setup + */ + public void setUp() + { + JCS.setConfigFilename( "/TestRemoteClient.ccf" ); + } + + /** + * + * + */ + public void skiptestSimpleSend() throws Exception + { + log.info( "testSimpleSend" ); + System.out.println( "testSimpleSend" ); + + JCS cache = JCS.getInstance( "testCache" ); + + log.info( "cache = " + cache ); + + for ( int i = 0; i < 1000; i++ ) + { + System.out.println( "puttting " + i ); + cache.put( "key" + i, "data" + i ); + System.out.println( "put " + i ); + log.info( "put " + i ); + } + } + + + public void testService() throws Exception + { + + + Thread.sleep( 100 ); + + ICompositeCacheManager cacheMgr = new CompositeCacheManagerMockImpl(); + + RemoteCacheAttributes rca = new RemoteCacheAttributes(); + rca.setRemoteHost( "localhost" ); + rca.setRemotePort( 1101 ); + + RemoteCacheManager mgr = RemoteCacheManager.getInstance( rca, cacheMgr ); + AuxiliaryCache cache = mgr.getCache( "testCache" ); + + int numMes = 100; + for ( int i = 0; i < numMes; i++ ) + { + String message = "adsfasasfasfasdasf"; + CacheElement ce = new CacheElement( "key" + 1, "data" + i, message ); + cache.update( ce ); + System.out.println( "put " + ce ); + } + + //Thread.sleep( 2000 ); + + /* + // the receiver instance. + JCS cacheReceiver = JCS.getInstance( "testCache" ); + + log.info( "cache = " + cache ); + + for ( int i = 0; i < numMes; i++ ) + { + System.out.println( "getting " + i ); + Object data = cacheReceiver.get( "key" + i ); + System.out.println( i + " = " + data ); + } + */ + } +} Modified: jakarta/jcs/trunk/src/test/org/apache/jcs/engine/TestSystemPropertyUsage.java URL: http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/test/org/apache/jcs/engine/TestSystemPropertyUsage.java?rev=240226&r1=240225&r2=240226&view=diff ============================================================================== --- jakarta/jcs/trunk/src/test/org/apache/jcs/engine/TestSystemPropertyUsage.java (original) +++ jakarta/jcs/trunk/src/test/org/apache/jcs/engine/TestSystemPropertyUsage.java Fri Aug 26 05:47:59 2005 @@ -2,12 +2,12 @@ import java.util.Properties; +import junit.framework.TestCase; + import org.apache.jcs.JCS; import org.apache.jcs.engine.control.CompositeCacheManager; import org.apache.jcs.utils.props.PropertyLoader; -import junit.framework.TestCase; - /** * Verify that system properties can override. */ @@ -17,37 +17,45 @@ /** * Verify that the system properties are used. - * + * @throws Exception + * */ - public void testSystemPropertyUsage() throws Exception + public void testSystemPropertyUsage() + throws Exception { System.getProperties().setProperty( "jcs.default.cacheattributes.MaxObjects", "6789" ); - + JCS.setConfigFilename( "/TestSystemPropertyUsage.ccf" ); - + JCS jcs = JCS.getInstance( "someCacheNotInFile" ); - - assertEquals( "System property value is not reflected", jcs.getCacheAttributes().getMaxObjects(), Integer.parseInt( "6789" ) ); + + assertEquals( "System property value is not reflected", jcs.getCacheAttributes().getMaxObjects(), Integer + .parseInt( "6789" ) ); } - + /** - * Verify that the system properties are nto used is specified. - * + * Verify that the system properties are not used is specified. + * + * @throws Exception + * */ - public void testSystemPropertyUsage_inactive() throws Exception + public void testSystemPropertyUsage_inactive() + throws Exception { System.getProperties().setProperty( "jcs.default.cacheattributes.MaxObjects", "6789" ); - + CompositeCacheManager mgr = CompositeCacheManager.getUnconfiguredInstance(); - + Properties props = PropertyLoader.loadProperties( "TestSystemPropertyUsage.ccf" ); - + mgr.configure( props, false ); - + JCS jcs = JCS.getInstance( "someCacheNotInFile" ); - - assertFalse( "System property value should not be reflected", jcs.getCacheAttributes().getMaxObjects() == Integer.parseInt( props.getProperty("jcs.default.cacheattributes.MaxObjects") ) ); + + assertFalse( "System property value should not be reflected", + jcs.getCacheAttributes().getMaxObjects() == Integer.parseInt( props + .getProperty( "jcs.default.cacheattributes.MaxObjects" ) ) ); } } Modified: jakarta/jcs/trunk/src/test/org/apache/jcs/engine/memory/lru/TestLRUMemoryCache.java URL: http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/test/org/apache/jcs/engine/memory/lru/TestLRUMemoryCache.java?rev=240226&r1=240225&r2=240226&view=diff ============================================================================== --- jakarta/jcs/trunk/src/test/org/apache/jcs/engine/memory/lru/TestLRUMemoryCache.java (original) +++ jakarta/jcs/trunk/src/test/org/apache/jcs/engine/memory/lru/TestLRUMemoryCache.java Fri Aug 26 05:47:59 2005 @@ -20,19 +20,10 @@ import junit.framework.Test; import junit.framework.TestCase; -import org.apache.jcs.auxiliary.AuxiliaryCache; -import org.apache.jcs.auxiliary.lateral.LateralCacheAttributes; -import org.apache.jcs.auxiliary.lateral.LateralCacheFactory; -import org.apache.jcs.auxiliary.lateral.LateralCacheManager; -import org.apache.jcs.auxiliary.lateral.LateralCacheNoWait; -import org.apache.jcs.auxiliary.lateral.behavior.ILateralCacheAttributes; -import org.apache.jcs.auxiliary.lateral.socket.tcp.LateralTCPService; import org.apache.jcs.engine.CacheElement; import org.apache.jcs.engine.behavior.ICacheElement; -import org.apache.jcs.engine.behavior.ICompositeCacheManager; import org.apache.jcs.engine.control.CompositeCache; import org.apache.jcs.engine.control.CompositeCacheManager; -import org.apache.jcs.engine.control.CompositeCacheManagerMockImpl; /** * Test which exercises the LRUMemory cache. This one uses three different @@ -166,7 +157,5 @@ assertNull( "Removed key should be null: " + i + ":key", lru.get( i + ":key" ) ); } } - - - + } Modified: jakarta/jcs/trunk/src/test/org/apache/jcs/servlet/ListTestCacheServlet.java URL: http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/test/org/apache/jcs/servlet/ListTestCacheServlet.java?rev=240226&r1=240225&r2=240226&view=diff ============================================================================== --- jakarta/jcs/trunk/src/test/org/apache/jcs/servlet/ListTestCacheServlet.java (original) +++ jakarta/jcs/trunk/src/test/org/apache/jcs/servlet/ListTestCacheServlet.java Fri Aug 26 05:47:59 2005 @@ -16,38 +16,7 @@ * limitations under the License. */ -import java.io.BufferedReader; -import java.io.FileNotFoundException; -import java.io.FileReader; -import java.io.IOException; -import java.io.PrintWriter; -import java.io.Reader; - -import java.util.ArrayList; -import java.util.Enumeration; -import java.util.Hashtable; -import java.util.Iterator; - -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; - import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.jcs.access.GroupCacheAccess; - -import org.apache.jcs.access.behavior.IGroupCacheAccess; - -import org.apache.jcs.engine.behavior.ICache; -import org.apache.jcs.engine.behavior.ICompositeCacheAttributes; - -import org.apache.jcs.engine.control.CompositeCacheManager; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; /** * Description of the Class @@ -56,7 +25,6 @@ public class ListTestCacheServlet extends HttpServlet { - private final static Log log = LogFactory.getLog( ListTestCacheServlet.class ); // /** Description of the Field */ // protected static CacheHub cacheMgr; Modified: jakarta/jcs/trunk/xdocs/Downloads.xml URL: http://svn.apache.org/viewcvs/jakarta/jcs/trunk/xdocs/Downloads.xml?rev=240226&r1=240225&r2=240226&view=diff ============================================================================== --- jakarta/jcs/trunk/xdocs/Downloads.xml (original) +++ jakarta/jcs/trunk/xdocs/Downloads.xml Fri Aug 26 05:47:59 2005 @@ -17,7 +17,7 @@ the tempbuild directory of the repository. </p> <p> - <a href="http://cvs.apache.org/viewcvs.cgi/jakarta-turbine-jcs/tempbuild/";>HERE</a> + <a href="http://svn.apache.org/viewcvs.cgi/jakarta/jcs/trunk/tempbuild/";>HERE</a> </p> <p> The core JCS jar is compiled using JDK 1.3. Modified: jakarta/jcs/trunk/xdocs/changes.xml URL: http://svn.apache.org/viewcvs/jakarta/jcs/trunk/xdocs/changes.xml?rev=240226&r1=240225&r2=240226&view=diff ============================================================================== --- jakarta/jcs/trunk/xdocs/changes.xml (original) +++ jakarta/jcs/trunk/xdocs/changes.xml Fri Aug 26 05:47:59 2005 @@ -5,6 +5,15 @@ </properties> <body> + <release version="1.2.6.7" date="in CVS"> + <action dev="asmuts" type="fix" due-to=""> + Fixed abstract inner class references for Jikes. + </action> + <action dev="asmuts" type="update" due-to=""> + IMproved Javadocs throughout. + </action> + </release> + <release version="1.2.6.6" date="in CVS"> <action dev="asmuts" type="fix"> Properties are loaded using the current thread's classloader by default. --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
