cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thors...@apache.org
Subject svn commit: r591307 - in /cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components: src/main/java/org/apache/cocoon/components/modules/input/SettingsInputModule.java status.xml
Date Fri, 02 Nov 2007 11:38:06 GMT
Author: thorsten
Date: Fri Nov  2 04:38:05 2007
New Revision: 591307

URL: http://svn.apache.org/viewvc?rev=591307&view=rev
Log:
COCOON-2144
Fix SettingsInputModule.getAttributeNames(...) returns an empty iterator.

Thanks very much Grzegorz Kossakowski for the review.

Modified:
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/SettingsInputModule.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/status.xml

Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/SettingsInputModule.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/SettingsInputModule.java?rev=591307&r1=591306&r2=591307&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/SettingsInputModule.java
(original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/SettingsInputModule.java
Fri Nov  2 04:38:05 2007
@@ -26,7 +26,6 @@
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.avalon.framework.service.Serviceable;
 import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.commons.collections.IteratorUtils;
 
 import org.apache.cocoon.configuration.Settings;
 import org.apache.cocoon.processing.ProcessInfoProvider;
@@ -78,7 +77,8 @@
      */
     public Iterator getAttributeNames(Configuration modeConf, Map objectModel)
     throws ConfigurationException {
-        return IteratorUtils.EMPTY_ITERATOR;
+        final Settings settings = (Settings)WebAppContextUtils.getCurrentWebApplicationContext().getBean(Settings.ROLE);
+        return settings.getPropertyNames().iterator();
     }
 
     /**

Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/status.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/status.xml?rev=591307&r1=591306&r2=591307&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/status.xml (original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/status.xml Fri Nov  2 04:38:05
2007
@@ -69,6 +69,10 @@
       Fixed getInputStream() in XModuleSource:
       Set up XMLSerializer in a component way, i.e. retrieve it from ServiceManager.
     </action>
+    <action dev="TS" type="fix" fixes-bug="COCOON-2144">
+      Fixed getAttributeNames(...) in SettingsInputModule:
+      The getAttributeNames(...) method returns an iterator of all properties instead an
empty one.
+    </action>
   </release>
  </changes>
 



Mime
View raw message