http://blog.gmane.org/gmane.text.xml.forrest.cvs hourly 1 1901-01-01T00:00+00:00 http://gmane.org/img/gmane-25t.png http://gmane.org http://comments.gmane.org/gmane.text.xml.forrest.cvs/9474 Author: crossley Date: Sat Nov 29 18:53:28 2008 New Revision: 721753 URL: http://svn.apache.org/viewvc?rev=721753&view=rev Log: The Message of the Day (motd) for old plugins was incorrect. Modified: forrest/trunk/site-author/skinconf.xml Modified: forrest/trunk/site-author/skinconf.xml URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/skinconf.xml?rev=721753&r1=721752&r2=721753&view=diff ============================================================================== --- forrest/trunk/site-author/skinconf.xml (original) +++ forrest/trunk/site-author/skinconf.xml Sat Nov 29 18:53:28 2008 < at >< at > -141,7 +141,7 < at >< at > <motd-option pattern="plugins_0_70"> <motd-title>v0.7</motd-title> <motd-page location="both"> - This is documentation for current version v0.7 + This is documentation for past version v0.7 </motd-page> <motd-page-url>http://forrest.apache.org/pluginDocs/</motd-page-url> </motd-option> crossley< at >apache.org 2008-11-30T02:53:28 http://comments.gmane.org/gmane.text.xml.forrest.cvs/9473 Author: crossley Date: Wed Nov 26 21:51:36 2008 New Revision: 721084 URL: http://svn.apache.org/viewvc?rev=721084&view=rev Log: In r124991 a dummy DTD was added to the "seed site" xdocs directory, to work around an issue with 'build.sh test' not using the projects xml catalog. As a result of other recent changes (e.g. FOR-1131) this dummy is now not required. Removed: forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples-b/hello-v10.dtd crossley< at >apache.org 2008-11-27T05:51:36 http://comments.gmane.org/gmane.text.xml.forrest.cvs/9472 Author: crossley Date: Wed Nov 26 21:35:21 2008 New Revision: 721083 URL: http://svn.apache.org/viewvc?rev=721083&view=rev Log: The preparation of the set of xmlcatalogs is better done in our "validation-props" ant target. Thanks to assistance from Thomas Emmel. Issue: FOR-1131 FOR-1120 Modified: forrest/trunk/main/forrest.build.xml forrest/trunk/main/targets/validate.xml Modified: forrest/trunk/main/forrest.build.xml URL: http://svn.apache.org/viewvc/forrest/trunk/main/forrest.build.xml?rev=721083&r1=721082&r2=721083&view=diff ============================================================================== --- forrest/trunk/main/forrest.build.xml (original) +++ forrest/trunk/main/forrest.build.xml Wed Nov 26 21:35:21 2008 < at >< at > -36,16 +36,6 < at >< at > <property name="forrest.build.lib-dir" location="${forrest.home}/build"/> <property name="forrest.core" location="${forrest.home}/main"/> <property name="forrest.core.webapp" location="${forrest.core}/webapp"/> - <path id="fcatalog.path"> - <pathelement location="${forrest.core.webapp}/resources/schema/catalog.xcat"/> - <pathelement location="${forrest.plugins-dir}/catalog.xcat"/> - <pathelement location="${catalog}"/> - </path> - <xmlcatalog id="fcatalog"> - <catalogpath> - <path refid="fcatalog.path"/> - </catalogpath> - </xmlcatalog> <import file="targets/validate.xml"/> <import file="targets/webapp.xml"/> <import file="targets/site.xml"/> Modified: forrest/trunk/main/targets/validate.xml URL: http://svn.apache.org/viewvc/forrest/trunk/main/targets/validate.xml?rev=721083&r1=721082&r2=721083&view=diff ============================================================================== --- forrest/trunk/main/targets/validate.xml (original) +++ forrest/trunk/main/targets/validate.xml Wed Nov 26 21:35:21 2008 < at >< at > -95,6 +95,17 < at >< at > <property name="forrest.validate.skins.stylesheets.excludes" value=""/> <property name="forrest.validate.skins.stylesheets.failonerror" value="${forrest.validate.skins.failonerror}" /> + <path id="fcatalog.path"> + <pathelement location="${forrest.core.webapp}/resources/schema/catalog.xcat"/> + <pathelement location="${forrest.plugins-dir}/catalog.xcat"/> + <pathelement location="${catalog}"/> + </path> + <xmlcatalog id="fcatalog"> + <catalogpath> + <path refid="fcatalog.path"/> + </catalogpath> + </xmlcatalog> + <echo message="Using these catalog descriptors: ${toString:fcatalog.path}"/> </target> <target name="validate-site" depends="load-project-props"> <condition property="forrest.validate.skinconf.disable-xml-link"> < at >< at > -121,7 +132,6 < at >< at > </target> <target name="validate-xdocs" depends="init, validation-props" if="validate.xdocs" description="Validate the project xdocs"> - <echo level="verbose" message="Using these catalog descriptors: ${toString:fcatalog.path}"/> <xmlvalidate failonerror="${forrest.validate.xdocs.failonerror}" lenient="no" warn="yes" classpathref="forrest.cp" classname="org.apache.xerces.parsers.SAXParser"> <attribute name="http://apache.org/xml/features/validation/dynamic" value="true"/> <xmlcatalog refid="fcatalog" /> crossley< at >apache.org 2008-11-27T05:35:21 http://comments.gmane.org/gmane.text.xml.forrest.cvs/9471 Author: crossley Date: Wed Nov 26 19:55:26 2008 New Revision: 721076 URL: http://svn.apache.org/viewvc?rev=721076&view=rev Log: A better way to report the set of xmlcatalog files being used. Define a "path" structure and show it using toString:... Modified: forrest/trunk/main/forrest.build.xml forrest/trunk/main/targets/validate.xml Modified: forrest/trunk/main/forrest.build.xml URL: http://svn.apache.org/viewvc/forrest/trunk/main/forrest.build.xml?rev=721076&r1=721075&r2=721076&view=diff ============================================================================== --- forrest/trunk/main/forrest.build.xml (original) +++ forrest/trunk/main/forrest.build.xml Wed Nov 26 19:55:26 2008 < at >< at > -36,13 +36,14 < at >< at > <property name="forrest.build.lib-dir" location="${forrest.home}/build"/> <property name="forrest.core" location="${forrest.home}/main"/> <property name="forrest.core.webapp" location="${forrest.core}/webapp"/> + <path id="fcatalog.path"> + <pathelement location="${forrest.core.webapp}/resources/schema/catalog.xcat"/> + <pathelement location="${forrest.plugins-dir}/catalog.xcat"/> + <pathelement location="${catalog}"/> + </path> <xmlcatalog id="fcatalog"> <catalogpath> - <pathelement - location="${forrest.core.webapp}/resources/schema/catalog.xcat"/> - <pathelement - location="${forrest.plugins-dir}/catalog.xcat"/> - <pathelement location="${catalog}"/> + <path refid="fcatalog.path"/> </catalogpath> </xmlcatalog> <import file="targets/validate.xml"/> Modified: forrest/trunk/main/targets/validate.xml URL: http://svn.apache.org/viewvc/forrest/trunk/main/targets/validate.xml?rev=721076&r1=721075&r2=721076&view=diff ============================================================================== --- forrest/trunk/main/targets/validate.xml (original) +++ forrest/trunk/main/targets/validate.xml Wed Nov 26 19:55:26 2008 < at >< at > -121,10 +121,7 < at >< at > </target> <target name="validate-xdocs" depends="init, validation-props" if="validate.xdocs" description="Validate the project xdocs"> - <echo level="verbose" message="Using these catalog descriptors: -forrest.core.webapp=${forrest.core.webapp}/resources/schema/catalog.xcat -forrest.plugins-dir=${forrest.plugins-dir}/catalog.xcat -catalog=${catalog}"/> + <echo level="verbose" message="Using these catalog descriptors: ${toString:fcatalog.path}"/> <xmlvalidate failonerror="${forrest.validate.xdocs.failonerror}" lenient="no" warn="yes" classpathref="forrest.cp" classname="org.apache.xerces.parsers.SAXParser"> <attribute name="http://apache.org/xml/features/validation/dynamic" value="true"/> <xmlcatalog refid="fcatalog" /> crossley< at >apache.org 2008-11-27T03:55:26 http://comments.gmane.org/gmane.text.xml.forrest.cvs/9470 Author: crossley Date: Wed Nov 26 14:59:03 2008 New Revision: 721024 URL: http://svn.apache.org/viewvc?rev=721024&view=rev Log: The "fixes-bug" attribute needs the "FOR-" prefix. Modified: forrest/trunk/site-author/status.xml Modified: forrest/trunk/site-author/status.xml URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/status.xml?rev=721024&r1=721023&r2=721024&view=diff ============================================================================== --- forrest/trunk/site-author/status.xml (original) +++ forrest/trunk/site-author/status.xml Wed Nov 26 14:59:03 2008 < at >< at > -186,7 +186,7 < at >< at > products such as Apache Xerces and Apache Xalan, etc. See <link href="site:upgrading_09/cocoon">upgrading notes</link>. </action> - <action context="code" type="update" dev="TS" fixes-bug="1103" importance="high"> + <action context="code" type="update" dev="TS" fixes-bug="FOR-1103" importance="high"> Promoting the output.inputModule plugin to core. Main reason for the move is to prevent plugins dependencies since the code has attracted different use cases solved in plugins to move it into core. crossley< at >apache.org 2008-11-26T22:59:04 http://comments.gmane.org/gmane.text.xml.forrest.cvs/9469 Author: crossley Date: Wed Nov 26 14:57:13 2008 New Revision: 721023 URL: http://svn.apache.org/viewvc?rev=721023&view=rev Log: Raise the importance of the Jing upgrade, mention FOR-984 Java 6 missing datatype library. Modified: forrest/trunk/site-author/status.xml Modified: forrest/trunk/site-author/status.xml URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/status.xml?rev=721023&r1=721022&r2=721023&view=diff ============================================================================== --- forrest/trunk/site-author/status.xml (original) +++ forrest/trunk/site-author/status.xml Wed Nov 26 14:57:13 2008 < at >< at > -155,9 +155,11 < at >< at > <action context="code" type="update" dev="DC"> Forrestbot deploy.scp workstage now reports which files were transferred. </action> - <action context="code" type="update" dev="DC"> - Updated to Jing-20081028 release from - <link href="http://code.google.com/p/jing-trang/">http://code.google.com/p/jing-trang/</link> + <action context="code" type="update" dev="DC" fixes-bug="FOR-984" importance="high"> + Updated to Jing-20081028 release (from + <link href="http://code.google.com/p/jing-trang/">http://code.google.com/p/jing-trang/</link>). + As well as providing us with a reliable RELAX NG tool, this upgrade + fixes an issue on some Java 6 with missing datatype library. </action> <!-- 2008-10 --> <action context="code" type="update" dev="DC" importance="high"> crossley< at >apache.org 2008-11-26T22:57:14 http://comments.gmane.org/gmane.text.xml.forrest.cvs/9468 Author: crossley Date: Tue Nov 25 20:48:13 2008 New Revision: 720742 URL: http://svn.apache.org/viewvc?rev=720742&view=rev Log: The Cocoon "Running Modes" facility is not available in cocoon-2.1 version. Issues: FOR-1091 FOR-917 Modified: forrest/trunk/site-author/content/xdocs/howto-dev.xml forrest/trunk/site-author/content/xdocs/site.xml forrest/trunk/site-author/status.xml Modified: forrest/trunk/site-author/content/xdocs/howto-dev.xml URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/howto-dev.xml?rev=720742&r1=720741&r2=720742&view=diff ============================================================================== --- forrest/trunk/site-author/content/xdocs/howto-dev.xml (original) +++ forrest/trunk/site-author/content/xdocs/howto-dev.xml Tue Nov 25 20:48:13 2008 < at >< at > -384,24 +384,6 < at >< at > Cocoon logfiles and their configuration. </p> </section> - <section id="debug-modes"> - <title>Cocoon Running Modes</title> - <p> - Cocoon startup reads additional properties from various files. This - enables some different properties to be used for production or - development. By default, Forrest uses Cocoon in running mode "dev". So - it first reads from - <code>main/webapp/WEB-INF/properties/core.properties</code> then from - <code>main/webapp/WEB-INF/properties/dev/core.properties</code> - </p> - <p> - To use a different mode, say "prod" for production, add to the - forrest.jvmargs in your forrest.properties file: - <code>-Dorg.apache.cocoon.mode=prod</code> and provide the relevant - properties in a matching "prod" sub-directory of - <code>main/webapp/WEB-INF/properties</code> - </p> - </section> <section id="debug-intermediate"> <title>View intermediate processing</title> <p> Modified: forrest/trunk/site-author/content/xdocs/site.xml URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/site.xml?rev=720742&r1=720741&r2=720742&view=diff ============================================================================== --- forrest/trunk/site-author/content/xdocs/site.xml (original) +++ forrest/trunk/site-author/content/xdocs/site.xml Tue Nov 25 20:48:13 2008 < at >< at > -98,7 +98,6 < at >< at > <sitemap href="#sitemap"/> <debug href="#debug"/> <debug-cocoon-profiler href="#debug-cocoon-profiler"/> - <debug-modes href="#debug-modes"/> <debug-sitemap-exec href="#debug-sitemap-exec"/> <debug-validation href="#debug-validation"/> </forrest-dev> Modified: forrest/trunk/site-author/status.xml URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/status.xml?rev=720742&r1=720741&r2=720742&view=diff ============================================================================== --- forrest/trunk/site-author/status.xml (original) +++ forrest/trunk/site-author/status.xml Tue Nov 25 20:48:13 2008 < at >< at > -304,11 +304,6 < at >< at > <action dev="DC" type="add" context="docs"> New document to explain <link href="site:sitemap-explain">Cocoon sitemaps</link> using a specific worked example. </action> - <action dev="DC" type="add" context="docs"> - Add explanation of - <link href="site:procedures/forrest-dev/debug-modes">Cocoon Running Modes</link> - for setting different properties. - </action> <action dev="DC" type="update" context="code"> Enhanced the Message of the Day (MOTD) facility to enable specific matches. See skinconf.xml from a "seed" site for configuration details. crossley< at >apache.org 2008-11-26T04:48:13 http://comments.gmane.org/gmane.text.xml.forrest.cvs/9467 Author: crossley Date: Tue Nov 25 20:33:46 2008 New Revision: 720739 URL: http://svn.apache.org/viewvc?rev=720739&view=rev Log: Cocoon properties are now at WEB-INF/properties/core.properties file. Issue: FOR-1091 Modified: forrest/trunk/site-author/content/xdocs/docs_0_90/validation.xml Modified: forrest/trunk/site-author/content/xdocs/docs_0_90/validation.xml URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/docs_0_90/validation.xml?rev=720739&r1=720738&r2=720739&view=diff ============================================================================== --- forrest/trunk/site-author/content/xdocs/docs_0_90/validation.xml (original) +++ forrest/trunk/site-author/content/xdocs/docs_0_90/validation.xml Tue Nov 25 20:33:46 2008 < at >< at > -342,7 +342,7 < at >< at > <p> However this configuration does not show your DTDs being resolved. So raise the verbosity level in the central configuration at - <code>main/webapp/WEB-INF/properties/dev/core.properties</code> and + <code>main/webapp/WEB-INF/properties/core.properties</code> and re-start forrest. This also shows the main catalogs being loaded and shows the resolving of every DTD and entity set. </p> crossley< at >apache.org 2008-11-26T04:33:46 http://comments.gmane.org/gmane.text.xml.forrest.cvs/9466 Author: crossley Date: Sun Nov 23 20:33:48 2008 New Revision: 720112 URL: http://svn.apache.org/viewvc?rev=720112&view=rev Log: Added newton.codecauldron.org Issue: FOR-1130 Modified: forrest/trunk/site-author/content/xdocs/live-sites.xml Modified: forrest/trunk/site-author/content/xdocs/live-sites.xml URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/live-sites.xml?rev=720112&r1=720111&r2=720112&view=diff ============================================================================== --- forrest/trunk/site-author/content/xdocs/live-sites.xml (original) +++ forrest/trunk/site-author/content/xdocs/live-sites.xml Sun Nov 23 20:33:48 2008 < at >< at > -165,6 +165,7 < at >< at > <li><a href="http://stephane.galles.free.fr/jagraffe/english" rel="nofollow">JAgraffe</a> Quickly send scaled down pictures by email only via DnD</li> <li><a href="http://incubator.apache.org/hama">Apache Hama - a parallel matrix computational package based on Hadoop.</a></li> + <li><a href="http://newton.codecauldron.org/">Newton</a> - Distributed OSGi framework</li> <!-- <li><a href=""></a></li> --> </ul> </section> crossley< at >apache.org 2008-11-24T04:33:48 http://comments.gmane.org/gmane.text.xml.forrest.cvs/9465 Author: crossley Date: Sun Nov 23 19:28:39 2008 New Revision: 720106 URL: http://svn.apache.org/viewvc?rev=720106&view=rev Log: Use the a.o/events/ promotion resources, rather than link to specific events. Modified: forrest/trunk/site-author/skinconf.xml Modified: forrest/trunk/site-author/skinconf.xml URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/skinconf.xml?rev=720106&r1=720105&r2=720106&view=diff ============================================================================== --- forrest/trunk/site-author/skinconf.xml (original) +++ forrest/trunk/site-author/skinconf.xml Sun Nov 23 19:28:39 2008 < at >< at > -269,9 +269,9 < at >< at > <height>22</height> </credit> <credit box-location="alt2"> - <name>ApacheCon US 2008</name> - <url>http://us.apachecon.com/</url> - <image>http://apache.org/ads/ApacheCon/2008-usa-125x125.png</image> + <name>ApacheCon</name> + <url>http://www.apache.org/events/current-event.html</url> + <image>http://www.apache.org/events/current-event-125x125.png</image> <width>125</width> <height>125</height> </credit> crossley< at >apache.org 2008-11-24T03:28:40 http://comments.gmane.org/gmane.text.xml.forrest.cvs/9464 Author: crossley Date: Sun Nov 23 18:55:29 2008 New Revision: 720103 URL: http://svn.apache.org/viewvc?rev=720103&view=rev Log: Forrestbot deploy.scp workstage now reports which files were transferred. Modified: forrest/trunk/site-author/status.xml forrest/trunk/tools/forrestbot/core/deploy.xml Modified: forrest/trunk/site-author/status.xml URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/status.xml?rev=720103&r1=720102&r2=720103&view=diff ============================================================================== --- forrest/trunk/site-author/status.xml (original) +++ forrest/trunk/site-author/status.xml Sun Nov 23 18:55:29 2008 < at >< at > -153,6 +153,9 < at >< at > </action> <!-- 2008-11 --> <action context="code" type="update" dev="DC"> + Forrestbot deploy.scp workstage now reports which files were transferred. + </action> + <action context="code" type="update" dev="DC"> Updated to Jing-20081028 release from <link href="http://code.google.com/p/jing-trang/">http://code.google.com/p/jing-trang/</link> </action> Modified: forrest/trunk/tools/forrestbot/core/deploy.xml URL: http://svn.apache.org/viewvc/forrest/trunk/tools/forrestbot/core/deploy.xml?rev=720103&r1=720102&r2=720103&view=diff ============================================================================== --- forrest/trunk/tools/forrestbot/core/deploy.xml (original) +++ forrest/trunk/tools/forrestbot/core/deploy.xml Sun Nov 23 18:55:29 2008 < at >< at > -77,7 +77,7 < at >< at > </then> </if> <scp todir="${deploy.scp.dest}" - keyfile="${deploy.scp.keyfile}" passphrase="${deploy.scp.passphrase}"> + keyfile="${deploy.scp.keyfile}" passphrase="${deploy.scp.passphrase}" verbose="true"> <fileset dir="${build.site-dir}"> <modified/> </fileset> crossley< at >apache.org 2008-11-24T02:55:29 http://comments.gmane.org/gmane.text.xml.forrest.cvs/9463 Author: crossley Date: Sun Nov 23 18:27:53 2008 New Revision: 720102 URL: http://svn.apache.org/viewvc?rev=720102&view=rev Log: Update Jsch license. Added: forrest/trunk/tools/ant/lib/jsch-0.1.39.jar.license.txt (contents, props changed) - copied, changed from r719458, forrest/trunk/tools/ant/lib/jsch-0.1.28.jar.license.txt Removed: forrest/trunk/tools/ant/lib/jsch-0.1.28.jar.license.txt Copied: forrest/trunk/tools/ant/lib/jsch-0.1.39.jar.license.txt (from r719458, forrest/trunk/tools/ant/lib/jsch-0.1.28.jar.license.txt) URL: http://svn.apache.org/viewvc/forrest/trunk/tools/ant/lib/jsch-0.1.39.jar.license.txt?p2=forrest/trunk/tools/ant/lib/jsch-0.1.39.jar.license.txt&p1=forrest/trunk/tools/ant/lib/jsch-0.1.28.jar.license.txt&r1=719458&r2=720102&rev=720102&view=diff ============================================================================== --- forrest/trunk/tools/ant/lib/jsch-0.1.28.jar.license.txt (original) +++ forrest/trunk/tools/ant/lib/jsch-0.1.39.jar.license.txt Sun Nov 23 18:27:53 2008 < at >< at > -2,7 +2,7 < at >< at > over to a BSD-style license. ------------------------------------------------------------------------------ -Copyright (c) 2002,2003,2004,2005,2006 Atsuhiko Yamanaka, JCraft,Inc. +Copyright (c) 2002,2003,2004,2005,2006,2007,2008 Atsuhiko Yamanaka, JCraft,Inc. All rights reserved. Redistribution and use in source and binary forms, with or without Propchange: forrest/trunk/tools/ant/lib/jsch-0.1.39.jar.license.txt ------------------------------------------------------------------------------ svn:eol-style = native Propchange: forrest/trunk/tools/ant/lib/jsch-0.1.39.jar.license.txt ------------------------------------------------------------------------------ svn:mergeinfo = crossley< at >apache.org 2008-11-24T02:27:54 http://comments.gmane.org/gmane.text.xml.forrest.cvs/9462 Author: crossley Date: Thu Nov 20 20:10:17 2008 New Revision: 719471 URL: http://svn.apache.org/viewvc?rev=719471&view=rev Log: Upgraded Jing from Jing-20030619 to new Jing-20081028 from http://code.google.com/p/jing-trang/ This should also fix FOR-984. Added: forrest/trunk/lib/core/jing-20081028.jar (with props) forrest/trunk/lib/core/jing-20081028.jar.license.txt (contents, props changed) - copied, changed from r719458, forrest/trunk/lib/core/jing-20030619.jar.license.txt Removed: forrest/trunk/lib/core/jing-20030619.jar forrest/trunk/lib/core/jing-20030619.jar.license.txt Modified: forrest/trunk/site-author/status.xml Added: forrest/trunk/lib/core/jing-20081028.jar URL: http://svn.apache.org/viewvc/forrest/trunk/lib/core/jing-20081028.jar?rev=719471&view=auto ============================================================================== Binary file - no diff available. Propchange: forrest/trunk/lib/core/jing-20081028.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Copied: forrest/trunk/lib/core/jing-20081028.jar.license.txt (from r719458, forrest/trunk/lib/core/jing-20030619.jar.license.txt) URL: http://svn.apache.org/viewvc/forrest/trunk/lib/core/jing-20081028.jar.license.txt?p2=forrest/trunk/lib/core/jing-20081028.jar.license.txt&p1=forrest/trunk/lib/core/jing-20030619.jar.license.txt&r1=719458&r2=719471&rev=719471&view=diff ============================================================================== --- forrest/trunk/lib/core/jing-20030619.jar.license.txt (original) +++ forrest/trunk/lib/core/jing-20081028.jar.license.txt Thu Nov 20 20:10:17 2008 < at >< at > -1,4 +1,4 < at >< at > -Copyright (c) 2001, 2002 Thai Open Source Software Center Ltd +Copyright (c) 2001-2003, 2008 Thai Open Source Software Center Ltd All rights reserved. Redistribution and use in source and binary forms, with or without Propchange: forrest/trunk/lib/core/jing-20081028.jar.license.txt ------------------------------------------------------------------------------ svn:eol-style = native Propchange: forrest/trunk/lib/core/jing-20081028.jar.license.txt ------------------------------------------------------------------------------ svn:mergeinfo = Modified: forrest/trunk/site-author/status.xml URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/status.xml?rev=719471&r1=719470&r2=719471&view=diff ============================================================================== --- forrest/trunk/site-author/status.xml (original) +++ forrest/trunk/site-author/status.xml Thu Nov 20 20:10:17 2008 < at >< at > -151,6 +151,11 < at >< at > Added document to facilitate <link href="site:upgrading_09">upgrading to v0.9</link> </action> +<!-- 2008-11 --> + <action context="code" type="update" dev="DC"> + Updated to Jing-20081028 release from + <link href="http://code.google.com/p/jing-trang/">http://code.google.com/p/jing-trang/</link> + </action> <!-- 2008-10 --> <action context="code" type="update" dev="DC" importance="high"> Updated to Apache-Ant-1.7.1 release. crossley< at >apache.org 2008-11-21T04:10:18 http://comments.gmane.org/gmane.text.xml.forrest.cvs/9461 Author: twilliams Date: Thu Nov 20 18:39:58 2008 New Revision: 719454 URL: http://svn.apache.org/viewvc?rev=719454&view=rev Log: After reading FOR-1071 and FOR-1075 I gather this was just an oversight. Added: forrest/trunk/main/template-sites/benchmark/src/documentation/resources/schema/symbols-project-v10.ent Added: forrest/trunk/main/template-sites/benchmark/src/documentation/resources/schema/symbols-project-v10.ent URL: http://svn.apache.org/viewvc/forrest/trunk/main/template-sites/benchmark/src/documentation/resources/schema/symbols-project-v10.ent?rev=719454&view=auto ============================================================================== --- forrest/trunk/main/template-sites/benchmark/src/documentation/resources/schema/symbols-project-v10.ent (added) +++ forrest/trunk/main/template-sites/benchmark/src/documentation/resources/schema/symbols-project-v10.ent Thu Nov 20 18:39:58 2008 < at >< at > -0,0 +1,26 < at >< at > +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<!-- Typical invocation: + <!ENTITY % symbols-project + PUBLIC "-//Apache Forrest//ENTITIES Symbols Project v1.0//EN" + "symbols-project-v10.ent"> + %symbols-project; +--> +<!ENTITY myp "My Project Name"> +<!ENTITY myp-s "<strong>My Project Name</strong>"> +<!ENTITY myp-t "My Project Name&trade;"> twilliams< at >apache.org 2008-11-21T02:39:58 http://comments.gmane.org/gmane.text.xml.forrest.cvs/9460 Author: crossley Date: Sat Nov 15 00:33:11 2008 New Revision: 714223 URL: http://svn.apache.org/viewvc?rev=714223&view=rev Log: ApacheCon 2009. Modified: forrest/trunk/tools/logos/projects.xml Modified: forrest/trunk/tools/logos/projects.xml URL: http://svn.apache.org/viewvc/forrest/trunk/tools/logos/projects.xml?rev=714223&r1=714222&r2=714223&view=diff ============================================================================== --- forrest/trunk/tools/logos/projects.xml (original) +++ forrest/trunk/tools/logos/projects.xml Sat Nov 15 00:33:11 2008 < at >< at > -18,6 +18,54 < at >< at > <projects> <!-- ApacheCon images. See www.apache.org/ads/ApacheCon/ --> <project + id="apachecon-eu-2009" + logo="apachecon" + name="Europe" + name-2="2009" + name-3="March 23-27" + name-4="Amsterdam" + name-5="The Netherlands" + bgcolor="#c98d44" + color="white" + color-2="black" + scale="normal" /> + <project + id="apachecon-eu-2009-wide" + logo="apachecon-wide" + name="Europe" + name-2="2009" + name-3="March 23-27" + name-4="Amsterdam" + name-5="The Netherlands" + bgcolor="#c98d44" + color="white" + color-2="black" + scale="normal" /> + <project + id="apachecon-us-2009" + logo="apachecon" + name="US" + name-2="2009" + name-3="November 2-6" + name-4="Oakland" + name-5="California, USA" + bgcolor="#4169e1" + color="white" + color-2="black" + scale="normal" /> + <project + id="apachecon-us-2009-wide" + logo="apachecon-wide" + name="US" + name-2="2009" + name-3="November 2-6" + name-4="Oakland" + name-5="California, USA" + bgcolor="#4169e1" + color="white" + color-2="black" + scale="normal" /> + <project id="apachecon-eu-2008" logo="apachecon" name="Europe" crossley< at >apache.org 2008-11-15T08:33:11 http://comments.gmane.org/gmane.text.xml.forrest.cvs/9459 Author: thorsten Date: Thu Nov 6 17:14:44 2008 New Revision: 712030 URL: http://svn.apache.org/viewvc?rev=712030&view=rev Log: Updating link generation to actually generate the correct link. Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/stylesheets/solrQueryResult-to-xdocs.xsl Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/stylesheets/solrQueryResult-to-xdocs.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/stylesheets/solrQueryResult-to-xdocs.xsl?rev=712030&r1=712029&r2=712030&view=diff ============================================================================== --- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/stylesheets/solrQueryResult-to-xdocs.xsl (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/stylesheets/solrQueryResult-to-xdocs.xsl Thu Nov 6 17:14:44 2008 < at >< at > -64,7 +64,7 < at >< at > <section id="result-{$id}"> <title><xsl:value-of select="str[< at >name='title']"/></title> <p> - <a href="{concat(substring-before($id,'.xml'),'.html')}"> + <a href="{concat(substring-after(substring-before($id,'.xml'),':'),'.html')}"> <xsl:value-of select="str[< at >name='title']"/> </a> </p> thorsten< at >apache.org 2008-11-07T01:14:44 http://comments.gmane.org/gmane.text.xml.forrest.cvs/9458 Author: thorsten Date: Thu Nov 6 17:12:42 2008 New Revision: 712029 URL: http://svn.apache.org/viewvc?rev=712029&view=rev Log: Updating solr result document matching Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/stylesheets/solrResult-to-xdocs.xsl Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/stylesheets/solrResult-to-xdocs.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/stylesheets/solrResult-to-xdocs.xsl?rev=712029&r1=712028&r2=712029&view=diff ============================================================================== --- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/stylesheets/solrResult-to-xdocs.xsl (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.solr/resources/stylesheets/solrResult-to-xdocs.xsl Thu Nov 6 17:12:42 2008 < at >< at > -21,7 +21,7 < at >< at > <document> <header> <xsl:choose> - <xsl:when test="not(result/< at >status='0')"> + <xsl:when test="not(response/lst[< at >name='responseHeader']/int[< at >name='status']/text()='0')"> <title>error in solr operation </title> </xsl:when> <xsl:otherwise> < at >< at > -30,11 +30,11 < at >< at > </xsl:choose> </header> <body> - <xsl:apply-templates select="result"/> + <xsl:apply-templates select="response"/> </body> </document> </xsl:template> - <xsl:template match="result"> + <xsl:template match="response"> <section id="result"> <title>solr server response</title> <p> < at >< at > -42,7 +42,7 < at >< at > <xsl:value-of select="$command"/> </p> <xsl:choose> - <xsl:when test="not(< at >status='0')"> + <xsl:when test="not(lst[< at >name='responseHeader']/int[< at >name='status']/text()='0')"> <warning> There was a problem: <xsl:value-of select="."/> thorsten< at >apache.org 2008-11-07T01:12:42 http://comments.gmane.org/gmane.text.xml.forrest.cvs/9457 Author: thorsten Date: Fri Oct 31 07:01:37 2008 New Revision: 709421 URL: http://svn.apache.org/viewvc?rev=709421&view=rev Log: Adding a sax implementation again since both other are slower then the former version. The sax version needs still some attention Added: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/transformation/DispatcherWrapperTransformer.java - copied, changed from r708186, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/transformation/DispatcherTransformer.java Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/spring/dispatcher-context.xml forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/transformation/DispatcherTransformer.java Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/spring/dispatcher-context.xml URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/spring/dispatcher-context.xml?rev=709421&r1=709420&r2=709421&view=diff ============================================================================== --- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/spring/dispatcher-context.xml (original) +++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/spring/dispatcher-context.xml Fri Oct 31 07:01:37 2008 < at >< at > -18,21 +18,28 < at >< at > limitations under the License. --> <beans> - <bean id="dispatcher" + <bean id="dispatcher" scope="prototype" name="org.apache.cocoon.transformation.Transformer/dispatcher" class="org.apache.forrest.dispatcher.transformation.DispatcherTransformer"> <property name="manager" ref="org.apache.avalon.framework.service.ServiceManager"/> <property name="config" ref="config"/> - <property name="xpathSupport" value="enhanced"/> + <property name="xpathSupport" value="basic"/> </bean> - <bean id="dispatcherEnhanced" - name="org.apache.cocoon.transformation.Transformer/dispatcherEnhanced" - class="org.apache.forrest.dispatcher.transformation.DispatcherTransformer"> + <bean id="dispatcherWrapper" scope="prototype" + name="org.apache.cocoon.transformation.Transformer/dispatcherWrapper" + class="org.apache.forrest.dispatcher.transformation.DispatcherWrapperTransformer"> + <property name="manager" ref="org.apache.avalon.framework.service.ServiceManager"/> + <property name="config" ref="config"/> + <property name="xpathSupport" value="basic"/> + </bean> + <bean id="dispatcherWrapperEnhanced" scope="prototype" + name="org.apache.cocoon.transformation.Transformer/dispatcherWrapperEnhanced" + class="org.apache.forrest.dispatcher.transformation.DispatcherWrapperTransformer"> <property name="manager" ref="org.apache.avalon.framework.service.ServiceManager"/> <property name="config" ref="config"/> <property name="xpathSupport" value="enhanced"/> </bean> - <bean id="config" + <bean id="config" scope="prototype" class="org.apache.forrest.dispatcher.config.WritableDispatcherBean"> <property name="allowXmlProperties" value="true"/> <property name="shrink" value="false"/> Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/transformation/DispatcherTransformer.java URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/transformation/DispatcherTransformer.java?rev=709421&r1=709420&r2=709421&view=diff ============================================================================== --- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/transformation/DispatcherTransformer.java (original) +++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/transformation/DispatcherTransformer.java Fri Oct 31 07:01:37 2008 < at >< at > -23,8 +23,13 < at >< at > import java.io.InputStream; import java.io.Serializable; import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; import java.util.Map; +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamReader; import javax.xml.transform.TransformerException; import javax.xml.transform.TransformerFactory; import javax.xml.transform.TransformerFactoryConfigurationError; < at >< at > -38,6 +43,15 < at >< at > import org.apache.avalon.framework.service.ServiceException; import org.apache.avalon.framework.service.ServiceManager; import org.apache.axiom.attachments.utils.IOUtils; +import org.apache.axiom.om.OMAbstractFactory; +import org.apache.axiom.om.OMAttribute; +import org.apache.axiom.om.OMDocument; +import org.apache.axiom.om.OMElement; +import org.apache.axiom.om.OMFactory; +import org.apache.axiom.om.OMNamespace; +import org.apache.axiom.om.OMNode; +import org.apache.axiom.om.impl.builder.StAXOMBuilder; +import org.apache.commons.io.output.ByteArrayOutputStream; import org.apache.cocoon.ProcessingException; import org.apache.cocoon.caching.CacheableProcessingComponent; import org.apache.cocoon.environment.SourceResolver; < at >< at > -47,32 +61,33 < at >< at > import org.apache.excalibur.source.SourceException; import org.apache.excalibur.source.SourceValidity; import org.apache.excalibur.xml.sax.SAXParser; +import org.apache.forrest.dispatcher.api.Contract; +import org.apache.forrest.dispatcher.api.Resolver; import org.apache.forrest.dispatcher.api.Structurer; import org.apache.forrest.dispatcher.config.DispatcherBean; import org.apache.forrest.dispatcher.config.WritableDispatcherBean; +import org.apache.forrest.dispatcher.exception.ContractException; import org.apache.forrest.dispatcher.exception.DispatcherException; +import org.apache.forrest.dispatcher.factories.ContractFactory; import org.apache.forrest.dispatcher.impl.CocoonResolver; import org.apache.forrest.dispatcher.impl.XMLStructurer; import org.apache.forrest.dispatcher.impl.XMLStructurerAxiom; +import org.apache.forrest.dispatcher.impl.helper.AXIOMXPathCreate; import org.apache.forrest.dispatcher.impl.helper.Captions; import org.apache.forrest.dispatcher.impl.helper.StAX; +import org.apache.forrest.dispatcher.impl.helper.StreamHelper; import org.apache.forrest.dispatcher.impl.helper.XMLProperties; +import org.jaxen.JaxenException; +import org.xml.sax.Attributes; import org.xml.sax.InputSource; import org.xml.sax.SAXException; /** - * A cocoon transformer wrapper class for the dispatcher. + * A cocoon transformer class for the dispatcher. * - * The actual work will be done in the core code of the dispatcher which is - * based on StAX and AXIOM. - * - * <li>In this transformer we doing principal configuration to adopt the - * dispatcher to the cocoon environment ({< at >link #configure(Configuration)} and ( - * {< at >link #setup(SourceResolver, Map, String, Parameters)} <li>We reusing cocoon - * caching mechanism ({< at >link #getKey()} and {< at >link #getValidity()} to cache the - * dispatcher. <li>We record the SAX events ({< at >link #startDocument()} to later - * {< at >link #endDocument()} passing them as Stream to the Structurer - * implementation we have chosen. + * Unlike the wrapper this class will do the actual work and only reuse the + * contract handling from the core. This class is nearly the same as we had + * before just switching DOM for StAX/AXIOM. * * < at >version 1.0 * < at >< at > -80,6 +95,8 < at >< at > public class DispatcherTransformer extends AbstractSAXTransformer implements Disposable, CacheableProcessingComponent, URIResolver { + private static final String PATH_PREFIX = "result"; + /** * The requested format. * <p> < at >< at > -137,17 +154,21 < at >< at > /** * Main configuration bean of the dispatcher. * <p> - * This config will control things like <li>contract prefixes/suffixes <li> + * This config will control things like + * <li>contract prefixes/suffixes + * <li> * resolver to use */ private WritableDispatcherBean config; /** - * Cocoon 2.2 compatible method. - * Allow that the ServiceManager is be set via e.g. spring - * < at >param manager manger to use in the context + * Cocoon 2.2 compatible method. Allow that the ServiceManager is be set via + * e.g. spring + * + * < at >param manager + * manger to use in the context */ - public void setManager(ServiceManager manager){ + public void setManager(ServiceManager manager) { this.manager = manager; } < at >< at > -162,7 +183,8 < at >< at > private String xpathSupport; /** - * < at >param xpathSupport the xpathSupport to set + * < at >param xpathSupport + * the xpathSupport to set */ public synchronized void setXpathSupport(String xpathSupport) { this.xpathSupport = xpathSupport; < at >< at > -184,6 +206,34 < at >< at > */ private static final String DEFAULT_VARIABLES = "defaultVariables"; + /** + * preparing the parser that will pick up the result and pass it to the + * consumer again. + */ + private SAXParser parser = null; + private OMFactory factory; + private ContractFactory contractRep; + + private boolean insideProperties = false; + private boolean includeNodes = true; + private OMElement root; + + private OMElement pathNode; + + private Resolver resolverDispatcher; + + private Contract contract; + + private HashMap<String, Object> map; + + private HashMap<String, Object> localParams; + + private boolean allowXml; + + private String currentProperty; + + private InputStream dataStream; + /* * < at >see * org.apache.cocoon.transformation.AbstractSAXTransformer#configure(org.apache < at >< at > -195,37 +245,43 < at >< at > // parameters here config = new WritableDispatcherBean(); config.setStaxHelper(new StAX()); - boolean allowXml = configuration.getChild("allowXml").getValueAsBoolean( + allowXml = configuration.getChild("allowXml").getValueAsBoolean( false); config.setAllowXmlProperties(allowXml); contractUriPrefix = configuration.getChild("contractUriPrefix").getValue( "cocoon://resolve.contract."); - config.setContractUriSufix(configuration.getChild("contractUriSufix").getValue("")); + config.setContractUriSufix(configuration.getChild("contractUriSufix") + .getValue("")); xpathSupport = configuration.getChild("xpathSupport").getValue("basic"); boolean shrink = configuration.getChild("shrink").getValueAsBoolean(true); config.setShrink(shrink); setNewTransformerFactory(); } - + /** - * Cocoon 2.2 compatible method. - * Allow that the WritableDispatcherBean is be set via e.g. spring - * < at >param config the configuration to use. + * Cocoon 2.2 compatible method. Allow that the WritableDispatcherBean is be + * set via e.g. spring + * + * < at >param config + * the configuration to use. */ public void setConfig(WritableDispatcherBean config) { this.config = config; - if(config.getTransFact()==null){ + if (config.getTransFact() == null) { setNewTransformerFactory(); } contractUriPrefix = config.getContractUriPrefix(); } + private void setNewTransformerFactory() throws TransformerFactoryConfigurationError { - // FIXME: is this the best way to get an instance in cocoon? + // Is this the best way to get an instance in cocoon? TransformerFactory tfactory = TransformerFactory.newInstance(); tfactory.setURIResolver(this); tfactory.setErrorListener(new TraxErrorHandler(getLogger())); config.setTransFact(tfactory); + this.factory = OMAbstractFactory.getOMFactory(); + this.contractRep = new ContractFactory(config); } // we do all the heavy stuff later and only prepare the basics here, < at >< at > -238,8 +294,9 < at >< at > .getParameter(DISPATCHER_REQUEST_ATTRIBUTE, null); this.cacheKey = parameters.getParameter(CACHE_PARAMETER, null); if (null == this.cacheKey) - getLogger().warn("Caching not activated! Declare the CACHE_KEY_PARAMETER=" - + CACHE_PARAMETER + " in your sitemap."); + getLogger().warn( + "Caching not activated! Declare the CACHE_KEY_PARAMETER=" + + CACHE_PARAMETER + " in your sitemap."); this.validityFile = parameters.getParameter(VALIDITY_PARAMETER, null); this.validityChecking = parameters.getParameter( VALIDITY_OVERRIDE_PARAMETER, ""); < at >< at > -263,48 +320,331 < at >< at > throw new ProcessingException(error); } this.cacheKey += requestedFormat; - if (null == m_resolver){ + if (null == m_resolver) { try { m_resolver = (org.apache.excalibur.source.SourceResolver) manager .lookup(SourceResolver.ROLE); - config.setResolver(new CocoonResolver(m_resolver)); + resolverDispatcher = new CocoonResolver(m_resolver); + config.setResolver(resolverDispatcher); } catch (ServiceException e) { throw new ProcessingException(e); } } } + + /* + * old transformer link < at >see + * http://svn.apache.org/viewvc?view=rev&revision=694101 + * + * < at >see + * org.apache.cocoon.transformation.AbstractSAXTransformer#startElement(String + * uri, String name, String raw, Attributes attr) + */ + public void startElement(String uri, String name, String raw, Attributes attr) + throws SAXException { + // Process start element event + if (Captions.NS.equals(uri)) { + try { + /* + * We are in the dispatcher ns. + */ + getLogger().debug("Starting dispatcher element: " + raw); + if (Captions.STRUCTURE_ELEMENT.equals(name)) { + structurerProcessingStart(attr); + } else if (Captions.HOOK_ELEMENT.equals(name) && this.includeNodes) { + hookProcessingStart(name, raw, attr); + } else if (Captions.CONTRACT_ELEMENT.equals(name) && this.includeNodes) { + contractProcessingStart(attr); + } else if (Captions.PROPERTY_ELEMENT.equals(name) && this.includeNodes) { + this.insideProperties = true; + propertyProcessingStart(uri, name, raw, attr); + } + } catch (Exception e) { + throw new SAXException(e); + } + } else { + if (!this.insideProperties && this.includeNodes ){ + super.startElement(uri, name, raw, attr); + } + } + + } -/* - * Here we just start recording to use them later on. - * - * In the future we may want to implement a sax based - * structurer implementation again. - * - * old transformer link < at >see - * http://svn.apache.org/viewvc?view=rev&revision=694101 - * - * < at >see org.apache.cocoon.transformation.AbstractSAXTransformer#startDocument() - */ - public void startDocument() throws SAXException { - // just start the recording - startSerializedXMLRecording(null); + public void endElement(String uri, String name, String raw) + throws SAXException { + getLogger().debug("Ending element: " + raw); + if (Captions.NS.equals(uri)){ + try { + if (Captions.STRUCTURE_ELEMENT.equals(name)){ + structurerProcessingEnd(raw); + } else if (Captions.HOOK_ELEMENT.equals(name) && this.includeNodes) { + //TODO Implement + } else if (Captions.CONTRACT_ELEMENT.equals(name) && this.includeNodes) { + contractProcessingEnd(); + } else if (Captions.PROPERTY_ELEMENT.equals(name) && this.includeNodes){ + if (allowXml){ + String property = null; + try { + super.endElement(uri, name, raw); + property = super.endSerializedXMLRecording(); + } catch (ProcessingException e) { + throw new SAXException(e); + } + if (null != property){ + localParams.put(currentProperty, property.getBytes()); + } + } + } + } catch (ContractException e) { + throw new SAXException (e); + } catch (IOException e) { + throw new SAXException (e); + } catch (JaxenException e) { + throw new SAXException (e); + } catch (XMLStreamException e) { + throw new SAXException (e); + } + }else if (!this.insideProperties && this.includeNodes){ + super.endElement(uri, name, raw); + } + } + + private void contractProcessingEnd() throws ContractException, IOException, JaxenException, XMLStreamException { + InputStream resultStream = contract.execute(dataStream, localParams); + StreamHelper.closeStream(dataStream); + processContractResult(resultStream, pathNode); + StreamHelper.closeStream(resultStream); + } + + /** + * < at >param resultStream + * < at >param pathNode + * < at >throws XMLStreamException + * < at >throws JaxenException + */ + < at >SuppressWarnings("unchecked") + private void processContractResult(InputStream resultStream, + OMElement pathNode) throws XMLStreamException, JaxenException { + XMLStreamReader contractResultReader = config.getStaxHelper().getReader(resultStream); + StAXOMBuilder builder = new StAXOMBuilder(contractResultReader); + OMElement content = builder.getDocumentElement(); + /* + * For full blown ns support we need to get all ns from the result. This + * will be passed later to the XPath processor. + */ + Iterator<OMNamespace> ns = content.getAllDeclaredNamespaces(); + HashSet<OMNamespace> spaces = new HashSet<OMNamespace>(); + while (ns.hasNext()) { + OMNamespace space = ns.next(); + spaces.add(space); + } + Iterator<OMElement> parts = content.getChildrenWithName(qIt( + Captions.NS_CONTRACTS, Captions.PART_ELEMENT)); + while (parts.hasNext()) { + OMElement part = parts.next(); + String xpath = part.getAttributeValue(qIt(Captions.RESULT_XPATH)); + Iterator<OMNode> children = part.getChildren(); + if (xpath == null) { + while (children.hasNext()) { + OMNode child = (OMNode) children.next(); + pathNode.addChild(child); + } + } else { + xpath = PATH_PREFIX + xpath; + // we need to feed the xpathSelector with the ns we may have + AXIOMXPathCreate xpathSelector = new AXIOMXPathCreate(xpath); + + for (OMNamespace space : spaces) { + xpathSelector + .addNamespace(space.getPrefix(), space.getNamespaceURI()); + } + OMElement injectionPoint = (OMElement) xpathSelector.selectSingleNode( + root, true); + while (children.hasNext()) { + OMNode child = (OMNode) children.next(); + injectionPoint.addChild(child); + } + + } + } + } + /** + * < at >param name + * < at >return + */ + private QName qIt(String name) { + return new QName(name); + } + /** + * < at >param name + * < at >param uri + * < at >return + */ + private QName qIt(String uri,String name) { + return new QName(uri,name); + } + private void structurerProcessingEnd(String raw) { + if(includeNodes){ + + } + + } + + private void propertyProcessingStart(String uri, String name, String raw, + Attributes attr) throws SAXException { + + String id = null , value = null; + for (int i = 0; i < attr.getLength(); i++) { + String localName = attr.getLocalName(i); + String localValue = attr.getValue(i); + if (Captions.NAME_ATT.equals(localName)){ + id = localValue; + }else if(Captions.VALUE_ATT.equals(localName)){ + value = localValue; + } + } + + if (allowXml){ + // just start the recording + startSerializedXMLRecording(null); + super.startElement(uri, name, raw, attr); + currentProperty = id; + }else{ + if (id!=null && value!= null){ + localParams.put(id, new String(value)); + } + } + + } + + private void contractProcessingStart(Attributes attr) throws SAXException { + String name = "", data = null; + try { + for (int i = 0; i < attr.getLength(); i++) { + String localName = attr.getLocalName(i); + String value = attr.getValue(i); + if (Captions.NAME_ATT.equals(localName)) { + name = value; + } else if (Captions.DATA_ATT.equals(localName)) { + data = value; + } + } + dataStream = null; + if (null != data && !data.equals("")) { + dataStream = resolverDispatcher.resolve(data); + } + contract = contractRep.resolve(name); + localParams = new HashMap<String, Object>(map); + + } catch (Exception e) { + String error = DispatcherException.ERROR_500 + "\n" + + "component: ContractBean" + "\n" + + "message: Could not setup contractBean." + "\n" + "\n\n" + + "dispatcherErrorStack:\n" + e; + getLogger().error(error); + throw new SAXException(error); + } + + } + + private void hookProcessingStart(String name, String raw, Attributes attr) { + OMElement element = factory.createOMElement(name, Captions.NS, "forrest"); + for (int i = 0; i < attr.getLength(); i++) { + String localName = attr.getLocalName(i); + String value = attr.getValue(i); + OMAttribute attribute = factory.createOMAttribute(localName, null, value); + element.addAttribute(attribute); + } + pathNode.addChild(element); + } + + /** + * view type="?" Here we check which format we have in the view. That should + * be extended to matching the requested format + * + * < at >param attr + * < at >throws JaxenException + * < at >throws SAXException + */ + private void structurerProcessingStart(Attributes attr) + throws DispatcherException { + String m_type = "", path = ""; + for (int i = 0; i < attr.getLength(); i++) { + String localName = attr.getLocalName(i); + String value = attr.getValue(i); + if (localName.equals(Captions.TYPE_ATT)) { + m_type = value; + } + if (localName.equals(Captions.HOOKS_ATT)) { + // adding the default path + boolean startsWithRoot = "/".equals(String.valueOf(value.charAt(0))); + if (!startsWithRoot) { + value = "/" + value; + } else if (value.length() == 1 && startsWithRoot) { + value = ""; + } + path += value; + } + } + if (requestedFormat.equals(m_type)) { + try { + // need to get the properties for this uri + map = new HashMap<String, Object>(); + String propertyURI = "cocoon://" + requestId + ".props"; + // get the source representation of the propertyURI + Source propsSource = m_resolver.resolveURI(propertyURI); + if (propsSource != null) { + // get the stream + InputStream stream = new BufferedInputStream(propsSource + .getInputStream()); + /* + * we need either just the bytes of the stream (if we allow xml + * properties) or we need to process it extracting the properties. + */ + if (config.isAllowXmlProperties()) { + // get the bytes from the stream + byte[] properties = IOUtils.getStreamAsByteArray(stream); + /* + * add the bytes to the properties map later on they will be picked + * up and parsed to a dom node. + */ + map.put(DEFAULT_VARIABLES, properties); + } else { + // extract the properties of the in coming stream + XMLProperties.parseProperties(stream, map); + } + // release source - you need to ALWAYS do this! + release(propsSource); + } + BufferedInputStream stream = null; + ByteArrayOutputStream out = new ByteArrayOutputStream(); + /* + * Preparing the model by creating a root document/element. Afterward we + * need to strip the root element again. + */ + OMDocument doc = factory.createOMDocument(); + root = factory.createOMElement(PATH_PREFIX, null); + doc.addChild(root); + AXIOMXPathCreate xpath = new AXIOMXPathCreate("/"+PATH_PREFIX + path); + pathNode = (OMElement) xpath.selectSingleNode(root, true); + this.includeNodes = true; + } catch (Exception e) { + throw new DispatcherException(e); + } + } else { + pathNode = null; // unset path because we do not process the node + this.includeNodes = false; + } + } /* - * Here we pick up the recoreder result and start the - * processing on it. + * Here we pick up the recoreder result and start the processing on it. * * < at >see org.apache.cocoon.transformation.AbstractSAXTransformer#endDocument() */ public void endDocument() throws SAXException { - // the recorded document we just streamed - String document = null; - try { - // request the information from the recorder - document = super.endSerializedXMLRecording(); - } catch (ProcessingException e) { - throw new SAXException(e); - } + // start structurer routine Structurer structurer = null; // need to get the properties for this uri < at >< at > -314,28 +654,26 < at >< at > // get the source representation of the propertyURI Source propsSource = m_resolver.resolveURI(propertyURI); if (propsSource != null) { - // get the stream + // get the stream InputStream stream = new BufferedInputStream(propsSource .getInputStream()); /* - * we need either just the bytes of the stream (if we allow - * xml properties) or we need to process it extracting the - * properties. + * we need either just the bytes of the stream (if we allow xml + * properties) or we need to process it extracting the properties. */ if (config.isAllowXmlProperties()) { // get the bytes from the stream byte[] properties = IOUtils.getStreamAsByteArray(stream); /* - * add the bytes to the properties map - * later on they will be picked up and - * parsed to a dom node. + * add the bytes to the properties map later on they will be picked up + * and parsed to a dom node. */ map.put(DEFAULT_VARIABLES, properties); } else { // extract the properties of the in coming stream XMLProperties.parseProperties(stream, map); } - // release source - you need to ALWAYS do this! + // release source - you need to ALWAYS do this! release(propsSource); } } catch (Exception e) { < at >< at > -344,26 +682,29 < at >< at > // which implementation do we want if (xpathSupport.equals("enhanced")) { /* - * The axiom implementation is an object model - * approach to StAX. It allows you a dom like navigation - * (allocate xpath nodes), adding of child elements in - * this xpath statement and many more. + * The axiom implementation is an object model approach to StAX. It allows + * you a dom like navigation (allocate xpath nodes), adding of child + * elements in this xpath statement and many more. */ - structurer = new XMLStructurerAxiom((DispatcherBean)config, map); + structurer = new XMLStructurerAxiom((DispatcherBean) config, map); } else { /* - * The stax implementationis 100% StAX even the generation - * of the resulting document is done with StAX. - * However it does not offer real support of xpath expressions. + * The stax implementationis 100% StAX even the generation of the + * resulting document is done with StAX. However it does not offer real + * support of xpath expressions. */ - structurer = new XMLStructurer((DispatcherBean)config, map); + structurer = new XMLStructurer((DispatcherBean) config, map); } - /* - * preparing the parser that will pick up the result and - * pass it to the consumer again. - */ - SAXParser parser = null; + try { + // the recorded document we just streamed + String document = null; + try { + // request the information from the recorder + document = super.endSerializedXMLRecording(); + } catch (ProcessingException e) { + throw new SAXException(e); + } // get the result of the structurer as stream InputStream result = structurer.execute(new BufferedInputStream( new ByteArrayInputStream(document.getBytes())), requestedFormat); < at >< at > -377,7 +718,7 < at >< at > throw new SAXException(e); } finally { if (null != parser) { - // release parser - you need to ALWAYS do this! + // release parser - you need to ALWAYS do this! manager.release(parser); } } < at >< at > -456,9 +797,11 < at >< at > } - /* + /* * From URIResolver, copied from TraxProcessor - * < at >see javax.xml.transform.URIResolver#resolve(java.lang.String, java.lang.String) + * + * < at >see javax.xml.transform.URIResolver#resolve(java.lang.String, + * java.lang.String) */ public javax.xml.transform.Source resolve(String href, String base) throws TransformerException { Copied: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/transformation/DispatcherWrapperTransformer.java (from r708186, forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/transformation/DispatcherTransformer.java) URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/transformation/DispatcherWrapperTransformer.java?p2=forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/transformation/DispatcherWrapperTransformer.java&p1=forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/transformation/DispatcherTransformer.java&r1=708186&r2=709421&rev=709421&view=diff ============================================================================== --- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/transformation/DispatcherTransformer.java (original) +++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/transformation/DispatcherWrapperTransformer.java Fri Oct 31 07:01:37 2008 < at >< at > -77,7 +77,7 < at >< at > * < at >version 1.0 * */ -public class DispatcherTransformer extends AbstractSAXTransformer implements +public class DispatcherWrapperTransformer extends AbstractSAXTransformer implements Disposable, CacheableProcessingComponent, URIResolver { /** < at >< at > -184,6 +184,11 < at >< at > */ private static final String DEFAULT_VARIABLES = "defaultVariables"; + /** + * preparing the parser that will pick up the result and + * pass it to the consumer again. + */ + SAXParser parser = null; /* * < at >see * org.apache.cocoon.transformation.AbstractSAXTransformer#configure(org.apache < at >< at > -297,14 +302,7 < at >< at > * < at >see org.apache.cocoon.transformation.AbstractSAXTransformer#endDocument() */ public void endDocument() throws SAXException { - // the recorded document we just streamed - String document = null; - try { - // request the information from the recorder - document = super.endSerializedXMLRecording(); - } catch (ProcessingException e) { - throw new SAXException(e); - } + // start structurer routine Structurer structurer = null; // need to get the properties for this uri < at >< at > -358,19 +356,23 < at >< at > */ structurer = new XMLStructurer((DispatcherBean)config, map); } - /* - * preparing the parser that will pick up the result and - * pass it to the consumer again. - */ - SAXParser parser = null; + try { - // get the result of the structurer as stream - InputStream result = structurer.execute(new BufferedInputStream( - new ByteArrayInputStream(document.getBytes())), requestedFormat); - // requesting a parser - parser = (SAXParser) manager.lookup(SAXParser.ROLE); - // adding the result to the consumer - parser.parse(new InputSource(result), super.xmlConsumer); + // the recorded document we just streamed + String document = null; + try { + // request the information from the recorder + document = super.endSerializedXMLRecording(); + } catch (ProcessingException e) { + throw new SAXException(e); + } + // get the result of the structurer as stream + InputStream result = structurer.execute(new BufferedInputStream( + new ByteArrayInputStream(document.getBytes())), requestedFormat); + // requesting a parser + parser = (SAXParser) manager.lookup(SAXParser.ROLE); + // adding the result to the consumer + parser.parse(new InputSource(result), super.xmlConsumer); } catch (DispatcherException e) { throw new SAXException(e); } catch (Exception e) { thorsten< at >apache.org 2008-10-31T14:01:37 http://comments.gmane.org/gmane.text.xml.forrest.cvs/9456 Author: thorsten Date: Fri Oct 31 07:00:36 2008 New Revision: 709419 URL: http://svn.apache.org/viewvc?rev=709419&view=rev Log: Using the basic version Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/sitemap.xmap Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/sitemap.xmap URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/sitemap.xmap?rev=709419&r1=709418&r2=709419&view=diff ============================================================================== --- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/sitemap.xmap (original) +++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/sitemap.xmap Fri Oct 31 07:00:36 2008 < at >< at > -36,7 +36,7 < at >< at > <map:parameter name="contextPath" value="{request:contextPath}"/> <map:parameter name="getRequestExtension" value="html"/> </map:generate> - <map:transform type="dispatcherEnhanced"> + <map:transform type="dispatcher"> <map:parameter name="cacheKey" value="{0}"/> <map:parameter name="validityFile" value="lm://resolve.structurer.{1}"/> thorsten< at >apache.org 2008-10-31T14:00:37 http://comments.gmane.org/gmane.text.xml.forrest.cvs/9455 Author: thorsten Date: Fri Oct 31 06:59:02 2008 New Revision: 709418 URL: http://svn.apache.org/viewvc?rev=709418&view=rev Log: Fixing bug regarding panels Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/XMLStructurerAxiom.java Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/XMLStructurerAxiom.java URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/XMLStructurerAxiom.java?rev=709418&r1=709417&r2=709418&view=diff ============================================================================== --- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/XMLStructurerAxiom.java (original) +++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/XMLStructurerAxiom.java Fri Oct 31 06:59:02 2008 < at >< at > -199,6 +199,8 < at >< at > } else if (component.getQName().equals( qIt(Captions.NS, Captions.HOOK_ELEMENT))) { processHook(component, pathNode); + } else{ + nextChildren(component, pathNode); } } < at >< at > -223,6 +225,12 < at >< at > } pathNode.addChild(element); + nextChildren(component, element); + } + + private void nextChildren(OMElement component, OMElement element) + throws DispatcherException, XMLStreamException, IOException, + JaxenException { Iterator<OMNode> childs = component.getChildren(); while (childs.hasNext()) { OMNode node = (OMNode) childs.next(); thorsten< at >apache.org 2008-10-31T13:59:02 http://comments.gmane.org/gmane.text.xml.forrest.cvs/9454 Author: thorsten Date: Mon Oct 27 07:06:32 2008 New Revision: 708187 URL: http://svn.apache.org/viewvc?rev=708187&view=rev Log: Adding simple key generating class that can be use in the jx template like: 'jx:cache-key="${Packages.org.apache.forrest.dispatcher.impl.helper.Key(cocoon.request).toString()}"' Added: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/Key.java (with props) Added: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/Key.java URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/Key.java?rev=708187&view=auto ============================================================================== --- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/Key.java (added) +++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/Key.java Mon Oct 27 07:06:32 2008 < at >< at > -0,0 +1,41 < at >< at > +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.forrest.dispatcher.impl.helper; + +import java.io.Serializable; + +import org.apache.cocoon.environment.http.HttpRequest; + +public class Key implements Serializable{ + /** + * serialVersionUID + */ + private static final long serialVersionUID = 1L; + private String key; + + public Key(HttpRequest request) { + + key = request.getRequestURI(); + + if (null != request.getQueryString()){ + key=key+request.getQueryString(); + } + } + public String toString(){ + return key; + } +} \ No newline at end of file Propchange: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/Key.java ------------------------------------------------------------------------------ svn:eol-style = native thorsten< at >apache.org 2008-10-27T14:06:32 Search the mailing list at Gmane query http://search.gmane.org/?group=$group=gmane.text.xml.forrest.cvs