Author: unico
Date: Mon Oct 25 10:02:49 2004
New Revision: 55504
Added:
cocoon/branches/BRANCH_2_1_X/lib/optional/antlr-2.7.3.jar
- copied unchanged from rev 55502,
cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/lib/antlr-2.7.3.jar
cocoon/branches/BRANCH_2_1_X/lib/optional/apache-garbage-0.0.jar
- copied unchanged from rev 55502,
cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/lib/apache-garbage-0.0.jar
cocoon/branches/BRANCH_2_1_X/lib/optional/asm-1.4.3.jar
- copied unchanged from rev 55502,
cocoon/branches/BRANCH_2_1_X/src/blocks/bsf/lib/asm-1.4.3.jar
cocoon/branches/BRANCH_2_1_X/lib/optional/asm-util-1.4.3.jar
- copied unchanged from rev 55502,
cocoon/branches/BRANCH_2_1_X/src/blocks/bsf/lib/asm-util-1.4.3.jar
cocoon/branches/BRANCH_2_1_X/lib/optional/axis-1.1.jar
- copied unchanged from rev 55502,
cocoon/branches/BRANCH_2_1_X/src/blocks/axis/lib/axis-1.1.jar
cocoon/branches/BRANCH_2_1_X/lib/optional/axis-jaxrpc-1.1.jar
- copied unchanged from rev 55502,
cocoon/branches/BRANCH_2_1_X/src/blocks/axis/lib/axis-jaxrpc-1.1.jar
cocoon/branches/BRANCH_2_1_X/lib/optional/axis-saaj-1.1.jar
- copied unchanged from rev 55502,
cocoon/branches/BRANCH_2_1_X/src/blocks/axis/lib/axis-saaj-1.1.jar
cocoon/branches/BRANCH_2_1_X/lib/optional/batik-all-1.5.1.jar
- copied unchanged from rev 55502,
cocoon/branches/BRANCH_2_1_X/src/blocks/batik/lib/batik-all-1.5.1.jar
cocoon/branches/BRANCH_2_1_X/lib/optional/bsf-2.3.0.jar
- copied unchanged from rev 55502,
cocoon/branches/BRANCH_2_1_X/src/blocks/bsf/lib/bsf-2.3.0.jar
cocoon/branches/BRANCH_2_1_X/lib/optional/chaperon-20040205.jar
- copied unchanged from rev 55502,
cocoon/branches/BRANCH_2_1_X/src/blocks/chaperon/lib/chaperon-20040205.jar
cocoon/branches/BRANCH_2_1_X/lib/optional/cocoon-serializers-charsets-0.1.jar
- copied unchanged from rev 55502,
cocoon/branches/BRANCH_2_1_X/src/blocks/serializers/lib/cocoon-serializers-charsets-0.1.jar
cocoon/branches/BRANCH_2_1_X/lib/optional/commons-beanutils-core-1.7.jar
- copied unchanged from rev 55502,
cocoon/branches/BRANCH_2_1_X/src/blocks/faces/lib/commons-beanutils-core-1.7.jar
cocoon/branches/BRANCH_2_1_X/lib/optional/commons-betwixt-0.5.jar
- copied unchanged from rev 55502,
cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/lib/commons-betwixt-0.5.jar
cocoon/branches/BRANCH_2_1_X/lib/optional/commons-dbcp-1.2.1.jar
- copied unchanged from rev 55502,
cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/lib/commons-dbcp-1.2.1.jar
cocoon/branches/BRANCH_2_1_X/lib/optional/commons-digester-1.5.jar
- copied unchanged from rev 55502,
cocoon/branches/BRANCH_2_1_X/src/blocks/faces/lib/commons-digester-1.5.jar
cocoon/branches/BRANCH_2_1_X/lib/optional/commons-discovery-0.2.jar
- copied unchanged from rev 55502,
cocoon/branches/BRANCH_2_1_X/src/blocks/axis/lib/commons-discovery-0.2.jar
cocoon/branches/BRANCH_2_1_X/lib/optional/commons-el-1.0.jar
- copied unchanged from rev 55502,
cocoon/branches/BRANCH_2_1_X/src/blocks/faces/lib/commons-el-1.0.jar
cocoon/branches/BRANCH_2_1_X/lib/optional/commons-pool-1.2.jar
- copied unchanged from rev 55502,
cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/lib/commons-pool-1.2.jar
cocoon/branches/BRANCH_2_1_X/lib/optional/db-ojb-1.0.0.jar
- copied unchanged from rev 55502,
cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/lib/db-ojb-1.0.0.jar
cocoon/branches/BRANCH_2_1_X/lib/optional/deli-x020904.jar
- copied unchanged from rev 55502,
cocoon/branches/BRANCH_2_1_X/src/blocks/deli/lib/deli-x020904.jar
cocoon/branches/BRANCH_2_1_X/lib/optional/excalibur-util-1.0.jar
- copied unchanged from rev 55502,
cocoon/branches/BRANCH_2_1_X/src/blocks/axis/lib/excalibur-util-1.0.jar
cocoon/branches/BRANCH_2_1_X/lib/optional/fop-0.20.5.jar
- copied unchanged from rev 55502,
cocoon/branches/BRANCH_2_1_X/src/blocks/fop/lib/fop-0.20.5.jar
cocoon/branches/BRANCH_2_1_X/lib/optional/geronimo-spec-jms-DEV-20031120.jar
- copied unchanged from rev 55502,
cocoon/branches/BRANCH_2_1_X/src/blocks/jms/lib/geronimo-spec-jms-DEV-20031120.jar
cocoon/branches/BRANCH_2_1_X/lib/optional/geronimo-spec-jta-DEV-20040202.jar
- copied unchanged from rev 55502,
cocoon/branches/BRANCH_2_1_X/src/blocks/slide/lib/geronimo-spec-jta-DEV-20040202.jar
cocoon/branches/BRANCH_2_1_X/lib/optional/groovy-1.0-beta-6.jar
- copied unchanged from rev 55502,
cocoon/branches/BRANCH_2_1_X/src/blocks/bsf/lib/groovy-1.0-beta-6.jar
cocoon/branches/BRANCH_2_1_X/lib/optional/hsqldb-1.7.1.jar
- copied unchanged from rev 55502,
cocoon/branches/BRANCH_2_1_X/src/blocks/hsqldb/lib/hsqldb-1.7.1.jar
cocoon/branches/BRANCH_2_1_X/lib/optional/icu4j-3.0.jar
- copied unchanged from rev 55502,
cocoon/branches/BRANCH_2_1_X/src/blocks/deli/lib/icu4j-3.0.jar
cocoon/branches/BRANCH_2_1_X/lib/optional/itext-1.02b.jar
- copied unchanged from rev 55502,
cocoon/branches/BRANCH_2_1_X/src/blocks/itext/lib/itext-1.02b.jar
cocoon/branches/BRANCH_2_1_X/lib/optional/itext-xml-1.02.jar
- copied unchanged from rev 55502,
cocoon/branches/BRANCH_2_1_X/src/blocks/itext/lib/itext-xml-1.02.jar
cocoon/branches/BRANCH_2_1_X/lib/optional/jakarta-slide-webdavlib-2.0.jar
- copied unchanged from rev 55502,
cocoon/branches/BRANCH_2_1_X/src/blocks/webdav/lib/jakarta-slide-webdavlib-2.0.jar
cocoon/branches/BRANCH_2_1_X/lib/optional/jdom-b9.jar
- copied unchanged from rev 55502,
cocoon/branches/BRANCH_2_1_X/src/blocks/slide/lib/jdom-b9.jar
cocoon/branches/BRANCH_2_1_X/lib/optional/jena-2.1.jar
- copied unchanged from rev 55502,
cocoon/branches/BRANCH_2_1_X/src/blocks/deli/lib/jena-2.1.jar
cocoon/branches/BRANCH_2_1_X/lib/optional/jfor-0.7.1.jar
- copied unchanged from rev 55502,
cocoon/branches/BRANCH_2_1_X/src/blocks/jfor/lib/jfor-0.7.1.jar
cocoon/branches/BRANCH_2_1_X/lib/optional/joost-20040330.jar
- copied unchanged from rev 55502,
cocoon/branches/BRANCH_2_1_X/src/blocks/stx/lib/joost-20040330.jar
cocoon/branches/BRANCH_2_1_X/lib/optional/jsp-api-2.0.jar
- copied unchanged from rev 55502,
cocoon/branches/BRANCH_2_1_X/src/blocks/faces/lib/jsp-api-2.0.jar
cocoon/branches/BRANCH_2_1_X/lib/optional/jtidy-04aug2000r7-dev.jar
- copied unchanged from rev 55502,
cocoon/branches/BRANCH_2_1_X/src/blocks/html/lib/jtidy-04aug2000r7-dev.jar
cocoon/branches/BRANCH_2_1_X/lib/optional/lucene-1.4.1.jar
- copied unchanged from rev 55502,
cocoon/branches/BRANCH_2_1_X/src/blocks/lucene/lib/lucene-1.4.1.jar
cocoon/branches/BRANCH_2_1_X/lib/optional/myfaces-20041005m.jar
- copied unchanged from rev 55502,
cocoon/branches/BRANCH_2_1_X/src/blocks/faces/lib/myfaces-20041005m.jar
cocoon/branches/BRANCH_2_1_X/lib/optional/myfaces-jsf-api-20041005.jar
- copied unchanged from rev 55502,
cocoon/branches/BRANCH_2_1_X/src/blocks/faces/lib/myfaces-jsf-api-20041005.jar
cocoon/branches/BRANCH_2_1_X/lib/optional/pluto-1.0.1-rc1.jar
- copied unchanged from rev 55502,
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/lib/pluto-1.0.1-rc1.jar
cocoon/branches/BRANCH_2_1_X/lib/optional/poi-2.5.1-final-20040804.jar
- copied unchanged from rev 55502,
cocoon/branches/BRANCH_2_1_X/src/blocks/poi/lib/poi-2.5.1-final-20040804.jar
cocoon/branches/BRANCH_2_1_X/lib/optional/portlet-api-1.0.jar
- copied unchanged from rev 55502,
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/lib/portlet-api-1.0.jar
cocoon/branches/BRANCH_2_1_X/lib/optional/qdox-1.5.jar
- copied unchanged from rev 55502,
cocoon/branches/BRANCH_2_1_X/src/blocks/qdox/lib/qdox-1.5.jar
cocoon/branches/BRANCH_2_1_X/lib/optional/quartz-1.4.2.jar
- copied unchanged from rev 55502,
cocoon/branches/BRANCH_2_1_X/src/blocks/cron/lib/quartz-1.4.2.jar
cocoon/branches/BRANCH_2_1_X/lib/optional/servlet-2_3.jar
- copied unchanged from rev 55502,
cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/lib/servlet-2_3.jar
cocoon/branches/BRANCH_2_1_X/lib/optional/slide-kernel-2.0.jar
- copied unchanged from rev 55502,
cocoon/branches/BRANCH_2_1_X/src/blocks/slide/lib/slide-kernel-2.0.jar
cocoon/branches/BRANCH_2_1_X/lib/optional/slide-stores-2.0.jar
- copied unchanged from rev 55502,
cocoon/branches/BRANCH_2_1_X/src/blocks/slide/lib/slide-stores-2.0.jar
cocoon/branches/BRANCH_2_1_X/lib/optional/slide-webdavservlet-2.0.jar
- copied unchanged from rev 55502,
cocoon/branches/BRANCH_2_1_X/src/blocks/slide/lib/slide-webdavservlet-2.0.jar
cocoon/branches/BRANCH_2_1_X/lib/optional/spark-0.2.jar
- copied unchanged from rev 55502,
cocoon/branches/BRANCH_2_1_X/src/blocks/swf/lib/spark-0.2.jar
cocoon/branches/BRANCH_2_1_X/lib/optional/velocity-1.4.jar
- copied unchanged from rev 55502,
cocoon/branches/BRANCH_2_1_X/src/blocks/velocity/lib/velocity-1.4.jar
cocoon/branches/BRANCH_2_1_X/lib/optional/wsdl4j-1.4.jar
- copied unchanged from rev 55502,
cocoon/branches/BRANCH_2_1_X/src/blocks/axis/lib/wsdl4j-1.4.jar
cocoon/branches/BRANCH_2_1_X/lib/optional/xindice-1.1b4.jar
- copied unchanged from rev 55502,
cocoon/branches/BRANCH_2_1_X/src/blocks/xmldb/lib/xindice-1.1b4.jar
cocoon/branches/BRANCH_2_1_X/lib/optional/xmldb-api-20030701.jar
- copied unchanged from rev 55502,
cocoon/branches/BRANCH_2_1_X/src/blocks/xmldb/lib/xmldb-api-20030701.jar
cocoon/branches/BRANCH_2_1_X/lib/optional/xmldb-common-20030701.jar
- copied unchanged from rev 55502,
cocoon/branches/BRANCH_2_1_X/src/blocks/xmldb/lib/xmldb-common-20030701.jar
cocoon/branches/BRANCH_2_1_X/lib/optional/xmldb-xupdate-20040205.jar
- copied unchanged from rev 55502,
cocoon/branches/BRANCH_2_1_X/src/blocks/xmldb/lib/xmldb-xupdate-20040205.jar
cocoon/branches/BRANCH_2_1_X/lib/optional/xmlrpc-1.1.jar
- copied unchanged from rev 55502,
cocoon/branches/BRANCH_2_1_X/src/blocks/xmldb/lib/xmlrpc-1.1.jar
Removed:
cocoon/branches/BRANCH_2_1_X/src/blocks/axis/lib/axis-1.1.jar
cocoon/branches/BRANCH_2_1_X/src/blocks/axis/lib/axis-jaxrpc-1.1.jar
cocoon/branches/BRANCH_2_1_X/src/blocks/axis/lib/axis-saaj-1.1.jar
cocoon/branches/BRANCH_2_1_X/src/blocks/axis/lib/commons-discovery-0.2.jar
cocoon/branches/BRANCH_2_1_X/src/blocks/axis/lib/excalibur-util-1.0.jar
cocoon/branches/BRANCH_2_1_X/src/blocks/axis/lib/wsdl4j-1.4.jar
cocoon/branches/BRANCH_2_1_X/src/blocks/batik/lib/batik-all-1.5.1.jar
cocoon/branches/BRANCH_2_1_X/src/blocks/bsf/lib/asm-1.4.3.jar
cocoon/branches/BRANCH_2_1_X/src/blocks/bsf/lib/asm-util-1.4.3.jar
cocoon/branches/BRANCH_2_1_X/src/blocks/bsf/lib/bsf-2.3.0.jar
cocoon/branches/BRANCH_2_1_X/src/blocks/bsf/lib/groovy-1.0-beta-6.jar
cocoon/branches/BRANCH_2_1_X/src/blocks/chaperon/lib/chaperon-20040205.jar
cocoon/branches/BRANCH_2_1_X/src/blocks/cron/lib/quartz-1.4.2.jar
cocoon/branches/BRANCH_2_1_X/src/blocks/deli/lib/deli-x020904.jar
cocoon/branches/BRANCH_2_1_X/src/blocks/deli/lib/icu4j-3.0.jar
cocoon/branches/BRANCH_2_1_X/src/blocks/deli/lib/jena-2.1.jar
cocoon/branches/BRANCH_2_1_X/src/blocks/faces/lib/commons-beanutils-core-1.7.jar
cocoon/branches/BRANCH_2_1_X/src/blocks/faces/lib/commons-digester-1.5.jar
cocoon/branches/BRANCH_2_1_X/src/blocks/faces/lib/commons-el-1.0.jar
cocoon/branches/BRANCH_2_1_X/src/blocks/faces/lib/jsp-api-2.0.jar
cocoon/branches/BRANCH_2_1_X/src/blocks/faces/lib/myfaces-20041005m.jar
cocoon/branches/BRANCH_2_1_X/src/blocks/faces/lib/myfaces-jsf-api-20041005.jar
cocoon/branches/BRANCH_2_1_X/src/blocks/fop/lib/fop-0.20.5.jar
cocoon/branches/BRANCH_2_1_X/src/blocks/hsqldb/lib/hsqldb-1.7.1.jar
cocoon/branches/BRANCH_2_1_X/src/blocks/html/lib/jtidy-04aug2000r7-dev.jar
cocoon/branches/BRANCH_2_1_X/src/blocks/itext/lib/itext-1.02b.jar
cocoon/branches/BRANCH_2_1_X/src/blocks/itext/lib/itext-xml-1.02.jar
cocoon/branches/BRANCH_2_1_X/src/blocks/jfor/lib/jfor-0.7.1.jar
cocoon/branches/BRANCH_2_1_X/src/blocks/jms/lib/geronimo-spec-jms-DEV-20031120.jar
cocoon/branches/BRANCH_2_1_X/src/blocks/lucene/lib/lucene-1.4.1.jar
cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/lib/antlr-2.7.3.jar
cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/lib/commons-dbcp-1.2.1.jar
cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/lib/commons-pool-1.2.jar
cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/lib/db-ojb-1.0.0.jar
cocoon/branches/BRANCH_2_1_X/src/blocks/poi/lib/poi-2.5.1-final-20040804.jar
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/lib/pluto-1.0.1-rc1.jar
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/lib/portlet-api-1.0.jar
cocoon/branches/BRANCH_2_1_X/src/blocks/qdox/lib/qdox-1.5.jar
cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/lib/apache-garbage-0.0.jar
cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/lib/commons-betwixt-0.5.jar
cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/lib/servlet-2_3.jar
cocoon/branches/BRANCH_2_1_X/src/blocks/serializers/lib/cocoon-serializers-charsets-0.1.jar
cocoon/branches/BRANCH_2_1_X/src/blocks/slide/lib/geronimo-spec-jta-DEV-20040202.jar
cocoon/branches/BRANCH_2_1_X/src/blocks/slide/lib/jdom-b9.jar
cocoon/branches/BRANCH_2_1_X/src/blocks/slide/lib/slide-kernel-2.0.jar
cocoon/branches/BRANCH_2_1_X/src/blocks/slide/lib/slide-stores-2.0.jar
cocoon/branches/BRANCH_2_1_X/src/blocks/slide/lib/slide-webdavservlet-2.0.jar
cocoon/branches/BRANCH_2_1_X/src/blocks/stx/lib/joost-20040330.jar
cocoon/branches/BRANCH_2_1_X/src/blocks/swf/lib/spark-0.2.jar
cocoon/branches/BRANCH_2_1_X/src/blocks/velocity/lib/velocity-1.4.jar
cocoon/branches/BRANCH_2_1_X/src/blocks/webdav/lib/jakarta-slide-webdavlib-2.0.jar
cocoon/branches/BRANCH_2_1_X/src/blocks/xmldb/lib/xindice-1.1b4.jar
cocoon/branches/BRANCH_2_1_X/src/blocks/xmldb/lib/xmldb-api-20030701.jar
cocoon/branches/BRANCH_2_1_X/src/blocks/xmldb/lib/xmldb-common-20030701.jar
cocoon/branches/BRANCH_2_1_X/src/blocks/xmldb/lib/xmldb-xupdate-20040205.jar
cocoon/branches/BRANCH_2_1_X/src/blocks/xmldb/lib/xmlrpc-1.1.jar
Modified:
cocoon/branches/BRANCH_2_1_X/gump.xml
cocoon/branches/BRANCH_2_1_X/lib/jars.xml
cocoon/branches/BRANCH_2_1_X/src/blocks/eventcache/java/org/apache/cocoon/caching/impl/DefaultEventRegistryImpl.java
cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/build.xml
cocoon/branches/BRANCH_2_1_X/tools/src/blocks-build.xsl
Log:
change the build system so that block dependency jars can be shared between
blocks
and only optional jars that are actually used are copied to WEB-INF/lib
Note that due to this change all block dependencies *must* be declared in
gump.xml just in order
be able to compile it.
Modified: cocoon/branches/BRANCH_2_1_X/gump.xml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/gump.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/gump.xml Mon Oct 25 10:02:49 2004
@@ -122,7 +122,9 @@
</ant>
<depend project="cocoon" inherit="all"/>
- <depend project="xml-fop-maintenance"/>
+ <depend project="xml-fop-maintenance">
+ <library name="fop"/>
+ </depend>
<depend project="cocoon-block-batik"/>
<work nested="tools/anttasks"/>
@@ -146,14 +148,19 @@
<depend project="castor"/>
<depend project="commons-jexl" inherit="all"/>
<depend project="commons-betwixt" inherit="all"/>
- <depend project="jakarta-velocity" inherit="all"/>
- <depend project="jakarta-servletapi-4"/>
+ <depend project="jakarta-velocity" inherit="all">
+ <library name="velocity"/>
+ </depend>
+ <depend project="jakarta-servletapi-4">
+ <library name="servlet-2_3"/>
+ </depend>
<depend project="cocoon-block-velocity"/>
<depend project="cocoon-block-cron"/>
<depend project="cocoon-block-batik" type="samples"/>
<depend project="cocoon-block-xsp"/>
<depend project="cocoon-block-faces"/>
<depend project="cocoon-block-axis"/>
+ <depend project="apache-garbage"/>
<work nested="tools/anttasks"/>
<home nested="build/cocoon-@@DATE@@"/>
@@ -172,7 +179,9 @@
</ant>
<depend project="cocoon" inherit="all"/>
- <depend project="xml-batik"/>
+ <depend project="xml-batik">
+ <library name="batik-all"/>
+ </depend>
<work nested="tools/anttasks"/>
<home nested="build/cocoon-@@DATE@@"/>
@@ -193,6 +202,7 @@
<depend project="cocoon" inherit="all"/>
<depend project="chaperon"/>
+ <depend project="castor"/>
<depend project="cocoon-block-xsp" type="samples"/>
<work nested="build/cocoon-@@DATE@@/blocks/chaperon/dest"/>
@@ -370,7 +380,9 @@
</ant>
<depend project="cocoon" inherit="all"/>
- <depend project="jakarta-poi"/>
+ <depend project="jakarta-poi">
+ <library name="poi"/>
+ </depend>
<work nested="tools/anttasks"/>
<home nested="build/cocoon-@@DATE@@"/>
@@ -468,7 +480,9 @@
</ant>
<depend project="cocoon" inherit="all"/>
- <depend project="jakarta-lucene"/>
+ <depend project="jakarta-lucene">
+ <library name="lucene"/>
+ </depend>
<depend project="cocoon-block-xsp" type="samples"/>
<depend project="cocoon-block-forms" type="samples"/>
@@ -490,6 +504,9 @@
<depend project="cocoon" inherit="all"/>
<depend project="jtidy"/>
+ <depend project="jakarta-servletapi">
+ <library name="servlet"/>
+ </depend>
<work nested="tools/anttasks"/>
<home nested="build/cocoon-@@DATE@@"/>
@@ -509,6 +526,11 @@
<depend project="cocoon" inherit="all"/>
<depend project="bsf"/>
+ <depend project="groovy"/>
+ <depend project="asm">
+ <library name="asm"/>
+ <library name="asm-util"/>
+ </depend>
<work nested="tools/anttasks"/>
<home nested="build/cocoon-@@DATE@@"/>
@@ -545,7 +567,9 @@
</ant>
<depend project="cocoon" inherit="all"/>
- <depend project="jakarta-velocity"/>
+ <depend project="jakarta-velocity">
+ <library name="velocity"/>
+ </depend>
<work nested="tools/anttasks"/>
<home nested="build/cocoon-@@DATE@@"/>
@@ -606,8 +630,14 @@
<depend project="cocoon" inherit="all"/>
<depend project="cocoon-block-repository"/>
<depend project="cocoon-block-jms"/>
- <depend project="jta"/>
- <depend project="jakarta-slide"/>
+ <depend project="jta">
+ <library name="geronimo-spec-jta"/>
+ </depend>
+ <depend project="jakarta-slide">
+ <library name="slide-kernel"/>
+ <library name="slide-stores"/>
+ <library name="slide-webdavservlet"/>
+ </depend>
<depend project="jdom"/>
<work nested="tools/anttasks"/>
@@ -629,6 +659,9 @@
<depend project="cocoon" inherit="all"/>
<depend project="commons-httpclient"/>
<depend project="commons-logging"/>
+ <depend project="jakarta-servletapi">
+ <library name="servlet"/>
+ </depend>
<work nested="tools/anttasks"/>
<home nested="build/cocoon-@@DATE@@"/>
@@ -648,7 +681,18 @@
<depend project="cocoon" inherit="all"/>
<depend project="cocoon-block-databases"/>
- <depend project="xmldb"/>
+ <depend project="xmldb">
+ <library name="xmldb-api"/>
+ <library name="xmldb-common"/>
+ <library name="xmldb-xupdate"/>
+ </depend>
+ <depend project="ws-xmlrpc">
+ <library name="xmlrpc"/>
+ </depend>
+ <depend project="xml-xindice">
+ <library name="xindice"/>
+ </depend>
+
<work nested="tools/anttasks"/>
<home nested="build/cocoon-@@DATE@@"/>
@@ -668,6 +712,11 @@
<depend project="cocoon" inherit="all"/>
<depend project="deli"/>
+ <depend project="jena"/>
+ <depend project="icu4j"/>
+ <depend project="jakarta-servletapi">
+ <library name="servlet"/>
+ </depend>
<work nested="tools/anttasks"/>
<home nested="build/cocoon-@@DATE@@"/>
@@ -707,7 +756,6 @@
<depend project="cocoon" inherit="all"/>
<depend project="cocoon-block-asciiart"/>
- <depend project="cocoon-block-scratchpad"/>
<depend project="javamail"/>
<depend project="jaf"/>
@@ -728,7 +776,17 @@
</ant>
<depend project="cocoon" inherit="all"/>
- <depend project="xml-axis"/>
+ <depend project="ws-axis">
+ <library name="axis"/>
+ <library name="axis-saaj"/>
+ <library name="axis-jaxrpc"/>
+ </depend>
+ <depend project="excalibur-util" inherit="all"/>
+ <depend project="wsdl4j" inherit="all"/>
+ <depend project="commons-discovery" inherit="all"/>
+ <depend project="jakarta-servletapi">
+ <library name="servlet"/>
+ </depend>
<work nested="tools/anttasks"/>
<home nested="build/cocoon-@@DATE@@"/>
@@ -834,6 +892,10 @@
<depend project="jtidy"/>
<depend project="castor"/>
<depend project="commons-collections"/>
+ <depend project="jakarta-pluto">
+ <library name="pluto"/>
+ <library name="portlet-api"/>
+ </depend>
<work nested="tools/anttasks"/>
<home nested="build/cocoon-@@DATE@@"/>
@@ -913,7 +975,10 @@
<depend project="cocoon" inherit="all"/>
<depend project="cocoon-block-repository"/>
- <depend project="jakarta-slide"/>
+ <depend project="commons-httpclient"/>
+ <depend project="jakarta-slide">
+ <library name="jakarta-slide-webdavlib"/>
+ </depend>
<work nested="build/cocoon-@@DATE@@/blocks/webdav/dest"/>
<work nested="build/cocoon-@@DATE@@/blocks/webdav/test"/>
@@ -1012,6 +1077,7 @@
<depend project="cocoon" inherit="all"/>
<depend project="quartz"/>
+ <depend project="excalibur-datasource"/>
<work nested="tools/anttasks"/>
<home nested="build/cocoon-@@DATE@@"/>
@@ -1032,6 +1098,10 @@
<depend project="cocoon" inherit="all"/>
<depend project="cocoon-block-databases"/>
<depend project="cocoon-block-forms" type="samples"/>
+ <depend project="db-ojb"/>
+ <depend project="antlr"/>
+ <depend project="commons-dbcp"/>
+ <depend project="commons-pool"/>
<work nested="tools/anttasks"/>
<home nested="build/cocoon-@@DATE@@"/>
@@ -1054,6 +1124,9 @@
<!--depend project="cocoon-block-eventcache" type="samples"/-->
<depend project="cocoon-block-databases" type="samples"/>
<depend project="cocoon-block-hsqldb"/>
+ <depend project="gump.resource.geronimo-spec-jms">
+ <library name="geronimo-spec-jms"/>
+ </depend>
<work nested="tools/anttasks"/>
<home nested="build/cocoon-@@DATE@@"/>
@@ -1092,7 +1165,9 @@
<property name="version" value="@@DATE@@"/>
</ant>
- <depend project="jakarta-servletapi"/>
+ <depend project="jakarta-servletapi">
+ <library name="servlet"/>
+ </depend>
<depend project="cocoon" inherit="all"/>
<work nested="tools/anttasks"/>
@@ -1136,7 +1211,7 @@
<work nested="tools/anttasks"/>
<home nested="build/cocoon-@@DATE@@"/>
- <jar name="blocks/serializers-block.jar"/>
+ <jar name="blocks/javaflow-block.jar"/>
<nag from="Gump <[email protected]>"
to="[email protected]"/>
</project>
@@ -1150,6 +1225,7 @@
</ant>
<depend project="cocoon" inherit="all"/>
+ <depend project="cocoon-serializers-charsets"/>
<work nested="tools/anttasks"/>
<home nested="build/cocoon-@@DATE@@"/>
@@ -1193,9 +1269,12 @@
<depend project="cocoon-block-portal"/>
<depend project="commons-beanutils-core" inherit="all"/>
<depend project="commons-digester" inherit="all"/>
- <!-- FIXME Add commons-el dependency -->
+ <depend project="commons-el" inherit="all"/>
<depend project="jakarta-servletapi-5" inherit="all"/>
- <!-- FIXME Add myfaces dependency -->
+ <depend project="myfaces" inherit="all">
+ <library name="myfaces"/>
+ <library name="myfaces-jsf-api"/>
+ </depend>
<work nested="tools/anttasks"/>
<home nested="build/cocoon-@@DATE@@"/>
@@ -1282,8 +1361,7 @@
<description>
Spark is a library for converting XML to Flash (swf)
</description>
- <home nested="src/blocks/swf/lib"/>
- <jar name="spark-0.2.jar"/>
+ <jar name="lib/optional/spark-0.2.jar"/>
</project>
<project name="xreporter-expression">
@@ -1329,7 +1407,20 @@
<description>
A simple, fast and thread safe cache for Java
</description>
- <home nested="src/blocks/scratchpad/lib"/>
- <jar name="ehcache-0.9.jar"/>
+ <jar name="lib/optional/ehcache-1.0.jar"/>
</project>
+
+ <project name="asm">
+ <jar name="lib/optional/asm-1.4.3.jar"/>
+ <jar name="lib/optional/asm-util-1.4.3.jar"/>
+ </project>
+
+ <project name="apache-garbage">
+ <jar name="lib/optional/apache-garbage-0.0.jar"/>
+ </project>
+
+ <project name="cocoon-serializers-charsets">
+ <jar name="lib/optional/cocoon-serializers-charsets-0.1.jar"/>
+ </project>
+
</module>
Modified: cocoon/branches/BRANCH_2_1_X/lib/jars.xml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/lib/jars.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/lib/jars.xml Mon Oct 25 10:02:49 2004
@@ -360,7 +360,7 @@
the Scalable Vector Graphics (SVG) format for various purposes, such as
viewing, generation or manipulation.</description>
<used-by>SVG serializer (batik block)</used-by>
- <lib>batik/lib/batik-all-1.5.1.jar</lib>
+ <lib>optional/batik-all-1.5.1.jar</lib>
<homepage>http://xml.apache.org/batik/</homepage>
</file>
@@ -375,7 +375,7 @@
support the additional languages.
</description>
<used-by>BSF Block (Script generator, script action)</used-by>
- <lib>bsf/lib/bsf-2.3.0.jar</lib>
+ <lib>optional/bsf-2.3.0.jar</lib>
<homepage>http://jakarta.apache.org/bsf/</homepage>
</file>
@@ -387,7 +387,7 @@
available to the Java developers using a Java-like syntax.
</description>
<used-by>BSF Block (Script generator, script action)</used-by>
- <lib>bsf/lib/groovy-1.0-beta-6.jar</lib>
+ <lib>optional/groovy-1.0-beta-6.jar</lib>
<homepage>http://groovy.codehaus.org/</homepage>
</file>
@@ -400,7 +400,7 @@
before they are loaded into the Java Virtual Machine.
</description>
<used-by>BSF Block (Script generator, script action)</used-by>
- <lib>bsf/lib/asm-1.4.3.jar</lib>
+ <lib>optional/asm-1.4.3.jar</lib>
<homepage>http://asm.objectweb.org/</homepage>
</file>
@@ -411,7 +411,7 @@
class visitors that can be useful for programming and debugging purposes.
</description>
<used-by>BSF Block (Script generator, script action)</used-by>
- <lib>bsf/lib/asm-util-1.4.3.jar</lib>
+ <lib>optional/asm-util-1.4.3.jar</lib>
<homepage>http://asm.objectweb.org/</homepage>
</file>
@@ -426,7 +426,7 @@
delivery context.
</description>
<used-by>DELI (deli block)</used-by>
- <lib>deli/lib/deli-x020904.jar</lib>
+ <lib>optional/deli-x020904.jar</lib>
<homepage>http://delicon.sourceforge.net</homepage>
</file>
@@ -459,7 +459,7 @@
<title>iText XML to PDF/HTML/RTF converter (Renderer)</title>
<description>iText reads XML documents and turns them into
PDFs</description>
<used-by>iText serializer</used-by>
- <lib>itext/lib/itext-1.02b.jar</lib>
+ <lib>optional/itext-1.02b.jar</lib>
<homepage>http://www.lowagie.com/iText/</homepage>
</file>
@@ -467,7 +467,7 @@
<title>iText XML to PDF/HTML/RTF converter (XML APIs)</title>
<description>iText reads XML documents and turns them into
PDFs</description>
<used-by>iText serializer</used-by>
- <lib>itext/lib/itext-xml-1.02.jar</lib>
+ <lib>optional/itext-xml-1.02.jar</lib>
<homepage>http://www.lowagie.com/iText/</homepage>
</file>
@@ -478,7 +478,7 @@
the XSL recommendation and then turns it into a PDF document.
</description>
<used-by>FOP serializer (fop block)</used-by>
- <lib>fop/lib/fop-0.20.5.jar</lib>
+ <lib>optional/fop-0.20.5.jar</lib>
<homepage>http://xml.apache.org/fop/</homepage>
</file>
@@ -490,7 +490,7 @@
common wordprocessors.
</description>
<used-by>RTF serializer (jfor block)</used-by>
- <lib>jfor/lib/jfor-0.7.1.jar</lib>
+ <lib>optional/jfor-0.7.1.jar</lib>
<homepage>http://www.jfor.org</homepage>
</file>
@@ -502,7 +502,7 @@
database engine which offers both in memory and disk based tables.
</description>
<used-by>Cocoon samples webapp</used-by>
- <lib>hsqldb/lib/hsqldb-1.7.1.jar</lib>
+ <lib>optional/hsqldb-1.7.1.jar</lib>
<homepage>http://hsqldb.sourceforge.net/</homepage>
</file>
@@ -513,7 +513,7 @@
based upon Microsoft's OLE 2 Compound Document format using pure Java.
</description>
<used-by>MS Excel serializer (poi block)</used-by>
- <lib>poi/lib/poi-2.5.1-final-20040804.jar</lib>
+ <lib>optional/poi-2.5.1-final-20040804.jar</lib>
<homepage>http://jakarta.apache.org/poi/</homepage>
</file>
@@ -521,7 +521,7 @@
<title>Jena RDF framework</title>
<description>Jena is a java API for manipulating RDF models.</description>
<used-by>DELI (deli block)</used-by>
- <lib>deli/lib/jena-2.1.jar</lib>
+ <lib>optional/jena-2.1.jar</lib>
<homepage>http://jena.sourceforge.net/</homepage>
</file>
@@ -531,7 +531,7 @@
provides robust and full-featured Unicode services on a wide variety
of platforms. </description>
<used-by>DELI (deli block)</used-by>
- <lib>deli/lib/icu4j-3.0.jar</lib>
+ <lib>optional/icu4j-3.0.jar</lib>
<homepage>http://oss.software.ibm.com/icu4j/</homepage>
</file>
@@ -555,7 +555,7 @@
<title>Transform HTML to XML</title>
<description>Tidy is a HTML syntax checker and pretty
printer.</description>
<used-by>HTML generator (html block), RSSTransformer (Portal
block)</used-by>
- <lib>html/lib/jtidy-04aug2000r7-dev.jar</lib>
+ <lib>optional/jtidy-04aug2000r7-dev.jar</lib>
<homepage>http://jtidy.sourceforge.net/</homepage>
</file>
@@ -566,7 +566,7 @@
searching of documents.
</description>
<used-by>Lucene block</used-by>
- <lib>lucene/lib/lucene-1.4.1.jar</lib>
+ <lib>optional/lucene-1.4.1.jar</lib>
<homepage>http://jakarta.apache.org/lucene/</homepage>
</file>
@@ -617,7 +617,7 @@
<title>Velocity engine</title>
<description>Velocity is a general purpose template engine written in
Java.</description>
<used-by>Velocity Generator (velocity block)</used-by>
- <lib>velocity/lib/velocity-1.4.jar</lib>
+ <lib>optional/velocity-1.4.jar</lib>
<homepage>http://jakarta.apache.org/velocity/</homepage>
</file>
@@ -719,7 +719,7 @@
data format to XML conforming to a specialized DTD and vice versa
</description>
<used-by>SWF Serializer (swf block)</used-by>
- <lib>swf/lib/spark-0.2.jar</lib>
+ <lib>optional/spark-0.2.jar</lib>
<homepage>http://www.tivano.de/software/spark/</homepage>
</file>
@@ -730,7 +730,7 @@
those to XML files.
</description>
<used-by>Chaperon block</used-by>
- <lib>chaperon/lib/chaperon-20040205.jar</lib>
+ <lib>optional/chaperon-20040205.jar</lib>
<homepage>http://chaperon.sourceforge.net</homepage>
</file>
@@ -761,7 +761,7 @@
A large list of character sets used for XML/HTML serialization.
</description>
<used-by>serializers</used-by>
- <lib>serializers/lib/cocoon-serializers-charsets-0.1.jar</lib>
+ <lib>optional/cocoon-serializers-charsets-0.1.jar</lib>
<homepage>http://cocoon.apache.org/</homepage>
</file>
@@ -769,7 +769,7 @@
<title>Slide kernel</title>
<description>The Jakarta Slide kernel API.</description>
<used-by>Slide block</used-by>
- <lib>slide/lib/slide-kernel-2.0.jar</lib>
+ <lib>optional/slide-kernel-2.0.jar</lib>
<homepage>http://jakarta.apache.org/slide/</homepage>
</file>
@@ -777,7 +777,7 @@
<title>Slide stores</title>
<description>The Jakarta Slide stores implementation.</description>
<used-by>Slide block</used-by>
- <lib>slide/lib/slide-stores-2.0.jar</lib>
+ <lib>optional/slide-stores-2.0.jar</lib>
<homepage>http://jakarta.apache.org/slide/</homepage>
</file>
@@ -785,7 +785,7 @@
<title>Slide WebDAV Servlet</title>
<description>The Jakarta Slide WebDAV servlet.</description>
<used-by>Slide block</used-by>
- <lib>slide/lib/slide-webdavservlet-2.0.jar</lib>
+ <lib>optional/slide-webdavservlet-2.0.jar</lib>
<homepage>http://jakarta.apache.org/slide/</homepage>
</file>
@@ -793,7 +793,7 @@
<title>Slide WebDAV Client library</title>
<description>The Jakarta Slide WebDAV client library.</description>
<used-by>WebDAV block</used-by>
- <lib>webdav/lib/jakarta-slide-webdavlib-2.0.jar</lib>
+ <lib>optional/jakarta-slide-webdavlib-2.0.jar</lib>
<homepage>http://jakarta.apache.org/slide/</homepage>
</file>
@@ -812,7 +812,7 @@
Implementation taken from the Apache Geronimo project for license
compatibility.
</description>
<used-by>Slide block</used-by>
- <lib>slide/lib/geronimo-spec-jta-DEV-20040202.jar</lib>
+ <lib>optional/geronimo-spec-jta-DEV-20040202.jar</lib>
<homepage>http://java.sun.com/products/jta/</homepage>
</file>
@@ -824,7 +824,7 @@
describing services
</description>
<used-by>Axis block</used-by>
- <lib>axis/lib/wsdl4j-1.4.jar</lib>
+ <lib>optional/wsdl4j-1.4.jar</lib>
<homepage>http://www-124.ibm.com/developerworks/projects/wsdl4j/</homepage>
</file>
@@ -835,7 +835,7 @@
SOAP 1.1 specification and SOAP with Attachments note.
</description>
<used-by>Axis block</used-by>
- <lib>axis/lib/axis-saaj-1.1.jar</lib>
+ <lib>optional/axis-saaj-1.1.jar</lib>
<homepage>http://java.sun.com/xml/saaj/</homepage>
</file>
@@ -843,7 +843,7 @@
<title>Avalon Excalibur Util</title>
<description>???</description>
<used-by>Axis block</used-by>
- <lib>axis/lib/excalibur-util-1.0.jar</lib>
+ <lib>optional/excalibur-util-1.0.jar</lib>
<homepage>http://avalon.apache.org/excalibur/</homepage>
</file>
@@ -855,7 +855,7 @@
general, and for lifecycle management of singleton (factory) classes.
</description>
<used-by>Axis block</used-by>
- <lib>axis/lib/commons-discovery-0.2.jar</lib>
+ <lib>optional/commons-discovery-0.2.jar</lib>
<homepage>http://jakarta.apache.org/commons/discovery/</homepage>
</file>
@@ -868,7 +868,7 @@
on the Java platform.
</description>
<used-by>Axis block</used-by>
- <lib>axis/lib/axis-jaxrpc-1.1.jar</lib>
+ <lib>optional/axis-jaxrpc-1.1.jar</lib>
<homepage>http://java.sun.com/xml/jaxrpc/</homepage>
</file>
@@ -879,7 +879,7 @@
Protocol")
</description>
<used-by>Axis block</used-by>
- <lib>axis/lib/axis-1.1.jar</lib>
+ <lib>optional/axis-1.1.jar</lib>
<homepage>http://ws.apache.org/axis/</homepage>
</file>
@@ -916,7 +916,7 @@
<title>Joost</title>
<description>Streaming Transformation for XML (STX) library</description>
<used-by>STX block</used-by>
- <lib>stx/lib/joost-20040330.jar</lib>
+ <lib>optional/joost-20040330.jar</lib>
<homepage>http://joost.sourceforge.net/</homepage>
</file>
@@ -927,7 +927,7 @@
definitions from source files complete with JavaDoc @tags.
</description>
<used-by>QDoxSource (qdox block)</used-by>
- <lib>qdox/lib/qdox-1.5.jar</lib>
+ <lib>optional/qdox-1.5.jar</lib>
<homepage>http://qdox.codehaus.org/</homepage>
</file>
@@ -935,7 +935,7 @@
<title>Quartz</title>
<description>Quartz Scheduler</description>
<used-by>Cron block</used-by>
- <lib>cron/lib/quartz-1.4.2.jar</lib>
+ <lib>optional/quartz-1.4.2.jar</lib>
<homepage>http://sourceforge.net/projects/quartz/</homepage>
</file>
@@ -943,7 +943,7 @@
<title>Garbage</title>
<description>Garbage</description>
<used-by>Scratchpad block</used-by>
- <lib>scratchpad/lib/apache-garbage-0.0.jar</lib>
+ <lib>optional/apache-garbage-0.0.jar</lib>
<homepage>http://cocoon.apache.org/</homepage>
</file>
@@ -970,7 +970,7 @@
The BeanUtils component provides easy-to-use wrappers around these
capabilities.
</description>
<used-by>Faces block, BetwixtTransformer</used-by>
- <lib>faces/lib/commons-beanutils-core-1.7.jar</lib>
+ <lib>optional/commons-beanutils-core-1.7.jar</lib>
<homepage>http://jakarta.apache.org/commons/beanutils/</homepage>
</file>
@@ -983,7 +983,7 @@
available for your use, or you can also create your own.
</description>
<used-by>Faces block, BetwixtTransformer</used-by>
- <lib>faces/lib/commons-digester-1.5.jar</lib>
+ <lib>optional/commons-digester-1.5.jar</lib>
<homepage>http://jakarta.apache.org/commons/digester/</homepage>
</file>
@@ -995,7 +995,7 @@
translators from grammatical descriptions containing Java, C#, or C++
actions
</description>
<used-by>OJB</used-by>
- <lib>ojb/lib/antlr-2.7.3.jar</lib>
+ <lib>optional/antlr-2.7.3.jar</lib>
<homepage>http://www.antlr.org/</homepage>
</file>
@@ -1005,7 +1005,7 @@
Database Connection Pool API
</description>
<used-by>OJB</used-by>
- <lib>ojb/lib/commons-dbcp-1.2.1.jar</lib>
+ <lib>optional/commons-dbcp-1.2.1.jar</lib>
<homepage>http://jakarta.apache.org/commons/dbcp/</homepage>
</file>
@@ -1016,7 +1016,7 @@
may be useful when creating new pool implementations.
</description>
<used-by>OJB</used-by>
- <lib>ojb/lib/commons-pool-1.2.jar</lib>
+ <lib>optional/commons-pool-1.2.jar</lib>
<homepage>http://jakarta.apache.org/commons/pool/</homepage>
</file>
@@ -1027,7 +1027,7 @@
for Java Objects against relational databases.
</description>
<used-by>OJB</used-by>
- <lib>ojb/lib/db-ojb-1.0.0.jar</lib>
+ <lib>optional/db-ojb-1.0.0.jar</lib>
<homepage>http://db.apache.org/ojb/</homepage>
</file>
<!-- OJB block end (6-Aug-2003) -->
@@ -1103,7 +1103,7 @@
original spec.
</description>
<used-by>Portal</used-by>
- <lib>portal/lib/portlet-api-1.0.jar</lib>
+ <lib>optional/portlet-api-1.0.jar</lib>
<homepage>http://portals.apache.org/pluto/</homepage>
</file>
<file>
@@ -1114,7 +1114,7 @@
original spec.
</description>
<used-by>Portal</used-by>
- <lib>portal/lib/pluto-1.0.1-rc1.jar</lib>
+ <lib>optional/pluto-1.0.1-rc1.jar</lib>
<homepage>http://portals.apache.org/pluto/</homepage>
</file>
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/eventcache/java/org/apache/cocoon/caching/impl/DefaultEventRegistryImpl.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/eventcache/java/org/apache/cocoon/caching/impl/DefaultEventRegistryImpl.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/eventcache/java/org/apache/cocoon/caching/impl/DefaultEventRegistryImpl.java
Mon Oct 25 10:02:49 2004
@@ -36,7 +36,7 @@
*
* @since 2.1
* @author <a href="mailto:[EMAIL PROTECTED]">Geoff Howard</a>
- * @version CVS $Id: DefaultEventRegistryImpl.java,v 1.12 2004/03/05 13:01:56
bdelacretaz Exp $
+ * @version CVS $Id$
*/
public class DefaultEventRegistryImpl
extends AbstractDoubleMapEventRegistry
@@ -72,8 +72,7 @@
protected void persist(EventRegistryDataWrapper registryWrapper) {
ObjectOutputStream oos = null;
try {
- oos = new ObjectOutputStream(
- new
FileOutputStream(this.m_persistentFile));
+ oos = new ObjectOutputStream(new
FileOutputStream(this.m_persistentFile));
oos.writeObject(registryWrapper);
oos.flush();
} catch (FileNotFoundException e) {
@@ -99,7 +98,7 @@
try {
ois = new ObjectInputStream(
new FileInputStream(this.m_persistentFile));
- ecdw = (EventRegistryDataWrapper)ois.readObject();
+ ecdw = (EventRegistryDataWrapper) ois.readObject();
} catch (FileNotFoundException e) {
getLogger().error("Unable to retrieve EventRegistry", e);
createBlankCache();
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/build.xml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/build.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/build.xml Mon Oct 25
10:02:49 2004
@@ -21,7 +21,7 @@
<path id="ojb.classpath">
<pathelement path="${build.blocks.ojb.samples}"/>
- <fileset dir="${block.dir}/lib">
+ <fileset dir="${basedir}/lib/optional">
<include name="*.jar"/>
</fileset>
<fileset dir="${basedir}/lib/local">
Modified: cocoon/branches/BRANCH_2_1_X/tools/src/blocks-build.xsl
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/tools/src/blocks-build.xsl (original)
+++ cocoon/branches/BRANCH_2_1_X/tools/src/blocks-build.xsl Mon Oct 25
10:02:49 2004
@@ -34,9 +34,6 @@
<include name="*.jar"/>
</fileset>
-->
- <fileset dir="${{lib.optional}}">
- <include name="*.jar"/>
- </fileset>
<fileset dir="${{build.blocks}}">
<include name="*.jar"/>
</fileset>
@@ -278,7 +275,8 @@
<xsl:template match="project">
<xsl:variable name="block-name"
select="substring-after(@name,'cocoon-block-')"/>
<xsl:variable name="cocoon-block-dependencies"
select="depend[starts-with(@project,'cocoon-block-')]"/>
-
+ <xsl:variable name="non-cocoon-block-dependencies"
select="depend[not(starts-with(@project,'cocoon'))]"/>
+
<target name="[EMAIL PROTECTED]" if="internal.exclude.block.{$block-name}">
<echo message="NOTICE: Block '{$block-name}' is excluded from the
build."/>
</target>
@@ -531,18 +529,23 @@
</xsl:attribute>
</xsl:if>
- <!-- Test if this block has libraries -->
- <if>
- <available type="dir" file="${{blocks}}/{$block-name}/lib/"/>
- <then>
- <copy filtering="off" todir="${{build.webapp.lib}}">
- <fileset dir="${{blocks}}/{$block-name}/lib">
- <include name="*.jar"/>
- <exclude name="servlet*.jar"/>
- </fileset>
- </copy>
- </then>
- </if>
+ <!-- Copy the library depencies -->
+ <copy filtering="off" todir="${{build.webapp.lib}}">
+ <fileset dir="${{lib.optional}}">
+ <xsl:for-each select="$non-cocoon-block-dependencies">
+ <xsl:choose>
+ <xsl:when test="library">
+ <xsl:for-each select="library">
+ <include name="[EMAIL PROTECTED]"/>
+ </xsl:for-each>
+ </xsl:when>
+ <xsl:otherwise>
+ <include name="[EMAIL PROTECTED]"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:for-each>
+ </fileset>
+ </copy>
<!-- Test if this block has global WEB-INF files -->
<if>
@@ -573,8 +576,19 @@
<path id="{$block-name}.classpath">
<path refid="classpath"/>
- <fileset dir="${{blocks}}/{$block-name}">
- <include name="lib/*.jar"/>
+ <fileset dir="${{lib.optional}}">
+ <xsl:for-each select="$non-cocoon-block-dependencies">
+ <xsl:choose>
+ <xsl:when test="library">
+ <xsl:for-each select="library">
+ <include name="[EMAIL PROTECTED]"/>
+ </xsl:for-each>
+ </xsl:when>
+ <xsl:otherwise>
+ <include name="[EMAIL PROTECTED]"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:for-each>
</fileset>
<pathelement location="${{build.blocks}}/{$block-name}/mocks"/>
<pathelement location="${{build.blocks}}/{$block-name}/dest"/>
