sylvain 01/08/22 05:03:33
Modified: . changes.xml
src/org/apache/cocoon/acting Action.java
DatabaseAddAction.java
DatabaseAuthenticatorAction.java
DatabaseDeleteAction.java DatabaseSelectAction.java
DatabaseUpdateAction.java FormValidatorAction.java
HelloAction.java HttpHeaderAction.java
LangSelect.java LocaleAction.java
RequestParamAction.java ResourceExistsAction.java
ScriptAction.java SendmailAction.java
ServerPagesAction.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
1.30 +6 -1 xml-cocoon2/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/changes.xml,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- changes.xml 2001/08/16 11:25:41 1.29
+++ changes.xml 2001/08/22 12:03:32 1.30
@@ -4,7 +4,7 @@
<!--
History of Cocoon changes
- $Id: changes.xml,v 1.29 2001/08/16 11:25:41 cziegeler Exp $
+ $Id: changes.xml,v 1.30 2001/08/22 12:03:32 sylvain Exp $
-->
<changes title="History of Changes">
@@ -26,6 +26,11 @@
</devs>
<release version="2.1-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
1.6 +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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Action.java 2001/08/20 13:55:09 1.5
+++ Action.java 2001/08/22 12:03:32 1.6
@@ -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.5 $ $Date: 2001/08/20 13:55:09 $
+ * @version CVS $Revision: 1.6 $ $Date: 2001/08/22 12:03:32 $
*/
-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.11 +3 -2 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DatabaseAddAction.java 2001/08/20 13:55:09 1.10
+++ DatabaseAddAction.java 2001/08/22 12:03:32 1.11
@@ -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;
@@ -38,9 +39,9 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Berin Loritsch</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Donald Ball</a>
- * @version CVS $Revision: 1.10 $ $Date: 2001/08/20 13:55:09 $
+ * @version CVS $Revision: 1.11 $ $Date: 2001/08/22 12:03:32 $
*/
-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();
1.11 +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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DatabaseAuthenticatorAction.java 2001/08/21 19:04:14 1.10
+++ DatabaseAuthenticatorAction.java 2001/08/22 12:03:32 1.11
@@ -1,9 +1,10 @@
-// $Id: DatabaseAuthenticatorAction.java,v 1.10 2001/08/21 19:04:14 mman Exp $
+// $Id: DatabaseAuthenticatorAction.java,v 1.11 2001/08/22 12:03:32 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.10 $ $Date: 2001/08/21 19:04:14 $
+ * @version CVS $Revision: 1.11 $ $Date: 2001/08/22 12:03:32 $
*/
-public class DatabaseAuthenticatorAction extends AbstractDatabaseAction
+public class DatabaseAuthenticatorAction extends AbstractDatabaseAction implements
ThreadSafe
{
/**
* Main invocation routine.
@@ -261,5 +262,5 @@
}
}
-// $Id: DatabaseAuthenticatorAction.java,v 1.10 2001/08/21 19:04:14 mman Exp $
+// $Id: DatabaseAuthenticatorAction.java,v 1.11 2001/08/22 12:03:32 sylvain Exp $
// vim: set et ts=4 sw=4:
1.9 +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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DatabaseDeleteAction.java 2001/08/20 13:55:09 1.8
+++ DatabaseDeleteAction.java 2001/08/22 12:03:32 1.9
@@ -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.8 $ $Date: 2001/08/20 13:55:09 $
+ * @version CVS $Revision: 1.9 $ $Date: 2001/08/22 12:03:32 $
*/
-public final class DatabaseDeleteAction extends AbstractDatabaseAction {
+public final class DatabaseDeleteAction extends AbstractDatabaseAction implements
ThreadSafe {
private static final Map deleteStatements = new HashMap();
/**
1.3 +3 -2
xml-cocoon2/src/org/apache/cocoon/acting/DatabaseSelectAction.java
Index: DatabaseSelectAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/DatabaseSelectAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DatabaseSelectAction.java 2001/08/20 13:55:09 1.2
+++ DatabaseSelectAction.java 2001/08/22 12:03:32 1.3
@@ -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 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Berin Loritsch</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Vadim Gritsenko</a>
- * @version CVS $Revision: 1.2 $ $Date: 2001/08/20 13:55:09 $
+ * @version CVS $Revision: 1.3 $ $Date: 2001/08/22 12:03:32 $
*/
-public class DatabaseSelectAction extends AbstractDatabaseAction {
+public class DatabaseSelectAction extends AbstractDatabaseAction implements
ThreadSafe {
private static final Map selectStatements = new HashMap();
1.10 +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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DatabaseUpdateAction.java 2001/08/20 13:55:09 1.9
+++ DatabaseUpdateAction.java 2001/08/22 12:03:32 1.10
@@ -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.9 $ $Date: 2001/08/20 13:55:09 $
+ * @version CVS $Revision: 1.10 $ $Date: 2001/08/22 12:03:32 $
*/
-public class DatabaseUpdateAction extends AbstractDatabaseAction {
+public class DatabaseUpdateAction extends AbstractDatabaseAction implements
ThreadSafe {
private static final Map updateStatements = new HashMap();
/**
1.10 +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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- FormValidatorAction.java 2001/08/20 13:55:09 1.9
+++ FormValidatorAction.java 2001/08/22 12:03:32 1.10
@@ -1,8 +1,9 @@
-// $Id: FormValidatorAction.java,v 1.9 2001/08/20 13:55:09 dims Exp $
+// $Id: FormValidatorAction.java,v 1.10 2001/08/22 12:03:32 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.9 $ $Date: 2001/08/20 13:55:09 $
+ * @version CVS $Revision: 1.10 $ $Date: 2001/08/22 12:03:32 $
*/
-public class FormValidatorAction extends AbstractValidatorAction
+public class FormValidatorAction extends AbstractValidatorAction implements
ThreadSafe
{
/**
* Main invocation routine.
@@ -204,5 +205,5 @@
}
}
-// $Id: FormValidatorAction.java,v 1.9 2001/08/20 13:55:09 dims Exp $
+// $Id: FormValidatorAction.java,v 1.10 2001/08/22 12:03:32 sylvain Exp $
// vim: set et ts=4 sw=4:
1.5 +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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- HelloAction.java 2001/08/20 13:55:09 1.4
+++ HelloAction.java 2001/08/22 12:03:32 1.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.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.4 $ $Date: 2001/08/20 13:55:09 $
+ * @version CVS $Revision: 1.5 $ $Date: 2001/08/22 12:03:32 $
*/
-public class HelloAction extends ComposerAction {
+public class HelloAction extends ComposerAction implements ThreadSafe {
/**
* A simple Action that logs if the <code>Session</code> object
1.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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- HttpHeaderAction.java 2001/08/20 13:55:09 1.3
+++ HttpHeaderAction.java 2001/08/22 12:03:32 1.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.6 +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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- LangSelect.java 2001/08/20 13:55:09 1.5
+++ LangSelect.java 2001/08/22 12:03:32 1.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.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.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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LocaleAction.java 2001/08/20 13:55:09 1.3
+++ LocaleAction.java 2001/08/22 12:03:32 1.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.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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RequestParamAction.java 2001/08/20 13:55:09 1.4
+++ RequestParamAction.java 2001/08/22 12:03:32 1.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.4 $
+ * @version CVS $Revision: 1.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.10 +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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ResourceExistsAction.java 2001/08/22 03:51:05 1.9
+++ ResourceExistsAction.java 2001/08/22 12:03:32 1.10
@@ -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.9 $ $Date: 2001/08/22 03:51:05 $
+ * @version CVS $Revision: 1.10 $ $Date: 2001/08/22 12:03:32 $
*/
-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 -1 xml-cocoon2/src/org/apache/cocoon/acting/ScriptAction.java
Index: ScriptAction.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/ScriptAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ScriptAction.java 2001/08/20 13:55:09 1.2
+++ ScriptAction.java 2001/08/22 12:03:32 1.3
@@ -14,6 +14,7 @@
import com.ibm.bsf.BSFManager;
import com.ibm.bsf.util.IOUtils;
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.Roles;
@@ -33,7 +34,7 @@
* A simple action that executes any script that can be run by the BSF
*/
-public class ScriptAction extends ComposerAction implements Roles {
+public class ScriptAction extends ComposerAction implements Roles, ThreadSafe {
public Map act( Redirector redirector, SourceResolver resolver, Map
objectModel, String source, Parameters par ) throws Exception
1.5 +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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SendmailAction.java 2001/08/20 13:55:09 1.4
+++ SendmailAction.java 2001/08/22 12:03:32 1.5
@@ -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.4 +3 -2 xml-cocoon2/src/org/apache/cocoon/acting/ServerPagesAction.java
Index: ServerPagesAction.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/ServerPagesAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ServerPagesAction.java 2001/08/20 13:55:09 1.3
+++ ServerPagesAction.java 2001/08/22 12:03:32 1.4
@@ -12,6 +12,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.components.sax.XMLByteStreamCompiler;
import org.apache.cocoon.components.sax.XMLByteStreamFragment;
@@ -58,9 +59,9 @@
* </pre>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Sylvain Wallez</a>
- * @version CVS $Revision: 1.3 $ $Date: 2001/08/20 13:55:09 $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/08/22 12:03:32 $
*/
-public class ServerPagesAction extends ConfigurableComposerAction implements
Disposable {
+public class ServerPagesAction extends ConfigurableComposerAction implements
Disposable, ThreadSafe {
public static final String REDIRECTOR_OBJECT = "xsp-action:redirector";
public static final String ACTION_RESULT_OBJECT = "xsp-action:result";
1.5 +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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SessionInvalidatorAction.java 2001/08/20 13:55:09 1.4
+++ SessionInvalidatorAction.java 2001/08/22 12:03:32 1.5
@@ -1,7 +1,8 @@
-// $Id: SessionInvalidatorAction.java,v 1.4 2001/08/20 13:55:09 dims Exp $
+// $Id: SessionInvalidatorAction.java,v 1.5 2001/08/22 12:03:32 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.4 $ $Date: 2001/08/20 13:55:09 $
+ * @version CVS $Revision: 1.5 $ $Date: 2001/08/22 12:03:32 $
*/
-public class SessionInvalidatorAction extends AbstractAction
+public class SessionInvalidatorAction extends AbstractAction implements ThreadSafe
{
/**
* Main invocation routine.
@@ -49,5 +50,5 @@
}
}
-// $Id: SessionInvalidatorAction.java,v 1.4 2001/08/20 13:55:09 dims Exp $
+// $Id: SessionInvalidatorAction.java,v 1.5 2001/08/22 12:03:32 sylvain Exp $
// vim: set et ts=4 sw=4:
1.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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SessionIsValidAction.java 2001/08/20 13:55:09 1.2
+++ SessionIsValidAction.java 2001/08/22 12:03:32 1.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.2 $ $Date: 2001/08/20 13:55:09 $
+ * @version CVS $Revision: 1.3 $ $Date: 2001/08/22 12:03:32 $
*/
-public class SessionIsValidAction extends AbstractValidatorAction
+public class SessionIsValidAction extends AbstractValidatorAction implements
ThreadSafe
{
/**
* Main invocation routine.
1.6 +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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SessionPropagatorAction.java 2001/08/20 13:55:09 1.5
+++ SessionPropagatorAction.java 2001/08/22 12:03:32 1.6
@@ -1,9 +1,10 @@
-// $Id: SessionPropagatorAction.java,v 1.5 2001/08/20 13:55:09 dims Exp $
+// $Id: SessionPropagatorAction.java,v 1.6 2001/08/22 12:03:32 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.5 $ $Date: 2001/08/20 13:55:09 $
+ * @version CVS $Revision: 1.6 $ $Date: 2001/08/22 12:03:32 $
*/
-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.5 2001/08/20 13:55:09 dims Exp $
+// $Id: SessionPropagatorAction.java,v 1.6 2001/08/22 12:03:32 sylvain Exp $
// vim: set et ts=4 sw=4:
1.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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SessionStateAction.java 2001/08/20 13:55:09 1.3
+++ SessionStateAction.java 2001/08/22 12:03:32 1.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.3 2001/08/20 13:55:09 dims Exp $ */
-public class SessionStateAction extends AbstractConfigurableAction {
+ * @version CVS $Id: SessionStateAction.java,v 1.4 2001/08/22 12:03:32 sylvain Exp
$ */
+public class SessionStateAction extends AbstractConfigurableAction implements
ThreadSafe {
private static String componentName = "REZEPTE SessionStateAction";
protected String statekey = Constants.SESSION_STATE_ATTRIBUTE;
1.10 +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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SessionValidatorAction.java 2001/08/20 13:55:09 1.9
+++ SessionValidatorAction.java 2001/08/22 12:03:32 1.10
@@ -1,8 +1,9 @@
-// $Id: SessionValidatorAction.java,v 1.9 2001/08/20 13:55:09 dims Exp $
+// $Id: SessionValidatorAction.java,v 1.10 2001/08/22 12:03:32 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.9 $ $Date: 2001/08/20 13:55:09 $
+ * @version CVS $Revision: 1.10 $ $Date: 2001/08/22 12:03:32 $
*/
-public class SessionValidatorAction extends AbstractValidatorAction
+public class SessionValidatorAction extends AbstractValidatorAction implements
ThreadSafe
{
/**
* Main invocation routine.
@@ -196,5 +197,5 @@
}
}
-// $Id: SessionValidatorAction.java,v 1.9 2001/08/20 13:55:09 dims Exp $
+// $Id: SessionValidatorAction.java,v 1.10 2001/08/22 12:03:32 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]
