forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject svn commit: r1529397 - in /forrest/trunk: ./ etc/ etc/cocoon_upgrade/ lib/core/ lib/endorsed/ main/webapp/ main/webapp/resources/stylesheets/ main/webapp/skins/common/images/ plugins/ plugins/org.apache.forrest.plugin.input.PhotoGallery/ plugins/org.ap...
Date Sat, 05 Oct 2013 06:58:29 GMT
Author: crossley
Date: Sat Oct  5 06:58:27 2013
New Revision: 1529397

URL: http://svn.apache.org/r1529397
Log:
Merged branch update_cocoon_2.1.12 1452761:1529371 into the trunk.
Issue: FOR-1240

Added:
    forrest/trunk/lib/core/batik-all-1.7.jar
      - copied unchanged from r1529356, forrest/branches/update_cocoon_2.1.12/lib/core/batik-all-1.7.jar
    forrest/trunk/lib/core/batik-license.txt
      - copied unchanged from r1529356, forrest/branches/update_cocoon_2.1.12/lib/core/batik-license.txt
    forrest/trunk/lib/core/cocoon-2.1.13-dev.jar
      - copied unchanged from r1529356, forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-2.1.13-dev.jar
    forrest/trunk/lib/core/log4j-1.2.17.jar
      - copied unchanged from r1529356, forrest/branches/update_cocoon_2.1.12/lib/core/log4j-1.2.17.jar
    forrest/trunk/lib/core/log4j-LICENSE.txt
      - copied unchanged from r1529356, forrest/branches/update_cocoon_2.1.12/lib/core/log4j-LICENSE.txt
    forrest/trunk/lib/core/log4j-NOTICE.txt
      - copied unchanged from r1529356, forrest/branches/update_cocoon_2.1.12/lib/core/log4j-NOTICE.txt
    forrest/trunk/lib/core/slf4j-LICENSE.txt
      - copied unchanged from r1529356, forrest/branches/update_cocoon_2.1.12/lib/core/slf4j-LICENSE.txt
    forrest/trunk/lib/core/slf4j-api-1.7.2.jar
      - copied unchanged from r1529356, forrest/branches/update_cocoon_2.1.12/lib/core/slf4j-api-1.7.2.jar
    forrest/trunk/lib/core/slf4j-log4j12-1.7.2.jar
      - copied unchanged from r1529356, forrest/branches/update_cocoon_2.1.12/lib/core/slf4j-log4j12-1.7.2.jar
    forrest/trunk/lib/core/xml-commons-resolver-1.2.jar
      - copied unchanged from r1529356, forrest/branches/update_cocoon_2.1.12/lib/core/xml-commons-resolver-1.2.jar
    forrest/trunk/lib/core/xmlgraphics-commons-1.5.jar
      - copied unchanged from r1529356, forrest/branches/update_cocoon_2.1.12/lib/core/xmlgraphics-commons-1.5.jar
    forrest/trunk/lib/endorsed/xercesImpl-2.11.0.jar
      - copied unchanged from r1529356, forrest/branches/update_cocoon_2.1.12/lib/endorsed/xercesImpl-2.11.0.jar
    forrest/trunk/lib/endorsed/xml-apis-1.4.01.jar
      - copied unchanged from r1529356, forrest/branches/update_cocoon_2.1.12/lib/endorsed/xml-apis-1.4.01.jar
    forrest/trunk/lib/endorsed/xml-apis-ext-1.4.01.jar
      - copied unchanged from r1529356, forrest/branches/update_cocoon_2.1.12/lib/endorsed/xml-apis-ext-1.4.01.jar
    forrest/trunk/main/webapp/resources/stylesheets/add-namespace-svg.xsl
      - copied unchanged from r1529356, forrest/branches/update_cocoon_2.1.12/main/webapp/resources/stylesheets/add-namespace-svg.xsl
    forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/lib/fop-1.0.jar
      - copied unchanged from r1529356, forrest/branches/update_cocoon_2.1.12/plugins/org.apache.forrest.plugin.output.pdf/lib/fop-1.0.jar
