sylvain 01/08/22 05:08:21 Modified: . Tag: cocoon_20_branch changes.xml src/org/apache/cocoon/acting Tag: cocoon_20_branch Action.java DatabaseAddAction.java DatabaseAuthenticatorAction.java DatabaseDeleteAction.java DatabaseUpdateAction.java FormValidatorAction.java HelloAction.java HttpHeaderAction.java LangSelect.java LocaleAction.java RequestParamAction.java ResourceExistsAction.java SendmailAction.java SessionInvalidatorAction.java SessionIsValidAction.java SessionPropagatorAction.java SessionStateAction.java SessionValidatorAction.java Log: Remove ThreadSafe from Action, add it to non-abstract actions. Revision Changes Path No revision No revision 1.2.2.30 +6 -1 xml-cocoon2/changes.xml Index: changes.xml =================================================================== RCS file: /home/cvs/xml-cocoon2/changes.xml,v retrieving revision 1.2.2.29 retrieving revision 1.2.2.30 diff -u -r1.2.2.29 -r1.2.2.30 --- changes.xml 2001/08/16 11:25:21 1.2.2.29 +++ changes.xml 2001/08/22 12:08:20 1.2.2.30 @@ -4,7 +4,7 @@ <!-- History of Cocoon changes - $Id: changes.xml,v 1.2.2.29 2001/08/16 11:25:21 cziegeler Exp $ + $Id: changes.xml,v 1.2.2.30 2001/08/22 12:08:20 sylvain Exp $ --> <changes title="History of Changes"> @@ -26,6 +26,11 @@ </devs> <release version="2.0b2-dev" date="@date@"> + <action dev="SW" type="add"> + Removed ThreadSafe from the Action interfaces : the decision to be ThreadSafe + is left to each implementation. Consequently, existing actions now explictly + implement ThreadSafe. + </action> <action dev="CZ" type="add"> Redesigned the handling of the cocoon: protocol. Removed the pushURI and popURI methods. It is now possible to load cocoon: resources No revision No revision 1.3.2.3 +5 -5 xml-cocoon2/src/org/apache/cocoon/acting/Action.java Index: Action.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/Action.java,v retrieving revision 1.3.2.2 retrieving revision 1.3.2.3 diff -u -r1.3.2.2 -r1.3.2.3 --- Action.java 2001/08/20 14:07:24 1.3.2.2 +++ Action.java 2001/08/22 12:08:20 1.3.2.3 @@ -9,7 +9,6 @@ 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.environment.Redirector; import org.apache.cocoon.environment.SourceResolver; @@ -18,9 +17,9 @@ /** * * @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a> - * @version CVS $Revision: 1.3.2.2 $ $Date: 2001/08/20 14:07:24 $ + * @version CVS $Revision: 1.3.2.3 $ $Date: 2001/08/22 12:08:20 $ */ -public interface Action extends Component, ThreadSafe { +public interface Action extends Component { String ROLE = "org.apache.cocoon.acting.Action"; @@ -30,8 +29,9 @@ * <code>Map</code> object with values used in subsequent * sitemap substitution patterns. * - * NOTE: It is important that <code>Action<code> classes are - * written in a thread safe manner. + * NOTE: This interface is designed so that implentations can be <code>ThreadSafe<code>. + * When an action is ThreadSafe, only one instance serves all requests : this + * reduces memory usage and avoids pooling. * * @param resolver The <code>SourceResolver</code> in charge * @param objectModel The <code>Map</code> with object of the 1.6.2.6 +6 -5 xml-cocoon2/src/org/apache/cocoon/acting/DatabaseAddAction.java Index: DatabaseAddAction.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/DatabaseAddAction.java,v retrieving revision 1.6.2.5 retrieving revision 1.6.2.6 diff -u -r1.6.2.5 -r1.6.2.6 --- DatabaseAddAction.java 2001/08/20 14:07:24 1.6.2.5 +++ DatabaseAddAction.java 2001/08/22 12:08:20 1.6.2.6 @@ -11,6 +11,7 @@ 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.thread.ThreadSafe; import org.apache.cocoon.Constants; import org.apache.cocoon.ProcessingException; import org.apache.cocoon.environment.Redirector; @@ -33,14 +34,14 @@ * Adds record in a database. The action can update one or more tables, * and can add more than one row to a table at a time. The form descriptor * semantics for this are still in a bit of a state of flux. Note - * that if a secondary table relies on the value of a new primary key in a + * that if a secondary table relies on the value of a new primary key in a * primary table, the primary key must be created using manual mode. * * @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a> * @author <a href="mailto:[EMAIL PROTECTED]">Donald Ball</a> - * @version CVS $Revision: 1.6.2.5 $ $Date: 2001/08/20 14:07:24 $ + * @version CVS $Revision: 1.6.2.6 $ $Date: 2001/08/22 12:08:20 $ */ -public class DatabaseAddAction extends AbstractDatabaseAction { +public class DatabaseAddAction extends AbstractDatabaseAction implements ThreadSafe { protected static final Map addStatements = new HashMap(); private static final Map selectStatements = new HashMap(); @@ -209,8 +210,8 @@ * </dl> * * This method has a couple of side effects. If the mode is manual, - * the key value is stored in the request object's attributes for use - * by other inserts. The key is the string "key:TABLENAME:DBCOL". + * the key value is stored in the request object's attributes for use + * by other inserts. The key is the string "key:TABLENAME:DBCOL". * This method also puts the value of manually created keys in the results * map. That key is simply the value of the dbcol attribute. Note this * stuff is definitely up in the air. 1.3.2.8 +5 -4 xml-cocoon2/src/org/apache/cocoon/acting/DatabaseAuthenticatorAction.java Index: DatabaseAuthenticatorAction.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/DatabaseAuthenticatorAction.java,v retrieving revision 1.3.2.7 retrieving revision 1.3.2.8 diff -u -r1.3.2.7 -r1.3.2.8 --- DatabaseAuthenticatorAction.java 2001/08/21 19:05:10 1.3.2.7 +++ DatabaseAuthenticatorAction.java 2001/08/22 12:08:20 1.3.2.8 @@ -1,9 +1,10 @@ -// $Id: DatabaseAuthenticatorAction.java,v 1.3.2.7 2001/08/21 19:05:10 mman Exp $ +// $Id: DatabaseAuthenticatorAction.java,v 1.3.2.8 2001/08/22 12:08:20 sylvain Exp $ package org.apache.cocoon.acting; import org.apache.avalon.excalibur.datasource.DataSourceComponent; import org.apache.avalon.framework.configuration.Configuration; import org.apache.avalon.framework.parameters.Parameters; +import org.apache.avalon.framework.thread.ThreadSafe; import org.apache.cocoon.Constants; import org.apache.cocoon.environment.Redirector; import org.apache.cocoon.environment.Request; @@ -50,9 +51,9 @@ * not verified. * * @author Martin Man <[EMAIL PROTECTED]> - * @version CVS $Revision: 1.3.2.7 $ $Date: 2001/08/21 19:05:10 $ + * @version CVS $Revision: 1.3.2.8 $ $Date: 2001/08/22 12:08:20 $ */ -public class DatabaseAuthenticatorAction extends AbstractDatabaseAction +public class DatabaseAuthenticatorAction extends AbstractDatabaseAction implements ThreadSafe { /** * Main invocation routine. @@ -261,5 +262,5 @@ } } -// $Id: DatabaseAuthenticatorAction.java,v 1.3.2.7 2001/08/21 19:05:10 mman Exp $ +// $Id: DatabaseAuthenticatorAction.java,v 1.3.2.8 2001/08/22 12:08:20 sylvain Exp $ // vim: set et ts=4 sw=4: 1.3.2.7 +3 -2 xml-cocoon2/src/org/apache/cocoon/acting/DatabaseDeleteAction.java Index: DatabaseDeleteAction.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/DatabaseDeleteAction.java,v retrieving revision 1.3.2.6 retrieving revision 1.3.2.7 diff -u -r1.3.2.6 -r1.3.2.7 --- DatabaseDeleteAction.java 2001/08/20 14:07:25 1.3.2.6 +++ DatabaseDeleteAction.java 2001/08/22 12:08:20 1.3.2.7 @@ -11,6 +11,7 @@ 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.thread.ThreadSafe; import org.apache.cocoon.Constants; import org.apache.cocoon.ProcessingException; import org.apache.cocoon.environment.Redirector; @@ -31,9 +32,9 @@ * the keys. * * @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a> - * @version CVS $Revision: 1.3.2.6 $ $Date: 2001/08/20 14:07:25 $ + * @version CVS $Revision: 1.3.2.7 $ $Date: 2001/08/22 12:08:20 $ */ -public final class DatabaseDeleteAction extends AbstractDatabaseAction { +public final class DatabaseDeleteAction extends AbstractDatabaseAction implements ThreadSafe { private static final Map deleteStatements = new HashMap(); /** 1.3.2.8 +3 -2 xml-cocoon2/src/org/apache/cocoon/acting/DatabaseUpdateAction.java Index: DatabaseUpdateAction.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/DatabaseUpdateAction.java,v retrieving revision 1.3.2.7 retrieving revision 1.3.2.8 diff -u -r1.3.2.7 -r1.3.2.8 --- DatabaseUpdateAction.java 2001/08/20 14:07:25 1.3.2.7 +++ DatabaseUpdateAction.java 2001/08/22 12:08:20 1.3.2.8 @@ -11,6 +11,7 @@ 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.thread.ThreadSafe; import org.apache.cocoon.Constants; import org.apache.cocoon.ProcessingException; import org.apache.cocoon.environment.Redirector; @@ -28,9 +29,9 @@ * only one table at a time to update. * * @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a> - * @version CVS $Revision: 1.3.2.7 $ $Date: 2001/08/20 14:07:25 $ + * @version CVS $Revision: 1.3.2.8 $ $Date: 2001/08/22 12:08:20 $ */ -public class DatabaseUpdateAction extends AbstractDatabaseAction { +public class DatabaseUpdateAction extends AbstractDatabaseAction implements ThreadSafe { private static final Map updateStatements = new HashMap(); /** 1.4.2.6 +5 -4 xml-cocoon2/src/org/apache/cocoon/acting/FormValidatorAction.java Index: FormValidatorAction.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/FormValidatorAction.java,v retrieving revision 1.4.2.5 retrieving revision 1.4.2.6 diff -u -r1.4.2.5 -r1.4.2.6 --- FormValidatorAction.java 2001/08/20 14:07:25 1.4.2.5 +++ FormValidatorAction.java 2001/08/22 12:08:20 1.4.2.6 @@ -1,8 +1,9 @@ -// $Id: FormValidatorAction.java,v 1.4.2.5 2001/08/20 14:07:25 dims Exp $ +// $Id: FormValidatorAction.java,v 1.4.2.6 2001/08/22 12:08:20 sylvain Exp $ package org.apache.cocoon.acting; import org.apache.avalon.framework.configuration.Configuration; import org.apache.avalon.framework.parameters.Parameters; +import org.apache.avalon.framework.thread.ThreadSafe; import org.apache.cocoon.Constants; import org.apache.cocoon.environment.Redirector; import org.apache.cocoon.environment.Request; @@ -54,9 +55,9 @@ * * @author Martin Man <[EMAIL PROTECTED]> * @author <a href="mailto:[EMAIL PROTECTED]">Christian Haul</a> - * @version CVS $Revision: 1.4.2.5 $ $Date: 2001/08/20 14:07:25 $ + * @version CVS $Revision: 1.4.2.6 $ $Date: 2001/08/22 12:08:20 $ */ -public class FormValidatorAction extends AbstractValidatorAction +public class FormValidatorAction extends AbstractValidatorAction implements ThreadSafe { /** * Main invocation routine. @@ -204,5 +205,5 @@ } } -// $Id: FormValidatorAction.java,v 1.4.2.5 2001/08/20 14:07:25 dims Exp $ +// $Id: FormValidatorAction.java,v 1.4.2.6 2001/08/22 12:08:20 sylvain Exp $ // vim: set et ts=4 sw=4: 1.3.2.2 +3 -2 xml-cocoon2/src/org/apache/cocoon/acting/HelloAction.java Index: HelloAction.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/HelloAction.java,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -u -r1.3.2.1 -r1.3.2.2 --- HelloAction.java 2001/08/20 14:07:25 1.3.2.1 +++ HelloAction.java 2001/08/22 12:08:20 1.3.2.2 @@ -8,6 +8,7 @@ package org.apache.cocoon.acting; import org.apache.avalon.framework.parameters.Parameters; +import org.apache.avalon.framework.thread.ThreadSafe; import org.apache.cocoon.Constants; import org.apache.cocoon.environment.Redirector; import org.apache.cocoon.environment.Request; @@ -21,9 +22,9 @@ * has been created or not. * * @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a> - * @version CVS $Revision: 1.3.2.1 $ $Date: 2001/08/20 14:07:25 $ + * @version CVS $Revision: 1.3.2.2 $ $Date: 2001/08/22 12:08:20 $ */ -public class HelloAction extends ComposerAction { +public class HelloAction extends ComposerAction implements ThreadSafe { /** * A simple Action that logs if the <code>Session</code> object 1.1.2.4 +2 -1 xml-cocoon2/src/org/apache/cocoon/acting/HttpHeaderAction.java Index: HttpHeaderAction.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/HttpHeaderAction.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- HttpHeaderAction.java 2001/08/20 14:07:25 1.1.2.3 +++ HttpHeaderAction.java 2001/08/22 12:08:20 1.1.2.4 @@ -10,6 +10,7 @@ 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.thread.ThreadSafe; import org.apache.cocoon.Constants; import org.apache.cocoon.environment.Redirector; import org.apache.cocoon.environment.Response; @@ -25,7 +26,7 @@ * @author <a href="mailto:[EMAIL PROTECTED]">Donald Ball</a> * @version CVS $Revision: */ -public class HttpHeaderAction extends AbstractConfigurableAction { +public class HttpHeaderAction extends AbstractConfigurableAction implements ThreadSafe { private static Object[] defaults = {}; 1.4.2.2 +2 -1 xml-cocoon2/src/org/apache/cocoon/acting/LangSelect.java Index: LangSelect.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/LangSelect.java,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -u -r1.4.2.1 -r1.4.2.2 --- LangSelect.java 2001/08/20 14:07:25 1.4.2.1 +++ LangSelect.java 2001/08/22 12:08:20 1.4.2.2 @@ -11,6 +11,7 @@ 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.thread.ThreadSafe; import org.apache.cocoon.Constants; import org.apache.cocoon.environment.Cookie; import org.apache.cocoon.environment.Redirector; @@ -55,7 +56,7 @@ * @author: <a href="mailto:[EMAIL PROTECTED]">Konstantin Piroumian</a> * @author: <a href="mailto:[EMAIL PROTECTED]">Lassi Immonen</a> */ -public class LangSelect extends java.lang.Object implements Action, Configurable { +public class LangSelect extends java.lang.Object implements Action, Configurable, ThreadSafe { /** * The default language: en (English). 1.1.2.4 +2 -1 xml-cocoon2/src/org/apache/cocoon/acting/LocaleAction.java Index: LocaleAction.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/LocaleAction.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- LocaleAction.java 2001/08/20 14:07:25 1.1.2.3 +++ LocaleAction.java 2001/08/22 12:08:20 1.1.2.4 @@ -10,6 +10,7 @@ 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.thread.ThreadSafe; import org.apache.cocoon.Constants; import org.apache.cocoon.environment.Cookie; import org.apache.cocoon.environment.Redirector; @@ -106,7 +107,7 @@ * @author <a href="mailto:[EMAIL PROTECTED]">Konstantin Piroumian</a> * @author <a href="mailto:[EMAIL PROTECTED]">Lassi Immonen</a> */ -public class LocaleAction extends ComposerAction { +public class LocaleAction extends ComposerAction implements ThreadSafe { /** * Constant representing the language parameter 1.1.2.5 +3 -2 xml-cocoon2/src/org/apache/cocoon/acting/RequestParamAction.java Index: RequestParamAction.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/RequestParamAction.java,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -u -r1.1.2.4 -r1.1.2.5 --- RequestParamAction.java 2001/08/20 14:07:25 1.1.2.4 +++ RequestParamAction.java 2001/08/22 12:08:20 1.1.2.5 @@ -15,6 +15,7 @@ * Standard imports */ import org.apache.avalon.framework.parameters.Parameters; +import org.apache.avalon.framework.thread.ThreadSafe; import org.apache.cocoon.Constants; import org.apache.cocoon.environment.Redirector; import org.apache.cocoon.environment.Request; @@ -73,9 +74,9 @@ * * @author <a href="mailto:[EMAIL PROTECTED]">Marcus Crafter</a> * @author <a href="mailto:[EMAIL PROTECTED]">Torsten Curdt</a> - * @version CVS $Revision: 1.1.2.4 $ + * @version CVS $Revision: 1.1.2.5 $ */ -public class RequestParamAction extends ComposerAction { +public class RequestParamAction extends ComposerAction implements ThreadSafe { public final static String MAP_URI = "requestURI"; public final static String MAP_QUERY = "requestQuery"; 1.5.2.5 +3 -2 xml-cocoon2/src/org/apache/cocoon/acting/ResourceExistsAction.java Index: ResourceExistsAction.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/ResourceExistsAction.java,v retrieving revision 1.5.2.4 retrieving revision 1.5.2.5 diff -u -r1.5.2.4 -r1.5.2.5 --- ResourceExistsAction.java 2001/08/22 03:57:58 1.5.2.4 +++ ResourceExistsAction.java 2001/08/22 12:08:20 1.5.2.5 @@ -8,6 +8,7 @@ package org.apache.cocoon.acting; import org.apache.avalon.framework.parameters.Parameters; +import org.apache.avalon.framework.thread.ThreadSafe; import org.apache.cocoon.environment.Redirector; import org.apache.cocoon.environment.Source; import org.apache.cocoon.environment.SourceResolver; @@ -22,9 +23,9 @@ * null otherwise. It has only been tested with context urls. * * @author <a href="mailto:[EMAIL PROTECTED]">Donald Ball</a> - * @version CVS $Revision: 1.5.2.4 $ $Date: 2001/08/22 03:57:58 $ + * @version CVS $Revision: 1.5.2.5 $ $Date: 2001/08/22 12:08:20 $ */ -public class ResourceExistsAction extends ComposerAction { +public class ResourceExistsAction extends ComposerAction implements ThreadSafe { public Map act(Redirector redirector, SourceResolver resolver, Map objectModel, String source, Parameters parameters) throws Exception { HashMap results = new HashMap(); 1.3.2.2 +2 -1 xml-cocoon2/src/org/apache/cocoon/acting/SendmailAction.java Index: SendmailAction.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/SendmailAction.java,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -u -r1.3.2.1 -r1.3.2.2 --- SendmailAction.java 2001/08/20 14:07:25 1.3.2.1 +++ SendmailAction.java 2001/08/22 12:08:20 1.3.2.2 @@ -10,6 +10,7 @@ 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.thread.ThreadSafe; import org.apache.cocoon.Constants; import org.apache.cocoon.environment.Redirector; import org.apache.cocoon.environment.Request; @@ -47,7 +48,7 @@ * @author <a href="mailto:[EMAIL PROTECTED]">Donald Ball</a> * @version CVS $Revision */ -public class SendmailAction extends AbstractAction { +public class SendmailAction extends AbstractAction implements ThreadSafe { Properties default_properties = null; 1.3.2.2 +5 -4 xml-cocoon2/src/org/apache/cocoon/acting/SessionInvalidatorAction.java Index: SessionInvalidatorAction.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/SessionInvalidatorAction.java,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -u -r1.3.2.1 -r1.3.2.2 --- SessionInvalidatorAction.java 2001/08/20 14:07:25 1.3.2.1 +++ SessionInvalidatorAction.java 2001/08/22 12:08:20 1.3.2.2 @@ -1,7 +1,8 @@ -// $Id: SessionInvalidatorAction.java,v 1.3.2.1 2001/08/20 14:07:25 dims Exp $ +// $Id: SessionInvalidatorAction.java,v 1.3.2.2 2001/08/22 12:08:20 sylvain Exp $ package org.apache.cocoon.acting; import org.apache.avalon.framework.parameters.Parameters; +import org.apache.avalon.framework.thread.ThreadSafe; import org.apache.cocoon.Constants; import org.apache.cocoon.environment.Redirector; import org.apache.cocoon.environment.Request; @@ -17,9 +18,9 @@ * empty map if everything is ok, null otherwise. * * @author Martin Man <[EMAIL PROTECTED]> - * @version CVS $Revision: 1.3.2.1 $ $Date: 2001/08/20 14:07:25 $ + * @version CVS $Revision: 1.3.2.2 $ $Date: 2001/08/22 12:08:20 $ */ -public class SessionInvalidatorAction extends AbstractAction +public class SessionInvalidatorAction extends AbstractAction implements ThreadSafe { /** * Main invocation routine. @@ -49,5 +50,5 @@ } } -// $Id: SessionInvalidatorAction.java,v 1.3.2.1 2001/08/20 14:07:25 dims Exp $ +// $Id: SessionInvalidatorAction.java,v 1.3.2.2 2001/08/22 12:08:20 sylvain Exp $ // vim: set et ts=4 sw=4: 1.1.2.3 +3 -2 xml-cocoon2/src/org/apache/cocoon/acting/SessionIsValidAction.java Index: SessionIsValidAction.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/SessionIsValidAction.java,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- SessionIsValidAction.java 2001/08/20 14:07:25 1.1.2.2 +++ SessionIsValidAction.java 2001/08/22 12:08:20 1.1.2.3 @@ -8,6 +8,7 @@ package org.apache.cocoon.acting; import org.apache.avalon.framework.parameters.Parameters; +import org.apache.avalon.framework.thread.ThreadSafe; import org.apache.cocoon.Constants; import org.apache.cocoon.environment.Redirector; import org.apache.cocoon.environment.Request; @@ -23,10 +24,10 @@ * seesion is still valid. * * @author <a href="mailto:[EMAIL PROTECTED]">Christian Haul</a> - * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/08/20 14:07:25 $ + * @version CVS $Revision: 1.1.2.3 $ $Date: 2001/08/22 12:08:20 $ */ -public class SessionIsValidAction extends AbstractValidatorAction +public class SessionIsValidAction extends AbstractValidatorAction implements ThreadSafe { /** * Main invocation routine. 1.3.2.3 +5 -4 xml-cocoon2/src/org/apache/cocoon/acting/SessionPropagatorAction.java Index: SessionPropagatorAction.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/SessionPropagatorAction.java,v retrieving revision 1.3.2.2 retrieving revision 1.3.2.3 diff -u -r1.3.2.2 -r1.3.2.3 --- SessionPropagatorAction.java 2001/08/20 14:07:25 1.3.2.2 +++ SessionPropagatorAction.java 2001/08/22 12:08:20 1.3.2.3 @@ -1,9 +1,10 @@ -// $Id: SessionPropagatorAction.java,v 1.3.2.2 2001/08/20 14:07:25 dims Exp $ +// $Id: SessionPropagatorAction.java,v 1.3.2.3 2001/08/22 12:08:20 sylvain Exp $ package org.apache.cocoon.acting; 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.thread.ThreadSafe; import org.apache.cocoon.Constants; import org.apache.cocoon.environment.Redirector; import org.apache.cocoon.environment.Request; @@ -28,9 +29,9 @@ * </pre> * * @author Martin Man <[EMAIL PROTECTED]> - * @version CVS $Revision: 1.3.2.2 $ $Date: 2001/08/20 14:07:25 $ + * @version CVS $Revision: 1.3.2.3 $ $Date: 2001/08/22 12:08:20 $ */ -public class SessionPropagatorAction extends AbstractConfigurableAction +public class SessionPropagatorAction extends AbstractConfigurableAction implements ThreadSafe { private static Object[] defaults = {}; @@ -114,6 +115,6 @@ } } -// $Id: SessionPropagatorAction.java,v 1.3.2.2 2001/08/20 14:07:25 dims Exp $ +// $Id: SessionPropagatorAction.java,v 1.3.2.3 2001/08/22 12:08:20 sylvain Exp $ // vim: set et ts=4 sw=4: 1.1.2.4 +3 -2 xml-cocoon2/src/org/apache/cocoon/acting/SessionStateAction.java Index: SessionStateAction.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/SessionStateAction.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- SessionStateAction.java 2001/08/20 14:07:25 1.1.2.3 +++ SessionStateAction.java 2001/08/22 12:08:20 1.1.2.4 @@ -10,6 +10,7 @@ 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.thread.ThreadSafe; import org.apache.cocoon.Constants; import org.apache.cocoon.environment.Redirector; import org.apache.cocoon.environment.Request; @@ -68,8 +69,8 @@ * @see org.apache.cocoon.selection.SessionStateSelectorFactory * * @author <a href="mailto:[EMAIL PROTECTED]">Christian Haul</a> - * @version CVS $Id: SessionStateAction.java,v 1.1.2.3 2001/08/20 14:07:25 dims Exp $ */ -public class SessionStateAction extends AbstractConfigurableAction { + * @version CVS $Id: SessionStateAction.java,v 1.1.2.4 2001/08/22 12:08:20 sylvain Exp $ */ +public class SessionStateAction extends AbstractConfigurableAction implements ThreadSafe { private static String componentName = "REZEPTE SessionStateAction"; protected String statekey = Constants.SESSION_STATE_ATTRIBUTE; 1.3.2.7 +5 -4 xml-cocoon2/src/org/apache/cocoon/acting/SessionValidatorAction.java Index: SessionValidatorAction.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/SessionValidatorAction.java,v retrieving revision 1.3.2.6 retrieving revision 1.3.2.7 diff -u -r1.3.2.6 -r1.3.2.7 --- SessionValidatorAction.java 2001/08/20 14:07:25 1.3.2.6 +++ SessionValidatorAction.java 2001/08/22 12:08:20 1.3.2.7 @@ -1,8 +1,9 @@ -// $Id: SessionValidatorAction.java,v 1.3.2.6 2001/08/20 14:07:25 dims Exp $ +// $Id: SessionValidatorAction.java,v 1.3.2.7 2001/08/22 12:08:20 sylvain Exp $ package org.apache.cocoon.acting; import org.apache.avalon.framework.configuration.Configuration; import org.apache.avalon.framework.parameters.Parameters; +import org.apache.avalon.framework.thread.ThreadSafe; import org.apache.cocoon.Constants; import org.apache.cocoon.environment.Redirector; import org.apache.cocoon.environment.Request; @@ -51,9 +52,9 @@ * all validated parameters to the sitemap via {name} expression. * * @author Martin Man <[EMAIL PROTECTED]> - * @version CVS $Revision: 1.3.2.6 $ $Date: 2001/08/20 14:07:25 $ + * @version CVS $Revision: 1.3.2.7 $ $Date: 2001/08/22 12:08:20 $ */ -public class SessionValidatorAction extends AbstractValidatorAction +public class SessionValidatorAction extends AbstractValidatorAction implements ThreadSafe { /** * Main invocation routine. @@ -196,5 +197,5 @@ } } -// $Id: SessionValidatorAction.java,v 1.3.2.6 2001/08/20 14:07:25 dims Exp $ +// $Id: SessionValidatorAction.java,v 1.3.2.7 2001/08/22 12:08:20 sylvain Exp $ // vim: set et ts=4 sw=4: ---------------------------------------------------------------------- In case of troubles, e-mail: [EMAIL PROTECTED] To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]