You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2006/06/22 16:48:18 UTC
svn commit: r416386 - in /cocoon/branches/BRANCH_2_1_X:
src/java/org/apache/cocoon/environment/TemplateObjectModelHelper.java
src/java/org/apache/cocoon/generation/JXTemplateGenerator.java status.xml
Author: cziegeler
Date: Thu Jun 22 07:48:17 2006
New Revision: 416386
URL: http://svn.apache.org/viewvc?rev=416386&view=rev
Log:
Use plain parameters object for templates
Modified:
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/TemplateObjectModelHelper.java
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/JXTemplateGenerator.java
cocoon/branches/BRANCH_2_1_X/status.xml
Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/TemplateObjectModelHelper.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/TemplateObjectModelHelper.java?rev=416386&r1=416385&r2=416386&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/TemplateObjectModelHelper.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/TemplateObjectModelHelper.java Thu Jun 22 07:48:17 2006
@@ -49,9 +49,9 @@
Context ctx = Context.enter();
try {
// Create it if never used up to now
- if (rootScope == null)
+ if (rootScope == null) {
rootScope = ctx.initStandardObjects(null);
-
+ }
Scriptable scope = null;
try {
scope = ctx.newObject(rootScope);
@@ -150,7 +150,7 @@
// cocoon.parameters
if ( parameters != null ) {
- cocoon.put("parameters", Parameters.toProperties(parameters));
+ cocoon.put("parameters", parameters);
}
final Map map = new HashMap();
Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/JXTemplateGenerator.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/JXTemplateGenerator.java?rev=416386&r1=416385&r2=416386&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 Thu Jun 22 07:48:17 2006
@@ -2436,7 +2436,7 @@
}
cocoon.put("context", FOM_JavaScriptFlowHelper.getFOM_Context(objectModel));
cocoon.put("continuation", FOM_JavaScriptFlowHelper.getFOM_WebContinuation(objectModel));
- cocoon.put("parameters", Parameters.toProperties(parameters));
+ cocoon.put("parameters", parameters);
this.variables = new MyVariables(cocoon, contextObject, kont, request, session, app, parameters);
Map map;
if (contextObject instanceof Map) {
Modified: cocoon/branches/BRANCH_2_1_X/status.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/status.xml?rev=416386&r1=416385&r2=416386&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/status.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/status.xml Thu Jun 22 07:48:17 2006
@@ -182,6 +182,11 @@
<release version="@version@" date="@date@">
-->
<release version="2.1.10" date="TBD">
+ <action dev="CZ" type="fix">
+ The predefined variables "parameters" and "cocoon.parameters" now both point to the
+ parameters object in JXTemplateGenerator and the template block. (cocoon.parameters did
+ point to a properties object).
+ </action>
<action dev="AG" type="fix" fixes-bug="COCOON-1862" due-to="Igor Naumov" due-to-emal="igornaumov@hotmail.com">
HSQLDB Block: Workaround for HSQLDB improper shutdown in SAP NetWeaver.
</action>