cziegeler 02/02/06 09:10:17
Modified: src/java/org/apache/cocoon Cocoon.java
src/java/org/apache/cocoon/acting HttpHeaderAction.java
LangSelect.java LocaleAction.java
RequestParameterExistsAction.java ScriptAction.java
SendmailAction.java ServerPagesAction.java
SessionInvalidatorAction.java
SessionIsValidAction.java
SessionPropagatorAction.java
SessionStateAction.java SessionValidatorAction.java
src/java/org/apache/cocoon/components/language/markup/xsp
XSPCookieHelper.java XSPFormValidatorHelper.java
XSPRequestHelper.java XSPResponseHelper.java
XSPSessionHelper.java
src/java/org/apache/cocoon/generation HTMLGenerator.java
RequestGenerator.java SearchGenerator.java
ServletGenerator.java VelocityGenerator.java
src/java/org/apache/cocoon/reading AbstractReader.java
DatabaseReader.java ResourceReader.java
src/java/org/apache/cocoon/selection/helpers
CodedSelectorHelper.java
src/java/org/apache/cocoon/transformation
ReadDOMSessionTransformer.java
RoleFilterTransformer.java TraxTransformer.java
WriteDOMSessionTransformer.java
Log:
First wave of changing from Constants.xxx to ObjectModelHelper.xxx
Revision Changes Path
1.13 +3 -2 xml-cocoon2/src/java/org/apache/cocoon/Cocoon.java
Index: Cocoon.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/Cocoon.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Cocoon.java 4 Feb 2002 22:42:53 -0000 1.12
+++ Cocoon.java 6 Feb 2002 17:10:16 -0000 1.13
@@ -84,6 +84,7 @@
import org.apache.cocoon.components.store.Store;
import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.environment.ModifiableSource;
+import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Session;
import org.apache.cocoon.sitemap.SitemapManager;
@@ -104,7 +105,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Pierpaolo Fumagalli</a> (Apache
Software Foundation, Exoffice Technologies)
* @author <a href="mailto:[EMAIL PROTECTED]";>Stefano Mazzocchi</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Leo Sutic</a>
- * @version CVS $Id: Cocoon.java,v 1.12 2002/02/04 22:42:53 vgritsenko Exp $
+ * @version CVS $Id: Cocoon.java,v 1.13 2002/02/06 17:10:16 cziegeler Exp $
*/
public class Cocoon
extends AbstractLoggable
@@ -459,7 +460,7 @@
EventPipeline eventPipeline) {
String lineSeparator = System.getProperty("line.separator");
Map objectModel = environment.getObjectModel();
- Request request = (Request) objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = ObjectModelHelper.getRequest(objectModel);
Session session = request.getSession(false);
StringBuffer msg = new StringBuffer();
msg.append("DEBUGGING INFORMATION:").append(lineSeparator);
1.5 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/acting/HttpHeaderAction.java
Index: HttpHeaderAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/acting/HttpHeaderAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- HttpHeaderAction.java 4 Feb 2002 12:08:39 -0000 1.4
+++ HttpHeaderAction.java 6 Feb 2002 17:10:16 -0000 1.5
@@ -60,7 +60,7 @@
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.ObjectModelHelper;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.Response;
import org.apache.cocoon.environment.SourceResolver;
@@ -73,7 +73,7 @@
* This action adds HTTP headers to the response.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Donald Ball</a>
- * @version CVS $Id: HttpHeaderAction.java,v 1.4 2002/02/04 12:08:39 cziegeler Exp $
+ * @version CVS $Id: HttpHeaderAction.java,v 1.5 2002/02/06 17:10:16 cziegeler Exp $
*/
public class HttpHeaderAction extends AbstractConfigurableAction implements
ThreadSafe, Configurable {
@@ -92,7 +92,7 @@
HashMap isDone = new HashMap();
Integer dummy = new Integer(1);
- Response response = (Response)objectModel.get(Constants.RESPONSE_OBJECT);
+ Response response = ObjectModelHelper.getResponse(objectModel);
String[] names = parameters.getNames();
// parameters
1.6 +5 -10 xml-cocoon2/src/java/org/apache/cocoon/acting/LangSelect.java
Index: LangSelect.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/acting/LangSelect.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- LangSelect.java 4 Feb 2002 14:18:35 -0000 1.5
+++ LangSelect.java 6 Feb 2002 17:10:16 -0000 1.6
@@ -61,7 +61,6 @@
import org.apache.avalon.framework.logger.AbstractLoggable;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.cocoon.Constants;
import org.apache.cocoon.environment.*;
import java.util.*;
@@ -93,7 +92,7 @@
* Modification date: (29.05.2001 0:30:01)
* @author: <a href="mailto:[EMAIL PROTECTED]";>Konstantin Piroumian</a>
* @author: <a href="mailto:[EMAIL PROTECTED]";>Lassi Immonen</a>
- * @version CVS $Id: LangSelect.java,v 1.5 2002/02/04 14:18:35 vgritsenko Exp $
+ * @version CVS $Id: LangSelect.java,v 1.6 2002/02/06 17:10:16 cziegeler Exp $
* @deprecated Use LocaleAction instead.
*/
public class LangSelect extends AbstractLoggable implements Action, Configurable,
ThreadSafe {
@@ -173,8 +172,7 @@
}
// Creating session to store the language code
- Request request =
- (Request)(objectModel.get(Constants.REQUEST_OBJECT));
+ Request request = ObjectModelHelper.getRequest(objectModel);
request.getSession(createSession);
if (storeInSession || storeInCookie) {
@@ -213,8 +211,7 @@
}
String def_lang = par.getParameter("default_lang", LangSelect.DEFAULT_LANG);
- Request request =
- (Request)(objectModel.get(Constants.REQUEST_OBJECT));
+ Request request = ObjectModelHelper.getRequest(objectModel);
String lang = null;
@@ -283,8 +280,7 @@
lang = DEFAULT_LANG;
}
- Request request =
- (Request)(objectModel.get(Constants.REQUEST_OBJECT));
+ Request request = ObjectModelHelper.getRequest(objectModel);
if (storeInRequest) {
request.setAttribute(PARAM_LANG, lang);
@@ -306,8 +302,7 @@
}
if (storeInCookie) {
- Response response =
- (Response)(objectModel.get(Constants.RESPONSE_OBJECT));
+ Response response = ObjectModelHelper.getResponse(objectModel);
Cookie langCookie = response.createCookie(PARAM_LANG, lang);
response.addCookie(langCookie);
1.6 +6 -9 xml-cocoon2/src/java/org/apache/cocoon/acting/LocaleAction.java
Index: LocaleAction.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/acting/LocaleAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- LocaleAction.java 4 Feb 2002 12:08:39 -0000 1.5
+++ LocaleAction.java 6 Feb 2002 17:10:16 -0000 1.6
@@ -65,8 +65,8 @@
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.ObjectModelHelper;
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Response;
@@ -156,7 +156,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Marcus Crafter</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Konstantin Piroumian</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Lassi Immonen</a>
- * @version CVS $Id: LocaleAction.java,v 1.5 2002/02/04 12:08:39 cziegeler Exp $
+ * @version CVS $Id: LocaleAction.java,v 1.6 2002/02/06 17:10:16 cziegeler Exp $
*/
public class LocaleAction extends ComposerAction implements ThreadSafe,
Configurable {
@@ -298,8 +298,7 @@
}
if (storeInRequest) {
- Request request =
- (Request) objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = ObjectModelHelper.getRequest(objectModel);
request.setAttribute(localeAttr, lc);
debug("updated request");
@@ -307,8 +306,7 @@
// store in session if so configured
if (storeInSession) {
- Request request =
- (Request) objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = ObjectModelHelper.getRequest(objectModel);
Session session = request.getSession(createSession);
if (session != null) {
@@ -319,8 +317,7 @@
// store in a cookie if so configured
if (storeInCookie) {
- Response response =
- (Response) objectModel.get(Constants.RESPONSE_OBJECT);
+ Response response = ObjectModelHelper.getResponse(objectModel);
response.addCookie(response.createCookie(localeAttr, lc));
debug("created cookies");
@@ -350,7 +347,7 @@
String ret_val;
// 1. Request CGI parameter 'locale'
- Request request = (Request) objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = ObjectModelHelper.getRequest(objectModel);
if ((ret_val = request.getParameter(LOCALE)) != null)
return ret_val;
1.6 +3 -2
xml-cocoon2/src/java/org/apache/cocoon/acting/RequestParameterExistsAction.java
Index: RequestParameterExistsAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/acting/RequestParameterExistsAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- RequestParameterExistsAction.java 6 Feb 2002 08:41:11 -0000 1.5
+++ RequestParameterExistsAction.java 6 Feb 2002 17:10:16 -0000 1.6
@@ -63,6 +63,7 @@
import java.util.Iterator;
import org.apache.avalon.framework.parameters.Parameters;
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;
@@ -89,7 +90,7 @@
* "name_1" must also exist and vice versa.</p>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Christian Haul</a>
- * @version CVS $Id: RequestParameterExistsAction.java,v 1.5 2002/02/06 08:41:11
cziegeler Exp $
+ * @version CVS $Id: RequestParameterExistsAction.java,v 1.6 2002/02/06 17:10:16
cziegeler Exp $
*/
public class RequestParameterExistsAction extends AbstractConfigurableAction
{
@@ -115,7 +116,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.7 +3 -2 xml-cocoon2/src/java/org/apache/cocoon/acting/ScriptAction.java
Index: ScriptAction.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/acting/ScriptAction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ScriptAction.java 4 Feb 2002 12:08:39 -0000 1.6
+++ ScriptAction.java 6 Feb 2002 17:10:16 -0000 1.7
@@ -64,6 +64,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.Source;
@@ -80,7 +81,7 @@
* A simple action that executes any script that can be run by the BSF
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason Foster</a>
- * @version CVS $Id: ScriptAction.java,v 1.6 2002/02/04 12:08:39 cziegeler Exp $
+ * @version CVS $Id: ScriptAction.java,v 1.7 2002/02/06 17:10:16 cziegeler Exp $
*/
public class ScriptAction
@@ -131,7 +132,7 @@
// TODO: should we check for a null request object here or let the
script handle it?
mgr.registerBean("logger", getLogger());
- mgr.registerBean("request", ( (Request)
objectModel.get(Constants.REQUEST_OBJECT) ) );
+ mgr.registerBean("request", ( ObjectModelHelper.getRequest(objectModel)
) );
mgr.registerBean("scriptaction", this );
mgr.registerBean("manager", this.manager );
1.5 +3 -2
xml-cocoon2/src/java/org/apache/cocoon/acting/SendmailAction.java
Index: SendmailAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/acting/SendmailAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SendmailAction.java 4 Feb 2002 12:08:39 -0000 1.4
+++ SendmailAction.java 6 Feb 2002 17:10:16 -0000 1.5
@@ -61,6 +61,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;
@@ -95,7 +96,7 @@
* SendmailAction as a spam source.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Donald Ball</a>
- * @version CVS $Id: SendmailAction.java,v 1.4 2002/02/04 12:08:39 cziegeler Exp $
+ * @version CVS $Id: SendmailAction.java,v 1.5 2002/02/06 17:10:16 cziegeler Exp $
*/
public class SendmailAction extends AbstractAction implements ThreadSafe,
Configurable {
@@ -111,7 +112,7 @@
public Map act(Redirector redirector, SourceResolver resolver, Map objectModel,
String source, Parameters parameters) throws Exception {
try {
getLogger().debug("SendmailAction: act start");
- Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = ObjectModelHelper.getRequest(objectModel);
Properties properties = new Properties(default_properties);
if (parameters.isParameter("smtphost")) {
properties.put("mail.smtp.host",parameters.getParameter("smtphost",null));
1.5 +3 -2
xml-cocoon2/src/java/org/apache/cocoon/acting/ServerPagesAction.java
Index: ServerPagesAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/acting/ServerPagesAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ServerPagesAction.java 4 Feb 2002 12:08:39 -0000 1.4
+++ ServerPagesAction.java 6 Feb 2002 17:10:16 -0000 1.5
@@ -66,6 +66,7 @@
import org.apache.cocoon.Constants;
import org.apache.cocoon.components.sax.XMLByteStreamCompiler;
import org.apache.cocoon.components.sax.XMLByteStreamFragment;
+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 @@
* </pre>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Sylvain Wallez</a>
- * @version CVS $Id: ServerPagesAction.java,v 1.4 2002/02/04 12:08:39 cziegeler Exp
$
+ * @version CVS $Id: ServerPagesAction.java,v 1.5 2002/02/06 17:10:16 cziegeler Exp
$
*/
public class ServerPagesAction
extends ConfigurableComposerAction
@@ -215,7 +216,7 @@
if (success == Boolean.TRUE) {
// Store the XSP output in the request
- Request req = (Request)objectModel.get(Constants.REQUEST_OBJECT);
+ Request req = ObjectModelHelper.getRequest(objectModel);
req.setAttribute(outputKey, new
XMLByteStreamFragment(compiler.getSAXFragment()));
}
}
1.6 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/acting/SessionInvalidatorAction.java
Index: SessionInvalidatorAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/acting/SessionInvalidatorAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SessionInvalidatorAction.java 4 Feb 2002 12:08:39 -0000 1.5
+++ SessionInvalidatorAction.java 6 Feb 2002 17:10:16 -0000 1.6
@@ -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;
@@ -72,7 +73,7 @@
* empty map if everything is ok, null otherwise.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Martin Man</a>
- * @version CVS $Id: SessionInvalidatorAction.java,v 1.5 2002/02/04 12:08:39
cziegeler Exp $
+ * @version CVS $Id: SessionInvalidatorAction.java,v 1.6 2002/02/06 17:10:16
cziegeler Exp $
*/
public class SessionInvalidatorAction extends AbstractAction implements ThreadSafe
{
@@ -81,8 +82,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 -3
xml-cocoon2/src/java/org/apache/cocoon/acting/SessionIsValidAction.java
Index: SessionIsValidAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/acting/SessionIsValidAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SessionIsValidAction.java 4 Feb 2002 12:08:39 -0000 1.4
+++ SessionIsValidAction.java 6 Feb 2002 17:10:16 -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;
@@ -72,7 +73,7 @@
* seesion is still valid.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Christian Haul</a>
- * @version CVS $Id: SessionIsValidAction.java,v 1.4 2002/02/04 12:08:39 cziegeler
Exp $
+ * @version CVS $Id: SessionIsValidAction.java,v 1.5 2002/02/06 17:10:16 cziegeler
Exp $
*/
public class SessionIsValidAction extends AbstractValidatorAction implements
ThreadSafe
@@ -82,8 +83,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);
if (req == null) {
getLogger ().debug ("SESSIONVALIDATOR: no request object");
1.6 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/acting/SessionPropagatorAction.java
Index: SessionPropagatorAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/acting/SessionPropagatorAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SessionPropagatorAction.java 4 Feb 2002 12:08:39 -0000 1.5
+++ SessionPropagatorAction.java 6 Feb 2002 17:10:16 -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;
@@ -83,7 +84,7 @@
* </pre>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Martin Man</a>
- * @version CVS $Id: SessionPropagatorAction.java,v 1.5 2002/02/04 12:08:39
cziegeler Exp $
+ * @version CVS $Id: SessionPropagatorAction.java,v 1.6 2002/02/06 17:10:16
cziegeler Exp $
*/
public class SessionPropagatorAction extends AbstractConfigurableAction implements
ThreadSafe
{
@@ -103,8 +104,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);
HashMap actionMap = new HashMap ();
HashMap isDone = new HashMap();
1.5 +3 -2
xml-cocoon2/src/java/org/apache/cocoon/acting/SessionStateAction.java
Index: SessionStateAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/acting/SessionStateAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SessionStateAction.java 4 Feb 2002 12:08:39 -0000 1.4
+++ SessionStateAction.java 6 Feb 2002 17:10:16 -0000 1.5
@@ -61,6 +61,7 @@
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.Constants;
import org.apache.cocoon.environment.Redirector;
+import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Session;
import org.apache.cocoon.environment.SourceResolver;
@@ -117,7 +118,7 @@
* @see org.apache.cocoon.selection.SessionAttributeSelectorFactory
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Christian Haul</a>
- * @version CVS $Id: SessionStateAction.java,v 1.4 2002/02/04 12:08:39 cziegeler
Exp $
+ * @version CVS $Id: SessionStateAction.java,v 1.5 2002/02/06 17:10:16 cziegeler
Exp $
*/
public class SessionStateAction extends AbstractConfigurableAction implements
ThreadSafe {
@@ -150,7 +151,7 @@
String src,
Parameters par) throws Exception
{
- Request request = (Request) objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = ObjectModelHelper.getRequest(objectModel);
// read local settings
newstate = par.getParameter("new-state", newstate);
1.6 +3 -4
xml-cocoon2/src/java/org/apache/cocoon/acting/SessionValidatorAction.java
Index: SessionValidatorAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/acting/SessionValidatorAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SessionValidatorAction.java 4 Feb 2002 12:08:39 -0000 1.5
+++ SessionValidatorAction.java 6 Feb 2002 17:10:16 -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.Session;
@@ -106,7 +107,7 @@
* all validated parameters to the sitemap via {name} expression.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Martin Man</a>
- * @version CVS $Id: SessionValidatorAction.java,v 1.5 2002/02/04 12:08:39
cziegeler Exp $
+ * @version CVS $Id: SessionValidatorAction.java,v 1.6 2002/02/06 17:10:16
cziegeler Exp $
*/
public class SessionValidatorAction extends AbstractValidatorAction implements
ThreadSafe
{
@@ -115,9 +116,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);
if (req == null) {
getLogger ().debug ("SESSIONVALIDATOR: no request object");
return null;
1.9 +6 -5
xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/XSPCookieHelper.java
Index: XSPCookieHelper.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/XSPCookieHelper.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XSPCookieHelper.java 5 Feb 2002 14:25:33 -0000 1.8
+++ XSPCookieHelper.java 6 Feb 2002 17:10:16 -0000 1.9
@@ -57,6 +57,7 @@
import org.apache.cocoon.Constants;
import org.apache.cocoon.environment.Cookie;
+import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Response;
import org.xml.sax.ContentHandler;
@@ -91,7 +92,7 @@
* private static String returnCookieProperty(Map ,String ,int ,String );
* </pre>
*
- * @version CVS $Id: XSPCookieHelper.java,v 1.8 2002/02/05 14:25:33 cziegeler Exp $
+ * @version CVS $Id: XSPCookieHelper.java,v 1.9 2002/02/06 17:10:16 cziegeler Exp $
*/
public class XSPCookieHelper extends XSPObjectHelper {
/**
@@ -117,7 +118,7 @@
String comment, String domain, int maxage,
String path,
String secure, int version)
{
- Response response = (Response)objectModel.get(Constants.RESPONSE_OBJECT);
+ Response response = ObjectModelHelper.getResponse(objectModel);
Cookie cookieToSet = response.createCookie(name,value);
if ((comment.trim()).length() > 0)
@@ -150,7 +151,7 @@
*/
public static Cookie[] getCookies(Map objectModel)
{
- Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = ObjectModelHelper.getRequest(objectModel);
return request.getCookies();
}
@@ -183,7 +184,7 @@
public static void getCookies(Map objectModel, ContentHandler contentHandler)
throws SAXException
{
- Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = ObjectModelHelper.getRequest(objectModel);
Cookie[] cookies = request.getCookies();
if(cookies != null && cookies.length > 0)
@@ -260,7 +261,7 @@
int count = 0;
- Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = ObjectModelHelper.getRequest(objectModel);
Cookie currentCookie = null;
if (cookieName != null) {
1.6 +4 -3
xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/XSPFormValidatorHelper.java
Index: XSPFormValidatorHelper.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/XSPFormValidatorHelper.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XSPFormValidatorHelper.java 4 Feb 2002 12:22:23 -0000 1.5
+++ XSPFormValidatorHelper.java 6 Feb 2002 17:10:16 -0000 1.6
@@ -64,6 +64,7 @@
import org.apache.cocoon.acting.ConfigurationHelper;
import org.apache.cocoon.acting.ValidatorActionResult;
import org.apache.cocoon.components.source.SourceHandler;
+import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Source;
import org.apache.log.Logger;
@@ -75,7 +76,7 @@
* The <code>ValidatorActionResult</code> object helper
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Christian Haul</a>
- * @version CVS $Id: XSPFormValidatorHelper.java,v 1.5 2002/02/04 12:22:23
cziegeler Exp $
+ * @version CVS $Id: XSPFormValidatorHelper.java,v 1.6 2002/02/06 17:10:16
cziegeler Exp $
*/
public class XSPFormValidatorHelper {
/**
@@ -145,7 +146,7 @@
Map objectModel,
String name) {
- Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = ObjectModelHelper.getRequest(objectModel);
return request.getAttribute(name);
}
@@ -161,7 +162,7 @@
Map objectModel
)
{
- Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = ObjectModelHelper.getRequest(objectModel);
return (Map) request.getAttribute(Constants.XSP_FORMVALIDATOR_PATH);
}
1.8 +20 -19
xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/XSPRequestHelper.java
Index: XSPRequestHelper.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/XSPRequestHelper.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XSPRequestHelper.java 4 Feb 2002 12:22:23 -0000 1.7
+++ XSPRequestHelper.java 6 Feb 2002 17:10:16 -0000 1.8
@@ -56,6 +56,7 @@
package org.apache.cocoon.components.language.markup.xsp;
import org.apache.cocoon.Constants;
+import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Session;
@@ -74,7 +75,7 @@
* The <code>Request</code> object helper
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Ricardo Rocha</a>
- * @version CVS $Id: XSPRequestHelper.java,v 1.7 2002/02/04 12:22:23 cziegeler Exp $
+ * @version CVS $Id: XSPRequestHelper.java,v 1.8 2002/02/06 17:10:16 cziegeler Exp $
*/
public class XSPRequestHelper {
/**
@@ -100,7 +101,7 @@
public static void getLocale(Map objectModel, ContentHandler handler)
throws SAXException {
- Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = ObjectModelHelper.getRequest(objectModel);
request.getLocale();
getLocale(request.getLocale(), handler);
}
@@ -110,7 +111,7 @@
* @return Array containing request locales.
*/
public static Locale[] getLocales(Map objectModel) {
- Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = ObjectModelHelper.getRequest(objectModel);
ArrayList a = new ArrayList(10);
Enumeration e = request.getLocales();
@@ -129,7 +130,7 @@
*/
public static void getLocales(Map objectModel, ContentHandler contentHandler)
throws SAXException {
- Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = ObjectModelHelper.getRequest(objectModel);
XSPObjectHelper.start(URI, PREFIX, contentHandler, "locales");
Enumeration e = request.getLocales();
while (e.hasMoreElements()) {
@@ -167,7 +168,7 @@
if(container_encoding == null)
container_encoding = "ISO-8859-1"; // default per Servlet spec
- Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = ObjectModelHelper.getRequest(objectModel);
String value = request.getParameter(name);
if(form_encoding != null && value != null && value.length() > 0) {
try {
@@ -240,7 +241,7 @@
ContentHandler contentHandler,
String name)
throws SAXException {
- Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = ObjectModelHelper.getRequest(objectModel);
AttributesImpl attr = new AttributesImpl();
XSPObjectHelper.addAttribute(attr, "name", name);
@@ -273,7 +274,7 @@
String name, String form_encoding,
String container_encoding)
throws SAXException {
- Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = ObjectModelHelper.getRequest(objectModel);
AttributesImpl attr = new AttributesImpl();
XSPObjectHelper.addAttribute(attr, "name", name);
@@ -313,7 +314,7 @@
public static String[] getParameterValues(Map objectModel, String name,
String form_encoding,
String container_encoding) {
- Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = ObjectModelHelper.getRequest(objectModel);
String[] values = request.getParameterValues(name);
@@ -340,7 +341,7 @@
* @return Array containing parameter names.
*/
public static String[] getParameterNames(Map objectModel) {
- Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = ObjectModelHelper.getRequest(objectModel);
ArrayList a = new ArrayList(10);
Enumeration e = request.getParameterNames();
@@ -361,7 +362,7 @@
public static void getParameterNames(Map objectModel,
ContentHandler contentHandler)
throws SAXException {
- Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = ObjectModelHelper.getRequest(objectModel);
XSPObjectHelper.start(URI, PREFIX, contentHandler, "parameter-names");
Enumeration e = request.getParameterNames();
@@ -383,7 +384,7 @@
public static void getHeaderNames(Map objectModel,
ContentHandler contentHandler)
throws SAXException {
- Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = ObjectModelHelper.getRequest(objectModel);
XSPObjectHelper.start(URI, PREFIX, contentHandler, "header-names");
Enumeration e = request.getHeaderNames();
@@ -401,7 +402,7 @@
* @param objectModel The Map objectModel
*/
public static String[] getHeaderNames(Map objectModel) {
- Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = ObjectModelHelper.getRequest(objectModel);
ArrayList a = new ArrayList(10);
Enumeration e = request.getHeaderNames();
@@ -413,7 +414,7 @@
}
public static String[] getHeaders(Map objectModel, String name) {
- Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = ObjectModelHelper.getRequest(objectModel);
ArrayList a = new ArrayList(10);
Enumeration e = request.getHeaders(name);
@@ -427,7 +428,7 @@
public static void getHeaders(Map objectModel, String name,
ContentHandler contentHandler)
throws SAXException {
- Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = ObjectModelHelper.getRequest(objectModel);
AttributesImpl attr = new AttributesImpl();
XSPObjectHelper.addAttribute(attr, "name", name);
@@ -443,7 +444,7 @@
}
public static Date getDateHeader(Map objectModel, String name) {
- Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = ObjectModelHelper.getRequest(objectModel);
if (name == null || name.length() == 0) {
return null;
@@ -456,7 +457,7 @@
}
public static String getDateHeader(Map objectModel, String name, String format)
{
- Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = ObjectModelHelper.getRequest(objectModel);
if (name == null || name.length() == 0) {
return null;
@@ -479,7 +480,7 @@
public static void getAttributeNames(Map objectModel,
ContentHandler contentHandler)
throws SAXException {
- Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = ObjectModelHelper.getRequest(objectModel);
XSPObjectHelper.start(URI, PREFIX, contentHandler, "attribute-names");
Enumeration e = request.getAttributeNames();
@@ -498,7 +499,7 @@
*/
public static String[] getAttributeNames(Map objectModel)
{
- Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = ObjectModelHelper.getRequest(objectModel);
ArrayList a = new ArrayList(10);
Enumeration e = request.getAttributeNames();
@@ -510,7 +511,7 @@
}
public static String getRequestedURL(Map objectModel) {
- Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = ObjectModelHelper.getRequest(objectModel);
StringBuffer uribuf = null;
boolean isSecure = request.isSecure();
int port = request.getServerPort();
1.5 +5 -4
xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/XSPResponseHelper.java
Index: XSPResponseHelper.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/XSPResponseHelper.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XSPResponseHelper.java 4 Feb 2002 12:22:23 -0000 1.4
+++ XSPResponseHelper.java 6 Feb 2002 17:10:16 -0000 1.5
@@ -56,6 +56,7 @@
package org.apache.cocoon.components.language.markup.xsp;
import org.apache.cocoon.Constants;
+import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Response;
import java.util.Map;
@@ -64,7 +65,7 @@
* The XSP <code>Response</code> object helper
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Ricardo Rocha</a>
- * @version CVS $Id: XSPResponseHelper.java,v 1.4 2002/02/04 12:22:23 cziegeler Exp
$
+ * @version CVS $Id: XSPResponseHelper.java,v 1.5 2002/02/06 17:10:16 cziegeler Exp
$
*/
public class XSPResponseHelper {
/**
@@ -81,7 +82,7 @@
* @param value The header value
*/
public static void setHeader(Map objectModel, String name, String value) {
- Response response = (Response)objectModel.get(Constants.RESPONSE_OBJECT);
+ Response response = ObjectModelHelper.getResponse(objectModel);
response.setHeader(name, value);
}
@@ -97,7 +98,7 @@
String name,
String value
) {
- Response response = (Response)objectModel.get(Constants.RESPONSE_OBJECT);
+ Response response = ObjectModelHelper.getResponse(objectModel);
response.addHeader(name, value);
}
@@ -111,7 +112,7 @@
Map objectModel,
String input
) {
- Response response = (Response)objectModel.get(Constants.RESPONSE_OBJECT);
+ Response response = ObjectModelHelper.getResponse(objectModel);
return response.encodeURL(input);
}
1.6 +14 -13
xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/XSPSessionHelper.java
Index: XSPSessionHelper.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/XSPSessionHelper.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XSPSessionHelper.java 5 Feb 2002 15:08:32 -0000 1.5
+++ XSPSessionHelper.java 6 Feb 2002 17:10:16 -0000 1.6
@@ -56,6 +56,7 @@
package org.apache.cocoon.components.language.markup.xsp;
import org.apache.cocoon.Constants;
+import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Session;
@@ -73,7 +74,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Ricardo Rocha</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Vadim Gritsenko</a>
- * @version CVS $Id: XSPSessionHelper.java,v 1.5 2002/02/05 15:08:32 vgritsenko Exp
$
+ * @version CVS $Id: XSPSessionHelper.java,v 1.6 2002/02/06 17:10:16 cziegeler Exp $
*/
public class XSPSessionHelper {
@@ -91,7 +92,7 @@
* @param content The parameter value
*/
public static void setSessionAttribute(Map objectModel, String name, Object
content) {
- Request request = (Request) objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = ObjectModelHelper.getRequest(objectModel);
Session session = request.getSession(false);
session.setAttribute(name, content);
}
@@ -104,7 +105,7 @@
* @param name The parameter name
*/
public static Object getSessionAttribute(Map objectModel, String name) {
- Request request = (Request) objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = ObjectModelHelper.getRequest(objectModel);
Session session = request.getSession(false);
return session.getAttribute(name);
}
@@ -119,7 +120,7 @@
*/
public static Object getSessionAttribute(Map objectModel, String name,
Object defaultValue) {
- Request request = (Request) objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = ObjectModelHelper.getRequest(objectModel);
Session session = request.getSession(false);
Object value = null;
@@ -140,7 +141,7 @@
* @param objectModel The Map objectModel
*/
public static List getSessionAttributeNames(Map objectModel) {
- Request request = (Request) objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = ObjectModelHelper.getRequest(objectModel);
ArrayList v = new ArrayList();
Enumeration e = request.getSession().getAttributeNames();
@@ -179,7 +180,7 @@
* @param objectModel The Map objectModel
*/
public static long getSessionCreationTime(Map objectModel) {
- Request request = (Request) objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = ObjectModelHelper.getRequest(objectModel);
return request.getSession().getCreationTime();
}
@@ -189,7 +190,7 @@
* @param objectModel The Map objectModel
*/
public static String getSessionId(Map objectModel) {
- Request request = (Request) objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = ObjectModelHelper.getRequest(objectModel);
return request.getSession().getId();
}
@@ -199,7 +200,7 @@
* @param objectModel The Map objectModel
*/
public static long getSessionLastAccessedTime(Map objectModel) {
- Request request = (Request) objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = ObjectModelHelper.getRequest(objectModel);
return request.getSession().getLastAccessedTime();
}
@@ -209,7 +210,7 @@
* @param objectModel The Map objectModel
*/
public static long getSessionMaxInactiveInterval(Map objectModel) {
- Request request = (Request) objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = ObjectModelHelper.getRequest(objectModel);
return request.getSession().getMaxInactiveInterval();
}
@@ -219,7 +220,7 @@
* @param interval max inactive interval
*/
public static void setSessionMaxInactiveInterval(Map objectModel, int interval)
{
- Request request = (Request) objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = ObjectModelHelper.getRequest(objectModel);
request.getSession().setMaxInactiveInterval(interval);
}
@@ -228,7 +229,7 @@
* @param objectModel The Map objectModel
*/
public static void invalidateSession(Map objectModel) {
- Request request = (Request) objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = ObjectModelHelper.getRequest(objectModel);
request.getSession().invalidate();
}
@@ -237,7 +238,7 @@
* @param objectModel The Map objectModel
*/
public static boolean isSessionNew(Map objectModel) {
- Request request = (Request) objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = ObjectModelHelper.getRequest(objectModel);
return request.getSession().isNew();
}
@@ -247,7 +248,7 @@
* @param name The parameter name
*/
public static void removeSessionAttribute(Map objectModel, String name) {
- Request request = (Request) objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = ObjectModelHelper.getRequest(objectModel);
request.getSession().removeAttribute(name);
}
}
1.7 +3 -2
xml-cocoon2/src/java/org/apache/cocoon/generation/HTMLGenerator.java
Index: HTMLGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/HTMLGenerator.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- HTMLGenerator.java 4 Feb 2002 13:15:04 -0000 1.6
+++ HTMLGenerator.java 6 Feb 2002 17:10:16 -0000 1.7
@@ -67,6 +67,7 @@
import org.apache.cocoon.caching.Cacheable;
import org.apache.cocoon.caching.TimeStampCacheValidity;
import org.apache.cocoon.components.xpath.XPathProcessor;
+import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Source;
import org.apache.cocoon.environment.SourceResolver;
@@ -93,7 +94,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Davanum Srinivas</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Nicola Ken Barozzi</a>
- * @version CVS $Id: HTMLGenerator.java,v 1.6 2002/02/04 13:15:04 cziegeler Exp $
+ * @version CVS $Id: HTMLGenerator.java,v 1.7 2002/02/06 17:10:16 cziegeler Exp $
*/
public class HTMLGenerator extends ComposerGenerator implements Cacheable,
Recyclable, Composable, Disposable {
@@ -136,7 +137,7 @@
throws ProcessingException, SAXException, IOException {
super.setup(resolver, objectModel, src, par);
- Request request = (Request) objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = ObjectModelHelper.getRequest(objectModel);
xpath = request.getParameter("xpath");
if(xpath == null)
xpath = par.getParameter("xpath",null);
1.4 +3 -2
xml-cocoon2/src/java/org/apache/cocoon/generation/RequestGenerator.java
Index: RequestGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/RequestGenerator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RequestGenerator.java 4 Feb 2002 13:15:04 -0000 1.3
+++ RequestGenerator.java 6 Feb 2002 17:10:16 -0000 1.4
@@ -60,6 +60,7 @@
import org.apache.avalon.framework.parameters.ParameterException;
import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.SourceResolver;
import org.xml.sax.SAXException;
@@ -86,7 +87,7 @@
* (Apache Software Foundation, Exoffice Technologies)
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Vadim Gritsenko</a>
- * @version CVS $Id: RequestGenerator.java,v 1.3 2002/02/04 13:15:04 cziegeler Exp $
+ * @version CVS $Id: RequestGenerator.java,v 1.4 2002/02/06 17:10:16 cziegeler Exp $
*/
public class RequestGenerator extends ServletGenerator implements Parameterizable,
Recyclable {
@@ -118,7 +119,7 @@
*/
public void generate()
throws SAXException {
- Request request = (Request) objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = ObjectModelHelper.getRequest(objectModel);
this.contentHandler.startDocument();
this.contentHandler.startPrefixMapping("",URI);
AttributesImpl attr=new AttributesImpl();
1.5 +3 -2
xml-cocoon2/src/java/org/apache/cocoon/generation/SearchGenerator.java
Index: SearchGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/SearchGenerator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SearchGenerator.java 4 Feb 2002 09:51:20 -0000 1.4
+++ SearchGenerator.java 6 Feb 2002 17:10:16 -0000 1.5
@@ -71,6 +71,7 @@
import org.apache.cocoon.components.search.LuceneXMLIndexer;
import org.apache.cocoon.components.search.LuceneCocoonPager;
import org.apache.cocoon.components.search.LuceneCocoonHelper;
+import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.SourceResolver;
@@ -126,7 +127,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Bernhard Huber</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Vadim Gritsenko</a>
- * @version CVS $Id: SearchGenerator.java,v 1.4 2002/02/04 09:51:20 cziegeler
Exp $
+ * @version CVS $Id: SearchGenerator.java,v 1.5 2002/02/06 17:10:16 cziegeler
Exp $
*/
public class SearchGenerator extends ComposerGenerator
implements Recyclable, Contextualizable, Initializable, Disposable
@@ -481,7 +482,7 @@
super.setup(resolver, objectModel, src, par);
String param_name;
- Request request = (Request) objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = ObjectModelHelper.getRequest(objectModel);
// get the analyzer
// Analyzer analyzer =
LuceneCocoonHelper.getAnalyzer("org.apache.lucene.analysis.standard.StandardAnalyzer");
1.5 +5 -5
xml-cocoon2/src/java/org/apache/cocoon/generation/ServletGenerator.java
Index: ServletGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/ServletGenerator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ServletGenerator.java 4 Feb 2002 13:15:04 -0000 1.4
+++ ServletGenerator.java 6 Feb 2002 17:10:16 -0000 1.5
@@ -56,9 +56,9 @@
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.Context;
+import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Response;
import org.apache.cocoon.environment.SourceResolver;
@@ -71,7 +71,7 @@
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
- * @version CVS $Id: ServletGenerator.java,v 1.4 2002/02/04 13:15:04 cziegeler Exp $
+ * @version CVS $Id: ServletGenerator.java,v 1.5 2002/02/06 17:10:16 cziegeler Exp $
*/
public abstract class ServletGenerator extends ComposerGenerator {
@@ -83,9 +83,9 @@
throws ProcessingException, SAXException, IOException {
super.setup(resolver, objectModel, src, par);
- this.request = (Request) objectModel.get(Constants.REQUEST_OBJECT);
- this.response = (Response) objectModel.get(Constants.RESPONSE_OBJECT);
- this.context = (Context) objectModel.get(Constants.CONTEXT_OBJECT);
+ this.request = ObjectModelHelper.getRequest(objectModel);
+ this.response = ObjectModelHelper.getResponse(objectModel);
+ this.context = ObjectModelHelper.getContext(objectModel);
}
/**
1.5 +5 -5
xml-cocoon2/src/java/org/apache/cocoon/generation/VelocityGenerator.java
Index: VelocityGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/VelocityGenerator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- VelocityGenerator.java 4 Feb 2002 13:15:04 -0000 1.4
+++ VelocityGenerator.java 6 Feb 2002 17:10:16 -0000 1.5
@@ -66,10 +66,10 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.parameters.ParameterException;
import org.apache.log.Logger;
-import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.ResourceNotFoundException;
import org.apache.cocoon.components.parser.Parser;
+import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Source;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.commons.collections.ExtendedProperties;
@@ -172,7 +172,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Davanum Srinivas</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Michael McKibben</a>
- * @version CVS $Id: VelocityGenerator.java,v 1.4 2002/02/04 13:15:04 cziegeler Exp
$
+ * @version CVS $Id: VelocityGenerator.java,v 1.5 2002/02/06 17:10:16 cziegeler Exp
$
*/
public class VelocityGenerator extends ComposerGenerator
implements Initializable, Configurable, Recyclable, LogSystem
@@ -452,9 +452,9 @@
//
this.velocityContext = new VelocityContext();
this.velocityContext.put("template", src);
- this.velocityContext.put("request",
objectModel.get(Constants.REQUEST_OBJECT));
- this.velocityContext.put("response",
objectModel.get(Constants.RESPONSE_OBJECT));
- this.velocityContext.put("context",
objectModel.get(Constants.CONTEXT_OBJECT));
+ this.velocityContext.put("request",
ObjectModelHelper.getRequest(objectModel));
+ this.velocityContext.put("response",
ObjectModelHelper.getResponse(objectModel));
+ this.velocityContext.put("context",
ObjectModelHelper.getContext(objectModel));
this.velocityContext.put("parameters", params);
// Export any additional objects to the Velocity context
1.4 +11 -8
xml-cocoon2/src/java/org/apache/cocoon/reading/AbstractReader.java
Index: AbstractReader.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/reading/AbstractReader.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractReader.java 4 Feb 2002 13:45:56 -0000 1.3
+++ AbstractReader.java 6 Feb 2002 17:10:17 -0000 1.4
@@ -69,26 +69,29 @@
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
- * @version CVS $Id: AbstractReader.java,v 1.3 2002/02/04 13:45:56 cziegeler Exp $
+ * @version CVS $Id: AbstractReader.java,v 1.4 2002/02/06 17:10:17 cziegeler Exp $
*/
-public abstract class AbstractReader extends AbstractLoggable implements Reader,
Recyclable {
+public abstract class AbstractReader
+ extends AbstractLoggable
+ implements Reader, Recyclable {
+
/** The current <code>SourceResolver</code>. */
- protected SourceResolver resolver=null;
+ protected SourceResolver resolver;
/** The current <code>Map</code> of the object model. */
- protected Map objectModel=null;
+ protected Map objectModel;
/** The current <code>Parameters</code>. */
- protected Parameters parameters=null;
+ protected Parameters parameters;
/** The source URI associated with the request or <b>null</b>. */
- protected String source=null;
+ protected String source;
/** The <code>OutputStream</code> to write on. */
- protected OutputStream out=null;
+ protected OutputStream out;
/**
* Set the <code>SourceResolver</code> the object model <code>Map</code>,
* the source and sitemap <code>Parameters</code> used to process the request.
*/
public void setup(SourceResolver resolver, Map objectModel, String src,
Parameters par)
- throws ProcessingException, SAXException, IOException {
+ throws ProcessingException, SAXException, IOException {
this.resolver=resolver;
this.objectModel=objectModel;
this.source=src;
1.7 +5 -5
xml-cocoon2/src/java/org/apache/cocoon/reading/DatabaseReader.java
Index: DatabaseReader.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/reading/DatabaseReader.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DatabaseReader.java 4 Feb 2002 13:45:56 -0000 1.6
+++ DatabaseReader.java 6 Feb 2002 17:10:17 -0000 1.7
@@ -62,13 +62,13 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.ResourceNotFoundException;
import org.apache.cocoon.caching.CacheValidity;
import org.apache.cocoon.caching.Cacheable;
import org.apache.cocoon.caching.NOPCacheValidity;
import org.apache.cocoon.caching.TimeStampCacheValidity;
+import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Response;
import org.apache.cocoon.environment.SourceResolver;
@@ -88,7 +88,7 @@
* to pull the image from, and source specifies the source key information.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Berin Loritsch</a>
- * @version CVS $Id: DatabaseReader.java,v 1.6 2002/02/04 13:45:56 cziegeler Exp $
+ * @version CVS $Id: DatabaseReader.java,v 1.7 2002/02/06 17:10:17 cziegeler Exp $
*/
public class DatabaseReader extends AbstractReader implements Composable,
Configurable, Disposable, Cacheable, Poolable {
private ComponentSelector dbselector;
@@ -141,8 +141,8 @@
ResultSet set = statement.executeQuery();
if (!set.next()) throw new ResourceNotFoundException("There is no
resource with that key");
- Response response = (Response)
objectModel.get(Constants.RESPONSE_OBJECT);
- Request request = (Request) objectModel.get(Constants.REQUEST_OBJECT);
+ Response response = ObjectModelHelper.getResponse(objectModel);
+ Request request = ObjectModelHelper.getRequest(objectModel);
if (this.modifiedSince(set, request, response)) {
this.resource = set.getBlob(1);
@@ -192,7 +192,7 @@
*/
public void generate() throws ProcessingException, SAXException, IOException {
try {
- Response response = (Response)
objectModel.get(Constants.RESPONSE_OBJECT);
+ Response response = ObjectModelHelper.getResponse(objectModel);
this.serialize(response);
} catch (IOException ioe) {
getLogger().debug("Assuming client reset stream");
1.5 +6 -7
xml-cocoon2/src/java/org/apache/cocoon/reading/ResourceReader.java
Index: ResourceReader.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/reading/ResourceReader.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ResourceReader.java 4 Feb 2002 13:45:56 -0000 1.4
+++ ResourceReader.java 6 Feb 2002 17:10:17 -0000 1.5
@@ -54,14 +54,13 @@
*/
package org.apache.cocoon.reading;
-import org.apache.avalon.excalibur.pool.Poolable;
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.caching.CacheValidity;
import org.apache.cocoon.caching.Cacheable;
import org.apache.cocoon.caching.TimeStampCacheValidity;
import org.apache.cocoon.environment.Context;
+import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Response;
import org.apache.cocoon.environment.Source;
import org.apache.cocoon.environment.SourceResolver;
@@ -91,7 +90,7 @@
* </dl>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
- * @version CVS $Id: ResourceReader.java,v 1.4 2002/02/04 13:45:56 cziegeler Exp $
+ * @version CVS $Id: ResourceReader.java,v 1.5 2002/02/06 17:10:17 cziegeler Exp $
*/
public class ResourceReader
extends AbstractReader
@@ -107,7 +106,7 @@
* the length and the last modification date
*/
public void setup(SourceResolver resolver, Map objectModel, String src,
Parameters par)
- throws ProcessingException, SAXException, IOException {
+ throws ProcessingException, SAXException, IOException {
super.setup(resolver, objectModel, src, par);
this.inputSource = this.resolver.resolve(super.source);
}
@@ -159,10 +158,10 @@
*/
public void generate()
throws IOException, ProcessingException {
- Response response = (Response) objectModel.get(Constants.RESPONSE_OBJECT);
+ final Response response = ObjectModelHelper.getResponse( this.objectModel);
try {
- long expires = parameters.getParameterAsInteger("expires", -1);
+ final long expires = parameters.getParameterAsInteger("expires", -1);
if (expires > 0) {
response.setDateHeader("Expires", System.currentTimeMillis() +
expires);
@@ -189,7 +188,7 @@
* Returns the mime-type of the resource in process.
*/
public String getMimeType () {
- Context ctx = (Context) objectModel.get(Constants.CONTEXT_OBJECT);
+ Context ctx = ObjectModelHelper.getContext( this.objectModel );
if (ctx != null) {
return ctx.getMimeType(this.source);
1.4 +5 -8
xml-cocoon2/src/java/org/apache/cocoon/selection/helpers/CodedSelectorHelper.java
Index: CodedSelectorHelper.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/selection/helpers/CodedSelectorHelper.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CodedSelectorHelper.java 4 Feb 2002 13:49:21 -0000 1.3
+++ CodedSelectorHelper.java 6 Feb 2002 17:10:17 -0000 1.4
@@ -54,8 +54,8 @@
*/
package org.apache.cocoon.selection.helpers;
-import org.apache.cocoon.Constants;
import org.apache.cocoon.environment.Context;
+import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Response;
import org.apache.cocoon.environment.Session;
@@ -69,7 +69,7 @@
* variables for developer ease.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Marcus Crafter</a>
- * @version CVS $Id: CodedSelectorHelper.java,v 1.3 2002/02/04 13:49:21 cziegeler
Exp $
+ * @version CVS $Id: CodedSelectorHelper.java,v 1.4 2002/02/06 17:10:17 cziegeler
Exp $
*/
public abstract class CodedSelectorHelper
{
@@ -79,12 +79,9 @@
protected void initialize(Map objectModel)
{
- context = (Context)
- objectModel.get(Constants.CONTEXT_OBJECT);
- request = (Request)
- objectModel.get(Constants.REQUEST_OBJECT);
- response = (Response)
- objectModel.get(Constants.RESPONSE_OBJECT);
+ context = ObjectModelHelper.getContext(objectModel);
+ request = ObjectModelHelper.getRequest(objectModel);
+ response = ObjectModelHelper.getResponse(objectModel);
session = request.getSession(false);
}
1.5 +3 -2
xml-cocoon2/src/java/org/apache/cocoon/transformation/ReadDOMSessionTransformer.java
Index: ReadDOMSessionTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/ReadDOMSessionTransformer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ReadDOMSessionTransformer.java 4 Feb 2002 14:17:58 -0000 1.4
+++ ReadDOMSessionTransformer.java 6 Feb 2002 17:10:17 -0000 1.5
@@ -58,6 +58,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.Request;
import org.apache.cocoon.environment.Session;
import org.apache.cocoon.environment.SourceResolver;
@@ -89,7 +90,7 @@
* the trigger-element
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Sven Beauprez</a>
- * @version CVS $Id: ReadDOMSessionTransformer.java,v 1.4 2002/02/04 14:17:58
cziegeler Exp $
+ * @version CVS $Id: ReadDOMSessionTransformer.java,v 1.5 2002/02/06 17:10:17
cziegeler Exp $
*/
public class ReadDOMSessionTransformer extends AbstractTransformer implements
Poolable {
@@ -114,7 +115,7 @@
public void setup(SourceResolver resolver, Map objectModel,
String source, Parameters parameters)
throws ProcessingException, SAXException, IOException {
- Request request = (Request)(objectModel.get(Constants.REQUEST_OBJECT));
+ Request request = ObjectModelHelper.getRequest(objectModel);
session = request.getSession(false);
if (session != null) {
getLogger().debug("ReadSessionTransformer: SessioID="+session.getId());
1.5 +3 -2
xml-cocoon2/src/java/org/apache/cocoon/transformation/RoleFilterTransformer.java
Index: RoleFilterTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/RoleFilterTransformer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RoleFilterTransformer.java 4 Feb 2002 14:08:34 -0000 1.4
+++ RoleFilterTransformer.java 6 Feb 2002 17:10:17 -0000 1.5
@@ -57,6 +57,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.Request;
import org.apache.cocoon.environment.SourceResolver;
import org.xml.sax.Attributes;
@@ -90,7 +91,7 @@
* will work as expected.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Berin Loritsch</a>
- * @version CVS $Id: RoleFilterTransformer.java,v 1.4 2002/02/04 14:08:34 cziegeler
Exp $
+ * @version CVS $Id: RoleFilterTransformer.java,v 1.5 2002/02/06 17:10:17 cziegeler
Exp $
*/
public class RoleFilterTransformer extends FilterTransformer {
private final static String URI = "http://apache.org/cocoon/role-filter/1.0";;
@@ -104,7 +105,7 @@
public final void setup(SourceResolver resolver, Map objectModel, String src,
Parameters params)
throws ProcessingException, SAXException, IOException {
super.setup(resolver, objectModel, src, params);
- this.request = (Request) objectModel.get(Constants.REQUEST_OBJECT);
+ this.request = ObjectModelHelper.getRequest(objectModel);
}
/**
1.11 +7 -6
xml-cocoon2/src/java/org/apache/cocoon/transformation/TraxTransformer.java
Index: TraxTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/TraxTransformer.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- TraxTransformer.java 4 Feb 2002 10:16:32 -0000 1.10
+++ TraxTransformer.java 6 Feb 2002 17:10:17 -0000 1.11
@@ -76,6 +76,7 @@
import org.apache.cocoon.components.deli.Deli;
import org.apache.cocoon.environment.Session;
import org.apache.cocoon.environment.Cookie;
+import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Source;
import org.apache.cocoon.environment.SourceResolver;
@@ -161,7 +162,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Ovidiu Predescu</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Mark H. Butler</a>
- * @version CVS $Id: TraxTransformer.java,v 1.10 2002/02/04 10:16:32 cziegeler Exp $
+ * @version CVS $Id: TraxTransformer.java,v 1.11 2002/02/06 17:10:17 cziegeler Exp $
*/
public class TraxTransformer extends AbstractTransformer
implements Transformer, Composable, Recyclable, Configurable, Cacheable, Disposable
{
@@ -408,7 +409,7 @@
if (this._useParameters) {
/** The Request object */
- Request request = (Request) objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = ObjectModelHelper.getRequest(objectModel);
Enumeration parameters = request.getParameterNames();
if ( parameters != null ) {
@@ -427,7 +428,7 @@
if (this._useSessionInfo) {
/** The Request object */
- Request request = (Request) objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = ObjectModelHelper.getRequest(objectModel);
if (map == null) map = new HashMap(5);
Session session = request.getSession(false);
@@ -444,7 +445,7 @@
}
if (this._useCookies) {
- Request request = (Request) objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = ObjectModelHelper.getRequest(objectModel);
Cookie cookies[] = request.getCookies();
if (cookies != null) {
for (int i=0; i<cookies.length; i++) {
@@ -461,7 +462,7 @@
}
if (this._useBrowserCap) try {
- Request request = (Request) objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = ObjectModelHelper.getRequest(objectModel);
if (map == null) {
map = new HashMap();
}
@@ -499,7 +500,7 @@
if (this._useDeli) {
try {
- Request request = (Request)
objectModel.get(Constants.REQUEST_OBJECT);
+ Request request = ObjectModelHelper.getRequest(objectModel);
if (map == null) {
map = new HashMap();
}
1.6 +3 -2
xml-cocoon2/src/java/org/apache/cocoon/transformation/WriteDOMSessionTransformer.java
Index: WriteDOMSessionTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/WriteDOMSessionTransformer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- WriteDOMSessionTransformer.java 4 Feb 2002 14:08:34 -0000 1.5
+++ WriteDOMSessionTransformer.java 6 Feb 2002 17:10:17 -0000 1.6
@@ -65,6 +65,7 @@
import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.parser.Parser;
+import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Session;
import org.apache.cocoon.environment.SourceResolver;
@@ -92,7 +93,7 @@
* dom-root-element is the trigger that will be the root element of the DOM
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Sven Beauprez</a>
- * @version CVS $Id: WriteDOMSessionTransformer.java,v 1.5 2002/02/04 14:08:34
cziegeler Exp $
+ * @version CVS $Id: WriteDOMSessionTransformer.java,v 1.6 2002/02/06 17:10:17
cziegeler Exp $
*/
public class WriteDOMSessionTransformer extends AbstractTransformer implements
@@ -121,7 +122,7 @@
String source, Parameters parameters)
throws ProcessingException, SAXException, IOException {
getLogger().debug("WriteSessionTransformer: setup");
- Request request = (Request)(objectModel.get(Constants.REQUEST_OBJECT));
+ Request request = ObjectModelHelper.getRequest(objectModel);
session = request.getSession(false);
if (session != null) {
DOMName = parameters.getParameter(WriteDOMSessionTransformer.DOM_NAME,null);
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
