cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gkossakow...@apache.org
Subject svn commit: r636423 - in /cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src: changes/changes.xml main/java/org/apache/cocoon/objectmodel/impl/CocoonEntryObjectModelProvider.java
Date Wed, 12 Mar 2008 17:08:33 GMT
Author: gkossakowski
Date: Wed Mar 12 10:08:18 2008
New Revision: 636423

URL: http://svn.apache.org/viewvc?rev=636423&view=rev
Log:
COCOON-2171: Fixed "The settings object is not available in Object Model (it can't be obtained
using expressions)" bug.

Modified:
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/changes/changes.xml
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/objectmodel/impl/CocoonEntryObjectModelProvider.java

Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/changes/changes.xml?rev=636423&r1=636422&r2=636423&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/changes/changes.xml (original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/changes/changes.xml Wed Mar 12
10:08:18 2008
@@ -34,6 +34,9 @@
         Remove support for Cocoon 2.0 error handlers, <map:handle-errors type="500">,
         which were deprecated since Cocoon 2.1m1.
       </action>
+      <action dev="gkossakowski" type="fix" due-to="Luca Morandini" due-to-email="lmorandini@ieee.org">
+      	The settings object is not available in Object Model (it can't be obtained using expressions).
+      </action>
     </release>
     <release version="1.0.0-RC2" date="2007-10-12" description="released">
       <action dev="gkossakowski" type="fix" issue="COCOON-2108" due-to="Hugh Sparks" due-to-email="hugh@csparks.com">

Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/objectmodel/impl/CocoonEntryObjectModelProvider.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/objectmodel/impl/CocoonEntryObjectModelProvider.java?rev=636423&r1=636422&r2=636423&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/objectmodel/impl/CocoonEntryObjectModelProvider.java
(original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/objectmodel/impl/CocoonEntryObjectModelProvider.java
Wed Mar 12 10:08:18 2008
@@ -73,6 +73,7 @@
         org.apache.cocoon.environment.Context context = ObjectModelHelper.getContext(objectModel);
         cocoonMap.put("context", context);
         
+        cocoonMap.put("settings", this.settings);
         
         return cocoonMap;
     }



Mime
View raw message