You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by un...@apache.org on 2003/10/25 19:46:39 UTC
cvs commit: cocoon-2.2/src/java/org/apache/cocoon/caching/impl CacheImpl.java
unico 2003/10/25 10:46:39
Modified: src/java/org/apache/cocoon/acting LocaleAction.java
SessionStateAction.java Action.java
SessionInvalidatorAction.java
ClearPersistentStoreAction.java
RequestParamAction.java
RequestParameterExistsAction.java
SetCharacterEncodingAction.java
SessionValidatorAction.java
ResourceExistsAction.java ClearCacheAction.java
FormValidatorAction.java InputModuleAction.java
SessionPropagatorAction.java
SessionIsValidAction.java HelloAction.java
HttpHeaderAction.java ServerPagesAction.java
src/java/org/apache/cocoon/caching Cache.java
src/java/org/apache/cocoon/caching/impl CacheImpl.java
Log:
move to fortress: remove Component and ThreadSafe marker interfaces and add meta tags
Revision Changes Path
1.3 +8 -2 cocoon-2.2/src/java/org/apache/cocoon/acting/LocaleAction.java
Index: LocaleAction.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/acting/LocaleAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LocaleAction.java 15 Oct 2003 20:09:50 -0000 1.2
+++ LocaleAction.java 25 Oct 2003 17:46:38 -0000 1.3
@@ -146,8 +146,14 @@
* @author <a href="mailto:kpiroumian@flagship.ru">Konstantin Piroumian</a>
* @author <a href="mailto:lassi.immonen@valkeus.com">Lassi Immonen</a>
* @version CVS $Id$
+ *
+ * @avalon.component
+ * @avalon.service type="Action"
+ * @x-avalon.lifestyle type="singleton"
+ * @x-avalon.info name="locale"
+ *
*/
-public class LocaleAction extends ServiceableAction implements ThreadSafe, Configurable {
+public class LocaleAction extends ServiceableAction implements Configurable {
/**
* Constant representing the language parameter
1.2 +8 -4 cocoon-2.2/src/java/org/apache/cocoon/acting/SessionStateAction.java
Index: SessionStateAction.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/acting/SessionStateAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SessionStateAction.java 9 Mar 2003 00:08:40 -0000 1.1
+++ SessionStateAction.java 25 Oct 2003 17:46:38 -0000 1.2
@@ -113,10 +113,14 @@
*
* @author <a href="mailto:haul@informatik.tu-darmstadt.de">Christian Haul</a>
* @version CVS $Id$
+ *
+ * @avalon.component
+ * @avalon.service type="Action"
+ * @x-avalon.lifestyle type="singleton"
+ * @x-avalon.info name="session-state"
+ *
*/
-public class SessionStateAction
- extends AbstractConfigurableAction
- implements ThreadSafe {
+public class SessionStateAction extends AbstractConfigurableAction {
protected String statekey = "org.apache.cocoon.SessionState";
protected String newstate = null;
1.2 +2 -2 cocoon-2.2/src/java/org/apache/cocoon/acting/Action.java
Index: Action.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/acting/Action.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Action.java 9 Mar 2003 00:08:38 -0000 1.1
+++ Action.java 25 Oct 2003 17:46:38 -0000 1.2
@@ -62,7 +62,7 @@
* @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
* @version CVS $Id$
*/
-public interface Action extends Component {
+public interface Action {
String ROLE = Action.class.getName();
1.2 +7 -2 cocoon-2.2/src/java/org/apache/cocoon/acting/SessionInvalidatorAction.java
Index: SessionInvalidatorAction.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/acting/SessionInvalidatorAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SessionInvalidatorAction.java 9 Mar 2003 00:08:39 -0000 1.1
+++ SessionInvalidatorAction.java 25 Oct 2003 17:46:38 -0000 1.2
@@ -66,8 +66,13 @@
*
* @author <a href="mailto:Martin.Man@seznam.cz">Martin Man</a>
* @version CVS $Id$
+ *
+ * @avalon.component
+ * @avalon.service type="Action"
+ * @x-avalon.lifestyle type="singleton"
+ * @x-avalon.info name="session-invalidator"
*/
-public class SessionInvalidatorAction extends AbstractAction implements ThreadSafe
+public class SessionInvalidatorAction extends AbstractAction
{
/**
* Main invocation routine.
1.4 +22 -6 cocoon-2.2/src/java/org/apache/cocoon/acting/ClearPersistentStoreAction.java
Index: ClearPersistentStoreAction.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/acting/ClearPersistentStoreAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ClearPersistentStoreAction.java 16 Oct 2003 14:50:22 -0000 1.3
+++ ClearPersistentStoreAction.java 25 Oct 2003 17:46:38 -0000 1.4
@@ -51,6 +51,8 @@
package org.apache.cocoon.acting;
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.thread.ThreadSafe;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.SourceResolver;
@@ -63,14 +65,26 @@
*
* @author <a href="mailto:g-froehlich@gmx.de">Gerhard Froehlich</a>
* @version CVS $Id$
+ *
+ * @avalon.component
+ * @avalon.service type="Action"
+ * @x-avalon.lifestyle type="singleton"
+ * @x-avalon.info name="clear-persistent-store"
*/
-public class ClearPersistentStoreAction extends ServiceableAction implements ThreadSafe {
+public class ClearPersistentStoreAction extends ServiceableAction {
+ /**
+ * @avalon.dependency type="Store"
+ */
+ public void service(ServiceManager manager) throws ServiceException {
+ super.service(manager);
+ }
+
public Map act(Redirector redirector,
- SourceResolver resolver,
- Map objectModel,
- String src,
- Parameters par
+ SourceResolver resolver,
+ Map objectModel,
+ String src,
+ Parameters par
) throws Exception {
Store store_persistent = (Store)this.manager.lookup(Store.PERSISTENT_STORE);
@@ -84,4 +98,6 @@
this.manager.release( store_persistent );
}
}
+
+
}
1.4 +7 -2 cocoon-2.2/src/java/org/apache/cocoon/acting/RequestParamAction.java
Index: RequestParamAction.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/acting/RequestParamAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RequestParamAction.java 15 Oct 2003 20:09:50 -0000 1.3
+++ RequestParamAction.java 25 Oct 2003 17:46:38 -0000 1.4
@@ -116,8 +116,13 @@
* @author <a href="mailto:Marcus.Crafter@osa.de">Marcus Crafter</a>
* @author <a href="mailto:tcurdt@dff.st">Torsten Curdt</a>
* @version CVS $Id$
+ *
+ * @avalon.component
+ * @avalon.service type="Action"
+ * @x-avalon.lifestyle type="singleton"
+ * @x-avalon.info name="request"
*/
-public class RequestParamAction extends ServiceableAction implements ThreadSafe {
+public class RequestParamAction implements Action {
public final static String MAP_URI = "requestURI";
public final static String MAP_QUERY = "requestQuery";
1.2 +7 -1 cocoon-2.2/src/java/org/apache/cocoon/acting/RequestParameterExistsAction.java
Index: RequestParameterExistsAction.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/acting/RequestParameterExistsAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RequestParameterExistsAction.java 9 Mar 2003 00:08:39 -0000 1.1
+++ RequestParameterExistsAction.java 25 Oct 2003 17:46:38 -0000 1.2
@@ -85,6 +85,12 @@
*
* @author <a href="mailto:haul@apache.org">Christian Haul</a>
* @version CVS $Id$
+ *
+ * @avalon.component
+ * @avalon.service type="Action"
+ * @x-avalon.lifestyle type="singleton"
+ * @x-avalon.info name="request-exists"
+ *
*/
public class RequestParameterExistsAction extends AbstractConfigurableAction
{
1.4 +8 -2 cocoon-2.2/src/java/org/apache/cocoon/acting/SetCharacterEncodingAction.java
Index: SetCharacterEncodingAction.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/acting/SetCharacterEncodingAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SetCharacterEncodingAction.java 15 Oct 2003 20:09:50 -0000 1.3
+++ SetCharacterEncodingAction.java 25 Oct 2003 17:46:38 -0000 1.4
@@ -76,8 +76,14 @@
*
* @author <a href="mailto:miyabe@jzf.co.jp">MIYABE Tatsuhiko</a>
* @version CVS $Id$
+ *
+ * @avalon.component
+ * @avalon.service type="Action"
+ * @x-avalon.lifestyle type="singleton"
+ * @x-avalon.info name="char-encoding"
+ *
*/
-public class SetCharacterEncodingAction extends ServiceableAction implements ThreadSafe, Parameterizable {
+public class SetCharacterEncodingAction extends ServiceableAction implements Parameterizable {
private String global_form_encoding = null;
public void parameterize(Parameters parameters)
1.3 +8 -2 cocoon-2.2/src/java/org/apache/cocoon/acting/SessionValidatorAction.java
Index: SessionValidatorAction.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/acting/SessionValidatorAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SessionValidatorAction.java 15 Aug 2003 15:53:20 -0000 1.2
+++ SessionValidatorAction.java 25 Oct 2003 17:46:38 -0000 1.3
@@ -71,8 +71,14 @@
* @author <a href="mailto:Martin.Man@seznam.cz">Martin Man</a>
* @author <a href="mailto:haul@apache.org">Christian Haul</a>
* @version CVS $Id$
+ *
+ * @avalon.component
+ * @avalon.service type="Action"
+ * @x-avalon.lifestyle type="singleton"
+ * @x-avalon.info name="session-validator"
+ *
*/
-public class SessionValidatorAction extends AbstractValidatorAction implements ThreadSafe {
+public class SessionValidatorAction extends AbstractValidatorAction {
/* (non-Javadoc)
* @see org.apache.cocoon.acting.AbstractValidatorAction#createMapOfParameters(java.util.Map, java.util.Collection)
1.4 +8 -2 cocoon-2.2/src/java/org/apache/cocoon/acting/ResourceExistsAction.java
Index: ResourceExistsAction.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/acting/ResourceExistsAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ResourceExistsAction.java 15 Oct 2003 20:09:50 -0000 1.3
+++ ResourceExistsAction.java 25 Oct 2003 17:46:38 -0000 1.4
@@ -71,8 +71,14 @@
*
* @author <a href="mailto:balld@apache.org">Donald Ball</a>
* @version CVS $Id$
+ *
+ * @avalon.component
+ * @avalon.service type="Action"
+ * @x-avalon.lifestyle type="singleton"
+ * @x-avalon.info name="resource-exists"
+ *
*/
-public class ResourceExistsAction extends ServiceableAction implements ThreadSafe {
+public class ResourceExistsAction extends AbstractAction {
public Map act(Redirector redirector, SourceResolver resolver, Map objectModel, String source, Parameters parameters) throws Exception {
String urlstring = parameters.getParameter("url", source);
1.5 +18 -2 cocoon-2.2/src/java/org/apache/cocoon/acting/ClearCacheAction.java
Index: ClearCacheAction.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/acting/ClearCacheAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ClearCacheAction.java 16 Oct 2003 14:50:22 -0000 1.4
+++ ClearCacheAction.java 25 Oct 2003 17:46:38 -0000 1.5
@@ -51,6 +51,8 @@
package org.apache.cocoon.acting;
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.thread.ThreadSafe;
import org.apache.cocoon.caching.Cache;
import org.apache.cocoon.environment.Redirector;
@@ -64,9 +66,22 @@
*
* @author <a href="mailto:Michael.Melhem@managesoft.com">Michael Melhem</a>
* @version CVS $Id$
+ *
+ * @avalon.component
+ * @avalon.service type="Action"
+ * @x-avalon.lifestyle type="singleton"
+ * @x-avalon.info name="clear-cache"
*/
-public class ClearCacheAction extends ServiceableAction implements ThreadSafe {
+public class ClearCacheAction extends ServiceableAction {
+
+ /**
+ * @avalon.dependency type="Cache"
+ */
+ public void service(ServiceManager manager) throws ServiceException {
+ super.service(manager);
+ }
+
public Map act(Redirector redirector,
SourceResolver resolver,
Map objectModel,
@@ -89,4 +104,5 @@
this.manager.release( cache );
}
}
+
}
1.3 +7 -2 cocoon-2.2/src/java/org/apache/cocoon/acting/FormValidatorAction.java
Index: FormValidatorAction.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/acting/FormValidatorAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FormValidatorAction.java 15 Aug 2003 15:53:20 -0000 1.2
+++ FormValidatorAction.java 25 Oct 2003 17:46:38 -0000 1.3
@@ -70,8 +70,13 @@
* @author <a href="mailto:Martin.Man@seznam.cz">Martin Man</a>
* @author <a href="mailto:haul@informatik.tu-darmstadt.de">Christian Haul</a>
* @version CVS $Id$
+ *
+ * @avalon.component
+ * @avalon.service type="Action"
+ * @x-avalon.lifestyle type="singleton"
+ * @x-avalon.info name="form-validator"
*/
-public class FormValidatorAction extends AbstractValidatorAction implements ThreadSafe {
+public class FormValidatorAction extends AbstractValidatorAction {
/**
* Reads parameter values from request parameters for all parameters
1.4 +16 -1 cocoon-2.2/src/java/org/apache/cocoon/acting/InputModuleAction.java
Index: InputModuleAction.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/acting/InputModuleAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- InputModuleAction.java 16 Oct 2003 14:50:22 -0000 1.3
+++ InputModuleAction.java 25 Oct 2003 17:46:38 -0000 1.4
@@ -53,6 +53,8 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.SourceResolver;
@@ -99,6 +101,12 @@
*
* @author <a href="mailto:haul@apache.org">Christian Haul</a>
* @version CVS $Id$
+ *
+ * @avalon.component
+ * @avalon.service type="Action"
+ * @x-avalon.lifestyle type="singleton"
+ * @x-avalon.info name="input-module"
+ *
*/
public class InputModuleAction extends ConfigurableServiceableAction {
@@ -151,6 +159,13 @@
}
}
return map;
+ }
+
+ /**
+ * @avalon.dependency type="org.apache.cocoon.components.modules.input.InputModule"
+ */
+ public void service(ServiceManager manager) throws ServiceException {
+ super.service(manager);
}
/* (non-Javadoc)
1.2 +7 -1 cocoon-2.2/src/java/org/apache/cocoon/acting/SessionPropagatorAction.java
Index: SessionPropagatorAction.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/acting/SessionPropagatorAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SessionPropagatorAction.java 9 Mar 2003 00:08:39 -0000 1.1
+++ SessionPropagatorAction.java 25 Oct 2003 17:46:38 -0000 1.2
@@ -80,6 +80,12 @@
*
* @author <a href="mailto:Martin.Man@seznam.cz">Martin Man</a>
* @version CVS $Id$
+ *
+ * @avalon.component
+ * @avalon.service type="Action"
+ * @x-avalon.lifestyle type="singleton"
+ * @x-avalon.info name="session-propagator"
+ *
*/
public class SessionPropagatorAction extends AbstractConfigurableAction implements ThreadSafe {
1.2 +8 -2 cocoon-2.2/src/java/org/apache/cocoon/acting/SessionIsValidAction.java
Index: SessionIsValidAction.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/acting/SessionIsValidAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SessionIsValidAction.java 9 Mar 2003 00:08:39 -0000 1.1
+++ SessionIsValidAction.java 25 Oct 2003 17:46:38 -0000 1.2
@@ -67,8 +67,14 @@
*
* @author <a href="mailto:haul@informatik.tu-darmstadt.de">Christian Haul</a>
* @version CVS $Id$
+ *
+ * @avalon.component
+ * @avalon.service type="Action"
+ * @x-avalon.lifestyle type="singleton"
+ * @x-avalon.info name="session-isvalid"
+ *
*/
-public class SessionIsValidAction extends AbstractAction implements ThreadSafe
+public class SessionIsValidAction extends AbstractAction
{
/**
* Main invocation routine.
1.3 +8 -2 cocoon-2.2/src/java/org/apache/cocoon/acting/HelloAction.java
Index: HelloAction.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/acting/HelloAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HelloAction.java 15 Oct 2003 20:09:50 -0000 1.2
+++ HelloAction.java 25 Oct 2003 17:46:38 -0000 1.3
@@ -50,6 +50,7 @@
*/
package org.apache.cocoon.acting;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.environment.ObjectModelHelper;
@@ -66,8 +67,13 @@
*
* @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
* @version CVS $Id$
+ *
+ * @avalon.component
+ * @avalon.service type="Action"
+ * @x-avalon.lifestyle type="singleton"
+ * @x-avalon.info name="hello"
*/
-public class HelloAction extends ServiceableAction implements ThreadSafe {
+public class HelloAction extends AbstractLogEnabled implements Action {
/**
* A simple Action that logs if the <code>Session</code> object
1.2 +7 -4 cocoon-2.2/src/java/org/apache/cocoon/acting/HttpHeaderAction.java
Index: HttpHeaderAction.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/acting/HttpHeaderAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HttpHeaderAction.java 9 Mar 2003 00:08:39 -0000 1.1
+++ HttpHeaderAction.java 25 Oct 2003 17:46:38 -0000 1.2
@@ -68,10 +68,13 @@
*
* @author <a href="mailto:balld@apache.org">Donald Ball</a>
* @version CVS $Id$
+ *
+ * @avalon.component
+ * @avalon.service type="Action"
+ * @x-avalon.lifestyle type="singleton"
+ * @x-avalon.info name="set-header"
*/
-public class HttpHeaderAction
-extends AbstractConfigurableAction
-implements ThreadSafe {
+public class HttpHeaderAction extends AbstractConfigurableAction {
/**
* Stores keys of global configuration.
1.6 +7 -1 cocoon-2.2/src/java/org/apache/cocoon/acting/ServerPagesAction.java
Index: ServerPagesAction.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/acting/ServerPagesAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ServerPagesAction.java 19 Oct 2003 16:13:36 -0000 1.5
+++ ServerPagesAction.java 25 Oct 2003 17:46:38 -0000 1.6
@@ -113,6 +113,12 @@
*
* @author <a href="mailto:sylvain@apache.org">Sylvain Wallez</a>
* @version CVS $Id$
+ *
+ * @avalon.component
+ * @avalon.service type="Action"
+ * @x-avalon.lifestyle type="singleton"
+ * @x-avalon.info name="serverpages"
+ *
*/
public class ServerPagesAction
extends ConfigurableServiceableAction
1.5 +2 -3 cocoon-2.2/src/java/org/apache/cocoon/caching/Cache.java
Index: Cache.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/caching/Cache.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Cache.java 7 Aug 2003 08:52:15 -0000 1.4
+++ Cache.java 25 Oct 2003 17:46:39 -0000 1.5
@@ -65,8 +65,7 @@
* @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
* @version CVS $Id$
*/
-public interface Cache
-extends Component {
+public interface Cache {
/** The Avalon Role **/
String ROLE = Cache.class.getName();
1.8 +34 -19 cocoon-2.2/src/java/org/apache/cocoon/caching/impl/CacheImpl.java
Index: CacheImpl.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/caching/impl/CacheImpl.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- CacheImpl.java 8 Aug 2003 11:15:11 -0000 1.7
+++ CacheImpl.java 25 Oct 2003 17:46:39 -0000 1.8
@@ -61,6 +61,9 @@
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.cocoon.ProcessingException;
import org.apache.cocoon.caching.Cache;
@@ -72,30 +75,54 @@
* and retrieving cached responses. It can be used to monitor the cache
* or the investigate which responses are cached etc.
* This component will grow!
- *
+ *
+ *
* @since 2.1
* @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
* @version CVS $Id$
+ *
+ * @avalon.component
+ * @avalon.service type="Cache"
+ * @x-avalon.lifestyle type="singleton"
+ * @x-avalon.info name="cache"
+ *
*/
public class CacheImpl
extends AbstractLogEnabled
-implements Cache, ThreadSafe, Composable, Disposable, Parameterizable {
+implements Cache, Serviceable, Disposable, Parameterizable {
/** The store containing the cached responses */
protected Store store;
/** The component manager */
- protected ComponentManager manager;
+ protected ServiceManager manager;
+
/**
- * Composable Interface
+ * Serviceable stage.
+ *
+ * @avalon.dependency type="Store"
*/
- public void compose (ComponentManager manager)
- throws ComponentException {
+ public void service (ServiceManager manager) {
this.manager = manager;
}
/**
+ * Reads the value of the <code>store</code> parameter that specifies the
+ * lookup hint of the Store service to use and looks it up on the service
+ * manager. If the parameter is not present the default transient store
+ * is attempted.
+ */
+ public void parameterize(Parameters parameters) throws ParameterException {
+ String storeName = parameters.getParameter("store", Store.TRANSIENT_STORE);
+ try {
+ this.store = (Store)this.manager.lookup(storeName);
+ } catch (ServiceException ce) {
+ throw new ParameterException("Unable to lookup store: " + storeName, ce);
+ }
+ }
+
+ /**
* Disposable Interface
*/
public void dispose() {
@@ -168,17 +195,5 @@
public boolean containsKey(Serializable key) {
return this.store.containsKey(key);
}
-
- /* (non-Javadoc)
- * @see org.apache.avalon.framework.parameters.Parameterizable#parameterize(org.apache.avalon.framework.parameters.Parameters)
- */
- public void parameterize(Parameters parameters) throws ParameterException {
- String storeName = parameters.getParameter("store", Store.TRANSIENT_STORE);
- try {
- this.store = (Store)this.manager.lookup(storeName);
- } catch (ComponentException ce) {
- throw new ParameterException("Unable to lookup store: " + storeName, ce);
- }
- }
}