Return-Path: 
 <cocoon-cvs-return-11295-apmail-xml-cocoon-cvs-archive=xml.apache.org@xml.apache.org>
Delivered-To: apmail-xml-cocoon-cvs-archive@xml.apache.org
Received: (qmail 63552 invoked by uid 500); 21 Mar 2003 08:40:11 -0000
Mailing-List: contact cocoon-cvs-help@xml.apache.org; run by ezmlm
Precedence: bulk
Reply-To: cocoon-dev@xml.apache.org
list-help: <mailto:cocoon-cvs-help@xml.apache.org>
list-unsubscribe: <mailto:cocoon-cvs-unsubscribe@xml.apache.org>
list-post: <mailto:cocoon-cvs@xml.apache.org>
Delivered-To: mailing list cocoon-cvs@xml.apache.org
Received: (qmail 63541 invoked by uid 500); 21 Mar 2003 08:40:11 -0000
Delivered-To: apmail-cocoon-2.1-cvs@apache.org
Received: (qmail 63538 invoked from network); 21 Mar 2003 08:40:11 -0000
Received: from icarus.apache.org (208.185.179.13)
  by daedalus.apache.org with SMTP; 21 Mar 2003 08:40:11 -0000
Received: (qmail 93185 invoked by uid 1010); 21 Mar 2003 08:40:10 -0000
Date: 21 Mar 2003 08:40:10 -0000
Message-ID: <20030321084010.93184.qmail@icarus.apache.org>
From: stefano@apache.org
To: cocoon-2.1-cvs@apache.org
Subject: cvs commit: cocoon-2.1 build.xml gump.xml
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