Removed:
    forrest/trunk/lib/core/batik-all-1.6.jar
    forrest/trunk/lib/core/batik-all-1.6.jar.license.txt
    forrest/trunk/lib/core/cocoon-2.1.12-dev.jar
    forrest/trunk/lib/core/log4j-1.2.13.jar
    forrest/trunk/lib/core/log4j-1.2.13.jar.license.txt
    forrest/trunk/lib/core/slf4j-api-1.5.11.jar
    forrest/trunk/lib/core/slf4j-log4j12-1.5.11.jar
    forrest/trunk/lib/core/xml-commons-resolver-1.2-dev-r395116.jar
    forrest/trunk/lib/core/xmlgraphics-commons-1.3.1.jar
    forrest/trunk/lib/endorsed/xercesImpl-2.9.1.jar
    forrest/trunk/lib/endorsed/xml-apis-1.3.04.jar
    forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/lib/cocoon-fop-ng-impl-special-SNAPSHOT.jar
    forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/lib/fop-0.95.jar
Modified:
    forrest/trunk/   (props changed)
    forrest/trunk/LICENSE.txt
    forrest/trunk/etc/cocoon_upgrade/README.txt
    forrest/trunk/etc/cocoon_upgrade/build.xml
    forrest/trunk/etc/review-plugin-deployment.txt
    forrest/trunk/lib/core/cocoon-asciiart-block.jar
    forrest/trunk/lib/core/cocoon-auth-block.jar
    forrest/trunk/lib/core/cocoon-batik-block.jar
    forrest/trunk/lib/core/cocoon-chaperon-block.jar
    forrest/trunk/lib/core/cocoon-fop-block.jar
    forrest/trunk/lib/core/cocoon-html-block.jar
    forrest/trunk/lib/core/cocoon-linkrewriter-block.jar
    forrest/trunk/lib/core/cocoon-lucene-block.jar
    forrest/trunk/lib/core/cocoon-profiler-block.jar
    forrest/trunk/lib/core/cocoon-template-block.jar
    forrest/trunk/lib/core/cocoon-validation-block.jar
    forrest/trunk/lib/core/cocoon-xsp-block.jar
    forrest/trunk/main/webapp/resources.xmap
    forrest/trunk/main/webapp/skins/common/images/corner-imports.svg.xslt
    forrest/trunk/main/webapp/skins/common/images/dc.svg.xslt
    forrest/trunk/main/webapp/skins/common/images/rc.svg.xslt
    forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/locationmap.xml
    forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/resources.xmap
    forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/build.xml
    forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/output.xmap
    forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/status.xml
    forrest/trunk/plugins/plugins.xml
    forrest/trunk/site-author/status.xml
    forrest/trunk/whiteboard/   (props changed)
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/locationmap.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/corner-imports.svg.xslt
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/dc.svg.xslt
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/rc.svg.xslt
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themes.xmap

Propchange: forrest/trunk/
------------------------------------------------------------------------------
    svn:mergeinfo = /forrest/branches/update_cocoon_2.1.12:1452762-1529368

Modified: forrest/trunk/LICENSE.txt
URL: http://svn.apache.org/viewvc/forrest/trunk/LICENSE.txt?rev=1529397&r1=1529396&r2=1529397&view=diff
==============================================================================
--- forrest/trunk/LICENSE.txt (original)
+++ forrest/trunk/LICENSE.txt Sat Oct  5 06:58:27 2013
@@ -210,7 +210,7 @@ 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
@@ -231,7 +231,7 @@ 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
@@ -346,8 +346,7 @@ 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

Modified: forrest/trunk/etc/cocoon_upgrade/README.txt
URL: http://svn.apache.org/viewvc/forrest/trunk/etc/cocoon_upgrade/README.txt?rev=1529397&r1=1529396&r2=1529397&view=diff
==============================================================================
--- forrest/trunk/etc/cocoon_upgrade/README.txt (original)
+++ forrest/trunk/etc/cocoon_upgrade/README.txt Sat Oct  5 06:58:27 2013
@@ -15,7 +15,7 @@ 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.
 
