Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 30403 invoked from network); 3 Aug 2007 12:18:16 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 3 Aug 2007 12:18:16 -0000 Received: (qmail 54575 invoked by uid 500); 3 Aug 2007 12:18:15 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 54441 invoked by uid 500); 3 Aug 2007 12:18:15 -0000 Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@cocoon.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 54430 invoked by uid 99); 3 Aug 2007 12:18:15 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Aug 2007 05:18:15 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Aug 2007 12:18:15 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E10EC1A981F; Fri, 3 Aug 2007 05:17:54 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r562427 - in /cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon: objectmodel/helper/TemplateObjectModelHelper.java template/environment/FlowObjectModelHelper.java Date: Fri, 03 Aug 2007 12:17:51 -0000 To: cvs@cocoon.apache.org From: gkossakowski@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070803121754.E10EC1A981F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gkossakowski Date: Fri Aug 3 05:17:49 2007 New Revision: 562427 URL: http://svn.apache.org/viewvc?view=rev&rev=562427 Log: Parameters are added to ObjectModel in FlowObjectModelHelper class instead of TemplateObjectModelHelper. Modified: cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/objectmodel/helper/TemplateObjectModelHelper.java cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/template/environment/FlowObjectModelHelper.java Modified: cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/objectmodel/helper/TemplateObjectModelHelper.java URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/objectmodel/helper/TemplateObjectModelHelper.java?view=diff&rev=562427&r1=562426&r2=562427 ============================================================================== --- cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/objectmodel/helper/TemplateObjectModelHelper.java (original) +++ cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/objectmodel/helper/TemplateObjectModelHelper.java Fri Aug 3 05:17:49 2007 @@ -84,20 +84,12 @@ /** * Create the object model. - * Currently the object model is a map with one single entry: - * cocoon + continuation The Continuation (if available) - * + parameters The parameters (if provided) */ public static Map getTemplateObjectModel(final Map objectModel, final Parameters parameters) { // first create the "cocoon object": final Map cocoon = new HashMap(); - - // cocoon.parameters - if (parameters != null) { - cocoon.put("parameters", new ParametersMap(parameters)); - } final Map map = new HashMap(); map.put("cocoon", cocoon); Modified: cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/template/environment/FlowObjectModelHelper.java URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/template/environment/FlowObjectModelHelper.java?view=diff&rev=562427&r1=562426&r2=562427 ============================================================================== --- cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/template/environment/FlowObjectModelHelper.java (original) +++ cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/template/environment/FlowObjectModelHelper.java Fri Aug 3 05:17:49 2007 @@ -22,6 +22,7 @@ import org.apache.avalon.framework.parameters.Parameters; import org.apache.cocoon.components.flow.FlowHelper; import org.apache.cocoon.objectmodel.ObjectModel; +import org.apache.cocoon.objectmodel.helper.ParametersMap; import org.apache.cocoon.objectmodel.helper.TemplateObjectModelHelper; import org.mozilla.javascript.Context; import org.mozilla.javascript.Scriptable; @@ -68,6 +69,7 @@ continue; newObjectModel.put(key, expressionContext.get(key)); } + ((Map)newObjectModel.get("cocoon")).put("parameters", new ParametersMap(parameters)); newObjectModel.put(org.apache.cocoon.objectmodel.ObjectModel.CONTEXTBEAN, FlowHelper.getContextObject(objectModel)); }