stefano     2003/03/21 00:40:10

  Modified:    .        build.xml gump.xml
  Log:
  fixed gump descriptor (as per nagoya logs):
  - supply the correct 'version' property to the blocks
  - added JTA dependency to Web3
  - created the 'gump' target so that we also build javadocs
  - update the jar block names so that inner block dependencies work
  
  there a few problems left, but I want to see today's gump run to see what happens.
  
  Revision  Changes    Path
  1.24      +4 -1      cocoon-2.1/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/build.xml,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- build.xml	20 Mar 2003 04:13:28 -0000	1.23
  +++ build.xml	21 Mar 2003 08:40:09 -0000	1.24
  @@ -1051,6 +1051,9 @@
   
   <!-- Admin targets ========================================================= -->
   
  +  <!-- The Gump Target  -->
  +  <target name="gump" depends="package, javadocs"/>
  +  
     <!-- Creates the web site  -->
     <target name="site" depends="docs, javadocs">
       <mkdir dir="${site}"/>
  
  
  
  1.19      +92 -60    cocoon-2.1/gump.xml
  
  Index: gump.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/gump.xml,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- gump.xml	19 Mar 2003 10:54:30 -0000	1.18
  +++ gump.xml	21 Mar 2003 08:40:09 -0000	1.19
  @@ -21,7 +21,7 @@
     <project name="cocoon">
       <package>org.apache.cocoon</package>
   
  -    <ant target="package">
  +    <ant target="gump">
         <property name="version" value="@@DATE@@"/>
         <depend property="logkit.jar"    project="dist-avalon-logkit"/>
         <depend property="avalonapi.jar" project="avalon"/>
  @@ -93,13 +93,14 @@
   
       <ant target="block">
         <property name="block-name" value="fop"/>
  +      <property name="version" value="@@DATE@@"/>
       </ant>
   
       <depend project="cocoon" inherit="all"/>
       <depend project="xml-fop" version="supplied"/>
   
       <work nested="tools/anttasks"/>
  -    <home nested="build/cocoon"/>
  +    <home nested="build/cocoon-@@DATE@@"/>
   
       <jar name="fop-block.jar"/>
   
  @@ -111,13 +112,14 @@
   
       <ant target="block">
         <property name="block-name" value="batik"/>
  +      <property name="version" value="@@DATE@@"/>
       </ant>
   
       <depend project="cocoon" inherit="all"/>
       <depend project="xml-batik" version="supplied"/>
   
       <work nested="tools/anttasks"/>
  -    <home nested="build/cocoon"/>
  +    <home nested="build/cocoon-@@DATE@@"/>
   
       <jar name="batik-block.jar"/>
   
  @@ -129,13 +131,14 @@
   
       <ant target="block">
         <property name="block-name" value="chaperon"/>
  +      <property name="version" value="@@DATE@@"/>
       </ant>
   
       <depend project="cocoon" inherit="all"/>
       <depend project="chaperon" version="supplied"/>
   
       <work nested="tools/anttasks"/>
  -    <home nested="build/cocoon"/>
  +    <home nested="build/cocoon-@@DATE@@"/>
   
       <jar name="chaperon-block.jar"/>
   
  @@ -147,13 +150,14 @@
   
       <ant target="block">
         <property name="block-name" value="swf"/>
  +      <property name="version" value="@@DATE@@"/>
       </ant>
   
       <depend project="cocoon" inherit="all"/>
       <depend project="spark" version="supplied"/>
   
       <work nested="tools/anttasks"/>
  -    <home nested="build/cocoon"/>
  +    <home nested="build/cocoon-@@DATE@@"/>
   
       <jar name="swf-block.jar"/>
   
  @@ -165,13 +169,14 @@
   
       <ant target="block">
         <property name="block-name" value="jfor"/>
  +      <property name="version" value="@@DATE@@"/>
       </ant>
   
       <depend project="cocoon" inherit="all"/>
       <depend project="jfor" version="supplied"/>
   
       <work nested="tools/anttasks"/>
  -    <home nested="build/cocoon"/>
  +    <home nested="build/cocoon-@@DATE@@"/>
   
       <jar name="jfor-block.jar"/>
   
  @@ -182,6 +187,7 @@
       <package>org.apache.cocoon</package>
       <ant target="block">
         <property name="block-name" value="itext"/>
  +      <property name="version" value="@@DATE@@"/>
       </ant>
   
       <depend project="cocoon" inherit="all"/>
  @@ -189,27 +195,27 @@
       <depend project="itext-xml" version="supplied"/>
   
       <work nested="tools/anttasks"/>
  -    <home nested="build/cocoon"/>
  +    <home nested="build/cocoon-@@DATE@@"/>
   
  -    <jar name="itext.jar"/>
  +    <jar name="itext-block.jar"/>
   
       <nag from="Gump" to="cocoon-dev@xml.apache.org"/>
     </project>
   
  -
     <project name="cocoon-block-session-fw">
       <package>org.apache.cocoon</package>
   
       <ant target="block">
         <property name="block-name" value="session-fw"/>
  +      <property name="version" value="@@DATE@@"/>
       </ant>
   
       <depend project="cocoon" inherit="all"/>
   
       <work nested="tools/anttasks"/>
  -    <home nested="build/cocoon"/>
  +    <home nested="build/cocoon-@@DATE@@"/>
   
  -    <jar name="session-fw.jar"/>
  +    <jar name="session-fw-block.jar"/>
   
       <nag from="Gump" to="cocoon-dev@xml.apache.org"/>
     </project>
  @@ -219,6 +225,7 @@
   
       <ant target="block">
         <property name="block-name" value="authentication-fw"/>
  +      <property name="version" value="@@DATE@@"/>
       </ant>
   
       <depend project="cocoon" inherit="all"/>
  @@ -227,7 +234,7 @@
       <work nested="tools/anttasks"/>
       <home nested="build/cocoon"/>
   
  -    <jar name="authentication-fw.jar"/>
  +    <jar name="authentication-fw-block.jar"/>
   
       <nag from="Gump" to="cocoon-dev@xml.apache.org"/>
     </project>
  @@ -237,6 +244,7 @@
   
       <ant target="block">
         <property name="block-name" value="portal-fw"/>
  +      <property name="version" value="@@DATE@@"/>
       </ant>
   
       <depend project="cocoon" inherit="all"/>
  @@ -244,9 +252,9 @@
       <depend project="cocoon-block-authentication-fw"/>
   
       <work nested="tools/anttasks"/>
  -    <home nested="build/cocoon"/>
  +    <home nested="build/cocoon-@@DATE@@"/>
   
  -    <jar name="portal-fw.jar"/>
  +    <jar name="portal-fw-block.jar"/>
   
       <nag from="Gump" to="cocoon-dev@xml.apache.org"/>
     </project>
  @@ -256,15 +264,16 @@
   
       <ant target="block">
         <property name="block-name" value="databases"/>
  +      <property name="version" value="@@DATE@@"/>
       </ant>
   
       <depend project="cocoon" inherit="all"/>
   
       <work nested="tools/anttasks"/>
       <work nested="build/cocoon-@@DATE@@/blocks/databases/mocks"/>
  -    <home nested="build/cocoon"/>
  +    <home nested="build/cocoon-@@DATE@@"/>
   
  -    <jar name="databases.jar"/>
  +    <jar name="databases-block.jar"/>
   
       <nag from="Gump" to="cocoon-dev@xml.apache.org"/>
     </project>
  @@ -274,6 +283,7 @@
   
       <ant target="block">
         <property name="block-name" value="hsqldb"/>
  +      <property name="version" value="@@DATE@@"/>
       </ant>
   
       <depend project="cocoon" inherit="all"/>
  @@ -281,9 +291,9 @@
       <depend project="hsqldb" version="supplied"/>
   
       <work nested="tools/anttasks"/>
  -    <home nested="build/cocoon"/>
  +    <home nested="build/cocoon-@@DATE@@"/>
   
  -    <jar name="hsqldb.jar"/>
  +    <jar name="hsqldb-block.jar"/>
   
       <nag from="Gump" to="cocoon-dev@xml.apache.org"/>
     </project>
  @@ -293,14 +303,15 @@
   
       <ant target="block">
         <property name="block-name" value="precept"/>
  +      <property name="version" value="@@DATE@@"/>
       </ant>
   
       <depend project="cocoon" inherit="all"/>
   
       <work nested="tools/anttasks"/>
  -    <home nested="build/cocoon"/>
  +    <home nested="build/cocoon-@@DATE@@"/>
   
  -    <jar name="precept.jar"/>
  +    <jar name="precept-block.jar"/>
   
       <nag from="Gump" to="cocoon-dev@xml.apache.org"/>
     </project>
  @@ -310,15 +321,16 @@
   
       <ant target="block">
         <property name="block-name" value="poi"/>
  +      <property name="version" value="@@DATE@@"/>
       </ant>
   
       <depend project="cocoon" inherit="all"/>
       <depend project="jakarta-poi" version="supplied"/>
   
       <work nested="tools/anttasks"/>
  -    <home nested="build/cocoon"/>
  +    <home nested="build/cocoon-@@DATE@@"/>
   
  -    <jar name="poi.jar"/>
  +    <jar name="poi-block.jar"/>
   
       <nag from="Gump" to="cocoon-dev@xml.apache.org"/>
     </project>
  @@ -328,15 +340,16 @@
   
       <ant target="block">
         <property name="block-name" value="naming"/>
  +      <property name="version" value="@@DATE@@"/>
       </ant>
   
       <depend project="cocoon" inherit="all"/>
       <depend project="jndi" version="supplied"/>
   
       <work nested="tools/anttasks"/>
  -    <home nested="build/cocoon"/>
  +    <home nested="build/cocoon-@@DATE@@"/>
   
  -    <jar name="naming.jar"/>
  +    <jar name="naming-block.jar"/>
   
       <nag from="Gump" to="cocoon-dev@xml.apache.org"/>
     </project>
  @@ -346,15 +359,16 @@
   
       <ant target="block">
         <property name="block-name" value="jsp"/>
  +      <property name="version" value="@@DATE@@"/>
       </ant>
   
       <depend project="cocoon" inherit="all"/>
   
       <work nested="tools/anttasks"/>
       <work nested="build/cocoon-@@DATE@@/blocks/jsp/mocks"/>
  -    <home nested="build/cocoon"/>
  +    <home nested="build/cocoon-@@DATE@@"/>
   
  -    <jar name="jsp.jar"/>
  +    <jar name="jsp-block.jar"/>
   
       <nag from="Gump" to="cocoon-dev@xml.apache.org"/>
     </project>
  @@ -364,15 +378,16 @@
   
       <ant target="block">
         <property name="block-name" value="php"/>
  +      <property name="version" value="@@DATE@@"/>
       </ant>
   
       <depend project="cocoon" inherit="all"/>
       <option project="phpservlt" version="supplied"/>
   
       <work nested="tools/anttasks"/>
  -    <home nested="build/cocoon"/>
  +    <home nested="build/cocoon-@@DATE@@"/>
   
  -    <jar name="php.jar"/>
  +    <jar name="php-block.jar"/>
   
       <nag from="Gump" to="cocoon-dev@xml.apache.org"/>
     </project>
  @@ -382,15 +397,16 @@
   
       <ant target="block">
         <property name="block-name" value="python"/>
  +      <property name="version" value="@@DATE@@"/>
       </ant>
   
       <depend project="cocoon" inherit="all"/>
       <option project="jython" version="supplied"/>
   
       <work nested="tools/anttasks"/>
  -    <home nested="build/cocoon"/>
  +    <home nested="build/cocoon-@@DATE@@"/>
   
  -    <jar name="python.jar"/>
  +    <jar name="python-block.jar"/>
   
       <nag from="Gump" to="cocoon-dev@xml.apache.org"/>
     </project>
  @@ -400,15 +416,16 @@
   
       <ant target="block">
         <property name="block-name" value="lucene"/>
  +      <property name="version" value="@@DATE@@"/>
       </ant>
   
       <depend project="cocoon" inherit="all"/>
       <depend project="jakarta-lucene" version="supplied"/>
   
       <work nested="tools/anttasks"/>
  -    <home nested="build/cocoon"/>
  +    <home nested="build/cocoon-@@DATE@@"/>
   
  -    <jar name="lucene.jar"/>
  +    <jar name="lucene-block.jar"/>
   
       <nag from="Gump" to="cocoon-dev@xml.apache.org"/>
     </project>
  @@ -418,15 +435,16 @@
   
       <ant target="block">
         <property name="block-name" value="html"/>
  +      <property name="version" value="@@DATE@@"/>
       </ant>
   
       <depend project="cocoon" inherit="all"/>
       <depend project="jtidy" version="supplied"/>
   
       <work nested="tools/anttasks"/>
  -    <home nested="build/cocoon"/>
  +    <home nested="build/cocoon-@@DATE@@"/>
   
  -    <jar name="html.jar"/>
  +    <jar name="html-block.jar"/>
   
       <nag from="Gump" to="cocoon-dev@xml.apache.org"/>
     </project>
  @@ -436,15 +454,16 @@
   
       <ant target="block">
         <property name="block-name" value="bsf"/>
  +      <property name="version" value="@@DATE@@"/>
       </ant>
   
       <depend project="cocoon" inherit="all"/>
       <depend project="bsf" version="supplied"/>
   
       <work nested="tools/anttasks"/>
  -    <home nested="build/cocoon"/>
  +    <home nested="build/cocoon-@@DATE@@"/>
   
  -    <jar name="bsf.jar"/>
  +    <jar name="bsf-block.jar"/>
   
       <nag from="Gump" to="cocoon-dev@xml.apache.org"/>
     </project>
  @@ -454,12 +473,13 @@
   
       <ant target="block">
         <property name="block-name" value="profiler"/>
  +      <property name="version" value="@@DATE@@"/>
       </ant>
   
       <depend project="cocoon" inherit="all"/>
   
       <work nested="tools/anttasks"/>
  -    <home nested="build/cocoon"/>
  +    <home nested="build/cocoon-@@DATE@@"/>
   
       <jar name="profiler.jar"/>
   
  @@ -471,15 +491,16 @@
   
       <ant target="block">
         <property name="block-name" value="velocity"/>
  +      <property name="version" value="@@DATE@@"/>
       </ant>
   
       <depend project="cocoon" inherit="all"/>
       <depend project="jakarta-velocity" version="supplied"/>
   
       <work nested="tools/anttasks"/>
  -    <home nested="build/cocoon"/>
  +    <home nested="build/cocoon-@@DATE@@"/>
   
  -    <jar name="velocity.jar"/>
  +    <jar name="velocity-block.jar"/>
   
       <nag from="Gump" to="cocoon-dev@xml.apache.org"/>
     </project>
  @@ -489,14 +510,15 @@
       
       <ant target="block">
         <property name="block-name" value="linkrewriter"/>
  +      <property name="version" value="@@DATE@@"/>
       </ant>
       
       <depend project="cocoon" inherit="all"/>
       
       <work nested="tools/anttasks"/>
  -    <home nested="build/cocoon"/>
  +    <home nested="build/cocoon-@@DATE@@"/>
       
  -    <jar name="linkrewriter.jar"/>
  +    <jar name="linkrewriter-block.jar"/>
   
       <nag from="Gump" to="cocoon-dev@xml.apache.org"/>
     </project>
  @@ -506,15 +528,17 @@
       
       <ant target="block">
         <property name="block-name" value="web3"/>
  +      <property name="version" value="@@DATE@@"/>
       </ant>
       
       <depend project="cocoon" inherit="all"/>
  +    <depend project="jta" version="supplied"/>
       
       <work nested="tools/anttasks"/>
       <work nested="build/cocoon-@@DATE@@/blocks/web3/mocks"/>
  -    <home nested="build/cocoon"/>
  +    <home nested="build/cocoon-@@DATE@@"/>
       
  -    <jar name="web3.jar"/>
  +    <jar name="web3-block.jar"/>
   
       <nag from="Gump" to="cocoon-dev@xml.apache.org"/>
     </project>  
  @@ -524,15 +548,16 @@
   
       <ant target="block">
         <property name="block-name" value="slide"/>
  +      <property name="version" value="@@DATE@@"/>
       </ant>
   
       <depend project="cocoon" inherit="all"/>
       <depend project="jakarta-slide" ids="kernel" version="supplied"/>
   
       <work nested="tools/anttasks"/>
  -    <home nested="build/cocoon"/>
  +    <home nested="build/cocoon-@@DATE@@"/>
   
  -    <jar name="slide.jar"/>
  +    <jar name="slide-block.jar"/>
   
       <nag from="Gump" to="cocoon-dev@xml.apache.org"/>
     </project>
  @@ -542,6 +567,7 @@
   
       <ant target="block">
         <property name="block-name" value="proxy"/>
  +      <property name="version" value="@@DATE@@"/>
       </ant>
   
       <depend project="cocoon" inherit="all"/>
  @@ -549,9 +575,9 @@
       <depend project="commons-logging" version="supplied"/>
   
       <work nested="tools/anttasks"/>
  -    <home nested="build/cocoon"/>
  +    <home nested="build/cocoon-@@DATE@@"/>
   
  -    <jar name="proxy.jar"/>
  +    <jar name="proxy-block.jar"/>
   
       <nag from="Gump" to="cocoon-dev@xml.apache.org"/>
     </project>
  @@ -561,6 +587,7 @@
   
       <ant target="block">
         <property name="block-name" value="xmldb"/>
  +      <property name="version" value="@@DATE@@"/>
       </ant>
   
       <depend project="cocoon" inherit="all"/>
  @@ -568,9 +595,9 @@
       <depend project="xmldb" version="supplied"/>
   
       <work nested="tools/anttasks"/>
  -    <home nested="build/cocoon"/>
  +    <home nested="build/cocoon-@@DATE@@"/>
   
  -    <jar name="xmldb.jar"/>
  +    <jar name="xmldb-block.jar"/>
   
       <nag from="Gump" to="cocoon-dev@xml.apache.org"/>
     </project>
  @@ -580,15 +607,16 @@
   
       <ant target="block">
         <property name="block-name" value="deli"/>
  +      <property name="version" value="@@DATE@@"/>
       </ant>
   
       <depend project="cocoon" inherit="all"/>
       <depend project="deli" version="supplied"/>
   
       <work nested="tools/anttasks"/>
  -    <home nested="build/cocoon"/>
  +    <home nested="build/cocoon-@@DATE@@"/>
   
  -    <jar name="deli.jar"/>
  +    <jar name="deli-block.jar"/>
   
       <nag from="Gump" to="cocoon-dev@xml.apache.org"/>
     </project>
  @@ -598,14 +626,15 @@
   
       <ant target="block">
         <property name="block-name" value="asciiart"/>
  +      <property name="version" value="@@DATE@@"/>
       </ant>
   
       <depend project="cocoon" inherit="all"/>
   
       <work nested="tools/anttasks"/>
  -    <home nested="build/cocoon"/>
  +    <home nested="build/cocoon-@@DATE@@"/>
   
  -    <jar name="asciiart.jar"/>
  +    <jar name="asciiart-block.jar"/>
   
       <nag from="Gump" to="cocoon-dev@xml.apache.org"/>
     </project>
  @@ -615,6 +644,7 @@
   
       <ant target="block">
         <property name="block-name" value="mail"/>
  +      <property name="version" value="@@DATE@@"/>
       </ant>
   
       <depend project="cocoon" inherit="all"/>
  @@ -622,9 +652,9 @@
       <depend project="javamail" version="supplied"/>
   
       <work nested="tools/anttasks"/>
  -    <home nested="build/cocoon"/>
  +    <home nested="build/cocoon-@@DATE@@"/>
   
  -    <jar name="mail.jar"/>
  +    <jar name="mail-block.jar"/>
   
       <nag from="Gump" to="cocoon-dev@xml.apache.org"/>
     </project>
  @@ -634,15 +664,16 @@
   
       <ant target="block">
         <property name="block-name" value="axis"/>
  +      <property name="version" value="@@DATE@@"/>
       </ant>
   
       <depend project="cocoon" inherit="all"/>
       <depend project="xml-axis" version="supplied"/>
   
       <work nested="tools/anttasks"/>
  -    <home nested="build/cocoon"/>
  +    <home nested="build/cocoon-@@DATE@@"/>
   
  -    <jar name="axis.jar"/>
  +    <jar name="axis-block.jar"/>
   
       <nag from="Gump" to="cocoon-dev@xml.apache.org"/>
     </project>
  @@ -652,14 +683,15 @@
   
       <ant target="block">
         <property name="block-name" value="taglib"/>
  +      <property name="version" value="@@DATE@@"/>
       </ant>
   
       <depend project="cocoon" inherit="all"/>
   
       <work nested="tools/anttasks"/>
  -    <home nested="build/cocoon"/>
  +    <home nested="build/cocoon-@@DATE@@"/>
   
  -    <jar name="taglib.jar"/>
  +    <jar name="taglib-block.jar"/>
   
       <nag from="Gump" to="cocoon-dev@xml.apache.org"/>
     </project>