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://permalink.gmane.org/gmane.text.xml.forrest.cvs/10394 <pre>Author: crossley Date: Mon Apr 8 07:12:12 2013 New Revision: 1465545 URL: http://svn.apache.org/r1465545 Log: Forrest PMC -= jeremias Modified: forrest/trunk/site-author/content/xdocs/who.xml Modified: forrest/trunk/site-author/content/xdocs/who.xml URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/who.xml?rev=1465545&amp;r1=1465544&amp;r2=1465545&amp;view=diff ============================================================================== --- forrest/trunk/site-author/content/xdocs/who.xml (original) +++ forrest/trunk/site-author/content/xdocs/who.xml Mon Apr 8 07:12:12 2013 &lt; at &gt;&lt; at &gt; -57,7 +57,7 &lt; at &gt;&lt; at &gt; &lt;li&gt;&lt;strong&gt;[AG] - Antonio Gallardo (antonio.at.apache.org)&lt;/strong&gt;&lt;/li&gt; &lt;li&gt;&lt;em&gt;[RDG] - Ross Gardler (rgardler.at.apache.org)&lt;/em&gt;&lt;/li&gt; &lt;li&gt;&lt;strong&gt;[DG] - Diwaker Gupta (diwaker.at.apache.org)&lt;/strong&gt;&lt;/li&gt; - &lt;li&gt;&lt;strong&gt;[JM] - Jeremias Maerki (jeremias.at.apache.org)&lt;/strong&gt;&lt;/li&gt; + &lt;li&gt;&lt;em&gt;[JM] - Jeremias Maerki (jeremias.at.apache.org)&lt;/em&gt;&lt;/li&gt; &lt;li&gt;&lt;strong&gt;[SKH] - Sina Khakbaz Heshmati (sina.at.apache.org)&lt;/strong&gt;&lt;/li&gt; &lt;li&gt;[SM] - Stefano Mazzocchi (stefano.at.apache.org)&lt;/li&gt; &lt;li&gt;&lt;em&gt;[GM] - Gavin McDonald (gmcdonald.at.apache.org)&lt;/em&gt;&lt;/li&gt; </pre> crossley< at >apache.org 2013-04-08T07:12:13 http://permalink.gmane.org/gmane.text.xml.forrest.cvs/10393 <pre>Author: crossley Date: Tue Mar 5 15:35:06 2013 New Revision: 1452854 URL: http://svn.apache.org/r1452854 Log: Version 0.4 of the "pdf Output" plugin now requires Forrest-0.10 Issue: FOR-1240 and FOR-1193 Modified: forrest/branches/update_cocoon_2.1.12/plugins/plugins.xml Modified: forrest/branches/update_cocoon_2.1.12/plugins/plugins.xml URL: http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/plugins/plugins.xml?rev=1452854&amp;r1=1452853&amp;r2=1452854&amp;view=diff ============================================================================== --- forrest/branches/update_cocoon_2.1.12/plugins/plugins.xml (original) +++ forrest/branches/update_cocoon_2.1.12/plugins/plugins.xml Tue Mar 5 15:35:06 2013 &lt; at &gt;&lt; at &gt; -174,15 +174,15 &lt; at &gt;&lt; at &gt; &lt;plugin name="org.apache.forrest.plugin.output.pdf" type="output" author="Apache Forrest Project" - website="http://forrest.apache.org/pluginDocs/plugins_0_90/org.apache.forrest.plugin.output.pdf" + website="http://forrest.apache.org/pluginDocs/plugins_0_100/org.apache.forrest.plugin.output.pdf" url="http://forrest.apache.org/plugins/" publish="true" - version="0.3"&gt; + version="0.4"&gt; &lt;description&gt; Enable Forrest documents to be output in PDF format. &lt;/description&gt; &lt;forrestVersionInitial&gt;0.6&lt;/forrestVersionInitial&gt; - &lt;forrestVersion&gt;0.9&lt;/forrestVersion&gt; + &lt;forrestVersion&gt;0.10&lt;/forrestVersion&gt; &lt;/plugin&gt; &lt;plugin name="org.apache.forrest.plugin.output.POD" type="output" </pre> crossley< at >apache.org 2013-03-05T15:35:07 http://permalink.gmane.org/gmane.text.xml.forrest.cvs/10392 <pre>Author: crossley Revision: 1452803 Modified property: svn:log Modified: svn:log at Tue Mar 5 15:28:46 2013 ------------------------------------------------------------------------------ --- svn:log (original) +++ svn:log Tue Mar 5 15:28:46 2013 &lt; at &gt;&lt; at &gt; -1,11 +1 &lt; at &gt;&lt; at &gt; Updated log4j to 1.2.17 and slf4j to 1.7.2 --This line, and those below, will be ignored-- - -AM lib/core/slf4j-LICENSE.txt -AM lib/core/slf4j-api-1.7.2.jar -AM lib/core/slf4j-log4j12-1.7.2.jar -AM lib/core/log4j-1.2.17.jar -A + lib/core/log4j-LICENSE.txt -AM lib/core/log4j-NOTICE.txt -M LICENSE.txt -M site-author/status.xml </pre> crossley< at >apache.org 2013-03-05T15:28:46 http://permalink.gmane.org/gmane.text.xml.forrest.cvs/10391 <pre>Author: crossley Date: Tue Mar 5 14:57:31 2013 New Revision: 1452826 URL: http://svn.apache.org/r1452826 Log: Updated our packaged Cocoon and blocks to the latest Cocoon-2.1.12-dev version. Updated Xerces to 2.11.0 and xml-apis to 1.4.01 and Batik to 1.7 Issue: FOR-1240 Added: forrest/branches/update_cocoon_2.1.12/lib/core/batik-all-1.7.jar (with props) forrest/branches/update_cocoon_2.1.12/lib/core/batik-license.txt - copied unchanged from r1452765, forrest/branches/update_cocoon_2.1.12/lib/core/batik-all-1.6.jar.license.txt forrest/branches/update_cocoon_2.1.12/lib/core/xml-commons-resolver-1.2.jar (with props) forrest/branches/update_cocoon_2.1.12/lib/core/xmlgraphics-commons-1.5.jar (with props) forrest/branches/update_cocoon_2.1.12/lib/endorsed/xercesImpl-2.11.0.jar (with props) forrest/branches/update_cocoon_2.1.12/lib/endorsed/xml-apis-1.4.01.jar (with props) forrest/branches/update_cocoon_2.1.12/lib/endorsed/xml-apis-ext-1.4.01.jar (with props) Removed: forrest/branches/update_cocoon_2.1.12/lib/core/batik-all-1.6.jar forrest/branches/update_cocoon_2.1.12/lib/core/batik-all-1.6.jar.license.txt forrest/branches/update_cocoon_2.1.12/lib/core/log4j-1.2.13.jar forrest/branches/update_cocoon_2.1.12/lib/core/log4j-1.2.13.jar.license.txt forrest/branches/update_cocoon_2.1.12/lib/core/slf4j-api-1.5.11.jar forrest/branches/update_cocoon_2.1.12/lib/core/slf4j-log4j12-1.5.11.jar forrest/branches/update_cocoon_2.1.12/lib/core/xml-commons-resolver-1.2-dev-r395116.jar forrest/branches/update_cocoon_2.1.12/lib/core/xmlgraphics-commons-1.3.1.jar forrest/branches/update_cocoon_2.1.12/lib/endorsed/xercesImpl-2.9.1.jar forrest/branches/update_cocoon_2.1.12/lib/endorsed/xml-apis-1.3.04.jar Modified: forrest/branches/update_cocoon_2.1.12/LICENSE.txt forrest/branches/update_cocoon_2.1.12/etc/review-plugin-deployment.txt forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-2.1.12-dev.jar forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-asciiart-block.jar forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-auth-block.jar forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-batik-block.jar forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-chaperon-block.jar forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-fop-block.jar forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-html-block.jar forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-linkrewriter-block.jar forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-lucene-block.jar forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-profiler-block.jar forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-template-block.jar forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-validation-block.jar forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-xsp-block.jar forrest/branches/update_cocoon_2.1.12/site-author/status.xml Modified: forrest/branches/update_cocoon_2.1.12/LICENSE.txt URL: http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/LICENSE.txt?rev=1452826&amp;r1=1452825&amp;r2=1452826&amp;view=diff ============================================================================== --- forrest/branches/update_cocoon_2.1.12/LICENSE.txt (original) +++ forrest/branches/update_cocoon_2.1.12/LICENSE.txt Tue Mar 5 14:57:31 2013 &lt; at &gt;&lt; at &gt; -210,7 +210,7 &lt; at &gt;&lt; at &gt; licenses. For more information, see: htt ---------------- These supporting products are licensed: Apache License, Version 2.0 license: lib/core/avalon-logkit-2.1.jar.license.txt -license: lib/core/batik-all-1.6.jar.license.txt +license: lib/core/batik-license.txt license: lib/core/cocoon.license.txt license: lib/core/commons-cli.license.txt license: lib/core/commons-collections.license.txt Modified: forrest/branches/update_cocoon_2.1.12/etc/review-plugin-deployment.txt URL: http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/etc/review-plugin-deployment.txt?rev=1452826&amp;r1=1452825&amp;r2=1452826&amp;view=diff ============================================================================== --- forrest/branches/update_cocoon_2.1.12/etc/review-plugin-deployment.txt (original) +++ forrest/branches/update_cocoon_2.1.12/etc/review-plugin-deployment.txt Tue Mar 5 14:57:31 2013 &lt; at &gt;&lt; at &gt; -32,7 +32,7 &lt; at &gt;&lt; at &gt; org.apache.forrest.plugin.input.simplifi org.apache.forrest.plugin.input.wiki | y 8 y 6 n y org.apache.forrest.plugin.output.POD | y 8 y y 6 n y y org.apache.forrest.plugin.output.Text | y 8 y y 6 n y y -org.apache.forrest.plugin.output.pdf | y 9 9 y y 6 y y y +org.apache.forrest.plugin.output.pdf | y 9 10 y y 6 y y y | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 20 whiteboard/plugins/ (34) Added: forrest/branches/update_cocoon_2.1.12/lib/core/batik-all-1.7.jar URL: http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/lib/core/batik-all-1.7.jar?rev=1452826&amp;view=auto ============================================================================== Binary file - no diff available. Propchange: forrest/branches/update_cocoon_2.1.12/lib/core/batik-all-1.7.jar ------------------------------------------------------------------------------ svn:mime-type = application/jar Modified: forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-2.1.12-dev.jar URL: http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-2.1.12-dev.jar?rev=1452826&amp;r1=1452825&amp;r2=1452826&amp;view=diff ============================================================================== Binary files - no diff available. Modified: forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-asciiart-block.jar URL: http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-asciiart-block.jar?rev=1452826&amp;r1=1452825&amp;r2=1452826&amp;view=diff ============================================================================== Binary files - no diff available. Modified: forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-auth-block.jar URL: http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-auth-block.jar?rev=1452826&amp;r1=1452825&amp;r2=1452826&amp;view=diff ============================================================================== Binary files - no diff available. Modified: forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-batik-block.jar URL: http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-batik-block.jar?rev=1452826&amp;r1=1452825&amp;r2=1452826&amp;view=diff ============================================================================== Binary files - no diff available. Modified: forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-chaperon-block.jar URL: http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-chaperon-block.jar?rev=1452826&amp;r1=1452825&amp;r2=1452826&amp;view=diff ============================================================================== Binary files - no diff available. Modified: forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-fop-block.jar URL: http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-fop-block.jar?rev=1452826&amp;r1=1452825&amp;r2=1452826&amp;view=diff ============================================================================== Binary files - no diff available. Modified: forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-html-block.jar URL: http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-html-block.jar?rev=1452826&amp;r1=1452825&amp;r2=1452826&amp;view=diff ============================================================================== Binary files - no diff available. Modified: forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-linkrewriter-block.jar URL: http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-linkrewriter-block.jar?rev=1452826&amp;r1=1452825&amp;r2=1452826&amp;view=diff ============================================================================== Binary files - no diff available. Modified: forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-lucene-block.jar URL: http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-lucene-block.jar?rev=1452826&amp;r1=1452825&amp;r2=1452826&amp;view=diff ============================================================================== Binary files - no diff available. Modified: forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-profiler-block.jar URL: http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-profiler-block.jar?rev=1452826&amp;r1=1452825&amp;r2=1452826&amp;view=diff ============================================================================== Binary files - no diff available. Modified: forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-template-block.jar URL: http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-template-block.jar?rev=1452826&amp;r1=1452825&amp;r2=1452826&amp;view=diff ============================================================================== Binary files - no diff available. Modified: forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-validation-block.jar URL: http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-validation-block.jar?rev=1452826&amp;r1=1452825&amp;r2=1452826&amp;view=diff ============================================================================== Binary files - no diff available. Modified: forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-xsp-block.jar URL: http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-xsp-block.jar?rev=1452826&amp;r1=1452825&amp;r2=1452826&amp;view=diff ============================================================================== Binary files - no diff available. Added: forrest/branches/update_cocoon_2.1.12/lib/core/xml-commons-resolver-1.2.jar URL: http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/lib/core/xml-commons-resolver-1.2.jar?rev=1452826&amp;view=auto ============================================================================== Binary file - no diff available. Propchange: forrest/branches/update_cocoon_2.1.12/lib/core/xml-commons-resolver-1.2.jar ------------------------------------------------------------------------------ svn:mime-type = application/jar Added: forrest/branches/update_cocoon_2.1.12/lib/core/xmlgraphics-commons-1.5.jar URL: http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/lib/core/xmlgraphics-commons-1.5.jar?rev=1452826&amp;view=auto ============================================================================== Binary file - no diff available. Propchange: forrest/branches/update_cocoon_2.1.12/lib/core/xmlgraphics-commons-1.5.jar ------------------------------------------------------------------------------ svn:mime-type = application/jar Added: forrest/branches/update_cocoon_2.1.12/lib/endorsed/xercesImpl-2.11.0.jar URL: http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/lib/endorsed/xercesImpl-2.11.0.jar?rev=1452826&amp;view=auto ============================================================================== Binary file - no diff available. Propchange: forrest/branches/update_cocoon_2.1.12/lib/endorsed/xercesImpl-2.11.0.jar ------------------------------------------------------------------------------ svn:mime-type = application/jar Added: forrest/branches/update_cocoon_2.1.12/lib/endorsed/xml-apis-1.4.01.jar URL: http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/lib/endorsed/xml-apis-1.4.01.jar?rev=1452826&amp;view=auto ============================================================================== Binary file - no diff available. Propchange: forrest/branches/update_cocoon_2.1.12/lib/endorsed/xml-apis-1.4.01.jar ------------------------------------------------------------------------------ svn:mime-type = application/jar Added: forrest/branches/update_cocoon_2.1.12/lib/endorsed/xml-apis-ext-1.4.01.jar URL: http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/lib/endorsed/xml-apis-ext-1.4.01.jar?rev=1452826&amp;view=auto ============================================================================== Binary file - no diff available. Propchange: forrest/branches/update_cocoon_2.1.12/lib/endorsed/xml-apis-ext-1.4.01.jar ------------------------------------------------------------------------------ svn:mime-type = application/jar Modified: forrest/branches/update_cocoon_2.1.12/site-author/status.xml URL: http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/site-author/status.xml?rev=1452826&amp;r1=1452825&amp;r2=1452826&amp;view=diff ============================================================================== --- forrest/branches/update_cocoon_2.1.12/site-author/status.xml (original) +++ forrest/branches/update_cocoon_2.1.12/site-author/status.xml Tue Mar 5 14:57:31 2013 &lt; at &gt;&lt; at &gt; -154,7 +154,11 &lt; at &gt;&lt; at &gt; &lt;link href="site:upgrading_010"&gt;upgrading to v0.10-dev&lt;/link&gt; &lt;/action&gt; &lt;!-- 2013-03 --&gt; - &lt;action context="code" type="update" dev="AG"&gt; + &lt;action context="code" type="update" dev="DC" fixes-bug="FOR-1240" importance="high"&gt; + Updated our packaged Cocoon and blocks to the latest Cocoon-2.1.12-dev version. + Updated Xerces to 2.11.0 and xml-apis to 1.4.01 and Batik to 1.7 + &lt;/action&gt; + &lt;action context="code" type="update" dev="DC"&gt; Updated log4j to 1.2.17 and slf4j to 1.7.2 &lt;/action&gt; &lt;!-- 2012-01 --&gt; </pre> crossley< at >apache.org 2013-03-05T14:57:33 http://permalink.gmane.org/gmane.text.xml.forrest.cvs/10390 <pre>Author: crossley Date: Tue Mar 5 14:37:22 2013 New Revision: 1452811 URL: http://svn.apache.org/r1452811 Log: Upgraded Apache FOP to version 1.0 and XML Graphics Commons to 1.5 Upgraded to the new Cocoon FOP Block, so we not need the local stuff anymore. Thanks. This version 0.4 of this plugin now requires Forrest-0.10 Issue: FOR-1240 and FOR-1193 Added: forrest/branches/update_cocoon_2.1.12/plugins/org.apache.forrest.plugin.output.pdf/lib/fop-1.0.jar (with props) Removed: forrest/branches/update_cocoon_2.1.12/plugins/org.apache.forrest.plugin.output.pdf/lib/cocoon-fop-ng-impl-special-SNAPSHOT.jar forrest/branches/update_cocoon_2.1.12/plugins/org.apache.forrest.plugin.output.pdf/lib/fop-0.95.jar Modified: forrest/branches/update_cocoon_2.1.12/plugins/org.apache.forrest.plugin.output.pdf/build.xml forrest/branches/update_cocoon_2.1.12/plugins/org.apache.forrest.plugin.output.pdf/output.xmap forrest/branches/update_cocoon_2.1.12/plugins/org.apache.forrest.plugin.output.pdf/status.xml Modified: forrest/branches/update_cocoon_2.1.12/plugins/org.apache.forrest.plugin.output.pdf/build.xml URL: http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/plugins/org.apache.forrest.plugin.output.pdf/build.xml?rev=1452811&amp;r1=1452810&amp;r2=1452811&amp;view=diff ============================================================================== --- forrest/branches/update_cocoon_2.1.12/plugins/org.apache.forrest.plugin.output.pdf/build.xml (original) +++ forrest/branches/update_cocoon_2.1.12/plugins/org.apache.forrest.plugin.output.pdf/build.xml Tue Mar 5 14:37:22 2013 &lt; at &gt;&lt; at &gt; -17,10 +17,10 &lt; at &gt;&lt; at &gt; --&gt; &lt;project default="docs" basedir="." name="Forrest plugin build file"&gt; &lt;property name="plugin-name" value="org.apache.forrest.plugin.output.pdf"/&gt; - &lt;property name="forrest.version" value="0.9"/&gt; + &lt;property name="forrest.version" value="0.10"/&gt; &lt;property name="forrest.version.initial" value="0.6"/&gt; &lt;property name="type" value="output"/&gt; - &lt;property name="plugin-version" value="0.3"/&gt; + &lt;property name="plugin-version" value="0.4"/&gt; &lt;property name="description" value="Create PDF documents from Forrest documents."/&gt; &lt;property name="author" value="Apache Forrest Project"/&gt; &lt;property name="websiteURL" value="http://forrest.apache.org/pluginDocs/plugins_0_90/org.apache.forrest.plugin.output.pdf"/&gt; Added: forrest/branches/update_cocoon_2.1.12/plugins/org.apache.forrest.plugin.output.pdf/lib/fop-1.0.jar URL: http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/plugins/org.apache.forrest.plugin.output.pdf/lib/fop-1.0.jar?rev=1452811&amp;view=auto ============================================================================== Binary file - no diff available. Propchange: forrest/branches/update_cocoon_2.1.12/plugins/org.apache.forrest.plugin.output.pdf/lib/fop-1.0.jar ------------------------------------------------------------------------------ svn:mime-type = application/jar Modified: forrest/branches/update_cocoon_2.1.12/plugins/org.apache.forrest.plugin.output.pdf/output.xmap URL: http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/plugins/org.apache.forrest.plugin.output.pdf/output.xmap?rev=1452811&amp;r1=1452810&amp;r2=1452811&amp;view=diff ============================================================================== --- forrest/branches/update_cocoon_2.1.12/plugins/org.apache.forrest.plugin.output.pdf/output.xmap (original) +++ forrest/branches/update_cocoon_2.1.12/plugins/org.apache.forrest.plugin.output.pdf/output.xmap Tue Mar 5 14:37:22 2013 &lt; at &gt;&lt; at &gt; -35,7 +35,7 &lt; at &gt;&lt; at &gt; &lt;/map:transformer&gt; &lt;/map:transformers&gt; &lt;map:serializers default="fo2pdf"&gt; - &lt;map:serializer name="fo2pdf" src="org.apache.cocoon.blocks.fop.FOPNGSerializer" mime-type="application/pdf"&gt; + &lt;map:serializer name="fo2pdf" src="org.apache.cocoon.serialization.FOPSerializer" mime-type="application/pdf"&gt; &lt;user-config&gt;&amp;pdf-config-file;&lt;/user-config&gt; &lt;/map:serializer&gt; &lt;/map:serializers&gt; Modified: forrest/branches/update_cocoon_2.1.12/plugins/org.apache.forrest.plugin.output.pdf/status.xml URL: http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/plugins/org.apache.forrest.plugin.output.pdf/status.xml?rev=1452811&amp;r1=1452810&amp;r2=1452811&amp;view=diff ============================================================================== --- forrest/branches/update_cocoon_2.1.12/plugins/org.apache.forrest.plugin.output.pdf/status.xml (original) +++ forrest/branches/update_cocoon_2.1.12/plugins/org.apache.forrest.plugin.output.pdf/status.xml Tue Mar 5 14:37:22 2013 &lt; at &gt;&lt; at &gt; -48,6 +48,16 &lt; at &gt;&lt; at &gt; title="Changes to Build" /&gt; &lt;/contexts&gt; &lt;changes&gt; + &lt;release version="0.4" date="not-yet-released"&gt; + &lt;action type="update" context="code" dev="DC" fixes-bug="FOR-1240,FOR-1193" importance="high"&gt; + Upgraded to the new Cocoon FOP Block, so we not need the local + stuff anymore. Thanks. + This version 0.4 of this plugin now requires Forrest-0.10 + &lt;/action&gt; + &lt;action type="update" context="code" dev="DC" importance="high"&gt; + Upgraded Apache FOP to version 1.0 and XML Graphics Commons to 1.5 + &lt;/action&gt; + &lt;/release&gt; &lt;release version="0.3" date="2011-02-07"&gt; &lt;action type="update" context="code" dev="JM" importance="high"&gt; Upgraded Apache FOP to version 0.95 and XML Graphics Commons to 1.3.1 </pre> crossley< at >apache.org 2013-03-05T14:37:22 http://permalink.gmane.org/gmane.text.xml.forrest.cvs/10389 <pre>Author: crossley Date: Tue Mar 5 14:13:48 2013 New Revision: 1452803 URL: http://svn.apache.org/r1452803 Log: Updated log4j to 1.2.17 and slf4j to 1.7.2 -This line, and those below, will be ignored-- AM lib/core/slf4j-LICENSE.txt AM lib/core/slf4j-api-1.7.2.jar AM lib/core/slf4j-log4j12-1.7.2.jar AM lib/core/log4j-1.2.17.jar A + lib/core/log4j-LICENSE.txt AM lib/core/log4j-NOTICE.txt M LICENSE.txt M site-author/status.xml Added: forrest/branches/update_cocoon_2.1.12/lib/core/log4j-1.2.17.jar (with props) forrest/branches/update_cocoon_2.1.12/lib/core/log4j-LICENSE.txt - copied unchanged from r1452765, forrest/branches/update_cocoon_2.1.12/lib/core/log4j-1.2.13.jar.license.txt forrest/branches/update_cocoon_2.1.12/lib/core/log4j-NOTICE.txt (with props) forrest/branches/update_cocoon_2.1.12/lib/core/slf4j-LICENSE.txt (with props) forrest/branches/update_cocoon_2.1.12/lib/core/slf4j-api-1.7.2.jar (with props) forrest/branches/update_cocoon_2.1.12/lib/core/slf4j-log4j12-1.7.2.jar (with props) Modified: forrest/branches/update_cocoon_2.1.12/LICENSE.txt forrest/branches/update_cocoon_2.1.12/site-author/status.xml Modified: forrest/branches/update_cocoon_2.1.12/LICENSE.txt URL: http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/LICENSE.txt?rev=1452803&amp;r1=1452802&amp;r2=1452803&amp;view=diff ============================================================================== --- forrest/branches/update_cocoon_2.1.12/LICENSE.txt (original) +++ forrest/branches/update_cocoon_2.1.12/LICENSE.txt Tue Mar 5 14:13:48 2013 &lt; at &gt;&lt; at &gt; -231,7 +231,7 &lt; at &gt;&lt; at &gt; license: lib/core/excalibur-sourceresolv license: lib/core/excalibur-store-2.1.jar.license.txt license: lib/core/excalibur-xmlutil-2.1.jar.license.txt license: lib/core/jcs-1.2.5-dev-20050313.jar.license.txt -license: lib/core/log4j-1.2.13.jar.license.txt +license: lib/core/log4j-LICENSE.txt license: lib/core/lucene-1.4.3.jar.license.txt license: lib/core/xml-commons-resolver.license.txt license: lib/core/xmlbeans-1.0.3.jar.license.txt &lt; at &gt;&lt; at &gt; -346,8 +346,7 &lt; at &gt;&lt; at &gt; license: tools/eclipse/plugins/org.apach ---------------- These supporting products are licensed: The MIT License -license: lib/core/slf4j-api-1.5.11.jar.license.txt -license: lib/core/slf4j-log4j12-1.5.11.jar.license.txt +license: lib/core/slf4j-LICENSE.txt ---------------- These supporting products are licensed: Common Development and Distribution License (CDDL) Version 1.0 Added: forrest/branches/update_cocoon_2.1.12/lib/core/log4j-1.2.17.jar URL: http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/lib/core/log4j-1.2.17.jar?rev=1452803&amp;view=auto ============================================================================== Binary file - no diff available. Propchange: forrest/branches/update_cocoon_2.1.12/lib/core/log4j-1.2.17.jar ------------------------------------------------------------------------------ svn:mime-type = application/jar Added: forrest/branches/update_cocoon_2.1.12/lib/core/log4j-NOTICE.txt URL: http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/lib/core/log4j-NOTICE.txt?rev=1452803&amp;view=auto ============================================================================== --- forrest/branches/update_cocoon_2.1.12/lib/core/log4j-NOTICE.txt (added) +++ forrest/branches/update_cocoon_2.1.12/lib/core/log4j-NOTICE.txt Tue Mar 5 14:13:48 2013 &lt; at &gt;&lt; at &gt; -0,0 +1,5 &lt; at &gt;&lt; at &gt; +Apache log4j +Copyright 2010 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). Propchange: forrest/branches/update_cocoon_2.1.12/lib/core/log4j-NOTICE.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: forrest/branches/update_cocoon_2.1.12/lib/core/slf4j-LICENSE.txt URL: http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/lib/core/slf4j-LICENSE.txt?rev=1452803&amp;view=auto ============================================================================== --- forrest/branches/update_cocoon_2.1.12/lib/core/slf4j-LICENSE.txt (added) +++ forrest/branches/update_cocoon_2.1.12/lib/core/slf4j-LICENSE.txt Tue Mar 5 14:13:48 2013 &lt; at &gt;&lt; at &gt; -0,0 +1,24 &lt; at &gt;&lt; at &gt; +Copyright (c) 2004-2008 QOS.ch +All rights reserved. + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + + Propchange: forrest/branches/update_cocoon_2.1.12/lib/core/slf4j-LICENSE.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: forrest/branches/update_cocoon_2.1.12/lib/core/slf4j-api-1.7.2.jar URL: http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/lib/core/slf4j-api-1.7.2.jar?rev=1452803&amp;view=auto ============================================================================== Binary file - no diff available. Propchange: forrest/branches/update_cocoon_2.1.12/lib/core/slf4j-api-1.7.2.jar ------------------------------------------------------------------------------ svn:mime-type = application/zip Added: forrest/branches/update_cocoon_2.1.12/lib/core/slf4j-log4j12-1.7.2.jar URL: http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/lib/core/slf4j-log4j12-1.7.2.jar?rev=1452803&amp;view=auto ============================================================================== Binary file - no diff available. Propchange: forrest/branches/update_cocoon_2.1.12/lib/core/slf4j-log4j12-1.7.2.jar ------------------------------------------------------------------------------ svn:mime-type = application/zip Modified: forrest/branches/update_cocoon_2.1.12/site-author/status.xml URL: http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/site-author/status.xml?rev=1452803&amp;r1=1452802&amp;r2=1452803&amp;view=diff ============================================================================== --- forrest/branches/update_cocoon_2.1.12/site-author/status.xml (original) +++ forrest/branches/update_cocoon_2.1.12/site-author/status.xml Tue Mar 5 14:13:48 2013 &lt; at &gt;&lt; at &gt; -153,6 +153,10 &lt; at &gt;&lt; at &gt; Added document to facilitate &lt;link href="site:upgrading_010"&gt;upgrading to v0.10-dev&lt;/link&gt; &lt;/action&gt; +&lt;!-- 2013-03 --&gt; + &lt;action context="code" type="update" dev="AG"&gt; + Updated log4j to 1.2.17 and slf4j to 1.7.2 + &lt;/action&gt; &lt;!-- 2012-01 --&gt; &lt;action context="docs" type="update" dev="DC" fixes-bug="FOR-1233"&gt; Improved documentation about configuring project entities file, </pre> crossley< at >apache.org 2013-03-05T14:13:49 http://permalink.gmane.org/gmane.text.xml.forrest.cvs/10388 <pre>Author: crossley Date: Tue Mar 5 14:12:34 2013 New Revision: 1452801 URL: http://svn.apache.org/r1452801 Log: Adjust the targets for copying Cocoon libs. Forrest has some newer ones. Issue: FOR-1240 Modified: forrest/branches/update_cocoon_2.1.12/etc/cocoon_upgrade/build.xml Modified: forrest/branches/update_cocoon_2.1.12/etc/cocoon_upgrade/build.xml URL: http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/etc/cocoon_upgrade/build.xml?rev=1452801&amp;r1=1452800&amp;r2=1452801&amp;view=diff ============================================================================== --- forrest/branches/update_cocoon_2.1.12/etc/cocoon_upgrade/build.xml (original) +++ forrest/branches/update_cocoon_2.1.12/etc/cocoon_upgrade/build.xml Tue Mar 5 14:12:34 2013 &lt; at &gt;&lt; at &gt; -53,23 +53,26 &lt; at &gt;&lt; at &gt; &lt;fileset dir="${cocoon.home}/lib/core" defaultexcludes="yes"&gt; &lt;!-- Exclude some that we don't need --&gt; &lt;exclude name="commons-beanutils-core-*.jar"/&gt; - &lt;exclude name="commons-javaflow-*.jar"/&gt; &lt;exclude name="excalibur-instrument-mgr-*.jar"/&gt; &lt;exclude name="javac*.jar"/&gt; &lt;exclude name="jdtcore-*.jar"/&gt; &lt;exclude name="js-*.jar"/&gt; - &lt;exclude name="nekohtml-*.jar"/&gt; - &lt;exclude name="pizza-*.jar"/&gt; - &lt;!-- OSGI not yet needed --&gt; - &lt;exclude name="knopflerfish-*.jar"/&gt; &lt;!-- FIXME: The jxpath upgrade cannot be done. See issue FOR-675 (and FOR-405 and FOR-303) and dev mail list. commons-jxpath-1.2 causes errors with "site:" links. We have a workaround so use Cocoon's jar. &lt;exclude name="commons-jxpath-*.jar"/&gt; --&gt; - &lt;!-- We have newer xml-commons-resolver --&gt; - &lt;exclude name="xml-commons-resolver-*.jar"/&gt; + &lt;!-- We have some jars that are newer than Cocoon --&gt; + &lt;exclude name="commons-cli-*.jar"/&gt; + &lt;exclude name="commons-collections-*.jar"/&gt; + &lt;exclude name="commons-io-*.jar"/&gt; + &lt;exclude name="commons-jxpath-*.jar"/&gt; + &lt;exclude name="commons-lang-*.jar"/&gt; + &lt;exclude name="commons-logging-*.jar"/&gt; + &lt;exclude name="ehcache-*.jar"/&gt; + &lt;exclude name="log4j-*.jar"/&gt; + &lt;exclude name="slf4j-api-*.jar"/&gt; &lt;!-- servlet.jar goes under tools/jetty --&gt; &lt;exclude name="servlet-*.jar"/&gt; &lt;/fileset&gt; &lt; at &gt;&lt; at &gt; -85,12 +88,9 &lt; at &gt;&lt; at &gt; &lt;copy todir="${forrest.home}/lib/core" preservelastmodified="true"&gt; &lt;fileset dir="${cocoon.home}/lib/optional"&gt; &lt;include name="batik-all-*.jar"/&gt; -&lt;!-- FIXME: Cocoon's FOP causes trouble FOR- ################### - &lt;include name="fop-*.jar"/&gt; ---&gt; + &lt;include name="xmlgraphics-commons-*.jar"/&gt; &lt;include name="lucene-*.jar"/&gt; &lt;include name="jtidy-*.jar"/&gt; - &lt;include name="nekopull-*.jar"/&gt; &lt;!-- FIXME: Chaperon required by core #FOR-501 --&gt; &lt;include name="chaperon-*.jar"/&gt; &lt;/fileset&gt; &lt; at &gt;&lt; at &gt; -104,6 +104,9 &lt; at &gt;&lt; at &gt; &lt;copy todir="${forrest.home}/plugins/org.apache.forrest.plugin.input.dtdx/lib" preservelastmodified="true"&gt; &lt;fileset dir="${cocoon.home}/lib/optional" includes="nekodtd-*.jar"/&gt; &lt;/copy&gt; + &lt;copy todir="${forrest.home}/plugins/org.apache.forrest.plugin.output.pdf/lib" preservelastmodified="true"&gt; + &lt;fileset dir="${cocoon.home}/lib/optional" includes="fop-*.jar"/&gt; + &lt;/copy&gt; &lt;/target&gt; &lt;target name="copy-endorsed-libs" depends="init"&gt; </pre> crossley< at >apache.org 2013-03-05T14:12:34 http://permalink.gmane.org/gmane.text.xml.forrest.cvs/10387 <pre>Author: crossley Date: Tue Mar 5 14:11:50 2013 New Revision: 1452799 URL: http://svn.apache.org/r1452799 Log: Tweak the notes. Mention the Jing issue FOR-1215. Issue: FOR-1240 Modified: forrest/branches/update_cocoon_2.1.12/etc/cocoon_upgrade/README.txt Modified: forrest/branches/update_cocoon_2.1.12/etc/cocoon_upgrade/README.txt URL: http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/etc/cocoon_upgrade/README.txt?rev=1452799&amp;r1=1452798&amp;r2=1452799&amp;view=diff ============================================================================== --- forrest/branches/update_cocoon_2.1.12/etc/cocoon_upgrade/README.txt (original) +++ forrest/branches/update_cocoon_2.1.12/etc/cocoon_upgrade/README.txt Tue Mar 5 14:11:50 2013 &lt; at &gt;&lt; at &gt; -15,7 +15,7 &lt; at &gt;&lt; at &gt; as Forrest's minimum requirement in $FOR ------------------------- 0. cd $FORREST_HOME/etc/cocoon_upgrade -1. Keep our local.*.properties files sychronised with Cocoon's. +1. Keep our local.*.properties files synchronised with Cocoon's. 2. Perhaps need to update version number for Cocoon in ./build.xml file. &lt; at &gt;&lt; at &gt; -30,12 +30,21 &lt; at &gt;&lt; at &gt; Step 3 and 4 can be done with "./build.s ant copy-core-libs ant copy-endorsed-libs ant copy-optional-libs + ant copy-plugins-libs + + We use a newer Jing. Cocoon cannot permanently upgrade to that because + they are limited to Java-1.4 + https://issues.apache.org/jira/browse/FOR-1215 + Just do this temporarily: + cp $FORREST_HOME/lib/core/jing-20091111.jar lib/optional/ + rm lib/optional/jing-20030619.jar + cp $FORREST_HOME/lib/core/jing-20091111.jar tools/lib/ + rm tools/lib/jing-20030619.jar + edit lib/jars.xml (fix the jing entry) 4. Verify that there are not two versions of libraries within the same directory: - cd $FORREST_HOME/lib/endorsed - svn st - cd $FORREST_HOME/lib/core + cd $FORREST_HOME/lib svn st 5. cd $FORREST_HOME/etc/cocoon_upgrade &lt; at &gt;&lt; at &gt; -44,11 +53,11 &lt; at &gt;&lt; at &gt; Steps 6 and 7 can be done with "./build. 6. Build Cocoon core and the blocks that we need. - ant build-cocoon + $FORREST_HOME/tools/ant/bin/ant build-cocoon 7. Copy the built Cocoon jars to Forrest. - ant copy-cocoon + $FORREST_HOME/tools/ant/bin/ant copy-cocoon 8. We need to make sure there is a license.txt file for each of the jars that we have in the lib/* directories. &lt; at &gt;&lt; at &gt; -56,15 +65,18 &lt; at &gt;&lt; at &gt; Steps 6 and 7 can be done with "./build. svn status | grep '^!' | grep 'license.txt' If the removed license.txt file listed above matches a jar - that we have, then revert the deletetion by doing an + that we have, then revert the deletion by doing an svn revert some.jar.license.txt Otherwise, copy the relevant license.txt file from $COCOON_HOME/legal. + Ensure that licenses are properly listed in Forrest LICENSE.txt + 9. Keep our Cocoon config files and sitemaps synchronised at main/webapp/WEB-INF/ 10. cd $FORREST_HOME/main + ./build.sh clean; ./build.sh 11. Build a regular forrest distribution and test, test test. </pre> crossley< at >apache.org 2013-03-05T14:11:50 http://permalink.gmane.org/gmane.text.xml.forrest.cvs/10386 <pre>Author: crossley Date: Tue Mar 5 12:19:56 2013 New Revision: 1452761 URL: http://svn.apache.org/r1452761 Log: create branch (from trunk r1452758) to update our cocoon Added: forrest/branches/update_cocoon_2.1.12/ - copied from r1452758, forrest/trunk/ </pre> crossley< at >apache.org 2013-03-05T12:19:57 http://permalink.gmane.org/gmane.text.xml.forrest.cvs/10385 <pre>Author: crossley Date: Thu Feb 14 04:48:20 2013 New Revision: 1446046 URL: http://svn.apache.org/r1446046 Log: Fix links to JIRA Issue Tracker. Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml?rev=1446046&amp;r1=1446045&amp;r2=1446046&amp;view=diff ============================================================================== --- forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml (original) +++ forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml Thu Feb 14 04:48:20 2013 &lt; at &gt;&lt; at &gt; -67,7 +67,7 &lt; at &gt;&lt; at &gt; &lt;action type="add" context="code" dev="RDG"&gt; Added handling of Google Code wiki format. See &lt;a href="site:sample/google"&gt;sample&lt;/a&gt;. &lt;/action&gt; - &lt;action type="fix" context="code" dev="RDG" fixes-bug="680" + &lt;action type="fix" context="code" dev="RDG" fixes-bug="FOR-680" due-to="Sjur N. Moshagen, Gavin"&gt; Corrected processing of nested lists so that sub-lists are properly nested within the LI of the outer list, thus bringing the output in &lt; at &gt;&lt; at &gt; -82,7 +82,7 &lt; at &gt;&lt; at &gt; &lt;action type="fix" context="code" dev="DB" due-to="Evrim ULU" due-to-email="evrim&lt; at &gt;core.gen.tr"&gt; Handle quoted links. &lt;/action&gt; - &lt;action type="add" context="docs" dev="DB" fixes-bug="283"&gt; + &lt;action type="add" context="docs" dev="DB" fixes-bug="FOR-283"&gt; Added sample for MoinMoin format documents. &lt;/action&gt; &lt;action dev="RDG" type="add" context="admin"&gt; </pre> crossley< at >apache.org 2013-02-14T04:48:20 http://permalink.gmane.org/gmane.text.xml.forrest.cvs/10384 <pre>Author: sjur Date: Thu Jan 24 21:38:25 2013 New Revision: 1438208 URL: http://svn.apache.org/viewvc?rev=1438208&amp;view=rev Log: Javascript now served (at least from our sitemap) as text/javascript. Modified: forrest/trunk/main/webapp/resources.xmap Modified: forrest/trunk/main/webapp/resources.xmap URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources.xmap?rev=1438208&amp;r1=1438207&amp;r2=1438208&amp;view=diff ============================================================================== --- forrest/trunk/main/webapp/resources.xmap (original) +++ forrest/trunk/main/webapp/resources.xmap Thu Jan 24 21:38:25 2013 &lt; at &gt;&lt; at &gt; -133,11 +133,11 &lt; at &gt;&lt; at &gt; $Revision: 1.13 $ &lt;map:pipelines&gt; &lt;map:pipeline&gt; &lt;map:match pattern="**skin/**.js"&gt; - &lt;map:read src="{lm:skin.js.{2}}" mime-type="application/x-javascript" /&gt; + &lt;map:read src="{lm:skin.js.{2}}" mime-type="text/javascript" /&gt; &lt;/map:match&gt; &lt;!-- &lt; at &gt;deprecated --&gt; &lt;map:match pattern="**.js"&gt; - &lt;map:read src="{lm:project.js.{1}}" mime-type="application/x-javascript" /&gt; + &lt;map:read src="{lm:project.js.{1}}" mime-type="text/javascript" /&gt; &lt;/map:match&gt; &lt;map:match pattern="**skin/**.css"&gt; &lt;map:select type="exists"&gt; </pre> sjur< at >apache.org 2013-01-24T21:38:25 http://permalink.gmane.org/gmane.text.xml.forrest.cvs/10383 <pre>Author: sjur Date: Thu Jan 24 20:44:17 2013 New Revision: 1438174 URL: http://svn.apache.org/viewvc?rev=1438174&amp;view=rev Log: Simplified the identity template. Content is equivalent. Modified: forrest/trunk/main/webapp/resources/stylesheets/html-to-document.xsl Modified: forrest/trunk/main/webapp/resources/stylesheets/html-to-document.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/stylesheets/html-to-document.xsl?rev=1438174&amp;r1=1438173&amp;r2=1438174&amp;view=diff ============================================================================== --- forrest/trunk/main/webapp/resources/stylesheets/html-to-document.xsl (original) +++ forrest/trunk/main/webapp/resources/stylesheets/html-to-document.xsl Thu Jan 24 20:44:17 2013 &lt; at &gt;&lt; at &gt; -280,9 +280,9 &lt; at &gt;&lt; at &gt; &lt;/xsl:otherwise&gt; &lt;/xsl:choose&gt; &lt;/xsl:template&gt; - &lt;xsl:template match="&lt; at &gt;*|*|text()|processing-instruction()|comment()"&gt; + &lt;xsl:template match="&lt; at &gt;*|node()"&gt; &lt;xsl:copy&gt; - &lt;xsl:apply-templates select="&lt; at &gt;*|*|text()|processing-instruction()|comment()"/&gt; + &lt;xsl:apply-templates select="&lt; at &gt;*|node()"/&gt; &lt;/xsl:copy&gt; &lt;/xsl:template&gt; &lt;/xsl:stylesheet&gt; </pre> sjur< at >apache.org 2013-01-24T20:44:18 http://permalink.gmane.org/gmane.text.xml.forrest.cvs/10382 <pre>Author: sjur Date: Thu Jan 24 20:40:31 2013 New Revision: 1438171 URL: http://svn.apache.org/viewvc?rev=1438171&amp;view=rev Log: Some small changes to allow for colons in table titles. Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/grammars/wiki.grm forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/wiki2xdoc.xsl forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/grammars/wiki.grm URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/grammars/wiki.grm?rev=1438171&amp;r1=1438170&amp;r2=1438171&amp;view=diff ============================================================================== --- forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/grammars/wiki.grm (original) +++ forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/grammars/wiki.grm Thu Jan 24 20:40:31 2013 &lt; at &gt;&lt; at &gt; -241,7 +241,8 &lt; at &gt;&lt; at &gt; tablehead ; tabletitle - : tabletitleitem textblock + : tabletitleitem textblock deftermdefstart + | tabletitleitem textblock ; tablerows Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/wiki2xdoc.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/wiki2xdoc.xsl?rev=1438171&amp;r1=1438170&amp;r2=1438171&amp;view=diff ============================================================================== --- forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/wiki2xdoc.xsl (original) +++ forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/wiki2xdoc.xsl Thu Jan 24 20:40:31 2013 &lt; at &gt;&lt; at &gt; -201,7 +201,8 &lt; at &gt;&lt; at &gt; &lt;/xsl:template&gt; &lt;xsl:template match="st:tabletitle"&gt; &lt;th&gt; - &lt;xsl:apply-templates select="st:textblock/*"/&gt; + &lt;xsl:value-of select="st:textblock"/&gt; + &lt;xsl:value-of select="st:deftermdefstart"/&gt; &lt;/th&gt; &lt;/xsl:template&gt; &lt;xsl:template match="st:tablecolumns"&gt; Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml?rev=1438171&amp;r1=1438170&amp;r2=1438171&amp;view=diff ============================================================================== --- forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml (original) +++ forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml Thu Jan 24 20:40:31 2013 &lt; at &gt;&lt; at &gt; -24,6 +24,9 &lt; at &gt;&lt; at &gt; &lt;changes&gt; &lt;release version="0.2-dev" date="not-released"&gt; &lt;action type="fix" context="code" dev="SNM"&gt; + Some small changes to allow for colons in table titles. + &lt;/action&gt; + &lt;action type="fix" context="code" dev="SNM"&gt; Allow more items as (the first) symbol(s) within inline elements. &lt;/action&gt; &lt;action type="add" context="code" dev="SNM"&gt; </pre> sjur< at >apache.org 2013-01-24T20:40:31 http://permalink.gmane.org/gmane.text.xml.forrest.cvs/10381 <pre>Author: crossley Date: Wed Jan 23 07:33:54 2013 New Revision: 1437279 URL: http://svn.apache.org/viewvc?rev=1437279&amp;view=rev Log: Remind committers to subscribe to svn&lt; at &gt; list so that their commit notifications are delivered without moderation. Modified: forrest/trunk/site-author/content/xdocs/who.xml Modified: forrest/trunk/site-author/content/xdocs/who.xml URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/who.xml?rev=1437279&amp;r1=1437278&amp;r2=1437279&amp;view=diff ============================================================================== --- forrest/trunk/site-author/content/xdocs/who.xml (original) +++ forrest/trunk/site-author/content/xdocs/who.xml Wed Jan 23 07:33:54 2013 &lt; at &gt;&lt; at &gt; -89,7 +89,9 &lt; at &gt;&lt; at &gt; &lt;p&gt; Some people were committers prior to Forrest becoming a top-level project and so gaining a PMC. They were not around since then, so have - never been on the PMC. All new committers are + never been on the PMC. + &lt;/p&gt; + &lt;p&gt;All new committers are &lt;a href="guidelines.html#pmc-committers"&gt;encouraged&lt;/a&gt; to be PMC members. &lt;/p&gt; &lt; at &gt;&lt; at &gt; -100,10 +102,12 &lt; at &gt;&lt; at &gt; &lt;a href="guidelines.html#contribution"&gt;acknowledgements&lt;/a&gt; section. &lt;/p&gt; &lt;p&gt; - All &lt;a href="http://people.apache.org/committers-by-project.html#lenya"&gt;Apache + All &lt;a href="http://people.apache.org/committers-by-project.html#cocoon"&gt;Apache Cocoon committers&lt;/a&gt; and &lt;a href="http://people.apache.org/committers-by-project.html#lenya"&gt;Apache Lenya committers&lt;/a&gt; also have rights to commit to Forrest. + Before your first commit, please either subscribe to the svn&lt; at &gt; mail list, + or add yourself to the "allow" list (i.e. svn-allow-subscribe&lt; at &gt;). &lt;/p&gt; &lt;/section&gt; &lt;/body&gt; </pre> crossley< at >apache.org 2013-01-23T07:33:54 http://permalink.gmane.org/gmane.text.xml.forrest.cvs/10380 <pre>Author: crossley Date: Wed Jan 23 07:10:09 2013 New Revision: 1437277 URL: http://svn.apache.org/viewvc?rev=1437277&amp;view=rev Log: Cocoon and Lenya 404ed their websites, so link to people.a.o instead. Modified: forrest/trunk/site-author/content/xdocs/who.xml Modified: forrest/trunk/site-author/content/xdocs/who.xml URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/who.xml?rev=1437277&amp;r1=1437276&amp;r2=1437277&amp;view=diff ============================================================================== --- forrest/trunk/site-author/content/xdocs/who.xml (original) +++ forrest/trunk/site-author/content/xdocs/who.xml Wed Jan 23 07:10:09 2013 &lt; at &gt;&lt; at &gt; -96,13 +96,13 &lt; at &gt;&lt; at &gt; &lt;p&gt; Committers can be as active as they choose and there is no performance pressure from the project. For those who are interested in the work that - each paticular committer has done, see the + each particular committer has done, see the &lt;a href="guidelines.html#contribution"&gt;acknowledgements&lt;/a&gt; section. &lt;/p&gt; &lt;p&gt; - All &lt;a href="http://cocoon.apache.org/community/members.html"&gt;Apache + All &lt;a href="http://people.apache.org/committers-by-project.html#lenya"&gt;Apache Cocoon committers&lt;/a&gt; and - &lt;a href="http://lenya.apache.org/community/acknowledgements.html"&gt;Apache + &lt;a href="http://people.apache.org/committers-by-project.html#lenya"&gt;Apache Lenya committers&lt;/a&gt; also have rights to commit to Forrest. &lt;/p&gt; &lt;/section&gt; </pre> crossley< at >apache.org 2013-01-23T07:10:10 http://permalink.gmane.org/gmane.text.xml.forrest.cvs/10379 <pre>Author: sjur Date: Mon Jan 21 14:43:22 2013 New Revision: 1436378 URL: http://svn.apache.org/viewvc?rev=1436378&amp;view=rev Log: Allow more items as (the first) symbol(s) within inline elements. Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/grammars/wiki.grm forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/grammars/wiki.grm URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/grammars/wiki.grm?rev=1436378&amp;r1=1436377&amp;r2=1436378&amp;view=diff ============================================================================== --- forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/grammars/wiki.grm (original) +++ forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/grammars/wiki.grm Mon Jan 21 14:43:22 2013 &lt; at &gt;&lt; at &gt; -327,10 +327,17 &lt; at &gt;&lt; at &gt; plaintextitems : text | deftermstart | deftermdefstart + | tabletitleitem | tablecolumnitem + | titleitem + | subtitleitem | subsubtitleitem | bulleted1item + | bulleted2item + | bulleted3item | numbered1item + | numbered2item + | numbered3item ; deflist Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml?rev=1436378&amp;r1=1436377&amp;r2=1436378&amp;view=diff ============================================================================== --- forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml (original) +++ forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml Mon Jan 21 14:43:22 2013 &lt; at &gt;&lt; at &gt; -23,6 +23,9 &lt; at &gt;&lt; at &gt; &lt;/developers&gt; &lt;changes&gt; &lt;release version="0.2-dev" date="not-released"&gt; + &lt;action type="fix" context="code" dev="SNM"&gt; + Allow more items as (the first) symbol(s) within inline elements. + &lt;/action&gt; &lt;action type="add" context="code" dev="SNM"&gt; Removed unneccessary block of reserved characters inside em, strong and code elements. </pre> sjur< at >apache.org 2013-01-21T14:43:22 http://permalink.gmane.org/gmane.text.xml.forrest.cvs/10378 <pre>Author: sjur Date: Sun Jan 20 17:47:17 2013 New Revision: 1435901 URL: http://svn.apache.org/viewvc?rev=1435901&amp;view=rev Log: Removed unneccessary block of reserved characters inside em, strong and code elements. Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/grammars/wiki.grm forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/wiki2xdoc.xsl forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/grammars/wiki.grm URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/grammars/wiki.grm?rev=1435901&amp;r1=1435900&amp;r2=1435901&amp;view=diff ============================================================================== --- forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/grammars/wiki.grm (original) +++ forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/grammars/wiki.grm Sun Jan 20 17:47:17 2013 &lt; at &gt;&lt; at &gt; -307,15 +307,30 &lt; at &gt;&lt; at &gt; termtextblock ; emblock - : emitem text emitem + : emitem plaintextblock emitem ; strongblock - : strongitem text strongitem + : strongitem plaintextblock strongitem ; codeblock - : codeopenitem text codecloseitem + : codeopenitem plaintextblock codecloseitem + ; + +plaintextblock + : plaintextitems plaintextblock + | plaintextitems + ; + +plaintextitems + : text + | deftermstart + | deftermdefstart + | tablecolumnitem + | subsubtitleitem + | bulleted1item + | numbered1item ; deflist Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/wiki2xdoc.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/wiki2xdoc.xsl?rev=1435901&amp;r1=1435900&amp;r2=1435901&amp;view=diff ============================================================================== --- forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/wiki2xdoc.xsl (original) +++ forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/wiki2xdoc.xsl Sun Jan 20 17:47:17 2013 &lt; at &gt;&lt; at &gt; -321,15 +321,15 &lt; at &gt;&lt; at &gt; &lt;!-- Inline formatting: --&gt; &lt;/xsl:template&gt; &lt;xsl:template match="st:emblock"&gt;&lt;em&gt; - &lt;xsl:value-of select="st:text"/&gt;&lt;/em&gt; + &lt;xsl:value-of select="st:plaintextblock"/&gt;&lt;/em&gt; &lt;xsl:call-template name="addSpaceAfter"/&gt; &lt;/xsl:template&gt; &lt;xsl:template match="st:strongblock"&gt;&lt;strong&gt; - &lt;xsl:value-of select="st:text"/&gt;&lt;/strong&gt; + &lt;xsl:value-of select="st:plaintextblock"/&gt;&lt;/strong&gt; &lt;xsl:call-template name="addSpaceAfter"/&gt; &lt;/xsl:template&gt; &lt;xsl:template match="st:codeblock"&gt;&lt;code&gt; - &lt;xsl:value-of select="st:text"/&gt;&lt;/code&gt; + &lt;xsl:value-of select="st:plaintextblock"/&gt;&lt;/code&gt; &lt;xsl:call-template name="addSpaceAfter"/&gt; &lt;/xsl:template&gt; Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml?rev=1435901&amp;r1=1435900&amp;r2=1435901&amp;view=diff ============================================================================== --- forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml (original) +++ forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml Sun Jan 20 17:47:17 2013 &lt; at &gt;&lt; at &gt; -23,6 +23,10 &lt; at &gt;&lt; at &gt; &lt;/developers&gt; &lt;changes&gt; &lt;release version="0.2-dev" date="not-released"&gt; + &lt;action type="add" context="code" dev="SNM"&gt; + Removed unneccessary block of reserved characters inside em, strong and + code elements. + &lt;/action&gt; &lt;action type="fix" context="code" dev="SNM"&gt; The list of cases for when NOT to add a space after a text segment was incomplete, thus several constructs contained spaces not in the original </pre> sjur< at >apache.org 2013-01-20T17:47:17 http://permalink.gmane.org/gmane.text.xml.forrest.cvs/10377 <pre>Author: sjur Date: Sat Jan 19 10:17:42 2013 New Revision: 1435515 URL: http://svn.apache.org/viewvc?rev=1435515&amp;view=rev Log: Renamed template name to make its purpose clearer. Added a number of other tests for when a space should NOT be added after a text segment. It should be fairly complete now (but only for the Latin script). Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/wiki2xdoc.xsl forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/wiki2xdoc.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/wiki2xdoc.xsl?rev=1435515&amp;r1=1435514&amp;r2=1435515&amp;view=diff ============================================================================== --- forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/wiki2xdoc.xsl (original) +++ forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/wiki2xdoc.xsl Sat Jan 19 10:17:42 2013 &lt; at &gt;&lt; at &gt; -65,8 +65,10 &lt; at &gt;&lt; at &gt; &lt;/xsl:template&gt; &lt;!-- Only add a space if the following char is not a punctuation mark: --&gt; - &lt;xsl:template name="addSpace"&gt; + &lt;xsl:template name="addSpaceAfter"&gt; &lt;xsl:choose&gt; + &lt;!-- Please note that we can't use ends-with() below - it throws an error. + Searches on the 'net indicates it is a bug in the Xslt processor. --&gt; &lt;xsl:when test="starts-with(./following::*[text()],'.') or starts-with(./following::*[text()],',') or starts-with(./following::*[text()],'!') or &lt; at &gt;&lt; at &gt; -74,6 +76,25 &lt; at &gt;&lt; at &gt; starts-with(./following::*[text()],';') or starts-with(./following::*[text()],':') or starts-with(./following::*[text()],'&amp;quot;') or + starts-with(./following::*[text()],'&gt;') or + starts-with(./following::*[text()],'›') or + starts-with(./following::*[text()],'»') or + starts-with(./following::*[text()],'’') or + starts-with(./following::*[text()],'”') or + starts-with(./following::*[text()],')') or + starts-with(./following::*[text()],'}') or + starts-with(./following::*[text()],']') or + contains(substring(., string-length(. - 1)),'¡') or + contains(substring(., string-length(. - 1)),'¿') or + contains(substring(., string-length(. - 1)),'&amp;quot;') or + contains(substring(., string-length(. - 1)),'&amp;lt;') or + contains(substring(., string-length(. - 1)),'‹') or + contains(substring(., string-length(. - 1)),'«') or + contains(substring(., string-length(. - 1)),'‘') or + contains(substring(., string-length(. - 1)),'“') or + contains(substring(., string-length(. - 1)),'(') or + contains(substring(., string-length(. - 1)),'{') or + contains(substring(., string-length(. - 1)),'[') or ./following::*[1]/st:deftermdefstart"&gt; &lt;xsl:text&gt;&lt;/xsl:text&gt; &lt;/xsl:when&gt; &lt; at &gt;&lt; at &gt; -208,7 +229,7 &lt; at &gt;&lt; at &gt; &lt;xsl:value-of select="."/&gt; &lt;/xsl:otherwise&gt; &lt;/xsl:choose&gt; - &lt;xsl:call-template name="addSpace"/&gt; + &lt;xsl:call-template name="addSpaceAfter"/&gt; &lt;/xsl:template&gt; &lt;xsl:template match="st:deftermdefstart[not(ancestor::st:deflist)]" &gt; &lt; at &gt;&lt; at &gt; -244,7 +265,7 &lt; at &gt;&lt; at &gt; &lt;/xsl:call-template&gt; &lt;/xsl:otherwise&gt; &lt;/xsl:choose&gt; - &lt;xsl:call-template name="addSpace"/&gt; + &lt;xsl:call-template name="addSpaceAfter"/&gt; &lt;/xsl:template&gt; &lt;xsl:template name="convertLink" &gt; &lt; at &gt;&lt; at &gt; -301,15 +322,15 &lt; at &gt;&lt; at &gt; &lt;/xsl:template&gt; &lt;xsl:template match="st:emblock"&gt;&lt;em&gt; &lt;xsl:value-of select="st:text"/&gt;&lt;/em&gt; - &lt;xsl:call-template name="addSpace"/&gt; + &lt;xsl:call-template name="addSpaceAfter"/&gt; &lt;/xsl:template&gt; &lt;xsl:template match="st:strongblock"&gt;&lt;strong&gt; &lt;xsl:value-of select="st:text"/&gt;&lt;/strong&gt; - &lt;xsl:call-template name="addSpace"/&gt; + &lt;xsl:call-template name="addSpaceAfter"/&gt; &lt;/xsl:template&gt; &lt;xsl:template match="st:codeblock"&gt;&lt;code&gt; &lt;xsl:value-of select="st:text"/&gt;&lt;/code&gt; - &lt;xsl:call-template name="addSpace"/&gt; + &lt;xsl:call-template name="addSpaceAfter"/&gt; &lt;/xsl:template&gt; &lt;!-- Bulleted lists: --&gt; Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml?rev=1435515&amp;r1=1435514&amp;r2=1435515&amp;view=diff ============================================================================== --- forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml (original) +++ forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml Sat Jan 19 10:17:42 2013 &lt; at &gt;&lt; at &gt; -24,6 +24,12 &lt; at &gt;&lt; at &gt; &lt;changes&gt; &lt;release version="0.2-dev" date="not-released"&gt; &lt;action type="fix" context="code" dev="SNM"&gt; + The list of cases for when NOT to add a space after a text segment was + incomplete, thus several constructs contained spaces not in the original + input. Now fixed for all common punctuation in the Latin script. The + list can easily be extended if need be. + &lt;/action&gt; + &lt;action type="fix" context="code" dev="SNM"&gt; Corrected a regression introduced in the previous fix. &lt;/action&gt; &lt;action type="add" context="code" dev="SNM"&gt; </pre> sjur< at >apache.org 2013-01-19T10:17:42 http://permalink.gmane.org/gmane.text.xml.forrest.cvs/10376 <pre>Author: sjur Date: Fri Jan 18 22:42:40 2013 New Revision: 1435387 URL: http://svn.apache.org/viewvc?rev=1435387&amp;view=rev Log: Status update. Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml?rev=1435387&amp;r1=1435386&amp;r2=1435387&amp;view=diff ============================================================================== --- forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml (original) +++ forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml Fri Jan 18 22:42:40 2013 &lt; at &gt;&lt; at &gt; -23,6 +23,9 &lt; at &gt;&lt; at &gt; &lt;/developers&gt; &lt;changes&gt; &lt;release version="0.2-dev" date="not-released"&gt; + &lt;action type="fix" context="code" dev="SNM"&gt; + Corrected a regression introduced in the previous fix. + &lt;/action&gt; &lt;action type="add" context="code" dev="SNM"&gt; Made i18n support in the wiki plugin configurable, by way of an xml configuration file. The default is false. </pre> sjur< at >apache.org 2013-01-18T22:42:40 http://permalink.gmane.org/gmane.text.xml.forrest.cvs/10375 <pre>Author: sjur Date: Fri Jan 18 22:36:06 2013 New Revision: 1435381 URL: http://svn.apache.org/viewvc?rev=1435381&amp;view=rev Log: The recent changes introduced one regression - linebreaks triggered new paragraphs where they shouldn't. Now newlines in the middle of a paragraph doesn't introduce a new paragaph anymore, and everything else seems to be the same. Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/grammars/wiki.grm forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/wiki2xdoc.xsl Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/grammars/wiki.grm URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/grammars/wiki.grm?rev=1435381&amp;r1=1435380&amp;r2=1435381&amp;view=diff ============================================================================== --- forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/grammars/wiki.grm (original) +++ forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/grammars/wiki.grm Fri Jan 18 22:36:06 2013 &lt; at &gt;&lt; at &gt; -133,18 +133,18 &lt; at &gt;&lt; at &gt; subsubsection ; title - : titleitem textsequence - | titleitem textsequence hardbreak + : titleitem limitedtextsequence + | titleitem limitedtextsequence hardbreak ; subtitle - : subtitleitem textsequence - | subtitleitem textsequence hardbreak + : subtitleitem limitedtextsequence + | subtitleitem limitedtextsequence hardbreak ; subsubtitle - : subsubtitleitem textsequence - | subsubtitleitem textsequence hardbreak + : subsubtitleitem limitedtextsequence + | subsubtitleitem limitedtextsequence hardbreak ; paragraphs &lt; at &gt;&lt; at &gt; -259,15 +259,23 &lt; at &gt;&lt; at &gt; tablecolumn ; limitedtextsequence - : textblock break limitedtextsequence - | textblock limitedtextsequence - | textblock + : limitedtextblock limitedtextsequence + | limitedtextblock ; +limitedtextblock + : link + | anchor + | strongblock + | emblock + | text + | codeblock + | deftermdefstart + | break + ; + textsequence - : textblock textsequence softbreak - | textblock textsequence - | textblock softbreak + : textblock textsequence | textblock ; &lt; at &gt;&lt; at &gt; -280,6 +288,7 &lt; at &gt;&lt; at &gt; textblock | codeblock | deftermdefstart | break + | softbreak ; termtextsequence Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/wiki2xdoc.xsl URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/wiki2xdoc.xsl?rev=1435381&amp;r1=1435380&amp;r2=1435381&amp;view=diff ============================================================================== --- forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/wiki2xdoc.xsl (original) +++ forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/wiki2xdoc.xsl Fri Jan 18 22:36:06 2013 &lt; at &gt;&lt; at &gt; -134,19 +134,19 &lt; at &gt;&lt; at &gt; &lt;!-- Sections: --&gt; &lt;xsl:template match="st:section"&gt; &lt;section&gt; - &lt;title&gt;&lt;xsl:value-of select="st:title/st:textsequence"/&gt;&lt;/title&gt; + &lt;title&gt;&lt;xsl:value-of select="st:title/st:limitedtextsequence"/&gt;&lt;/title&gt; &lt;xsl:apply-templates select="st:paragraphs/st:paragraph/*|st:subsections/st:subsection" mode="paragraph"/&gt; &lt;/section&gt; &lt;/xsl:template&gt; &lt;xsl:template match="st:subsection" mode="paragraph"&gt; &lt;section&gt; - &lt;title&gt;&lt;xsl:value-of select="st:subtitle/st:textsequence"/&gt;&lt;/title&gt; + &lt;title&gt;&lt;xsl:value-of select="st:subtitle/st:limitedtextsequence"/&gt;&lt;/title&gt; &lt;xsl:apply-templates select="st:paragraphs/st:paragraph/*|st:subsubsections/st:subsubsection" mode="paragraph"/&gt; &lt;/section&gt; &lt;/xsl:template&gt; &lt;xsl:template match="st:subsubsection" mode="paragraph"&gt; &lt;section&gt; - &lt;title&gt;&lt;xsl:value-of select="st:subsubtitle/st:textsequence"/&gt;&lt;/title&gt; + &lt;title&gt;&lt;xsl:value-of select="st:subsubtitle/st:limitedtextsequence"/&gt;&lt;/title&gt; &lt;xsl:apply-templates select="st:paragraphs/st:paragraph/*" mode="paragraph"/&gt; &lt;/section&gt; &lt;/xsl:template&gt; &lt; at &gt;&lt; at &gt; -191,7 +191,7 &lt; at &gt;&lt; at &gt; &lt;xsl:template match="st:tablecolumn"&gt; &lt;td&gt; - &lt;xsl:apply-templates select="st:limitedtextsequence/st:textblock/* + &lt;xsl:apply-templates select="st:limitedtextsequence/st:limitedtextblock/* | st:limitedtextsequence/st:break"/&gt; &lt;/td&gt; &lt;/xsl:template&gt; </pre> sjur< at >apache.org 2013-01-18T22:36:06 http://permalink.gmane.org/gmane.text.xml.forrest.cvs/10374 <pre>Author: sjur Date: Fri Jan 18 10:14:40 2013 New Revision: 1435066 URL: http://svn.apache.org/viewvc?rev=1435066&amp;view=rev Log: Made i18n support in the wiki plugin configurable, by way of an xml configuration file. The default is false. Commit of some code changes I have had locally for years - literally! Forrest has been in use all the time, so there should be no big issues connected to this new feature. Added: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/default.plugin.properties.xml (with props) Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/input.xmap forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml Added: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/default.plugin.properties.xml URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/default.plugin.properties.xml?rev=1435066&amp;view=auto ============================================================================== --- forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/default.plugin.properties.xml (added) +++ forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/default.plugin.properties.xml Fri Jan 18 10:14:40 2013 &lt; at &gt;&lt; at &gt; -0,0 +1,24 &lt; at &gt;&lt; at &gt; +&lt;?xml version="1.0" encoding="UTF-8"?&gt; +&lt;!-- + 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. +--&gt; +&lt;properties&gt; +&lt;!-- Property to specify whether locale-based file matching should + be allowed, e.g. whether the plugin should also look for files + of type document.en.jspwiki, and not only document.jspwiki. + Values are 'true' or 'false'. --&gt; + &lt;property name="input.wiki.allowLocaleBasedFiles" value="false"/&gt; +&lt;/properties&gt; Propchange: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/default.plugin.properties.xml ------------------------------------------------------------------------------ svn:eol-style = native Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/input.xmap URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/input.xmap?rev=1435066&amp;r1=1435065&amp;r2=1435066&amp;view=diff ============================================================================== --- forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/input.xmap (original) +++ forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/input.xmap Fri Jan 18 10:14:40 2013 &lt; at &gt;&lt; at &gt; -35,57 +35,104 &lt; at &gt;&lt; at &gt; &lt;map:resources&gt; &lt;map:resource name="file-resolver"&gt; &lt;map:select type="exists"&gt; + &lt;!-- Moinwiki Markup --&gt; &lt;map:when test="{lm:project.{uri}.moinwiki}"&gt; &lt;map:match type="regexp" pattern="^(.*?)([^/]*).xml$"&gt; - &lt;map:generate type="text2xml" src="{lm:project.{1}{2}.moinwiki}" /&gt; - &lt;map:transform type="lexer" src="cocoon:/moinwiki.xlex"/&gt; - &lt;map:transform type="parser" src="cocoon:/moinwiki.xgrm"/&gt; - &lt;map:transform type="xsltc" - src="{lm:wiki.transform.moinwiki.xdoc}"&gt; - &lt;map:parameter name="name" value="{2}" /&gt; - &lt;map:parameter name="spaceless-filenames" value="true"/&gt; - &lt;/map:transform&gt; - &lt;map:serialize type="xml-document"/&gt; + &lt;map:select type="config"&gt; + &lt;map:parameter name="value" value="{properties:forrest.i18n}"/&gt; + &lt;!-- i18n turned on --&gt; + &lt;map:when test="true"&gt; + &lt;map:match type="i18n" pattern="{lm:project.{1}{2}.*.moinwiki}"&gt; + &lt;map:generate type="text2xml" src="{source}" /&gt; + &lt;map:transform type="lexer" src="cocoon:/moinwiki.xlex"/&gt; + &lt;map:transform type="parser" src="cocoon:/moinwiki.xgrm"/&gt; + &lt;map:transform type="xsltc" + src="{lm:wiki.transform.moinwiki.xdoc}"&gt; + &lt;map:parameter name="name" value="{../2}" /&gt; + &lt;map:parameter name="spaceless-filenames" value="true"/&gt; + &lt;/map:transform&gt; + &lt;map:serialize type="xml-document"/&gt; + &lt;/map:match&gt; + &lt;/map:when&gt; + &lt;!-- i18n turned off --&gt; + &lt;map:otherwise&gt; + &lt;map:generate type="text2xml" src="{lm:project.{1}{2}.moinwiki}" /&gt; + &lt;map:transform type="lexer" src="cocoon:/moinwiki.xlex"/&gt; + &lt;map:transform type="parser" src="cocoon:/moinwiki.xgrm"/&gt; + &lt;map:transform type="xsltc" + src="{lm:wiki.transform.moinwiki.xdoc}"&gt; + &lt;map:parameter name="name" value="{2}" /&gt; + &lt;map:parameter name="spaceless-filenames" value="true"/&gt; + &lt;/map:transform&gt; + &lt;map:serialize type="xml-document"/&gt; + &lt;/map:otherwise&gt; + &lt;/map:select&gt; &lt;/map:match&gt; &lt;/map:when&gt; + &lt;!-- JSPWiki Markup --&gt; &lt;map:when test="{lm:project.{uri}.jspwiki}"&gt; &lt;map:match type="regexp" pattern="^(.*?)([^/]*).xml$"&gt; - &lt;map:generate type="text2xml" src="{lm:project.{1}{2}.jspwiki}" /&gt; - &lt;map:transform type="lexer" src="cocoon:/wiki.xlex"/&gt; - &lt;map:transform type="parser" src="cocoon:/wiki.xgrm"/&gt; - &lt;map:transform type="xsltc" - src="{lm:wiki.transform.wiki.xdoc}"&gt; - &lt;map:parameter name="name" value="{2}" /&gt; - &lt;map:parameter name="spaceless-filenames" value="true"/&gt; - &lt;/map:transform&gt; - &lt;map:serialize type="xml-document"/&gt; + &lt;map:select type="config"&gt; + &lt;map:parameter name="value" value="{properties:forrest.i18n}"/&gt; + &lt;!-- i18n turned on --&gt; + &lt;map:when test="true"&gt; + &lt;map:match type="i18n" pattern="{lm:project.{1}{2}.*.jspwiki}"&gt; + &lt;map:generate type="text2xml" src="{source}" /&gt; + &lt;map:transform type="lexer" src="cocoon:/wiki.xlex"/&gt; + &lt;map:transform type="parser" src="cocoon:/wiki.xgrm"/&gt; + &lt;map:transform type="xsltc" + src="{lm:wiki.transform.wiki.xdoc}"&gt; + &lt;map:parameter name="name" value="{../2}" /&gt; + &lt;map:parameter name="spaceless-filenames" value="true"/&gt; + &lt;/map:transform&gt; + &lt;map:serialize type="xml-document"/&gt; + &lt;/map:match&gt; + &lt;/map:when&gt; + &lt;!-- i18n turned off --&gt; + &lt;map:otherwise&gt; + &lt;map:generate type="text2xml" src="{lm:project.{1}{2}.jspwiki}" /&gt; + &lt;map:transform type="lexer" src="cocoon:/wiki.xlex"/&gt; + &lt;map:transform type="parser" src="cocoon:/wiki.xgrm"/&gt; + &lt;map:transform type="xsltc" + src="{lm:wiki.transform.wiki.xdoc}"&gt; + &lt;map:parameter name="name" value="{2}" /&gt; + &lt;map:parameter name="spaceless-filenames" value="true"/&gt; + &lt;/map:transform&gt; + &lt;map:serialize type="xml-document"/&gt; + &lt;/map:otherwise&gt; + &lt;/map:select&gt; &lt;/map:match&gt; &lt;/map:when&gt; + &lt;!-- CWiki Markup --&gt; &lt;map:when test="{lm:project.{uri}.cwiki}"&gt; &lt;map:match type="regexp" pattern="^(.*?)([^/]*).xml$"&gt; - &lt;map:generate type="text2xml" src="{lm:project.{1}{2}.cwiki}" /&gt; + &lt;map:match type="i18n" pattern="{lm:project.{1}{2}.*.cwiki}"&gt; + &lt;map:generate type="text2xml" src="{source}" /&gt; &lt;map:transform type="lexer" src="cocoon:/wiki.xlex"/&gt; &lt;map:transform type="parser" src="cocoon:/wiki.xgrm"/&gt; &lt;map:transform type="xsltc" src="{lm:wiki.transform.wiki.xdoc}"&gt; - &lt;map:parameter name="name" value="{2}" /&gt; + &lt;map:parameter name="name" value="{../2}" /&gt; &lt;map:parameter name="spaceless-filenames" value="true"/&gt; &lt;/map:transform&gt; &lt;map:serialize type="xml-document"/&gt; + &lt;/map:match&gt; &lt;/map:match&gt; &lt;/map:when&gt; &lt;!-- Google Code Wiki Markup --&gt; &lt;map:when test="{lm:project.{uri}.wiki}"&gt; &lt;map:match type="regexp" pattern="^(.*?)([^/]*).xml$"&gt; - &lt;map:generate type="text2xml" src="{lm:project.{1}{2}.wiki}" /&gt; + &lt;map:match type="i18n" pattern="{lm:project.{1}{2}.*.wiki}"&gt; + &lt;map:generate type="text2xml" src="{source}" /&gt; &lt;map:transform type="lexer" src="cocoon:/googlewiki.xlex"/&gt; &lt;map:transform type="parser" src="cocoon:/googlewiki.xgrm"/&gt; &lt;map:transform type="xsltc" src="{lm:wiki.transform.googlewiki.xdoc}"&gt; - &lt;map:parameter name="name" value="{2}" /&gt; + &lt;map:parameter name="name" value="{../2}" /&gt; &lt;map:parameter name="spaceless-filenames" value="true"/&gt; &lt;/map:transform&gt; &lt;map:serialize type="xml-document"/&gt; + &lt;/map:match&gt; &lt;/map:match&gt; &lt;/map:when&gt; &lt;/map:select&gt; Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml?rev=1435066&amp;r1=1435065&amp;r2=1435066&amp;view=diff ============================================================================== --- forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml (original) +++ forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml Fri Jan 18 10:14:40 2013 &lt; at &gt;&lt; at &gt; -23,6 +23,10 &lt; at &gt;&lt; at &gt; &lt;/developers&gt; &lt;changes&gt; &lt;release version="0.2-dev" date="not-released"&gt; + &lt;action type="add" context="code" dev="SNM"&gt; + Made i18n support in the wiki plugin configurable, by way of an xml + configuration file. The default is false. + &lt;/action&gt; &lt;action type="fix" context="code" dev="SNM"&gt; Added support for definition list constructs (&lt;code&gt;;Term:definition&lt;/code&gt;). Fixed numerous spacing bugs: extra or missing spaces after inline elements. </pre> sjur< at >apache.org 2013-01-18T10:14:40 Search the mailing list at Gmane query http://search.gmane.org/?group=$group=gmane.text.xml.forrest.cvs