unico 2004/03/07 14:34:58
Modified: src/blocks/scratchpad/java/org/apache/cocoon/components/store
AbstractJCSStore.java JCSDefaultStore.java
Log:
cleanup
Revision Changes Path
1.7 +9 -16
cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/components/store/AbstractJCSStore.java
Index: AbstractJCSStore.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/components/store/AbstractJCSStore.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AbstractJCSStore.java 6 Mar 2004 15:18:46 -0000 1.6
+++ AbstractJCSStore.java 7 Mar 2004 22:34:58 -0000 1.7
@@ -24,9 +24,6 @@
import org.apache.avalon.framework.parameters.ParameterException;
import org.apache.avalon.framework.parameters.Parameterizable;
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.service.ServiceException;
-import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.commons.collections.iterators.IteratorEnumeration;
import org.apache.excalibur.store.Store;
@@ -34,7 +31,6 @@
import org.apache.jcs.access.GroupCacheAccess;
import org.apache.jcs.access.exception.CacheException;
import org.apache.jcs.engine.control.CompositeCache;
-import org.apache.jcs.engine.control.CompositeCacheConfigurator;
import org.apache.jcs.engine.control.CompositeCacheManager;
/**
@@ -45,7 +41,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
*/
public abstract class AbstractJCSStore extends AbstractReadWriteStore
- implements Store, Serviceable, Parameterizable, Initializable,
Disposable, ThreadSafe {
+ implements Store, Parameterizable, Initializable, Disposable, ThreadSafe
{
/** The JCS configuration properties */
protected Properties m_properties;
@@ -59,21 +55,16 @@
/** The Java Cache System object */
private JCSCacheAccess m_JCS;
- /** Access to the SourceResolver */
- private ServiceManager m_manager;
-
// ---------------------------------------------------- Lifecycle
public AbstractJCSStore() {
}
- public void service(ServiceManager manager) throws ServiceException {
- m_manager = manager;
- }
-
public void parameterize(Parameters parameters) throws
ParameterException {
+ m_region = parameters.getParameter("region-name","main");
+
Properties defaults = new Properties();
try {
String defaultsFile = getDefaultPropertiesFile();
@@ -93,8 +84,7 @@
m_properties.put(names[i],
parameters.getParameter(names[i]));
}
}
-
- m_region = parameters.getParameter("region-name","main");
+
}
protected String getDefaultPropertiesFile() {
@@ -108,8 +98,11 @@
}
public void dispose() {
- m_JCS.save();
m_JCS.dispose();
+ m_cacheManager.release();
+ m_JCS = null;
+ m_cacheManager = null;
+ m_properties = null;
}
// ---------------------------------------------------- Store
implementation
@@ -241,7 +234,7 @@
return m_JCS.getSize();
}
-
+
private static class JCSCacheAccess extends GroupCacheAccess {
private JCSCacheAccess(CompositeCache cacheControl) {
super(cacheControl);
1.2 +3 -10
cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/components/store/JCSDefaultStore.java
Index: JCSDefaultStore.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/components/store/JCSDefaultStore.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JCSDefaultStore.java 6 Mar 2004 15:18:46 -0000 1.1
+++ JCSDefaultStore.java 7 Mar 2004 22:34:58 -0000 1.2
@@ -52,26 +52,18 @@
}
/**
- * Configure the Component.<br>
- * A few options can be used
- *
* TODO: describe options
*
- * @param params the configuration paramters
+ * @param params the configuration parameters
* @exception ParameterException
*/
public void parameterize(Parameters parameters) throws
ParameterException {
super.parameterize(parameters);
- int maxobjects = parameters.getParameterAsInteger("maxobjects",-1);
- if (maxobjects != -1) {
-
m_properties.setProperty("jcs.default.cacheattributes.MaxObjects",String.valueOf(maxobjects));
- }
-
// get the directory to use
try {
- File workDir = (File) m_context.get(Constants.CONTEXT_WORK_DIR);
+ final File workDir = (File)
m_context.get(Constants.CONTEXT_WORK_DIR);
if (parameters.getParameterAsBoolean("use-cache-directory",
false)) {
final File cacheDir = (File)
m_context.get(Constants.CONTEXT_CACHE_DIR);
if (getLogger().isDebugEnabled()) {
@@ -101,6 +93,7 @@
} catch (IOException e) {
throw new ParameterException("Unable to set directory", e);
}
+
}
protected String getDefaultPropertiesFile() {
