cziegeler 02/02/06 23:28:20
Modified: src/java/org/apache/cocoon/acting DatabaseAddAction.java
DatabaseAuthenticatorAction.java
DatabaseDeleteAction.java DatabaseSelectAction.java
DatabaseUpdateAction.java FormValidatorAction.java
HelloAction.java OraAddAction.java
RequestParamAction.java
src/java/org/apache/cocoon/components/language/markup/xsp
XSPUtil.java
src/scratchpad/src/org/apache/cocoon/acting
CookieCreatorAction.java CookieValidatorAction.java
DatabaseCookieAuthenticatorAction.java
ModularDatabaseAction.java SectionCutterAction.java
Log:
Second wave: Replaced Constants.xxx with ObjectModelHelper.getXXX
Revision Changes Path
1.6 +3 -2
xml-cocoon2/src/java/org/apache/cocoon/acting/DatabaseAddAction.java
Index: DatabaseAddAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/acting/DatabaseAddAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DatabaseAddAction.java 4 Feb 2002 12:08:39 -0000 1.5
+++ DatabaseAddAction.java 7 Feb 2002 07:28:19 -0000 1.6
@@ -62,6 +62,7 @@
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.SourceResolver;
@@ -81,7 +82,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Berin Loritsch</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Donald Ball</a>
- * @version CVS $Id: DatabaseAddAction.java,v 1.5 2002/02/04 12:08:39 cziegeler Exp
$
+ * @version CVS $Id: DatabaseAddAction.java,v 1.6 2002/02/07 07:28:19 cziegeler Exp
$
*/
public class DatabaseAddAction extends AbstractDatabaseAction implements ThreadSafe
{
protected static final Map addStatements = new HashMap();
@@ -109,7 +110,7 @@
datasource = this.getDataSource(conf);
conn = datasource.getConnection();
- Request request = (Request) objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = ObjectModelHelper.getRequest(objectModel);
if (conn.getAutoCommit()) {
conn.setAutoCommit(false);
1.6 +3 -2
xml-cocoon2/src/java/org/apache/cocoon/acting/DatabaseAuthenticatorAction.java
Index: DatabaseAuthenticatorAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/acting/DatabaseAuthenticatorAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DatabaseAuthenticatorAction.java 4 Feb 2002 12:08:39 -0000 1.5
+++ DatabaseAuthenticatorAction.java 7 Feb 2002 07:28:19 -0000 1.6
@@ -60,6 +60,7 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.Constants;
+import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Session;
@@ -108,7 +109,7 @@
* not verified.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Martin Man</a>
- * @version CVS $Id: DatabaseAuthenticatorAction.java,v 1.5 2002/02/04 12:08:39
cziegeler Exp $
+ * @version CVS $Id: DatabaseAuthenticatorAction.java,v 1.6 2002/02/07 07:28:19
cziegeler Exp $
*/
public class DatabaseAuthenticatorAction extends AbstractDatabaseAction implements
ThreadSafe
{
@@ -145,7 +146,7 @@
datasource = this.getDataSource(conf);
conn = datasource.getConnection();
- Request req = (Request) objectModel.get(Constants.REQUEST_OBJECT);
+ Request req = ObjectModelHelper.getRequest(objectModel);
/* check request validity */
if (req == null) {
1.6 +3 -2
xml-cocoon2/src/java/org/apache/cocoon/acting/DatabaseDeleteAction.java
Index: DatabaseDeleteAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/acting/DatabaseDeleteAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DatabaseDeleteAction.java 4 Feb 2002 12:08:39 -0000 1.5
+++ DatabaseDeleteAction.java 7 Feb 2002 07:28:19 -0000 1.6
@@ -62,6 +62,7 @@
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.SourceResolver;
@@ -80,7 +81,7 @@
* the keys.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Berin Loritsch</a>
- * @version CVS $Id: DatabaseDeleteAction.java,v 1.5 2002/02/04 12:08:39 cziegeler
Exp $
+ * @version CVS $Id: DatabaseDeleteAction.java,v 1.6 2002/02/07 07:28:19 cziegeler
Exp $
*/
public final class DatabaseDeleteAction extends AbstractDatabaseAction implements
ThreadSafe {
private static final Map deleteStatements = new HashMap();
@@ -108,7 +109,7 @@
String query = this.getDeleteQuery(conf);
datasource = this.getDataSource(conf);
conn = datasource.getConnection();
- Request request = (Request) objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = ObjectModelHelper.getRequest(objectModel);
if (conn.getAutoCommit()) {
conn.setAutoCommit(false);
1.5 +3 -2
xml-cocoon2/src/java/org/apache/cocoon/acting/DatabaseSelectAction.java
Index: DatabaseSelectAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/acting/DatabaseSelectAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DatabaseSelectAction.java 4 Feb 2002 12:08:39 -0000 1.4
+++ DatabaseSelectAction.java 7 Feb 2002 07:28:19 -0000 1.5
@@ -62,6 +62,7 @@
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.SourceResolver;
@@ -80,7 +81,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Berin Loritsch</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Vadim Gritsenko</a>
- * @version CVS $Id: DatabaseSelectAction.java,v 1.4 2002/02/04 12:08:39 cziegeler
Exp $
+ * @version CVS $Id: DatabaseSelectAction.java,v 1.5 2002/02/07 07:28:19 cziegeler
Exp $
*/
public class DatabaseSelectAction extends AbstractDatabaseAction implements
ThreadSafe {
@@ -107,7 +108,7 @@
resolver,
param.getParameterAsBoolean("reloadable",reloadable));
- Request request = (Request) objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = ObjectModelHelper.getRequest(objectModel);
Configuration[] keys =
conf.getChild("table").getChild("keys").getChildren("key");
Configuration[] values =
conf.getChild("table").getChild("values").getChildren("value");
1.7 +3 -2
xml-cocoon2/src/java/org/apache/cocoon/acting/DatabaseUpdateAction.java
Index: DatabaseUpdateAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/acting/DatabaseUpdateAction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DatabaseUpdateAction.java 4 Feb 2002 12:08:39 -0000 1.6
+++ DatabaseUpdateAction.java 7 Feb 2002 07:28:19 -0000 1.7
@@ -62,6 +62,7 @@
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.SourceResolver;
@@ -77,7 +78,7 @@
* only one table at a time to update.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Berin Loritsch</a>
- * @version CVS $Id: DatabaseUpdateAction.java,v 1.6 2002/02/04 12:08:39 cziegeler
Exp $
+ * @version CVS $Id: DatabaseUpdateAction.java,v 1.7 2002/02/07 07:28:19 cziegeler
Exp $
*/
public class DatabaseUpdateAction extends AbstractDatabaseAction implements
ThreadSafe {
private static final Map updateStatements = new HashMap();
@@ -105,7 +106,7 @@
String query = this.getUpdateQuery(conf);
datasource = this.getDataSource(conf);
conn = datasource.getConnection();
- Request request = (Request) objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = ObjectModelHelper.getRequest(objectModel);
if (conn.getAutoCommit()) {
conn.setAutoCommit(false);
1.6 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/acting/FormValidatorAction.java
Index: FormValidatorAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/acting/FormValidatorAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FormValidatorAction.java 4 Feb 2002 12:08:39 -0000 1.5
+++ FormValidatorAction.java 7 Feb 2002 07:28:19 -0000 1.6
@@ -59,6 +59,7 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.Constants;
+import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.SourceResolver;
@@ -109,7 +110,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Martin Man</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Christian Haul</a>
- * @version CVS $Id: FormValidatorAction.java,v 1.5 2002/02/04 12:08:39 cziegeler
Exp $
+ * @version CVS $Id: FormValidatorAction.java,v 1.6 2002/02/07 07:28:19 cziegeler
Exp $
*/
public class FormValidatorAction extends AbstractValidatorAction implements
ThreadSafe
{
@@ -118,8 +119,7 @@
*/
public Map act (Redirector redirector, SourceResolver resolver, Map
objectModel, String src,
Parameters parameters) throws Exception {
- Request req = (Request)
- objectModel.get (Constants.REQUEST_OBJECT);
+ Request req = ObjectModelHelper.getRequest(objectModel);
/* check request validity */
if (req == null) {
1.5 +3 -2 xml-cocoon2/src/java/org/apache/cocoon/acting/HelloAction.java
Index: HelloAction.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/acting/HelloAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- HelloAction.java 4 Feb 2002 12:08:39 -0000 1.4
+++ HelloAction.java 7 Feb 2002 07:28:19 -0000 1.5
@@ -58,6 +58,7 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.Constants;
+import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Session;
@@ -70,7 +71,7 @@
* has been created or not.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
- * @version CVS $Id: HelloAction.java,v 1.4 2002/02/04 12:08:39 cziegeler Exp $
+ * @version CVS $Id: HelloAction.java,v 1.5 2002/02/07 07:28:19 cziegeler Exp $
*/
public class HelloAction extends ComposerAction implements ThreadSafe {
@@ -79,7 +80,7 @@
* has been created
*/
public Map act (Redirector redirector, SourceResolver resolver, Map
objectModel, String src, Parameters par) throws Exception {
- Request request = (Request) objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = ObjectModelHelper.getRequest(objectModel);
if (request != null) {
Session session = request.getSession (false);
1.6 +3 -2 xml-cocoon2/src/java/org/apache/cocoon/acting/OraAddAction.java
Index: OraAddAction.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/acting/OraAddAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- OraAddAction.java 4 Feb 2002 12:08:39 -0000 1.5
+++ OraAddAction.java 7 Feb 2002 07:28:19 -0000 1.6
@@ -64,6 +64,7 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.SourceResolver;
@@ -83,7 +84,7 @@
* only one table at a time to update.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Berin Loritsch</a>
- * @version CVS $Id: OraAddAction.java,v 1.5 2002/02/04 12:08:39 cziegeler Exp $
+ * @version CVS $Id: OraAddAction.java,v 1.6 2002/02/07 07:28:19 cziegeler Exp $
*/
public class OraAddAction extends DatabaseAddAction {
private static final Map selectLOBStatements = new HashMap();
@@ -104,7 +105,7 @@
datasource = this.getDataSource(conf);
conn = datasource.getConnection();
- Request request = (Request) objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = ObjectModelHelper.getRequest(objectModel);
if (conn.getAutoCommit()) {
conn.setAutoCommit(false);
1.5 +3 -2
xml-cocoon2/src/java/org/apache/cocoon/acting/RequestParamAction.java
Index: RequestParamAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/acting/RequestParamAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RequestParamAction.java 4 Feb 2002 12:08:39 -0000 1.4
+++ RequestParamAction.java 7 Feb 2002 07:28:19 -0000 1.5
@@ -64,6 +64,7 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.Constants;
+import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.SourceResolver;
@@ -125,7 +126,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Marcus Crafter</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Torsten Curdt</a>
- * @version CVS $Id: RequestParamAction.java,v 1.4 2002/02/04 12:08:39 cziegeler
Exp $
+ * @version CVS $Id: RequestParamAction.java,v 1.5 2002/02/07 07:28:19 cziegeler
Exp $
*/
public class RequestParamAction extends ComposerAction implements ThreadSafe {
@@ -141,7 +142,7 @@
throws Exception
{
- Request request = (Request) objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = ObjectModelHelper.getRequest(objectModel);
if (request == null) {
getLogger().error("RequestInfoAction: no request object!");
return(null);
1.5 +4 -3
xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/XSPUtil.java
Index: XSPUtil.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/XSPUtil.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XSPUtil.java 4 Feb 2002 12:22:23 -0000 1.4
+++ XSPUtil.java 7 Feb 2002 07:28:20 -0000 1.5
@@ -58,6 +58,7 @@
import org.apache.cocoon.Constants;
import org.apache.cocoon.components.parser.Parser;
import org.apache.cocoon.components.url.URLFactory;
+import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Context;
import org.apache.cocoon.environment.Session;
import org.apache.cocoon.util.NetUtils;
@@ -78,7 +79,7 @@
* The XSP <code>Utility</code> object helper
* @author <a href="mailto:[EMAIL PROTECTED]";>Ricardo Rocha</a>
* @author <a href="mailto:[EMAIL PROTECTED]>Berin Loritsch</a>
- * @version CVS $Id: XSPUtil.java,v 1.4 2002/02/04 12:22:23 cziegeler Exp $
+ * @version CVS $Id: XSPUtil.java,v 1.5 2002/02/07 07:28:20 cziegeler Exp $
*/
public class XSPUtil {
public static String pathComponent(String filename) {
@@ -135,7 +136,7 @@
if (file.isAbsolute() && file.exists()) {
return filename;
}
- Context context = (Context) objectModel.get(Constants.CONTEXT_OBJECT);
+ Context context = ObjectModelHelper.getContext(objectModel);
return NetUtils.getPath(context.getResource(filename).toExternalForm());
}
@@ -271,7 +272,7 @@
public static Object getContextAttribute(Map objectModel, String name)
{
- Context context = (Context) objectModel.get(Constants.CONTEXT_OBJECT);
+ Context context = ObjectModelHelper.getContext(objectModel);
return context.getAttribute(name);
}
}
1.5 +3 -3
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/acting/CookieCreatorAction.java
Index: CookieCreatorAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/acting/CookieCreatorAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CookieCreatorAction.java 4 Feb 2002 12:08:40 -0000 1.4
+++ CookieCreatorAction.java 7 Feb 2002 07:28:20 -0000 1.5
@@ -58,7 +58,7 @@
import org.apache.avalon.framework.parameters.ParameterException;
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.cocoon.Constants;
+import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Cookie;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.Response;
@@ -81,7 +81,7 @@
* you want to remove a cookie set its maxage to -1.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Paolo Scaffardi</a>
- * @version CVS $Id: CookieCreatorAction.java,v 1.4 2002/02/04 12:08:40 cziegeler
Exp $
+ * @version CVS $Id: CookieCreatorAction.java,v 1.5 2002/02/07 07:28:20 cziegeler
Exp $
*/
public class CookieCreatorAction extends ComposerAction {
@@ -104,7 +104,7 @@
Parameters parameters)
throws Exception {
- Response res = (Response) objectModel.get(Constants.RESPONSE_OBJECT);
+ Response res = ObjectModelHelper.getResponse(objectModel);
/*
* check response validity
1.5 +3 -3
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/acting/CookieValidatorAction.java
Index: CookieValidatorAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/acting/CookieValidatorAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CookieValidatorAction.java 4 Feb 2002 12:08:40 -0000 1.4
+++ CookieValidatorAction.java 7 Feb 2002 07:28:20 -0000 1.5
@@ -60,6 +60,7 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.Constants;
import org.apache.cocoon.components.language.markup.xsp.XSPCookieHelper;
+import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Session;
@@ -96,7 +97,7 @@
* sitemap via {name} expression.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Paolo Scaffardi</a>
- * @version CVS $Id: CookieValidatorAction.java,v 1.4 2002/02/04 12:08:40 cziegeler
Exp $
+ * @version CVS $Id: CookieValidatorAction.java,v 1.5 2002/02/07 07:28:20 cziegeler
Exp $
*/
public class CookieValidatorAction extends AbstractValidatorAction {
@@ -125,8 +126,7 @@
Parameters parameters)
throws Exception {
- Request req = (Request)
- objectModel.get(Constants.REQUEST_OBJECT);
+ Request req = ObjectModelHelper.getRequest(objectModel);
if (req == null) {
if (getLogger().isDebugEnabled()) {
1.5 +3 -2
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/acting/DatabaseCookieAuthenticatorAction.java
Index: DatabaseCookieAuthenticatorAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/acting/DatabaseCookieAuthenticatorAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DatabaseCookieAuthenticatorAction.java 4 Feb 2002 12:08:40 -0000 1.4
+++ DatabaseCookieAuthenticatorAction.java 7 Feb 2002 07:28:20 -0000 1.5
@@ -61,6 +61,7 @@
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.Constants;
import org.apache.cocoon.components.language.markup.xsp.XSPCookieHelper;
+import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Session;
@@ -106,7 +107,7 @@
* parameter "append-session" to "yes" or "true".
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Paolo Scaffardi</a>
- * @version CVS $Id: DatabaseCookieAuthenticatorAction.java,v 1.4 2002/02/04
12:08:40 cziegeler Exp $
+ * @version CVS $Id: DatabaseCookieAuthenticatorAction.java,v 1.5 2002/02/07
07:28:20 cziegeler Exp $
*/
public class DatabaseCookieAuthenticatorAction extends AbstractDatabaseAction
implements ThreadSafe {
@@ -160,7 +161,7 @@
datasource = this.getDataSource(conf);
conn = datasource.getConnection();
- Request req = (Request) objectModel.get(Constants.REQUEST_OBJECT);
+ Request req = ObjectModelHelper.getRequest(objectModel);
/*
* check request validity
1.5 +3 -2
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/acting/ModularDatabaseAction.java
Index: ModularDatabaseAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/acting/ModularDatabaseAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ModularDatabaseAction.java 4 Feb 2002 12:08:40 -0000 1.4
+++ ModularDatabaseAction.java 7 Feb 2002 07:28:20 -0000 1.5
@@ -101,6 +101,7 @@
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.classloader.RepositoryClassLoader;
import org.apache.cocoon.components.url.URLFactory;
+import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.SourceResolver;
@@ -134,7 +135,7 @@
* components can utilize the helper components.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Christian Haul</a>
- * @version CVS $Id: ModularDatabaseAction.java,v 1.4 2002/02/04 12:08:40 cziegeler
Exp $
+ * @version CVS $Id: ModularDatabaseAction.java,v 1.5 2002/02/07 07:28:20 cziegeler
Exp $
*/
public abstract class ModularDatabaseAction extends AbstractDatabaseAction
implements Disposable, ThreadSafe, Contextualizable {
@@ -570,7 +571,7 @@
// read global parameter settings
boolean reloadable = Constants.DESCRIPTOR_RELOADABLE_DEFAULT;
- Request request = (Request) objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = ObjectModelHelper.getRequest(objectModel);
if (this.settings.containsKey("reloadable"))
reloadable = Boolean.getBoolean((String)
this.settings.get("reloadable"));
1.5 +3 -3
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/acting/SectionCutterAction.java
Index: SectionCutterAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/acting/SectionCutterAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SectionCutterAction.java 4 Feb 2002 12:08:40 -0000 1.4
+++ SectionCutterAction.java 7 Feb 2002 07:28:20 -0000 1.5
@@ -59,8 +59,8 @@
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.acting.ConfigurableComposerAction;
+import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Session;
@@ -81,7 +81,7 @@
* variable in the Map.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Sergio Carvalho</a>
- * @version CVS $Id: SectionCutterAction.java,v 1.4 2002/02/04 12:08:40 cziegeler
Exp $
+ * @version CVS $Id: SectionCutterAction.java,v 1.5 2002/02/07 07:28:20 cziegeler
Exp $
*/
public class SectionCutterAction extends ConfigurableComposerAction implements
ThreadSafe {
@@ -134,7 +134,7 @@
*/
public Map act(Redirector redirector, SourceResolver resolver, Map objectModel,
String src, Parameters par)
throws Exception {
- Request request = (Request) objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = ObjectModelHelper.getRequest(objectModel);
Map results = new HashMap();
if (request != null) {
boolean hasMatched = false;
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
