Author: unico
Date: Mon Oct 25 13:55:12 2004
New Revision: 55532
Modified:
cocoon/branches/BRANCH_2_1_X/gump.xml
cocoon/branches/BRANCH_2_1_X/tools/src/blocks-build.xsl
Log:
separate library element from depend element in gump.xml
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 13:55:12 2004
@@ -122,10 +122,10 @@
</ant>
<depend project="cocoon" inherit="all"/>
- <depend project="xml-fop-maintenance">
- <library name="fop"/>
- </depend>
+ <depend project="xml-fop-maintenance"/>
<depend project="cocoon-block-batik"/>
+
+ <library name="fop"/>
<work nested="tools/anttasks"/>
<home nested="build/cocoon-@@DATE@@"/>
@@ -146,14 +146,10 @@
<depend project="cocoon" inherit="all"/>
<depend project="castor"/>
- <depend project="commons-jexl" inherit="all"/>
- <depend project="commons-betwixt" inherit="all"/>
- <depend project="jakarta-velocity" inherit="all">
- <library name="velocity"/>
- </depend>
- <depend project="jakarta-servletapi-4">
- <library name="servlet-2_3"/>
- </depend>
+ <depend project="commons-jexl"/>
+ <depend project="commons-betwixt"/>
+ <depend project="jakarta-velocity"/>
+ <depend project="jakarta-servletapi-4"/>
<depend project="cocoon-block-velocity"/>
<depend project="cocoon-block-cron"/>
<depend project="cocoon-block-batik" type="samples"/>
@@ -162,6 +158,13 @@
<depend project="cocoon-block-axis"/>
<depend project="apache-garbage"/>
+ <library name="servlet-2_3"/>
+ <library name="velocity"/>
+ <library name="castor"/>
+ <library name="commons-jexl"/>
+ <library name="commons-betwixt"/>
+ <library name="apache-garbage"/>
+
<work nested="tools/anttasks"/>
<home nested="build/cocoon-@@DATE@@"/>
@@ -179,9 +182,9 @@
</ant>
<depend project="cocoon" inherit="all"/>
- <depend project="xml-batik">
- <library name="batik-all"/>
- </depend>
+ <depend project="xml-batik"/>
+
+ <library name="batik-all"/>
<work nested="tools/anttasks"/>
<home nested="build/cocoon-@@DATE@@"/>
@@ -205,6 +208,9 @@
<depend project="castor"/>
<depend project="cocoon-block-xsp" type="samples"/>
+ <library name="chaperon"/>
+ <library name="castor"/>
+
<work nested="build/cocoon-@@DATE@@/blocks/chaperon/dest"/>
<work nested="build/cocoon-@@DATE@@/blocks/chaperon/test"/>
<work nested="tools/anttasks"/>
@@ -226,6 +232,8 @@
<depend project="cocoon" inherit="all"/>
<depend project="spark"/>
+ <library name="spark"/>
+
<work nested="tools/anttasks"/>
<home nested="build/cocoon-@@DATE@@"/>
@@ -245,6 +253,8 @@
<depend project="cocoon" inherit="all"/>
<depend project="jfor"/>
+ <library name="jfor"/>
+
<work nested="tools/anttasks"/>
<home nested="build/cocoon-@@DATE@@"/>
@@ -264,6 +274,9 @@
<depend project="itext"/>
<depend project="itext-xml"/>
+ <library name="itext"/>
+ <library name="itext-xml"/>
+
<work nested="tools/anttasks"/>
<home nested="build/cocoon-@@DATE@@"/>
@@ -342,6 +355,8 @@
<depend project="excalibur-datasource"/>
<depend project="cocoon-block-xsp"/>
+ <library name="excalibur-datasource"/>
+
<work nested="tools/anttasks"/>
<work nested="build/cocoon-@@DATE@@/blocks/databases/mocks"/>
<home nested="build/cocoon-@@DATE@@"/>
@@ -363,6 +378,8 @@
<depend project="cocoon-block-databases"/>
<depend project="hsqldb"/>
+ <library name="hsqldb"/>
+
<work nested="tools/anttasks"/>
<home nested="build/cocoon-@@DATE@@"/>
@@ -380,9 +397,9 @@
</ant>
<depend project="cocoon" inherit="all"/>
- <depend project="jakarta-poi">
- <library name="poi"/>
- </depend>
+ <depend project="jakarta-poi"/>
+
+ <library name="poi"/>
<work nested="tools/anttasks"/>
<home nested="build/cocoon-@@DATE@@"/>
@@ -404,6 +421,8 @@
<depend project="cocoon" inherit="all"/>
<depend project="jndi"/>
+ <library name="jndi"/>
+
<work nested="tools/anttasks"/>
<home nested="build/cocoon-@@DATE@@"/>
@@ -480,12 +499,12 @@
</ant>
<depend project="cocoon" inherit="all"/>
- <depend project="jakarta-lucene">
- <library name="lucene"/>
- </depend>
+ <depend project="jakarta-lucene"/>
<depend project="cocoon-block-xsp" type="samples"/>
<depend project="cocoon-block-forms" type="samples"/>
+ <library name="lucene"/>
+
<work nested="tools/anttasks"/>
<home nested="build/cocoon-@@DATE@@"/>
@@ -504,9 +523,10 @@
<depend project="cocoon" inherit="all"/>
<depend project="jtidy"/>
- <depend project="jakarta-servletapi">
- <library name="servlet"/>
- </depend>
+ <depend project="jakarta-servletapi"/>
+
+ <library name="jtidy"/>
+ <library name="servlet"/>
<work nested="tools/anttasks"/>
<home nested="build/cocoon-@@DATE@@"/>
@@ -527,10 +547,12 @@
<depend project="cocoon" inherit="all"/>
<depend project="bsf"/>
<depend project="groovy"/>
- <depend project="asm">
- <library name="asm"/>
- <library name="asm-util"/>
- </depend>
+ <depend project="asm"/>
+
+ <library name="bsf"/>
+ <library name="groovy"/>
+ <library name="asm"/>
+ <library name="asm-util"/>
<work nested="tools/anttasks"/>
<home nested="build/cocoon-@@DATE@@"/>
@@ -567,9 +589,9 @@
</ant>
<depend project="cocoon" inherit="all"/>
- <depend project="jakarta-velocity">
- <library name="velocity"/>
- </depend>
+ <depend project="jakarta-velocity"/>
+
+ <library name="velocity"/>
<work nested="tools/anttasks"/>
<home nested="build/cocoon-@@DATE@@"/>
@@ -630,16 +652,15 @@
<depend project="cocoon" inherit="all"/>
<depend project="cocoon-block-repository"/>
<depend project="cocoon-block-jms"/>
- <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="jta"/>
+ <depend project="jakarta-slide"/>
<depend project="jdom"/>
+ <library name="geronimo-spec-jta"/>
+ <library name="slide-kernel"/>
+ <library name="slide-stores"/>
+ <library name="slide-webdavservlet"/>
+
<work nested="tools/anttasks"/>
<home nested="build/cocoon-@@DATE@@"/>
@@ -659,9 +680,11 @@
<depend project="cocoon" inherit="all"/>
<depend project="commons-httpclient"/>
<depend project="commons-logging"/>
- <depend project="jakarta-servletapi">
- <library name="servlet"/>
- </depend>
+ <depend project="jakarta-servletapi"/>
+
+ <library name="servlet"/>
+ <library name="commons-httpclient"/>
+ <library name="commons-logging"/>
<work nested="tools/anttasks"/>
<home nested="build/cocoon-@@DATE@@"/>
@@ -681,18 +704,15 @@
<depend project="cocoon" inherit="all"/>
<depend project="cocoon-block-databases"/>
- <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>
-
+ <depend project="xmldb"/>
+ <depend project="ws-xmlrpc"/>
+ <depend project="xml-xindice"/>
+
+ <library name="xmldb-api"/>
+ <library name="xmldb-common"/>
+ <library name="xmldb-xupdate"/>
+ <library name="xmlrpc"/>
+ <library name="xindice"/>
<work nested="tools/anttasks"/>
<home nested="build/cocoon-@@DATE@@"/>
@@ -714,9 +734,12 @@
<depend project="deli"/>
<depend project="jena"/>
<depend project="icu4j"/>
- <depend project="jakarta-servletapi">
- <library name="servlet"/>
- </depend>
+ <depend project="jakarta-servletapi"/>
+
+ <library name="deli"/>
+ <library name="jena"/>
+ <library name="icu4j"/>
+ <library name="servlet"/>
<work nested="tools/anttasks"/>
<home nested="build/cocoon-@@DATE@@"/>
@@ -759,6 +782,9 @@
<depend project="javamail"/>
<depend project="jaf"/>
+ <library name="javamail"/>
+ <library name="jaf"/>
+
<work nested="tools/anttasks"/>
<home nested="build/cocoon-@@DATE@@"/>
@@ -776,17 +802,19 @@
</ant>
<depend project="cocoon" inherit="all"/>
- <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>
+ <depend project="ws-axis"/>
+ <depend project="excalibur-util"/>
+ <depend project="wsdl4j"/>
+ <depend project="commons-discovery"/>
+ <depend project="jakarta-servletapi"/>
+
+ <library name="axis"/>
+ <library name="axis-saaj"/>
+ <library name="axis-jaxrpc"/>
+ <library name="excalibur-util"/>
+ <library name="wsdl4j"/>
+ <library name="commons-discovery"/>
+ <library name="servlet"/>
<work nested="tools/anttasks"/>
<home nested="build/cocoon-@@DATE@@"/>
@@ -827,6 +855,9 @@
<depend project="jakarta-oro"/>
<depend project="cocoon-block-xsp" type="samples"/>
+ <library name="xreporter-expression"/>
+ <library name="jakarta-oro"/>
+
<work nested="build/cocoon-@@DATE@@/blocks/forms/test"/>
<work nested="tools/anttasks"/>
<home nested="build/cocoon-@@DATE@@"/>
@@ -849,6 +880,9 @@
<depend project="jakarta-oro"/>
<depend project="cocoon-block-xsp" type="samples"/>
+ <library name="xreporter-expression"/>
+ <library name="jakarta-oro"/>
+
<work nested="build/cocoon-@@DATE@@/blocks/woody/test"/>
<work nested="tools/anttasks"/>
<home nested="build/cocoon-@@DATE@@"/>
@@ -869,6 +903,8 @@
<depend project="cocoon" inherit="all"/>
<depend project="qdox"/>
+ <library name="qdox"/>
+
<work nested="tools/anttasks"/>
<home nested="build/cocoon-@@DATE@@"/>
@@ -892,10 +928,13 @@
<depend project="jtidy"/>
<depend project="castor"/>
<depend project="commons-collections"/>
- <depend project="jakarta-pluto">
- <library name="pluto"/>
- <library name="portlet-api"/>
- </depend>
+ <depend project="jakarta-pluto"/>
+
+ <library name="jtidy"/>
+ <library name="castor"/>
+ <library name="commons-collections"/>
+ <library name="pluto"/>
+ <library name="portlet-api"/>
<work nested="tools/anttasks"/>
<home nested="build/cocoon-@@DATE@@"/>
@@ -939,6 +978,9 @@
<depend project="commons-logging"/>
<depend project="joost"/>
+ <library name="commons-logging"/>
+ <library name="joost"/>
+
<work nested="tools/anttasks"/>
<home nested="build/cocoon-@@DATE@@"/>
@@ -976,9 +1018,10 @@
<depend project="cocoon" inherit="all"/>
<depend project="cocoon-block-repository"/>
<depend project="commons-httpclient"/>
- <depend project="jakarta-slide">
- <library name="jakarta-slide-webdavlib"/>
- </depend>
+ <depend project="jakarta-slide"/>
+
+ <library name="commons-httpclient"/>
+ <library name="jakarta-slide-webdavlib"/>
<work nested="build/cocoon-@@DATE@@/blocks/webdav/dest"/>
<work nested="build/cocoon-@@DATE@@/blocks/webdav/test"/>
@@ -1079,6 +1122,9 @@
<depend project="quartz"/>
<depend project="excalibur-datasource"/>
+ <library name="quartz"/>
+ <library name="excalibur-datasource"/>
+
<work nested="tools/anttasks"/>
<home nested="build/cocoon-@@DATE@@"/>
@@ -1103,6 +1149,11 @@
<depend project="commons-dbcp"/>
<depend project="commons-pool"/>
+ <library name="db-ojb"/>
+ <library name="antlr"/>
+ <library name="commons-dbcp"/>
+ <library name="commons-pool"/>
+
<work nested="tools/anttasks"/>
<home nested="build/cocoon-@@DATE@@"/>
@@ -1124,9 +1175,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>
+ <depend project="gump.resource.geronimo-spec-jms"/>
+
+ <library name="geronimo-spec-jms"/>
<work nested="tools/anttasks"/>
<home nested="build/cocoon-@@DATE@@"/>
@@ -1165,10 +1216,10 @@
<property name="version" value="@@DATE@@"/>
</ant>
- <depend project="jakarta-servletapi">
- <library name="servlet"/>
- </depend>
<depend project="cocoon" inherit="all"/>
+ <depend project="jakarta-servletapi"/>
+
+ <library name="servlet"/>
<work nested="tools/anttasks"/>
<home nested="build/cocoon-@@DATE@@"/>
@@ -1227,6 +1278,8 @@
<depend project="cocoon" inherit="all"/>
<depend project="cocoon-serializers-charsets"/>
+ <library name="cocoon-serializers-charsets"/>
+
<work nested="tools/anttasks"/>
<home nested="build/cocoon-@@DATE@@"/>
@@ -1267,14 +1320,17 @@
<depend project="cocoon" inherit="all"/>
<depend project="cocoon-block-taglib"/>
<depend project="cocoon-block-portal"/>
- <depend project="commons-beanutils-core" inherit="all"/>
- <depend project="commons-digester" inherit="all"/>
- <depend project="commons-el" inherit="all"/>
- <depend project="jakarta-servletapi-5" inherit="all"/>
- <depend project="myfaces" inherit="all">
- <library name="myfaces"/>
- <library name="myfaces-jsf-api"/>
- </depend>
+ <depend project="commons-beanutils-core"/>
+ <depend project="commons-digester"/>
+ <depend project="commons-el"/>
+ <depend project="jakarta-servletapi-5"/>
+ <depend project="myfaces"/>
+
+ <library name="commons-beanutils-core"/>
+ <library name="commons-digester"/>
+ <library name="commons-el"/>
+ <library name="myfaces"/>
+ <library name="myfaces-jsf-api"/>
<work nested="tools/anttasks"/>
<home nested="build/cocoon-@@DATE@@"/>
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
13:55:12 2004
@@ -275,7 +275,6 @@
<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."/>
@@ -532,17 +531,8 @@
<!-- 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 select="library">
+ <include name="[EMAIL PROTECTED]"/>
</xsl:for-each>
</fileset>
</copy>
@@ -577,17 +567,8 @@
<path id="{$block-name}.classpath">
<path refid="classpath"/>
<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 select="library">
+ <include name="[EMAIL PROTECTED]"/>
</xsl:for-each>
</fileset>
<pathelement location="${{build.blocks}}/{$block-name}/mocks"/>