@@ -23,19 +23,29 @@ Step 3 and 4 can be done with "./build.s
 
 3. Copy the cocoon supporting libraries to forrest.
 
-   See ./build.xml where some are excluded. You might need to add/exclude
-   others via this build.xml file.
-   Remember that things will change with Cocoon and we must keep in sync.
+   See ./build.xml where some are excluded. You will probably need to
+   add/exclude others via this build.xml file.
+   Remember that things will change with Cocoon and we must keep our
+   build system up-to-date. Also, some of ours are newer.
 
     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 $COCOON_HOME/lib/optional/
+    rm $COCOON_HOME/lib/optional/jing-20030619.jar
+    cp $FORREST_HOME/lib/core/jing-20091111.jar $COCOON_HOME/tools/lib/
+    rm $COCOON_HOME/tools/lib/jing-20030619.jar
+    edit $COCOON_HOME/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
@@ -44,11 +54,11 @@ 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.
@@ -56,15 +66,18 @@ 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.
 

Modified: forrest/trunk/etc/cocoon_upgrade/build.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/etc/cocoon_upgrade/build.xml?rev=1529397&r1=1529396&r2=1529397&view=diff
==============================================================================
--- forrest/trunk/etc/cocoon_upgrade/build.xml (original)
+++ forrest/trunk/etc/cocoon_upgrade/build.xml Sat Oct  5 06:58:27 2013
@@ -26,7 +26,7 @@
     <property file="revision.properties" />
     <property environment="env"/>
     <property name="cocoon.home" location="${env.COCOON_HOME}"/>
-    <property name="cocoon.version" value="2.1.12-dev"/>
+    <property name="cocoon.version" value="2.1.13-dev"/>
     <property name="forrest.home" location="${env.FORREST_HOME}"/>
   </target>
 
@@ -53,23 +53,26 @@
       <fileset dir="${cocoon.home}/lib/core" defaultexcludes="yes">
         <!-- Exclude some that we don't need -->
         <exclude name="commons-beanutils-core-*.jar"/>
-        <exclude name="commons-javaflow-*.jar"/>
         <exclude name="excalibur-instrument-mgr-*.jar"/>
         <exclude name="javac*.jar"/>
         <exclude name="jdtcore-*.jar"/>
         <exclude name="js-*.jar"/>
-        <exclude name="nekohtml-*.jar"/>
-        <exclude name="pizza-*.jar"/>
-        <!-- OSGI not yet needed -->
-        <exclude name="knopflerfish-*.jar"/>
         <!-- 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.
         <exclude name="commons-jxpath-*.jar"/>
         -->
-        <!-- We have newer xml-commons-resolver -->
-        <exclude name="xml-commons-resolver-*.jar"/>
+        <!-- We have some jars that are newer than Cocoon -->
+        <exclude name="commons-cli-*.jar"/>
+        <exclude name="commons-collections-*.jar"/>
+        <exclude name="commons-io-*.jar"/>
+        <exclude name="commons-jxpath-*.jar"/>
+        <exclude name="commons-lang-*.jar"/>
+        <exclude name="commons-logging-*.jar"/>
+        <exclude name="ehcache-*.jar"/>
+        <exclude name="log4j-*.jar"/>
+        <exclude name="slf4j-api-*.jar"/>
         <!-- servlet.jar goes under tools/jetty -->
         <exclude name="servlet-*.jar"/>
       </fileset>
@@ -85,12 +88,9 @@
     <copy todir="${forrest.home}/lib/core" preservelastmodified="true">
       <fileset dir="${cocoon.home}/lib/optional">
         <include name="batik-all-*.jar"/>
