cziegeler 2003/10/15 13:47:15
Modified:
src/blocks/session-fw/java/org/apache/cocoon/webapps/session/acting
FormManagerAction.java SessionAction.java
src/blocks/portal-fw/java/org/apache/cocoon/webapps/portal/acting
AuthAction.java
src/blocks/eventcache/java/org/apache/cocoon/acting
CacheEventAction.java
src/blocks/scratchpad/java/org/apache/cocoon/acting
ExtendedResourceExistsAction.java
LinkTranslatorMapAction.java
CookieCreatorAction.java SectionCutterAction.java
ExpiresPipelineAction.java
src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/acting
AuthAction.java LoggedInAction.java
LoginAction.java LogoutAction.java
src/java/org/apache/cocoon/acting
SetCharacterEncodingAction.java
ClearCacheAction.java AbstractMultiAction.java
ClearPersistentStoreAction.java HelloAction.java
RequestParamAction.java LocaleAction.java
ResourceExistsAction.java
src/java/org/apache/cocoon/transformation/helpers
PreemptiveLoader.java PreemptiveLoaderAction.java
src/blocks/portal/java/org/apache/cocoon/portal/acting
LoginAction.java LogoutAction.java
src/blocks/taglib/java/org/apache/cocoon/taglib/test/acting
TagtestAction.java
src/blocks/mail/java/org/apache/cocoon/mail MailAction.java
src/blocks/precept/java/org/apache/cocoon/precept/acting
AbstractPreceptorAction.java
AbstractMethodAction.java
src/blocks/xmlform/java/org/apache/cocoon/acting
AbstractXMLFormAction.java
src/blocks/bsf/java/org/apache/cocoon/acting
ScriptAction.java
Log:
Changing to Serviceable
Revision Changes Path
1.2 +6 -7
cocoon-2.1/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/acting/FormManagerAction.java
Index: FormManagerAction.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/acting/FormManagerAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FormManagerAction.java 6 May 2003 17:08:25 -0000 1.1
+++ FormManagerAction.java 15 Oct 2003 20:47:14 -0000 1.2
@@ -52,12 +52,11 @@
import java.util.Map;
-import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.acting.ComposerAction;
+import org.apache.cocoon.acting.ServiceableAction;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.webapps.session.FormManager;
@@ -69,7 +68,7 @@
* @version CVS $Id$
*/
public final class FormManagerAction
-extends ComposerAction
+extends ServiceableAction
implements ThreadSafe {
public Map act(Redirector redirector,
@@ -82,10 +81,10 @@
try {
formManager = (FormManager)this.manager.lookup(FormManager.ROLE);
formManager.processInputFields();
- } catch (ComponentException ce) {
+ } catch (ServiceException ce) {
throw new ProcessingException("Error during lookup of
formManager component.", ce);
} finally {
- this.manager.release( (Component)formManager );
+ this.manager.release( formManager );
}
return EMPTY_MAP;
1.4 +6 -7
cocoon-2.1/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/acting/SessionAction.java
Index: SessionAction.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/acting/SessionAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SessionAction.java 18 Jul 2003 08:37:15 -0000 1.3
+++ SessionAction.java 15 Oct 2003 20:47:14 -0000 1.4
@@ -52,12 +52,11 @@
import java.util.Map;
-import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.acting.ComposerAction;
+import org.apache.cocoon.acting.ServiceableAction;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.webapps.session.SessionManager;
@@ -78,7 +77,7 @@
* @version CVS $Id$
*/
public final class SessionAction
-extends ComposerAction
+extends ServiceableAction
implements ThreadSafe {
public Map act(Redirector redirector,
@@ -112,10 +111,10 @@
} else {
throw new ProcessingException("Unknown action: " + action);
}
- } catch (ComponentException ce) {
+ } catch (ServiceException ce) {
throw new ProcessingException("Error during lookup of
sessionManager component.", ce);
} finally {
- this.manager.release( (Component)sessionManager );
+ this.manager.release( sessionManager );
}
return EMPTY_MAP;
1.3 +3 -3
cocoon-2.1/src/blocks/portal-fw/java/org/apache/cocoon/webapps/portal/acting/AuthAction.java
Index: AuthAction.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/portal-fw/java/org/apache/cocoon/webapps/portal/acting/AuthAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AuthAction.java 18 Jun 2003 12:36:46 -0000 1.2
+++ AuthAction.java 15 Oct 2003 20:47:14 -0000 1.3
@@ -53,7 +53,7 @@
import java.util.Map;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.cocoon.acting.ComposerAction;
+import org.apache.cocoon.acting.ServiceableAction;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.webapps.portal.components.PortalManager;
@@ -66,7 +66,7 @@
* @version CVS $Id$
*/
public final class AuthAction
-extends ComposerAction
+extends ServiceableAction
implements ThreadSafe {
public Map act(Redirector redirector,
1.4 +2 -2
cocoon-2.1/src/blocks/eventcache/java/org/apache/cocoon/acting/CacheEventAction.java
Index: CacheEventAction.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/eventcache/java/org/apache/cocoon/acting/CacheEventAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CacheEventAction.java 2 Oct 2003 04:21:17 -0000 1.3
+++ CacheEventAction.java 15 Oct 2003 20:47:14 -0000 1.4
@@ -73,7 +73,7 @@
* @author Geoff Howard ([EMAIL PROTECTED])
* @version CVS $Id$
*/
-public class CacheEventAction extends ComposerAction implements ThreadSafe {
+public class CacheEventAction extends ServiceableAction implements
ThreadSafe {
/**
* Lookup the cache and call its processEvent method. Returns an
1.2 +2 -2
cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/acting/ExtendedResourceExistsAction.java
Index: ExtendedResourceExistsAction.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/acting/ExtendedResourceExistsAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ExtendedResourceExistsAction.java 4 Sep 2003 12:42:42 -0000 1.1
+++ ExtendedResourceExistsAction.java 15 Oct 2003 20:47:14 -0000 1.2
@@ -78,7 +78,7 @@
* @version CVS $Id$
* @since 2.1
*/
-public class ExtendedResourceExistsAction extends ComposerAction implements
ThreadSafe {
+public class ExtendedResourceExistsAction extends ServiceableAction
implements ThreadSafe {
/**
* This parameter name is put into the objectModel map, setting it to
<code>true</code>,
1.3 +2 -2
cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/acting/LinkTranslatorMapAction.java
Index: LinkTranslatorMapAction.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/acting/LinkTranslatorMapAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LinkTranslatorMapAction.java 5 Sep 2003 07:04:35 -0000 1.2
+++ LinkTranslatorMapAction.java 15 Oct 2003 20:47:14 -0000 1.3
@@ -72,7 +72,7 @@
* @since 16 December 2002
* @version CVS $Id$
*/
-public class LinkTranslatorMapAction extends ComposerAction implements
ThreadSafe {
+public class LinkTranslatorMapAction extends ServiceableAction implements
ThreadSafe {
/**
* Execute the LinkTranslatorMapAction.
1.2 +3 -2
cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/acting/CookieCreatorAction.java
Index: CookieCreatorAction.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/acting/CookieCreatorAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CookieCreatorAction.java 4 Sep 2003 12:42:42 -0000 1.1
+++ CookieCreatorAction.java 15 Oct 2003 20:47:14 -0000 1.2
@@ -53,6 +53,7 @@
import org.apache.avalon.framework.parameters.ParameterException;
import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Cookie;
import org.apache.cocoon.environment.Redirector;
@@ -79,7 +80,7 @@
* @version CVS $Id$
*/
-public class CookieCreatorAction extends ComposerAction {
+public class CookieCreatorAction extends ServiceableAction implements
ThreadSafe {
/**
* Description of the Method
1.2 +2 -2
cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/acting/SectionCutterAction.java
Index: SectionCutterAction.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/acting/SectionCutterAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SectionCutterAction.java 4 Sep 2003 12:42:42 -0000 1.1
+++ SectionCutterAction.java 15 Oct 2003 20:47:14 -0000 1.2
@@ -79,7 +79,7 @@
* @version CVS $Id$
*/
-public class SectionCutterAction extends ConfigurableComposerAction
implements ThreadSafe {
+public class SectionCutterAction extends ConfigurableServiceableAction
implements ThreadSafe {
Vector sections = new Vector();
1.2 +2 -2
cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/acting/ExpiresPipelineAction.java
Index: ExpiresPipelineAction.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/acting/ExpiresPipelineAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ExpiresPipelineAction.java 4 Sep 2003 12:42:42 -0000 1.1
+++ ExpiresPipelineAction.java 15 Oct 2003 20:47:14 -0000 1.2
@@ -76,7 +76,7 @@
* @version CVS $Id$
* @since 2.1.1
*/
-public class ExpiresPipelineAction extends ComposerAction implements
ThreadSafe {
+public class ExpiresPipelineAction extends ServiceableAction implements
ThreadSafe {
public Map act(Redirector redirector,
SourceResolver resolver,
1.4 +4 -5
cocoon-2.1/src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/acting/AuthAction.java
Index: AuthAction.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/acting/AuthAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AuthAction.java 23 May 2003 12:13:13 -0000 1.3
+++ AuthAction.java 15 Oct 2003 20:47:14 -0000 1.4
@@ -52,10 +52,9 @@
import java.util.Map;
-import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.cocoon.acting.ComposerAction;
+import org.apache.cocoon.acting.ServiceableAction;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.webapps.authentication.AuthenticationManager;
@@ -73,7 +72,7 @@
* @version CVS $Id$
*/
public final class AuthAction
-extends ComposerAction
+extends ServiceableAction
implements ThreadSafe {
public Map act(Redirector redirector,
@@ -108,7 +107,7 @@
map = state.getHandler().getContext().getContextInfo();
}
} finally {
- this.manager.release( (Component)authManager );
+ this.manager.release( authManager );
}
if (this.getLogger().isDebugEnabled() ) {
this.getLogger().debug("END act map="+map);
1.3 +4 -5
cocoon-2.1/src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/acting/LoggedInAction.java
Index: LoggedInAction.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/acting/LoggedInAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LoggedInAction.java 4 May 2003 20:19:39 -0000 1.2
+++ LoggedInAction.java 15 Oct 2003 20:47:14 -0000 1.3
@@ -52,10 +52,9 @@
import java.util.Map;
-import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.cocoon.acting.ComposerAction;
+import org.apache.cocoon.acting.ServiceableAction;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.webapps.authentication.AuthenticationManager;
@@ -68,7 +67,7 @@
* @version CVS $Id$
*/
public final class LoggedInAction
-extends ComposerAction
+extends ServiceableAction
implements ThreadSafe {
public Map act(Redirector redirector,
@@ -95,7 +94,7 @@
map = handler.getContext().getContextInfo();
}
} finally {
- this.manager.release( (Component)authManager);
+ this.manager.release( authManager);
}
if (this.getLogger().isDebugEnabled() ) {
1.3 +4 -5
cocoon-2.1/src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/acting/LoginAction.java
Index: LoginAction.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/acting/LoginAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LoginAction.java 4 May 2003 20:19:39 -0000 1.2
+++ LoginAction.java 15 Oct 2003 20:47:14 -0000 1.3
@@ -52,11 +52,10 @@
import java.util.Map;
-import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.acting.ComposerAction;
+import org.apache.cocoon.acting.ServiceableAction;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.webapps.authentication.AuthenticationManager;
@@ -74,7 +73,7 @@
* @version CVS $Id$
*/
public final class LoginAction
-extends ComposerAction
+extends ServiceableAction
implements ThreadSafe {
public Map act(Redirector redirector,
@@ -124,7 +123,7 @@
}
} finally {
- this.manager.release( (Component)authManager);
+ this.manager.release( authManager);
}
if (this.getLogger().isDebugEnabled() ) {
1.5 +4 -5
cocoon-2.1/src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/acting/LogoutAction.java
Index: LogoutAction.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/acting/LogoutAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LogoutAction.java 23 May 2003 12:35:33 -0000 1.4
+++ LogoutAction.java 15 Oct 2003 20:47:14 -0000 1.5
@@ -52,11 +52,10 @@
import java.util.Map;
-import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.acting.ComposerAction;
+import org.apache.cocoon.acting.ServiceableAction;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.webapps.authentication.AuthenticationConstants;
@@ -70,7 +69,7 @@
* @version CVS $Id$
*/
public final class LogoutAction
-extends ComposerAction
+extends ServiceableAction
implements ThreadSafe {
public Map act(Redirector redirector,
@@ -110,7 +109,7 @@
throw new ProcessingException("LogoutAction requires at
least the handler parameter.");
authManager.logout( handlerName , mode );
} finally {
- this.manager.release( (Component)authManager );
+ this.manager.release( authManager );
}
if (this.getLogger().isDebugEnabled() ) {
1.3 +2 -2
cocoon-2.1/src/java/org/apache/cocoon/acting/SetCharacterEncodingAction.java
Index: SetCharacterEncodingAction.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/acting/SetCharacterEncodingAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SetCharacterEncodingAction.java 16 Mar 2003 17:49:11 -0000 1.2
+++ SetCharacterEncodingAction.java 15 Oct 2003 20:47:14 -0000 1.3
@@ -77,7 +77,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">MIYABE Tatsuhiko</a>
* @version CVS $Id$
*/
-public class SetCharacterEncodingAction extends ComposerAction implements
ThreadSafe, Parameterizable {
+public class SetCharacterEncodingAction extends ServiceableAction implements
ThreadSafe, Parameterizable {
private String global_form_encoding = null;
public void parameterize(Parameters parameters)
1.3 +2 -2
cocoon-2.1/src/java/org/apache/cocoon/acting/ClearCacheAction.java
Index: ClearCacheAction.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/acting/ClearCacheAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ClearCacheAction.java 7 Aug 2003 13:28:50 -0000 1.2
+++ ClearCacheAction.java 15 Oct 2003 20:47:14 -0000 1.3
@@ -65,7 +65,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Michael Melhem</a>
* @version CVS $Id$
*/
-public class ClearCacheAction extends ComposerAction implements ThreadSafe {
+public class ClearCacheAction extends ServiceableAction implements
ThreadSafe {
public Map act(Redirector redirector,
SourceResolver resolver,
1.7 +2 -2
cocoon-2.1/src/java/org/apache/cocoon/acting/AbstractMultiAction.java
Index: AbstractMultiAction.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/acting/AbstractMultiAction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AbstractMultiAction.java 24 Sep 2003 21:26:51 -0000 1.6
+++ AbstractMultiAction.java 15 Oct 2003 20:47:14 -0000 1.7
@@ -78,7 +78,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Torsten Curdt</a>
* @version CVS $Id$
*/
-public abstract class AbstractMultiAction extends ConfigurableComposerAction
{
+public abstract class AbstractMultiAction extends
ConfigurableServiceableAction {
private static final String ACTION_METHOD_PREFIX = "do";
private static final String ACTION_METHOD_PARAMETER = "method";
1.2 +2 -2
cocoon-2.1/src/java/org/apache/cocoon/acting/ClearPersistentStoreAction.java
Index: ClearPersistentStoreAction.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/acting/ClearPersistentStoreAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ClearPersistentStoreAction.java 9 Mar 2003 00:08:38 -0000 1.1
+++ ClearPersistentStoreAction.java 15 Oct 2003 20:47:14 -0000 1.2
@@ -64,7 +64,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Gerhard Froehlich</a>
* @version CVS $Id$
*/
-public class ClearPersistentStoreAction extends ComposerAction implements
ThreadSafe {
+public class ClearPersistentStoreAction extends ServiceableAction implements
ThreadSafe {
public Map act(Redirector redirector,
SourceResolver resolver,
1.2 +2 -2
cocoon-2.1/src/java/org/apache/cocoon/acting/HelloAction.java
Index: HelloAction.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/acting/HelloAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HelloAction.java 9 Mar 2003 00:08:39 -0000 1.1
+++ HelloAction.java 15 Oct 2003 20:47:14 -0000 1.2
@@ -67,7 +67,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
* @version CVS $Id$
*/
-public class HelloAction extends ComposerAction implements ThreadSafe {
+public class HelloAction extends ServiceableAction implements ThreadSafe {
/**
* A simple Action that logs if the <code>Session</code> object
1.3 +2 -2
cocoon-2.1/src/java/org/apache/cocoon/acting/RequestParamAction.java
Index: RequestParamAction.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/acting/RequestParamAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RequestParamAction.java 7 Aug 2003 12:37:04 -0000 1.2
+++ RequestParamAction.java 15 Oct 2003 20:47:14 -0000 1.3
@@ -117,7 +117,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Torsten Curdt</a>
* @version CVS $Id$
*/
-public class RequestParamAction extends ComposerAction implements ThreadSafe
{
+public class RequestParamAction extends ServiceableAction implements
ThreadSafe {
public final static String MAP_URI = "requestURI";
public final static String MAP_QUERY = "requestQuery";
1.2 +2 -2
cocoon-2.1/src/java/org/apache/cocoon/acting/LocaleAction.java
Index: LocaleAction.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/acting/LocaleAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LocaleAction.java 9 Mar 2003 00:08:39 -0000 1.1
+++ LocaleAction.java 15 Oct 2003 20:47:14 -0000 1.2
@@ -147,7 +147,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Lassi Immonen</a>
* @version CVS $Id$
*/
-public class LocaleAction extends ComposerAction implements ThreadSafe,
Configurable {
+public class LocaleAction extends ServiceableAction implements ThreadSafe,
Configurable {
/**
* Constant representing the language parameter
1.3 +2 -2
cocoon-2.1/src/java/org/apache/cocoon/acting/ResourceExistsAction.java
Index: ResourceExistsAction.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/acting/ResourceExistsAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ResourceExistsAction.java 19 Mar 2003 06:19:38 -0000 1.2
+++ ResourceExistsAction.java 15 Oct 2003 20:47:14 -0000 1.3
@@ -72,7 +72,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Donald Ball</a>
* @version CVS $Id$
*/
-public class ResourceExistsAction extends ComposerAction implements
ThreadSafe {
+public class ResourceExistsAction extends ServiceableAction implements
ThreadSafe {
public Map act(Redirector redirector, SourceResolver resolver, Map
objectModel, String source, Parameters parameters) throws Exception {
String urlstring = parameters.getParameter("url", source);
1.5 +3 -3
cocoon-2.1/src/java/org/apache/cocoon/transformation/helpers/PreemptiveLoader.java
Index: PreemptiveLoader.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/transformation/helpers/PreemptiveLoader.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PreemptiveLoader.java 27 Jul 2003 11:09:17 -0000 1.4
+++ PreemptiveLoader.java 15 Oct 2003 20:47:14 -0000 1.5
@@ -55,8 +55,8 @@
import java.util.List;
import java.util.Map;
-import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.logger.Logger;
+import org.apache.avalon.framework.service.ServiceManager;
import org.apache.cocoon.caching.CachedResponse;
import org.apache.cocoon.components.sax.XMLSerializer;
import org.apache.cocoon.components.source.SourceUtil;
@@ -128,7 +128,7 @@
* @param resolver A source resolver
* @param logger A logger
*/
- public void process(ComponentManager manager,
+ public void process(ServiceManager manager,
SourceResolver resolver,
Logger logger) {
this.alive = true;
1.3 +3 -3
cocoon-2.1/src/java/org/apache/cocoon/transformation/helpers/PreemptiveLoaderAction.java
Index: PreemptiveLoaderAction.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/transformation/helpers/PreemptiveLoaderAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PreemptiveLoaderAction.java 11 Mar 2003 16:33:37 -0000 1.2
+++ PreemptiveLoaderAction.java 15 Oct 2003 20:47:15 -0000 1.3
@@ -54,7 +54,7 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.cocoon.acting.ComposerAction;
+import org.apache.cocoon.acting.ServiceableAction;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.SourceResolver;
@@ -66,7 +66,7 @@
* @since 2.1
*/
public class PreemptiveLoaderAction
- extends ComposerAction
+ extends ServiceableAction
implements ThreadSafe {
/**
1.3 +5 -5
cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/acting/LoginAction.java
Index: LoginAction.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/acting/LoginAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LoginAction.java 18 Jul 2003 14:41:45 -0000 1.2
+++ LoginAction.java 15 Oct 2003 20:47:15 -0000 1.3
@@ -52,12 +52,12 @@
import java.util.Map;
-import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.parameters.ParameterException;
import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.acting.ComposerAction;
+import org.apache.cocoon.acting.ServiceableAction;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.portal.PortalService;
@@ -69,7 +69,7 @@
* @version CVS $Id$
*/
public final class LoginAction
-extends ComposerAction
+extends ServiceableAction
implements ThreadSafe {
public Map act(Redirector redirector,
@@ -92,7 +92,7 @@
service.getComponentManager().getProfileManager().login();
} catch (ParameterException pe) {
throw new ProcessingException("Parameter portal-name is
required.");
- } catch (ComponentException ce) {
+ } catch (ServiceException ce) {
throw new ProcessingException("Unable to lookup portal
service.", ce);
} finally {
this.manager.release(service);
1.3 +5 -5
cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/acting/LogoutAction.java
Index: LogoutAction.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/acting/LogoutAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LogoutAction.java 18 Jul 2003 14:41:45 -0000 1.2
+++ LogoutAction.java 15 Oct 2003 20:47:15 -0000 1.3
@@ -52,12 +52,12 @@
import java.util.Map;
-import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.parameters.ParameterException;
import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.acting.ComposerAction;
+import org.apache.cocoon.acting.ServiceableAction;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.portal.PortalService;
@@ -69,7 +69,7 @@
* @version CVS $Id$
*/
public final class LogoutAction
-extends ComposerAction
+extends ServiceableAction
implements ThreadSafe {
public Map act(Redirector redirector,
@@ -92,7 +92,7 @@
service.getComponentManager().getProfileManager().logout();
} catch (ParameterException pe) {
throw new ProcessingException("Parameter portal-name is
required.");
- } catch (ComponentException ce) {
+ } catch (ServiceException ce) {
throw new ProcessingException("Unable to lookup portal
service.", ce);
} finally {
this.manager.release(service);
1.3 +4 -3
cocoon-2.1/src/blocks/taglib/java/org/apache/cocoon/taglib/test/acting/TagtestAction.java
Index: TagtestAction.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/taglib/java/org/apache/cocoon/taglib/test/acting/TagtestAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TagtestAction.java 16 Mar 2003 17:49:09 -0000 1.2
+++ TagtestAction.java 15 Oct 2003 20:47:15 -0000 1.3
@@ -56,7 +56,8 @@
import java.util.Map;
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.cocoon.acting.ComposerAction;
+import org.apache.avalon.framework.thread.ThreadSafe;
+import org.apache.cocoon.acting.ServiceableAction;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.Request;
@@ -67,7 +68,7 @@
* @author ?
* @version CVS $Id$
*/
-public class TagtestAction extends ComposerAction {
+public class TagtestAction extends ServiceableAction implements ThreadSafe {
/*
* @see Action#act(Redirector, SourceResolver, Map, String, Parameters)
1.5 +3 -3
cocoon-2.1/src/blocks/mail/java/org/apache/cocoon/mail/MailAction.java
Index: MailAction.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/mail/java/org/apache/cocoon/mail/MailAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MailAction.java 5 Sep 2003 07:21:48 -0000 1.4
+++ MailAction.java 15 Oct 2003 20:47:15 -0000 1.5
@@ -68,7 +68,7 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.acting.ComposerAction;
+import org.apache.cocoon.acting.ServiceableAction;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.Request;
@@ -90,7 +90,7 @@
* @version CVS $Id$
* @since Cocoon 2.1, 16 December 2002
*/
-public class MailAction extends ComposerAction implements ThreadSafe {
+public class MailAction extends ServiceableAction implements ThreadSafe {
/**
* Request attribute name of a XMLizable folder
1.3 +3 -3
cocoon-2.1/src/blocks/precept/java/org/apache/cocoon/precept/acting/AbstractPreceptorAction.java
Index: AbstractPreceptorAction.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/precept/java/org/apache/cocoon/precept/acting/AbstractPreceptorAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractPreceptorAction.java 16 Mar 2003 17:49:04 -0000 1.2
+++ AbstractPreceptorAction.java 15 Oct 2003 20:47:15 -0000 1.3
@@ -56,7 +56,7 @@
import java.util.List;
import java.util.Map;
-import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.environment.ObjectModelHelper;
@@ -90,7 +90,7 @@
}
- final protected Instance createInstance(String id) throws
ComponentException {
+ final protected Instance createInstance(String id) throws
ServiceException {
InstanceFactory factory = (InstanceFactory)
manager.lookup(InstanceFactory.ROLE);
Instance instance = factory.createInstance(id);
manager.release(factory);
1.3 +3 -3
cocoon-2.1/src/blocks/precept/java/org/apache/cocoon/precept/acting/AbstractMethodAction.java
Index: AbstractMethodAction.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/precept/java/org/apache/cocoon/precept/acting/AbstractMethodAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractMethodAction.java 16 Mar 2003 17:49:04 -0000 1.2
+++ AbstractMethodAction.java 15 Oct 2003 20:47:15 -0000 1.3
@@ -64,7 +64,7 @@
import org.apache.cocoon.environment.ObjectModelHelper;
-import org.apache.cocoon.acting.ConfigurableComposerAction;
+import org.apache.cocoon.acting.ConfigurableServiceableAction;
import java.util.HashMap;
@@ -79,7 +79,7 @@
* @since Feb 25, 2002
* @version CVS $Id$
*/
-public abstract class AbstractMethodAction extends
ConfigurableComposerAction {
+public abstract class AbstractMethodAction extends
ConfigurableServiceableAction {
private static final String ACTION_METHOD_PREFIX = "do";
private static final String ACTION_METHOD_PARAMETER = "method";
1.5 +2 -2
cocoon-2.1/src/blocks/xmlform/java/org/apache/cocoon/acting/AbstractXMLFormAction.java
Index: AbstractXMLFormAction.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/xmlform/java/org/apache/cocoon/acting/AbstractXMLFormAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractXMLFormAction.java 3 Jul 2003 09:26:03 -0000 1.4
+++ AbstractXMLFormAction.java 15 Oct 2003 20:47:15 -0000 1.5
@@ -94,7 +94,7 @@
* @version CVS $Id$
*/
public abstract class AbstractXMLFormAction
- extends ConfigurableComposerAction
+ extends ConfigurableServiceableAction
implements Poolable, Recyclable, FormListener {
public static final String OBJECT_MAP_NEXT_PAGE = "page";
1.2 +2 -2
cocoon-2.1/src/blocks/bsf/java/org/apache/cocoon/acting/ScriptAction.java
Index: ScriptAction.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/bsf/java/org/apache/cocoon/acting/ScriptAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ScriptAction.java 9 Mar 2003 00:02:44 -0000 1.1
+++ ScriptAction.java 15 Oct 2003 20:47:15 -0000 1.2
@@ -75,7 +75,7 @@
*/
public class ScriptAction
-extends ComposerAction
+extends ServiceableAction
implements ThreadSafe {
