Author: crossley
Date: Mon Sep 30 07:39:14 2013
New Revision: 1527469
URL: http://svn.apache.org/r1527469
Log:
Updated our packaged Cocoon and blocks to the latest Cocoon-2.1.13-dev version (using r1489316).
Issue: FOR-1240
Added:
forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-2.1.13-dev.jar (with props)
Removed:
forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-2.1.12-dev.jar
Modified:
forrest/branches/update_cocoon_2.1.12/etc/cocoon_upgrade/README.txt
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/etc/cocoon_upgrade/README.txt
URL: http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/etc/cocoon_upgrade/README.txt?rev=1527469&r1=1527468&r2=1527469&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 Mon Sep 30 07:39:14 2013
@@ -37,11 +37,11 @@ Step 3 and 4 can be done with "./build.s
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)
+ 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:
Added: forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-2.1.13-dev.jar
URL: http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-2.1.13-dev.jar?rev=1527469&view=auto
==============================================================================
Binary file - no diff available.
Propchange: forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-2.1.13-dev.jar
------------------------------------------------------------------------------
svn:mime-type = application/jar
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=1527469&r1=1527468&r2=1527469&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=1527469&r1=1527468&r2=1527469&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=1527469&r1=1527468&r2=1527469&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=1527469&r1=1527468&r2=1527469&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=1527469&r1=1527468&r2=1527469&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=1527469&r1=1527468&r2=1527469&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=1527469&r1=1527468&r2=1527469&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=1527469&r1=1527468&r2=1527469&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=1527469&r1=1527468&r2=1527469&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=1527469&r1=1527468&r2=1527469&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=1527469&r1=1527468&r2=1527469&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=1527469&r1=1527468&r2=1527469&view=diff
==============================================================================
Binary files - no diff available.
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=1527469&r1=1527468&r2=1527469&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 Mon Sep 30 07:39:14 2013
@@ -153,6 +153,9 @@
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.
<!-- 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.
Date: Mon Sep 30 07:39:14 2013
New Revision: 1527469
URL: http://svn.apache.org/r1527469
Log:
Updated our packaged Cocoon and blocks to the latest Cocoon-2.1.13-dev version (using r1489316).
Issue: FOR-1240
Added:
forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-2.1.13-dev.jar (with props)
Removed:
forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-2.1.12-dev.jar
Modified:
forrest/branches/update_cocoon_2.1.12/etc/cocoon_upgrade/README.txt
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/etc/cocoon_upgrade/README.txt
URL: http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/etc/cocoon_upgrade/README.txt?rev=1527469&r1=1527468&r2=1527469&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 Mon Sep 30 07:39:14 2013
@@ -37,11 +37,11 @@ Step 3 and 4 can be done with "./build.s
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)
+ 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:
Added: forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-2.1.13-dev.jar
URL: http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-2.1.13-dev.jar?rev=1527469&view=auto
==============================================================================
Binary file - no diff available.
Propchange: forrest/branches/update_cocoon_2.1.12/lib/core/cocoon-2.1.13-dev.jar
------------------------------------------------------------------------------
svn:mime-type = application/jar
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=1527469&r1=1527468&r2=1527469&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=1527469&r1=1527468&r2=1527469&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=1527469&r1=1527468&r2=1527469&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=1527469&r1=1527468&r2=1527469&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=1527469&r1=1527468&r2=1527469&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=1527469&r1=1527468&r2=1527469&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=1527469&r1=1527468&r2=1527469&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=1527469&r1=1527468&r2=1527469&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=1527469&r1=1527468&r2=1527469&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=1527469&r1=1527468&r2=1527469&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=1527469&r1=1527468&r2=1527469&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=1527469&r1=1527468&r2=1527469&view=diff
==============================================================================
Binary files - no diff available.
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=1527469&r1=1527468&r2=1527469&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 Mon Sep 30 07:39:14 2013
@@ -153,6 +153,9 @@
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.
<!-- 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.