-<!-- FIXME: Cocoon's FOP causes trouble FOR-    ###################
-        <include name="fop-*.jar"/>
--->
+        <include name="xmlgraphics-commons-*.jar"/>
         <include name="lucene-*.jar"/>
         <include name="jtidy-*.jar"/>
-        <include name="nekopull-*.jar"/>
 <!-- FIXME: Chaperon required by core #FOR-501 -->
         <include name="chaperon-*.jar"/>
       </fileset>
@@ -104,6 +104,9 @@
     <copy todir="${forrest.home}/plugins/org.apache.forrest.plugin.input.dtdx/lib" preservelastmodified="true">
       <fileset dir="${cocoon.home}/lib/optional" includes="nekodtd-*.jar"/>
     </copy>
+    <copy todir="${forrest.home}/plugins/org.apache.forrest.plugin.output.pdf/lib" preservelastmodified="true">
+      <fileset dir="${cocoon.home}/lib/optional" includes="fop-*.jar"/>
+    </copy>
   </target>
 
   <target name="copy-endorsed-libs" depends="init">

Modified: forrest/trunk/etc/review-plugin-deployment.txt
URL: http://svn.apache.org/viewvc/forrest/trunk/etc/review-plugin-deployment.txt?rev=1529397&r1=1529396&r2=1529397&view=diff
==============================================================================
--- forrest/trunk/etc/review-plugin-deployment.txt (original)
+++ forrest/trunk/etc/review-plugin-deployment.txt Sat Oct  5 06:58:27 2013
@@ -32,7 +32,7 @@ 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)

Modified: forrest/trunk/lib/core/cocoon-asciiart-block.jar
URL: http://svn.apache.org/viewvc/forrest/trunk/lib/core/cocoon-asciiart-block.jar?rev=1529397&r1=1529396&r2=1529397&view=diff
==============================================================================
Binary files - no diff available.

Modified: forrest/trunk/lib/core/cocoon-auth-block.jar
URL: http://svn.apache.org/viewvc/forrest/trunk/lib/core/cocoon-auth-block.jar?rev=1529397&r1=1529396&r2=1529397&view=diff
==============================================================================
Binary files - no diff available.

Modified: forrest/trunk/lib/core/cocoon-batik-block.jar
URL: http://svn.apache.org/viewvc/forrest/trunk/lib/core/cocoon-batik-block.jar?rev=1529397&r1=1529396&r2=1529397&view=diff
==============================================================================
Binary files - no diff available.

Modified: forrest/trunk/lib/core/cocoon-chaperon-block.jar
URL: http://svn.apache.org/viewvc/forrest/trunk/lib/core/cocoon-chaperon-block.jar?rev=1529397&r1=1529396&r2=1529397&view=diff
==============================================================================
Binary files - no diff available.

Modified: forrest/trunk/lib/core/cocoon-fop-block.jar
URL: http://svn.apache.org/viewvc/forrest/trunk/lib/core/cocoon-fop-block.jar?rev=1529397&r1=1529396&r2=1529397&view=diff
==============================================================================
Binary files - no diff available.

Modified: forrest/trunk/lib/core/cocoon-html-block.jar
URL: http://svn.apache.org/viewvc/forrest/trunk/lib/core/cocoon-html-block.jar?rev=1529397&r1=1529396&r2=1529397&view=diff
==============================================================================
Binary files - no diff available.

Modified: forrest/trunk/lib/core/cocoon-linkrewriter-block.jar
URL: http://svn.apache.org/viewvc/forrest/trunk/lib/core/cocoon-linkrewriter-block.jar?rev=1529397&r1=1529396&r2=1529397&view=diff
==============================================================================
Binary files - no diff available.

Modified: forrest/trunk/lib/core/cocoon-lucene-block.jar
URL: http://svn.apache.org/viewvc/forrest/trunk/lib/core/cocoon-lucene-block.jar?rev=1529397&r1=1529396&r2=1529397&view=diff
==============================================================================
Binary files - no diff available.

