Author: crossley
Date: Wed Dec 7 23:02:38 2005
New Revision: 355020
URL: http://svn.apache.org/viewcvs?rev=355020&view=rev
Log:
Use Cocoon's new method of excluding all blocks,
then include only the blocks that we use.
Modified:
forrest/trunk/etc/cocoon_upgrade/README.txt
forrest/trunk/etc/cocoon_upgrade/local.blocks.properties
Modified: forrest/trunk/etc/cocoon_upgrade/README.txt
URL:
http://svn.apache.org/viewcvs/forrest/trunk/etc/cocoon_upgrade/README.txt?rev=355020&r1=355019&r2=355020&view=diff
==============================================================================
--- forrest/trunk/etc/cocoon_upgrade/README.txt (original)
+++ forrest/trunk/etc/cocoon_upgrade/README.txt Wed Dec 7 23:02:38 2005
@@ -15,7 +15,6 @@
0. cd $FORREST_HOME/etc/cocoon_upgrade
1. Keep our local.*.properties files sychronised with Cocoon's.
- Make sure to exclude any new blocks that we don't need.
Step 2 and 3 can be done with "./build.sh 0"
2. Copy the cocoon libraries to forrest (See ./build.xml where some are
excluded).
Modified: forrest/trunk/etc/cocoon_upgrade/local.blocks.properties
URL:
http://svn.apache.org/viewcvs/forrest/trunk/etc/cocoon_upgrade/local.blocks.properties?rev=355020&r1=355019&r2=355020&view=diff
==============================================================================
--- forrest/trunk/etc/cocoon_upgrade/local.blocks.properties (original)
+++ forrest/trunk/etc/cocoon_upgrade/local.blocks.properties Wed Dec 7
23:02:38 2005
@@ -54,7 +54,7 @@
# All blocks
-------------------------------------------------------------------
# Use this property to exclude all blocks at once
-# exclude.all.blocks=true
+exclude.all.blocks=true
# Use this property to include all blocks at once
# include.all.blocks=true
@@ -69,57 +69,57 @@
#-----[dependency]: "authentication-fw" depends on "session-fw".
#-----[dependency]: "authentication-fw" is needed by "portal", "portal-sample".
-include.block.authentication-fw=false
+#include.block.authentication-fw=false
#-----[dependency]: "batik" is needed by "fop", "scratchpad", "tour".
-#include.block.batik=false
-include.block.bsf=false
+include.block.batik=true
+#include.block.bsf=false
#-----[dependency]: "chaperon" depends on "template" (for samples).
-#include.block.chaperon=false
-include.block.core-samples-additional=false
+include.block.chaperon=true
+#include.block.core-samples-additional=false
#-----[dependency]: "core-samples-main" depends on "xsp" (for samples).
-include.block.core-samples-main=false
+#include.block.core-samples-main=false
#-----[dependency]: "databases" depends on "hsqldb" (for samples).
#-----[dependency]: "databases" is needed by "jms", "ojb", "petstore",
"repository", "xmldb", "xsp".
-include.block.databases=false
+#include.block.databases=false
#-----[dependency]: "fop" depends on "batik".
#-----[dependency]: "fop" is needed by "tour".
-#include.block.fop=false
+include.block.fop=true
#-----[dependency]: "hsqldb" is needed by "databases", "jms", "ojb",
"petstore".
-include.block.hsqldb=false
-#include.block.html=false
+#include.block.hsqldb=false
+include.block.html=true
#-----[dependency]: "itext" depends on "xsp" (for samples).
-include.block.itext=false
-include.block.jfor=false
-include.block.jsp=false
-#include.block.linkrewriter=false
+#include.block.itext=false
+#include.block.jfor=false
+#include.block.jsp=false
+include.block.linkrewriter=true
#-----[dependency]: "lucene" depends on "template" (for samples).
#-----[dependency]: "lucene" is needed by "querybean".
-#include.block.lucene=false
-include.block.midi=false
-include.block.naming=false
+include.block.lucene=true
+#include.block.midi=false
+#include.block.naming=false
#-----[dependency]: "ojb" depends on "databases" (for samples), "forms" (for
samples), "hsqldb" (for samples).
#-----[dependency]: "ojb" is needed by "portal-sample", "querybean".
-include.block.ojb=false
-include.block.paranoid=false
-include.block.poi=false
+#include.block.ojb=false
+#include.block.paranoid=false
+#include.block.poi=false
#-----[dependency]: "portal" depends on "ajax", "authentication-fw", "cron",
"forms", "session-fw".
#-----[dependency]: "portal" is needed by "faces", "portal-sample".
-include.block.portal=false
+#include.block.portal=false
#-----[dependency]: "portal-sample" depends on "authentication-fw", "cron",
"forms", "ojb", "portal", "session-fw", "template" (for samples).
-include.block.portal-sample=false
-#include.block.profiler=false
+#include.block.portal-sample=false
+include.block.profiler=true
#-----[dependency]: "python" depends on "xsp".
-include.block.python=false
+#include.block.python=false
#-----[dependency]: "session-fw" is needed by "authentication-fw", "portal",
"portal-sample", "xsp".
-include.block.session-fw=false
+#include.block.session-fw=false
#-----[dependency]: "velocity" is needed by "petstore", "scratchpad".
-include.block.velocity=false
-include.block.web3=false
+#include.block.velocity=false
+#include.block.web3=false
#-----[dependency]: "xmldb" depends on "databases".
-include.block.xmldb=false
+#include.block.xmldb=false
#-----[dependency]: "xsp" depends on "databases", "session-fw".
#-----[dependency]: "xsp" is needed by "core-samples-main", "itext", "mail",
"python", "scratchpad".
-#include.block.xsp=false
+include.block.xsp=true
# Unstable blocks
--------------------------------------------------------------
@@ -132,60 +132,60 @@
# stable.
#-----[dependency]: "ajax" is needed by "forms", "portal".
-include.block.ajax=false
+#include.block.ajax=false
#-----[dependency]: "apples" depends on "forms" (for samples).
-include.block.apples=false
+#include.block.apples=false
#-----[dependency]: "asciiart" is needed by "mail".
-#include.block.asciiart=false
+include.block.asciiart=true
#-----[dependency]: "axis" is needed by "scratchpad".
-include.block.axis=false
-include.block.captcha=false
+#include.block.axis=false
+#include.block.captcha=false
#-----[dependency]: "cron" depends on "template" (for samples).
#-----[dependency]: "cron" is needed by "jms", "portal", "portal-sample",
"scratchpad".
-include.block.cron=false
-include.block.deli=false
+#include.block.cron=false
+#include.block.deli=false
#-----[dependency]: "eventcache" depends on "jms", "template" (for samples).
#-----[dependency]: "eventcache" is needed by "repository".
-include.block.eventcache=false
+#include.block.eventcache=false
#-----[dependency]: "faces" depends on "portal", "taglib".
#-----[dependency]: "faces" is needed by "scratchpad".
-include.block.faces=false
+#include.block.faces=false
#-----[dependency]: "forms" depends on "ajax", "template".
#-----[dependency]: "forms" is needed by "apples", "javaflow", "ojb",
"petstore", "portal", "portal-sample", "querybean", "tour".
-include.block.forms=false
+#include.block.forms=false
#-----[dependency]: "javaflow" depends on "forms", "template" (for samples).
#-----[dependency]: "javaflow" is needed by "scratchpad".
-include.block.javaflow=false
-include.block.jcr=false
+#include.block.javaflow=false
+#include.block.jcr=false
#-----[dependency]: "jms" depends on "cron", "databases" (for samples),
"hsqldb" (for samples).
#-----[dependency]: "jms" is needed by "eventcache", "slide".
-include.block.jms=false
+#include.block.jms=false
#-----[dependency]: "mail" depends on "asciiart" (for samples), "xsp" (for
samples).
-include.block.mail=false
+#include.block.mail=false
#-----[dependency]: "petstore" depends on "databases", "forms", "hsqldb",
"template", "velocity".
-include.block.petstore=false
-include.block.proxy=false
-include.block.qdox=false
+#include.block.petstore=false
+#include.block.proxy=false
+#include.block.qdox=false
#-----[dependency]: "querybean" depends on "forms" (for samples), "lucene",
"ojb", "template" (for samples).
-include.block.querybean=false
+#include.block.querybean=false
#-----[dependency]: "repository" depends on "databases" (for samples),
"eventcache".
#-----[dependency]: "repository" is needed by "scratchpad", "slide", "webdav".
-include.block.repository=false
+#include.block.repository=false
#-----[dependency]: "scratchpad" depends on "axis" (for samples), "batik" (for
samples), "cron", "faces" (for samples), "javaflow", "repository", "template"
(for samples), "velocity" (for samples), "xsp".
-include.block.scratchpad=false
-include.block.serializers=false
+#include.block.scratchpad=false
+#include.block.serializers=false
#-----[dependency]: "slide" depends on "jms", "repository", "template" (for
samples).
-include.block.slide=false
+#include.block.slide=false
#-----[dependency]: "slop" is needed by "tour".
-include.block.slop=false
-include.block.spring-app=false
-include.block.stx=false
+#include.block.slop=false
+#include.block.spring-app=false
+#include.block.stx=false
#-----[dependency]: "taglib" is needed by "faces".
-include.block.taglib=false
+#include.block.taglib=false
#-----[dependency]: "template" is needed by "chaperon", "cron", "eventcache",
"forms", "javaflow", "lucene", "petstore", "portal-sample", "querybean",
"scratchpad", "slide", "tour", "webdav".
-#include.block.template=false
+include.block.template=true
#-----[dependency]: "tour" depends on "batik", "fop", "forms", "slop",
"template".
-include.block.tour=false
-#include.block.validation=false
+#include.block.tour=false
+include.block.validation=true
#-----[dependency]: "webdav" depends on "repository", "template" (for samples).
-include.block.webdav=false
+#include.block.webdav=false
