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&r1=1452798&r2=1452799&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
@@ -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.
@@ -30,12 +30,21 @@ 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
@@ -44,11 +53,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 +65,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.
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&r1=1452798&r2=1452799&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
@@ -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.
@@ -30,12 +30,21 @@ 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
@@ -44,11 +53,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 +65,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.