jtaylor 02/04/11 19:13:33
Modified: src/java/org/apache/jcs/auxiliary/remote/server
RemoteCacheServer.java
src/java/org/apache/jcs/engine/control CacheHub.java
src/test/org/apache/jcs/engine/control
CompositeCacheManagerTester.java
Added: src/java/org/apache/jcs JCSComponent.java
Log:
Component didn't make it into the last commit. Also, it works now, with a
change to how the properties are extracted from the configuration. Required
a cahnge in ConfigurationConverter in stratum, so that will need to be
updated.
Revision Changes Path
1.1 jakarta-turbine-jcs/src/java/org/apache/jcs/JCSComponent.java
Index: JCSComponent.java
===================================================================
package org.apache.jcs;
import org.apache.commons.lang.exception.NestableException;
import org.apache.jcs.engine.control.CacheHub;
import org.apache.jcs.engine.control.group.GroupCacheHub;
import org.apache.stratum.configuration.Configuration;
import org.apache.stratum.configuration.ConfigurationConverter;
import org.apache.stratum.lifecycle.Configurable;
import org.apache.stratum.lifecycle.Initializable;
/**
* Component wrapper for JCS, initializes the GroupCacheHub. The cache can then
* be accessed through {@link JCS}.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>James Taylor</a>
* @version $Id: JCSComponent.java,v 1.1 2002/04/12 02:13:33 jtaylor Exp $
*/
public class JCSComponent
implements Configurable, Initializable
{
Configuration configuration = null;
/** @see Configurable#configure */
public void configure( Configuration configuration )
throws NestableException
{
this.configuration = configuration;
}
/** @see Initializable#initialize */
public void initialize() throws Exception
{
CacheHub instance = GroupCacheHub.getUnconfiguredInstance();
instance.configure(
ConfigurationConverter.getProperties( configuration ) );
}
}
1.5 +12 -4
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RemoteCacheServer.java 10 Apr 2002 15:01:01 -0000 1.4
+++ RemoteCacheServer.java 12 Apr 2002 02:13:33 -0000 1.5
@@ -16,8 +16,6 @@
import java.util.Map;
import java.util.Set;
-import java.util.Map.Entry;
-
import org.apache.jcs.auxiliary.remote.behavior.IRemoteCacheAttributes;
import org.apache.jcs.auxiliary.remote.behavior.IRemoteCacheListener;
import org.apache.jcs.auxiliary.remote.behavior.IRemoteCacheObserver;
@@ -124,8 +122,18 @@
*/
protected CacheHub createCacheManager( String prop )
{
- return CacheHub.getInstance(
- prop == null ? "/remote.cache.properties" : prop );
+ CacheHub hub = CacheHub.getUnconfiguredInstance();
+
+ if ( prop == null )
+ {
+ hub.configure( "/remote.cache.properties" );
+ }
+ else
+ {
+ hub.configure( prop );
+ }
+
+ return hub;
}
1.6 +16 -0
jakarta-turbine-jcs/src/java/org/apache/jcs/engine/control/CacheHub.java
Index: CacheHub.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/engine/control/CacheHub.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CacheHub.java 12 Apr 2002 01:39:57 -0000 1.5
+++ CacheHub.java 12 Apr 2002 02:13:33 -0000 1.6
@@ -82,6 +82,22 @@
return instance;
}
+ public static synchronized CacheHub getInstance( String propsFilename )
+ {
+ if ( instance == null )
+ {
+ log.debug( "Instance is null, creating with default config" );
+
+ instance = createInstance();
+
+ instance.configure( propsFilename );
+ }
+
+ instance.incrementClients();
+
+ return instance;
+ }
+
/**
* Get a CacheHub instance which is not configured.
*/
1.3 +4 -1
jakarta-turbine-jcs/src/test/org/apache/jcs/engine/control/CompositeCacheManagerTester.java
Index: CompositeCacheManagerTester.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-jcs/src/test/org/apache/jcs/engine/control/CompositeCacheManagerTester.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CompositeCacheManagerTester.java 8 Apr 2002 14:27:38 -0000 1.2
+++ CompositeCacheManagerTester.java 12 Apr 2002 02:13:33 -0000 1.3
@@ -20,7 +20,10 @@
{
propsFile = args[0];
}
- CacheHub ccm = new CacheHub( propsFile );
+
+ CacheHub hub = new CacheHub();
+
+ hub.configure( propsFile );
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