Modified: forrest/trunk/lib/core/cocoon-profiler-block.jar
URL: http://svn.apache.org/viewvc/forrest/trunk/lib/core/cocoon-profiler-block.jar?rev=1529397&r1=1529396&r2=1529397&view=diff
==============================================================================
Binary files - no diff available.

Modified: forrest/trunk/lib/core/cocoon-template-block.jar
URL: http://svn.apache.org/viewvc/forrest/trunk/lib/core/cocoon-template-block.jar?rev=1529397&r1=1529396&r2=1529397&view=diff
==============================================================================
Binary files - no diff available.

Modified: forrest/trunk/lib/core/cocoon-validation-block.jar
URL: http://svn.apache.org/viewvc/forrest/trunk/lib/core/cocoon-validation-block.jar?rev=1529397&r1=1529396&r2=1529397&view=diff
==============================================================================
Binary files - no diff available.

Modified: forrest/trunk/lib/core/cocoon-xsp-block.jar
URL: http://svn.apache.org/viewvc/forrest/trunk/lib/core/cocoon-xsp-block.jar?rev=1529397&r1=1529396&r2=1529397&view=diff
==============================================================================
Binary files - no diff available.

Modified: forrest/trunk/main/webapp/resources.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources.xmap?rev=1529397&r1=1529396&r2=1529397&view=diff
==============================================================================
--- forrest/trunk/main/webapp/resources.xmap (original)
+++ forrest/trunk/main/webapp/resources.xmap Sat Oct  5 06:58:27 2013
@@ -183,7 +183,7 @@ $Revision: 1.13 $
           <map:parameter name="fg-color-name" value="{8}"/>
         </map:transform>
         <map:call resource="transform-project2text"/>
-        <map:serialize type="xml" />
+        <map:serialize type="svgxml" />
       </map:match>
 <!-- DEBUG: special case corner generator pipeline PNG from SVG-->
       <map:match pattern="skin/images**/*c-*-*-*-1*-2*-3*.test.png">

Modified: forrest/trunk/main/webapp/skins/common/images/corner-imports.svg.xslt
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/common/images/corner-imports.svg.xslt?rev=1529397&r1=1529396&r2=1529397&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/common/images/corner-imports.svg.xslt (original)
+++ forrest/trunk/main/webapp/skins/common/images/corner-imports.svg.xslt Sat Oct  5 06:58:27
2013
@@ -15,7 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/2000/svg">
   <xsl:param name="orientation-tb"/>
   <xsl:param name="orientation-lr"/>
   <xsl:param name="size"/>

Modified: forrest/trunk/main/webapp/skins/common/images/dc.svg.xslt
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/common/images/dc.svg.xslt?rev=1529397&r1=1529396&r2=1529397&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/common/images/dc.svg.xslt (original)
+++ forrest/trunk/main/webapp/skins/common/images/dc.svg.xslt Sat Oct  5 06:58:27 2013
@@ -15,7 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/2000/svg">
   <xsl:import href="corner-imports.svg.xslt" />
 <!-- Diagonal 45 degrees corner -->
   <xsl:template name="figure">

Modified: forrest/trunk/main/webapp/skins/common/images/rc.svg.xslt
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/common/images/rc.svg.xslt?rev=1529397&r1=1529396&r2=1529397&view=diff
==============================================================================
--- forrest/trunk/main/webapp/skins/common/images/rc.svg.xslt (original)
+++ forrest/trunk/main/webapp/skins/common/images/rc.svg.xslt Sat Oct  5 06:58:27 2013
@@ -15,7 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/2000/svg">
   <xsl:import href="corner-imports.svg.xslt" />
 <!-- Rounded corner -->
   <xsl:template name="figure">

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/locationmap.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/locationmap.xml?rev=1529397&r1=1529396&r2=1529397&view=diff
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/locationmap.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/locationmap.xml Sat
Oct  5 06:58:27 2013
@@ -41,5 +41,8 @@
         <location src="{forrest:forrest.plugins}/org.apache.forrest.plugin.input.PhotoGallery/resources/default-album-metadata.xml"/>
       </select>
     </match>
