Return-Path: Delivered-To: apmail-forrest-svn-archive@www.apache.org Received: (qmail 84528 invoked from network); 10 Aug 2006 23:42:45 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 10 Aug 2006 23:42:45 -0000 Received: (qmail 77104 invoked by uid 500); 10 Aug 2006 23:42:45 -0000 Delivered-To: apmail-forrest-svn-archive@forrest.apache.org Received: (qmail 77072 invoked by uid 500); 10 Aug 2006 23:42:45 -0000 Mailing-List: contact svn-help@forrest.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Forrest Developers List" List-Id: Delivered-To: mailing list svn@forrest.apache.org Received: (qmail 77061 invoked by uid 99); 10 Aug 2006 23:42:45 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Aug 2006 16:42:45 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Aug 2006 16:42:43 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id D4F911A981A; Thu, 10 Aug 2006 16:42:17 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r430593 - in /forrest/trunk: main/java/org/apache/forrest/conf/ForrestConfModule.java site-author/status.xml Date: Thu, 10 Aug 2006 23:42:17 -0000 To: svn@forrest.apache.org From: thorsten@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060810234217.D4F911A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N 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 @@ upgrading to v0.8 + 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. FOR-916 - adding site-wide configuration files Applying patches from Mathieu Champlon. Thanks Mathieu for your contribution.