You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by br...@apache.org on 2005/10/12 10:51:35 UTC
svn commit: r314824 -
/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/JXTemplateGenerator.java
Author: bruno
Date: Wed Oct 12 01:41:55 2005
New Revision: 314824
URL: http://svn.apache.org/viewcvs?rev=314824&view=rev
Log:
Make request object also available when JXTemplate is not used in a flowscript context. (needed for forms jx-macros.xml to work when not using javascript flow)
Modified:
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/JXTemplateGenerator.java
Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/JXTemplateGenerator.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/JXTemplateGenerator.java?rev=314824&r1=314823&r2=314824&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/JXTemplateGenerator.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/JXTemplateGenerator.java Wed Oct 12 01:41:55 2005
@@ -74,14 +74,7 @@
import org.apache.commons.jexl.util.introspection.VelMethod;
import org.apache.commons.jexl.util.introspection.VelPropertyGet;
import org.apache.commons.jexl.util.introspection.VelPropertySet;
-import org.apache.commons.jxpath.CompiledExpression;
-import org.apache.commons.jxpath.DynamicPropertyHandler;
-import org.apache.commons.jxpath.JXPathBeanInfo;
-import org.apache.commons.jxpath.JXPathContext;
-import org.apache.commons.jxpath.JXPathContextFactory;
-import org.apache.commons.jxpath.JXPathIntrospector;
-import org.apache.commons.jxpath.Pointer;
-import org.apache.commons.jxpath.Variables;
+import org.apache.commons.jxpath.*;
import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.excalibur.source.Source;
@@ -2434,7 +2427,8 @@
final Object session = request.getSession(false);
final Object app = ObjectModelHelper.getContext(objectModel);
cocoon = new HashMap();
- cocoon.put("request", FOM_JavaScriptFlowHelper.getFOM_Request(objectModel));
+ Object fomRequest = FOM_JavaScriptFlowHelper.getFOM_Request(objectModel);
+ cocoon.put("request", fomRequest != null ? fomRequest : request);
if (session != null) {
cocoon.put("session", FOM_JavaScriptFlowHelper.getFOM_Session(objectModel));
}