+    <match pattern="transform.xml.namespaced-svg">
+      <location src="{forrest:forrest.stylesheets}/add-namespace-svg.xsl" />
+    </match>
   </locator>
 </locationmap>

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/resources.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/resources.xmap?rev=1529397&r1=1529396&r2=1529397&view=diff
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/resources.xmap (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.PhotoGallery/resources.xmap Sat
Oct  5 06:58:27 2013
@@ -42,6 +42,7 @@
           <map:parameter name="use-request-parameters" value="true" />
           <map:parameter name="label" value="{2}" />
         </map:transform>
+        <map:transform src="{lm:transform.xml.namespaced-svg}"/>
         <map:serialize type="svg2png" />
       </map:match>
 

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/build.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/build.xml?rev=1529397&r1=1529396&r2=1529397&view=diff
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/build.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/build.xml Sat Oct  5 06:58:27
2013
@@ -17,10 +17,10 @@
 -->
 <project default="docs" basedir="." name="Forrest plugin build file">
   <property name="plugin-name" value="org.apache.forrest.plugin.output.pdf"/>
-  <property name="forrest.version" value="0.9"/>
+  <property name="forrest.version" value="0.10"/>
   <property name="forrest.version.initial" value="0.6"/>
   <property name="type" value="output"/>
-  <property name="plugin-version" value="0.3"/>
+  <property name="plugin-version" value="0.4"/>
   <property name="description" value="Create PDF documents from Forrest documents."/>
   <property name="author" value="Apache Forrest Project"/>
   <property name="websiteURL" value="http://forrest.apache.org/pluginDocs/plugins_0_90/org.apache.forrest.plugin.output.pdf"/>

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/output.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/output.xmap?rev=1529397&r1=1529396&r2=1529397&view=diff
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/output.xmap (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/output.xmap Sat Oct  5 06:58:27
2013
@@ -35,7 +35,7 @@
       </map:transformer>
     </map:transformers>
     <map:serializers default="fo2pdf">
-      <map:serializer name="fo2pdf" src="org.apache.cocoon.blocks.fop.FOPNGSerializer"
mime-type="application/pdf">
+      <map:serializer name="fo2pdf" src="org.apache.cocoon.serialization.FOPSerializer"
mime-type="application/pdf">
       	<user-config>&pdf-config-file;</user-config>
       </map:serializer> 
     </map:serializers>

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/status.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/status.xml?rev=1529397&r1=1529396&r2=1529397&view=diff
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/status.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/status.xml Sat Oct  5 06:58:27
2013
@@ -48,6 +48,16 @@
             title="Changes to Build" />
   </contexts>
   <changes>
+    <release version="0.4" date="not-yet-released">
+      <action type="update" context="code" dev="DC" fixes-bug="FOR-1240,FOR-1193" importance="high">
+        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
+      </action>
+      <action type="update" context="code" dev="DC" importance="high">
+        Upgraded Apache FOP to version 1.0 and XML Graphics Commons to 1.5
+      </action>
+    </release>
     <release version="0.3" date="2011-02-07">
       <action type="update" context="code" dev="JM" importance="high">
         Upgraded Apache FOP to version 0.95 and XML Graphics Commons to 1.3.1

Modified: forrest/trunk/plugins/plugins.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/plugins.xml?rev=1529397&r1=1529396&r2=1529397&view=diff
==============================================================================
--- forrest/trunk/plugins/plugins.xml (original)
+++ forrest/trunk/plugins/plugins.xml Sat Oct  5 06:58:27 2013
@@ -174,15 +174,15 @@
   <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">
+        version="0.4">
     <description>
       Enable Forrest documents to be output in PDF format.
     </description>
     <forrestVersionInitial>0.6</forrestVersionInitial>
-    <forrestVersion>0.9</forrestVersion>
+    <forrestVersion>0.10</forrestVersion>
   </plugin>
   <plugin name="org.apache.forrest.plugin.output.POD"
         type="output"

Modified: forrest/trunk/site-author/status.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/status.xml?rev=1529397&r1=1529396&r2=1529397&view=diff
==============================================================================
--- forrest/trunk/site-author/status.xml (original)
+++ forrest/trunk/site-author/status.xml Sat Oct  5 06:58:27 2013
@@ -153,6 +153,18 @@
         Added document to facilitate
         <link href="site:upgrading_010">upgrading to v0.10-dev</link>
       </action>
+<!-- 2013-09 -->
+      <action context="code" type="update" dev="DC" fixes-bug="FOR-1240">
+        Updated our packaged Cocoon and blocks to the latest Cocoon-2.1.13-dev version.
+      </action>
+<!-- 2013-03 -->
+      <action context="code" type="update" dev="DC" fixes-bug="FOR-1240" importance="high">
+        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
+      </action>
+      <action context="code" type="update" dev="DC">
+        Updated log4j to 1.2.17 and slf4j to 1.7.2
+      </action>
 <!-- 2012-01 -->
       <action context="docs" type="update" dev="DC" fixes-bug="FOR-1233">
         Improved documentation about configuring project entities file,

Propchange: forrest/trunk/whiteboard/
------------------------------------------------------------------------------
  Merged /forrest/branches/update_cocoon_2.1.12/whiteboard:r1452762-1529356

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/locationmap.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/locationmap.xml?rev=1529397&r1=1529396&r2=1529397&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/locationmap.xml
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/locationmap.xml
Sat Oct  5 06:58:27 2013
@@ -370,5 +370,8 @@
     <match pattern="transform.xml.variable.helper">
       <location src="{lm:dispatcher.home}/resources/stylesheets/helper/variable.helper.xsl"
/>
     </match>
+    <match pattern="transform.xml.namespaced-svg">
+      <location src="{forrest:forrest.stylesheets}/add-namespace-svg.xsl" />
+    </match>
   </locator>
 </locationmap>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/corner-imports.svg.xslt
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/corner-imports.svg.xslt?rev=1529397&r1=1529396&r2=1529397&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/corner-imports.svg.xslt
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/corner-imports.svg.xslt
Sat Oct  5 06:58:27 2013
@@ -15,7 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/2000/svg">
   <xsl:param name="orientation-tb" />
   <xsl:param name="orientation-lr" />
   <xsl:param name="size" />

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/dc.svg.xslt
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/dc.svg.xslt?rev=1529397&r1=1529396&r2=1529397&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/dc.svg.xslt
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/dc.svg.xslt
Sat Oct  5 06:58:27 2013
@@ -15,7 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/2000/svg">
   <xsl:import href="corner-imports.svg.xslt" />
   <!-- Diagonal 45 degrees corner -->
   <xsl:template name="figure">

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/rc.svg.xslt
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/rc.svg.xslt?rev=1529397&r1=1529396&r2=1529397&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/rc.svg.xslt
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/images/rc.svg.xslt
Sat Oct  5 06:58:27 2013
@@ -15,7 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/2000/svg">
   <xsl:import href="corner-imports.svg.xslt" />
   <!-- Rounded corner -->
   <xsl:template name="figure">

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themes.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themes.xmap?rev=1529397&r1=1529396&r2=1529397&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themes.xmap
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themes.xmap
Sat Oct  5 06:58:27 2013
@@ -77,7 +77,8 @@
           <map:parameter name="stroke-color-name" value="{6}" />
           <map:parameter name="fg-color-name" value="{7}" />
         </map:transform>
-        <map:serialize type="xml" />
+        <map:transform src="{lm:transform.xml.namespaced-svg}"/>
+        <map:serialize type="svgxml" />
       </map:match>
       <map:match pattern="themes/images**/roundcorner-*-*-*-bg*-stroke*-fg*.svg-to-png">
 



Mime
View raw message