Author: thorsten
Date: Thu Aug 10 16:42:16 2006
New Revision: 430593
URL: http://svn.apache.org/viewvc?rev=430593&view=rev
Log:
FOR-800 - make
forrest.properties.xml (as aggregation of all properties) aviable via
cocoon://.
The last remaining issue was implementing the Iterator
getAttributeNames in the
ForrestConfModule. To see all aviable properties add
org.apache.forrest.plugin.output.inputModule and request
cocoon://module.project.properties.
Modified:
forrest/trunk/main/java/org/apache/forrest/conf/ForrestConfModule.java
forrest/trunk/site-author/status.xml
Modified: forrest/trunk/main/java/org/apache/forrest/conf/ForrestConfModule.java
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/java/org/apache/forrest/conf/ForrestConfModule.java?rev=430593&r1=430592&r2=430593&view=diff
==============================================================================
--- forrest/trunk/main/java/org/apache/forrest/conf/ForrestConfModule.java
(original)
+++ forrest/trunk/main/java/org/apache/forrest/conf/ForrestConfModule.java Thu
Aug 10 16:42:16 2006
@@ -20,8 +20,11 @@
import java.io.InputStream;
import java.net.MalformedURLException;
import java.util.Enumeration;
+import java.util.Iterator;
import java.util.Map;
+import java.util.SortedSet;
import java.util.StringTokenizer;
+import java.util.TreeSet;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -107,6 +110,21 @@
}
return attributeValues;
+ }
+
+ public Iterator getAttributeNames(Configuration modeConf, Map objectModel)
+ throws ConfigurationException {
+
+ SortedSet matchset = new TreeSet();
+ Enumeration enumeration = filteringProperties.keys();
+ while (enumeration.hasMoreElements()) {
+ String key = (String) enumeration.nextElement();
+ matchset.add(key);
+ }
+ Iterator iterator = super.getAttributeNames(modeConf, objectModel);
+ while (iterator.hasNext())
+ matchset.add(iterator.next());
+ return matchset.iterator();
}
public void initialize() throws Exception {
Modified: forrest/trunk/site-author/status.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/site-author/status.xml?rev=430593&r1=430592&r2=430593&view=diff
==============================================================================
--- forrest/trunk/site-author/status.xml (original)
+++ forrest/trunk/site-author/status.xml Thu Aug 10 16:42:16 2006
@@ -140,6 +140,12 @@
<link href="site:v0.80//upgrading_08">upgrading to v0.8</link>
</action>
<!-- 2006-08 -->
+ <action context="code" type="update" dev="TS" fixes-bug="FOR-800">
FOR-800 - make
+ forrest.properties.xml (as aggregation of all properties) aviable via
cocoon://.
+ The last remaining issue was implementing the Iterator
getAttributeNames in the
+ ForrestConfModule. To see all aviable properties add
+ org.apache.forrest.plugin.output.inputModule and request
+ cocoon://module.project.properties.</action>
<action context="code" type="update" dev="TS" fixes-bug="FOR-916"
due-to="Mathieu Champlon"> FOR-916 - adding site-wide configuration
files
Applying patches from Mathieu Champlon. Thanks Mathieu for your
contribution.
