gump-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nic...@apache.org
Subject cvs commit: gump/project ant-1.5.xml ant.xml avalon-components.xml avalon-phoenix.xml avalon.xml barcode4j.xml beanshell.xml checkstyle.xml db-ojb.xml dom4j.xml domts.xml excalibur.xml forrest.xml incubator-altrmi.xml jakarta-cactus.xml jakarta-commons-sandbox.xml jakarta-commons.xml jakarta-jetspeed.xml jakarta-jmeter.xml jakarta-slide.xml jakarta-struts.xml jakarta-taglibs.xml jakarta-tomcat-40.xml jakarta-tomcat-5.xml jakarta-tomcat-catalina.xml jakarta-turbine-2.xml jdom.xml jelly-tags.xml jgen.xml jstl-jsp-12.xml mx4j.xml struts.xml ws-axis.xml wss4j.xml xdoclet.xml xml-batik.xml xml-fop-maintenance.xml xml-fop.xml xml-security.xml xml-stylebook.xml xml-xalan.xml xml-xerces.xml xml-xerces2.xml xml-xindice.xml xmlunit.xml
Date Sat, 16 Oct 2004 14:26:11 GMT
niclas      2004/10/16 07:26:11

  Modified:    project  ant-1.5.xml ant.xml avalon-components.xml
                        avalon-phoenix.xml avalon.xml barcode4j.xml
                        beanshell.xml checkstyle.xml db-ojb.xml dom4j.xml
                        domts.xml excalibur.xml forrest.xml
                        incubator-altrmi.xml jakarta-cactus.xml
                        jakarta-commons-sandbox.xml jakarta-commons.xml
                        jakarta-jetspeed.xml jakarta-jmeter.xml
                        jakarta-slide.xml jakarta-struts.xml
                        jakarta-taglibs.xml jakarta-tomcat-40.xml
                        jakarta-tomcat-5.xml jakarta-tomcat-catalina.xml
                        jakarta-turbine-2.xml jdom.xml jelly-tags.xml
                        jgen.xml jstl-jsp-12.xml mx4j.xml struts.xml
                        ws-axis.xml wss4j.xml xdoclet.xml xml-batik.xml
                        xml-fop-maintenance.xml xml-fop.xml
                        xml-security.xml xml-stylebook.xml xml-xalan.xml
                        xml-xerces.xml xml-xerces2.xml xml-xindice.xml
                        xmlunit.xml
  Log:
  Change the xml-xalan name to the Maven artifact id of 'xalan', to make Maven builds work.
  
  Revision  Changes    Path
  1.2       +1 -1      gump/project/ant-1.5.xml
  
  Index: ant-1.5.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/ant-1.5.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ant-1.5.xml	7 Apr 2004 15:18:31 -0000	1.1
  +++ ant-1.5.xml	16 Oct 2004 14:26:10 -0000	1.2
  @@ -30,7 +30,7 @@
   
       <depend project="xml-xerces"/>
       <depend project="xml-apis" />
  -    <depend project="xml-xalan2" ids="transformer" />
  +    <depend project="xalan" ids="transformer" />
       <depend project="xml-stylebook2"/>
       <depend project="junit"/>
   
  
  
  
  1.28      +2 -2      gump/project/ant.xml
  
  Index: ant.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/ant.xml,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- ant.xml	16 Oct 2004 14:07:54 -0000	1.27
  +++ ant.xml	16 Oct 2004 14:26:10 -0000	1.28
  @@ -37,7 +37,7 @@
       <depend project="bootstrap-ant"/>
       <depend project="xml-xerces"/>
       <depend project="xml-apis" />
  -    <option project="xml-xalan2" ids="transformer" />
  +    <option project="xalan" ids="transformer" />
       <option project="xml-stylebook2"/>
       <option project="junit"/>
   
  @@ -135,7 +135,7 @@
       </ant>
   
       <depend project="dist-ant" inherit="all"/>
  -    <depend project="xml-xalan2" ids="serializer" />
  +    <depend project="xalan" ids="serializer" />
       
       <option project="jakarta-tomcat-4.0" ids="jasper-compiler jasper-runtime"/>
       <option project="xml-commons-which"/>
  
  
  
  1.26      +12 -12    gump/project/avalon-components.xml
  
  Index: avalon-components.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/avalon-components.xml,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- avalon-components.xml	22 Aug 2004 11:55:48 -0000	1.25
  +++ avalon-components.xml	16 Oct 2004 14:26:10 -0000	1.26
  @@ -63,7 +63,7 @@
           <!-- build-time dependencies -->
           <depend project="ant" inherit="runtime"/>
           <depend project="xml-xerces"/>
  -        <depend project="xml-xalan2"/>
  +        <depend project="xalan"/>
   
           <!-- optional dependencies -->
           <option project="checkstyle" inherit="runtime"/>
  @@ -101,7 +101,7 @@
           <!-- build-time dependencies -->
           <depend project="ant" inherit="runtime"/>
           <depend project="xml-xerces"/>
  -        <depend project="xml-xalan2"/>
  +        <depend project="xalan"/>
   
           <!-- optional dependencies -->
           <option project="checkstyle" inherit="runtime"/>
  @@ -129,7 +129,7 @@
           <depend project="ant" inherit="runtime"/>
           <depend project="junit"/>
           <depend project="xml-xerces"/>
  -        <depend project="xml-xalan2"/>
  +        <depend project="xalan"/>
   
           <!-- optional dependencies -->
           <option project="checkstyle" inherit="runtime"/>
  @@ -161,7 +161,7 @@
           <depend project="ant" inherit="runtime"/>
           <depend project="junit"/>
           <depend project="xml-xerces"/>
  -        <depend project="xml-xalan2"/>
  +        <depend project="xalan"/>
   
           <!-- optional dependencies -->
           <option project="checkstyle" inherit="runtime"/>
  @@ -189,7 +189,7 @@
           <depend project="ant" inherit="runtime"/>
           <depend project="junit"/>
           <depend project="xml-xerces"/>
  -        <depend project="xml-xalan2"/>
  +        <depend project="xalan"/>
   
           <!-- optional dependencies -->
           <option project="checkstyle" inherit="runtime"/>
  @@ -222,7 +222,7 @@
           <depend project="ant" inherit="runtime"/>
           <depend project="junit"/>
           <depend project="xml-xerces"/>
  -        <depend project="xml-xalan2"/>
  +        <depend project="xalan"/>
   
           <!-- optional dependencies -->
           <option project="checkstyle" inherit="runtime"/>
  @@ -250,7 +250,7 @@
           <depend project="ant" inherit="runtime"/>
           <depend project="junit"/>
           <depend project="xml-xerces"/>
  -        <depend project="xml-xalan2"/>
  +        <depend project="xalan"/>
   
           <!-- optional dependencies -->
           <option project="checkstyle" inherit="runtime"/>
  @@ -281,7 +281,7 @@
           <depend project="ant" inherit="runtime"/>
           <depend project="junit"/>
           <depend project="xml-xerces"/>
  -        <depend project="xml-xalan2"/>
  +        <depend project="xalan"/>
   
           <!-- optional dependencies -->
           <option project="checkstyle" inherit="runtime"/>
  @@ -309,7 +309,7 @@
           <depend project="ant" inherit="runtime"/>
           <depend project="junit"/>
           <depend project="xml-xerces"/>
  -        <depend project="xml-xalan2"/>
  +        <depend project="xalan"/>
   
           <!-- optional dependencies -->
           <option project="checkstyle" inherit="runtime"/>
  @@ -340,7 +340,7 @@
           <depend project="ant" inherit="runtime"/>
           <depend project="junit"/>
           <depend project="xml-xerces"/>
  -        <depend project="xml-xalan2"/>
  +        <depend project="xalan"/>
   
           <!-- optional dependencies -->
           <option project="checkstyle" inherit="runtime"/>
  @@ -368,7 +368,7 @@
           <depend project="ant" inherit="runtime"/>
           <depend project="junit"/>
           <depend project="xml-xerces"/>
  -        <depend project="xml-xalan2"/>
  +        <depend project="xalan"/>
   
           <!-- optional dependencies -->
           <option project="checkstyle" inherit="runtime"/>
  @@ -404,7 +404,7 @@
           <depend project="ant" inherit="runtime"/>
           <depend project="junit"/>
           <depend project="xml-xerces"/>
  -        <depend project="xml-xalan2"/>
  +        <depend project="xalan"/>
   
           <!-- optional dependencies -->
           <option project="checkstyle" inherit="runtime"/>
  
  
  
  1.75      +1 -1      gump/project/avalon-phoenix.xml
  
  Index: avalon-phoenix.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/avalon-phoenix.xml,v
  retrieving revision 1.74
  retrieving revision 1.75
  diff -u -r1.74 -r1.75
  --- avalon-phoenix.xml	8 Oct 2004 17:07:50 -0000	1.74
  +++ avalon-phoenix.xml	16 Oct 2004 14:26:10 -0000	1.75
  @@ -79,7 +79,7 @@
           <depend project="mx4j" runtime="true"/>
           <depend project="mx4j-tools" runtime="true"/>
   -->
  -        <depend project="xml-xalan2"/>
  +        <depend project="xalan"/>
           <depend project="phoenix-qdox" runtime="true"/>
           <option project="jakarta-servletapi-4" runtime="true"/>
           <depend project="junit"/>
  
  
  
  1.55      +11 -11    gump/project/avalon.xml
  
  Index: avalon.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/avalon.xml,v
  retrieving revision 1.54
  retrieving revision 1.55
  diff -u -r1.54 -r1.55
  --- avalon.xml	7 Sep 2004 08:35:08 -0000	1.54
  +++ avalon.xml	16 Oct 2004 14:26:10 -0000	1.55
  @@ -46,7 +46,7 @@
           </ant>
   
           <depend project="ant" inherit="runtime"/>
  -        <depend project="xml-xalan2"/>
  +        <depend project="xalan"/>
           <depend project="xml-xerces"/>
           <depend runtime="true" project="junit"/>
   
  @@ -85,7 +85,7 @@
           <!-- build-time dependencies -->
           <depend project="ant" inherit="runtime"/>
           <depend project="xml-xerces"/>
  -        <depend project="xml-xalan2"/>
  +        <depend project="xalan"/>
   
           <!-- optional dependencies -->
           <option project="checkstyle" inherit="runtime"/>
  @@ -130,7 +130,7 @@
           <!-- build-time dependencies -->
           <depend project="ant" inherit="runtime"/>
           <depend project="xml-xerces"/>
  -        <depend project="xml-xalan2"/>
  +        <depend project="xalan"/>
   
           <!-- optional dependencies -->
           <option project="checkstyle" inherit="runtime"/>
  @@ -175,7 +175,7 @@
           <!-- build-time dependencies -->
           <depend project="ant" inherit="runtime"/>
           <depend project="xml-xerces"/>
  -        <depend project="xml-xalan2"/>
  +        <depend project="xalan"/>
   
           <!-- optional dependencies -->
           <option project="checkstyle" inherit="runtime"/>
  @@ -221,7 +221,7 @@
           <!-- build-time dependencies -->
           <depend project="ant" inherit="runtime"/>
           <depend project="xml-xerces"/>
  -        <depend project="xml-xalan2"/>
  +        <depend project="xalan"/>
   
           <!-- optional dependencies -->
           <option project="checkstyle" inherit="runtime"/>
  @@ -270,7 +270,7 @@
           <!-- build-time dependencies -->
           <depend project="ant" inherit="runtime"/>
           <depend project="xml-xerces"/>
  -        <depend project="xml-xalan2"/>
  +        <depend project="xalan"/>
   
           <!-- optional dependencies -->
           <option project="checkstyle" inherit="runtime"/>
  @@ -317,7 +317,7 @@
           <!-- build-time dependencies -->
           <depend project="ant" inherit="runtime"/>
           <depend project="xml-xerces"/>
  -        <depend project="xml-xalan2"/>
  +        <depend project="xalan"/>
   
           <!-- optional dependencies -->
           <option project="checkstyle" inherit="runtime"/>
  @@ -364,7 +364,7 @@
           <!-- build-time dependencies -->
           <depend project="ant" inherit="runtime"/>
           <depend project="xml-xerces"/>
  -        <depend project="xml-xalan2"/>
  +        <depend project="xalan"/>
   
           <!-- optional dependencies -->
           <option project="checkstyle" inherit="runtime"/>
  @@ -411,7 +411,7 @@
           <!-- build-time dependencies -->
           <depend project="ant" inherit="runtime"/>
           <depend project="xml-xerces"/>
  -        <depend project="xml-xalan2"/>
  +        <depend project="xalan"/>
   
           <!-- optional dependencies -->
           <option project="checkstyle" inherit="runtime"/>
  @@ -459,7 +459,7 @@
           <!-- build-time dependencies -->
           <depend project="ant" inherit="runtime"/>
           <depend project="xml-xerces"/>
  -        <depend project="xml-xalan2"/>
  +        <depend project="xalan"/>
   
           <!-- optional dependencies -->
           <option project="checkstyle" inherit="runtime"/>
  @@ -581,7 +581,7 @@
           <depend project="avalon-util-i18n"/>
           <depend project="ant" inherit="runtime"/>
           <depend project="junit"/>
  -        <depend project="xml-xalan2"/>
  +        <depend project="xalan"/>
           <depend project="xml-xerces"/>
           <depend project="avalon-framework"/>
           <depend project="excalibur-configuration"/>
  
  
  
  1.12      +1 -2      gump/project/barcode4j.xml
  
  Index: barcode4j.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/barcode4j.xml,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- barcode4j.xml	15 Oct 2004 19:49:45 -0000	1.11
  +++ barcode4j.xml	16 Oct 2004 14:26:10 -0000	1.12
  @@ -48,8 +48,7 @@
           <depend project="commons-cli"/>
           <depend project="junit"/>        
           <depend project="xml-xerces"/>      
  -        <depend project="xml-xalan2"/>
  -        <depend project="xml-xalan2" ids="serializer" />
  +        <depend project="xalan"/>
   
           <jar name="barcode4j.jar"/>
   
  
  
  
  1.10      +1 -1      gump/project/beanshell.xml
  
  Index: beanshell.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/beanshell.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- beanshell.xml	6 May 2004 16:03:40 -0000	1.9
  +++ beanshell.xml	16 Oct 2004 14:26:10 -0000	1.10
  @@ -35,7 +35,7 @@
   
       <depend project="ant" inherit="runtime"/>
       <depend project="xml-xerces"/>
  -    <depend project="xml-xalan2"/>
  +    <depend project="xalan"/>
       <depend project="jakarta-bsf"/>
       <depend project="jakarta-servletapi"/>
   
  
  
  
  1.31      +1 -1      gump/project/checkstyle.xml
  
  Index: checkstyle.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/checkstyle.xml,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- checkstyle.xml	16 Oct 2004 08:21:05 -0000	1.30
  +++ checkstyle.xml	16 Oct 2004 14:26:10 -0000	1.31
  @@ -40,7 +40,7 @@
   
       <depend project="ant" inherit="runtime"/>
       <depend project="xml-xerces"/>
  -    <depend project="xml-xalan2"/>
  +    <depend project="xalan"/>
       <depend project="antlr" runtime="true"/>
       <depend project="jakarta-regexp" runtime="true"/>
       <depend project="bcel" runtime="true"/>
  
  
  
  1.22      +2 -2      gump/project/db-ojb.xml
  
  Index: db-ojb.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/db-ojb.xml,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- db-ojb.xml	22 Aug 2004 11:59:50 -0000	1.21
  +++ db-ojb.xml	16 Oct 2004 14:26:10 -0000	1.22
  @@ -69,7 +69,7 @@
       <depend project="ejb" />
   
       <!-- needed for documentation -->
  -    <depend project="xml-xalan2"/>
  +    <depend project="xalan"/>
   
       <work nested="target/classes" />
   
  @@ -130,7 +130,7 @@
       <depend project="ejb" />
   
       <!-- needed for documentation -->
  -    <depend project="xml-xalan2"/>
  +    <depend project="xalan"/>
   
       <work nested="target/classes" />
   
  
  
  
  1.50      +1 -2      gump/project/dom4j.xml
  
  Index: dom4j.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/dom4j.xml,v
  retrieving revision 1.49
  retrieving revision 1.50
  diff -u -r1.49 -r1.50
  --- dom4j.xml	15 Oct 2004 19:49:45 -0000	1.49
  +++ dom4j.xml	16 Oct 2004 14:26:10 -0000	1.50
  @@ -36,8 +36,7 @@
       <depend project="xml-xerces"/>
       <depend project="junit"/>
       <depend project="xml-apis"/>
  -    <depend project="xml-xalan2"/>
  -    <depend project="xml-xalan2" ids="serializer" />
  +    <depend project="xalan"/>
       <depend project="xpp2"/>
       <depend project="xpp"/>
       <depend project="jaxen-from-packaged-dom4j"/>
  
  
  
  1.4       +3 -6      gump/project/domts.xml
  
  Index: domts.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/domts.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- domts.xml	15 Oct 2004 19:49:45 -0000	1.3
  +++ domts.xml	16 Oct 2004 14:26:10 -0000	1.4
  @@ -33,8 +33,7 @@
   
       <depend project="ant" inherit="runtime"/>
       <depend project="xml-xerces"/>
  -    <depend project="xml-xalan2"/>
  -    <depend project="xml-xalan2" ids="serializer" />
  +    <depend project="xalan"/>
       <depend project="junit"/>
   
       <home nested="build"/>
  @@ -53,8 +52,7 @@
   
       <depend project="ant" inherit="runtime"/>
       <depend project="xml-xerces"/>
  -    <depend project="xml-xalan2"/>
  -    <depend project="xml-xalan2" ids="serializer" />
  +    <depend project="xalan"/>
   
       <home nested="build"/>
       <jar name="dom2-core.jar" />
  @@ -72,8 +70,7 @@
   
       <depend project="ant" inherit="runtime"/>
       <depend project="xml-xerces"/>
  -    <depend project="xml-xalan2"/>
  -    <depend project="xml-xalan2" ids="serializer" />
  +    <depend project="xalan"/>
   
       <home nested="build"/>
       <jar name="dom3-core.jar" />
  
  
  
  1.36      +45 -47    gump/project/excalibur.xml
  
  Index: excalibur.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/excalibur.xml,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- excalibur.xml	16 Oct 2004 08:21:05 -0000	1.35
  +++ excalibur.xml	16 Oct 2004 14:26:10 -0000	1.36
  @@ -82,7 +82,7 @@
           
           <!-- build-time dependencies -->
           <depend project="ant" inherit="runtime"/>
  -        <depend project="xml-xalan2"/>
  +        <depend project="xalan"/>
           <depend project="xml-xerces"/>
           <depend project="jakarta-servletapi" inherit="runtime"/>
   
  @@ -118,7 +118,7 @@
   
           <!-- build-time dependencies -->
           <depend project="ant" inherit="runtime"/>
  -        <depend project="xml-xalan2"/>
  +        <depend project="xalan"/>
           <depend project="xml-xerces"/>
   
           <!-- optional dependencies -->
  @@ -162,7 +162,7 @@
   
           <depend project="ant" inherit="runtime"/>
           <depend project="xml-xerces"/>
  -        <depend project="xml-xalan2"/>
  +        <depend project="xalan"/>
   
           <option project="checkstyle" inherit="runtime"/>
   
  @@ -203,7 +203,7 @@
           <depend project="junit"/>
           <depend project="qdox"/>
           <depend project="xml-xerces"/>
  -        <depend project="xml-xalan2"/>
  +        <depend project="xalan"/>
           
           <option project="checkstyle" inherit="runtime"/>
           
  @@ -230,7 +230,7 @@
           <depend project="ant" inherit="runtime"/>
           <depend project="junit"/>
           <depend project="xml-xerces"/>
  -        <depend project="xml-xalan2"/>
  +        <depend project="xalan"/>
   
           <!-- optional dependencies -->
           <option project="checkstyle" inherit="runtime"/>
  @@ -267,7 +267,7 @@
           <!-- build-time dependencies -->
           <depend project="ant" inherit="runtime"/>
           <depend project="xml-xerces"/>
  -        <depend project="xml-xalan2"/>
  +        <depend project="xalan"/>
   
           <!-- optional dependencies -->
           <option project="checkstyle" inherit="runtime"/>
  @@ -293,7 +293,7 @@
           <!-- build-time dependencies -->
           <depend project="ant" inherit="runtime"/>
           <depend project="xml-xerces"/>
  -        <depend project="xml-xalan2"/>
  +        <depend project="xalan"/>
           <depend project="junit"/>
   
           <depend project="avalon-framework-api"/>
  @@ -330,7 +330,7 @@
           <!-- build-time dependencies -->
           <depend project="ant" inherit="runtime"/>
           <depend project="xml-xerces"/>
  -        <depend project="xml-xalan2"/>
  +        <depend project="xalan"/>
           <depend project="junit"/>
   
           <depend project="avalon-framework-api"/>
  @@ -382,7 +382,7 @@
           <!-- build-time dependencies -->
           <depend project="ant" inherit="runtime"/>
           <depend project="xml-xerces"/>
  -        <depend project="xml-xalan2"/>
  +        <depend project="xalan"/>
           <depend project="junit"/>
           <depend project="xml-apis" />
   
  @@ -443,35 +443,33 @@
           <!-- build-time dependencies -->
           <depend project="ant" inherit="runtime"/>
           <depend project="xml-xerces"/>
  -        <depend project="xml-xalan2"/>
  +        <depend project="xalan"/>
           <depend project="junit"/>
           
  -        <depend project="excalibur-fortress-container-api"/>
  -        <depend project="excalibur-fortress-container-impl"/>
           <depend project="avalon-framework-api"/>
  -        <depend project="avalon-framework-legacy"/>
           <depend project="avalon-framework-impl"/>
  +        <depend project="avalon-logkit"/>
  +        <depend project="commons-collections"/>
  +        <depend project="commons-logging"/>
           <depend project="excalibur-event-api"/>
           <depend project="excalibur-event-impl"/>
  -        <depend project="excalibur-logger"/>
  -        <depend project="excalibur-lifecycle-api"/>
  +        <depend project="excalibur-fortress-container-api"/>
  +        <depend project="excalibur-fortress-container-impl"/>
           <depend project="excalibur-instrument-api"/>
           <depend project="excalibur-instrument-mgr-api" />
           <depend project="excalibur-instrument-mgr-impl" />
  +        <depend project="excalibur-lifecycle-api"/>
  +        <depend project="excalibur-logger"/>
  +        <depend project="excalibur-monitor"/>
  +        <depend project="excalibur-pool-api"/>
           <depend project="excalibur-sourceresolve"/>
  -<!--  Remove for time being and see what happens...
  -        <depend project="excalibur-i18n"/>
  --->
           <depend project="excalibur-xmlutil"/>
  -        <depend project="excalibur-pool-api"/>
  -        <depend project="excalibur-monitor"/>
  -        <depend project="commons-collections"/>
           <depend project="concurrent"/>
  -        <depend project="avalon-logkit"/>
           <depend project="qdox"/>
           <depend project="xml-apis"/>
  -        <depend project="commons-logging"/>
  -
  +        <depend project="xalan"/>
  +        <depend project="xml-resolver"/>
  +        
           <!-- optional dependencies -->
           <option project="checkstyle" inherit="runtime"/>
   
  @@ -496,7 +494,7 @@
           <!-- build-time dependencies -->
           <depend project="ant" inherit="runtime"/>
           <depend project="xml-xerces"/>
  -        <depend project="xml-xalan2"/>
  +        <depend project="xalan"/>
           <depend project="junit"/>
   
           <depend project="excalibur-fortress-container-api" />
  @@ -534,7 +532,7 @@
   
           <depend project="ant" inherit="runtime"/>
           <depend project="xml-xerces"/>
  -        <depend project="xml-xalan2"/>
  +        <depend project="xalan"/>
           <depend project="junit"/>
   
           <option project="checkstyle" inherit="runtime"/>
  @@ -557,7 +555,7 @@
           <depend project="ant" inherit="runtime"/>
           <depend project="junit"/>
           <depend project="xml-xerces"/>
  -        <depend project="xml-xalan2"/>
  +        <depend project="xalan"/>
           <depend project="avalon-framework-api" runtime="true"/>
           <depend project="avalon-framework-legacy" runtime="true"/>
           <depend project="avalon-framework-impl" runtime="true"/>
  @@ -592,7 +590,7 @@
           <depend project="ant" inherit="runtime"/>
           <depend project="junit"/>
           <depend project="xml-xerces"/>
  -        <depend project="xml-xalan2"/>
  +        <depend project="xalan"/>
   
           <!-- optional dependencies -->
           <option project="checkstyle" inherit="runtime"/>
  @@ -626,7 +624,7 @@
           <depend project="ant" inherit="runtime"/>
           <depend project="junit"/>
           <depend project="xml-xerces"/>
  -        <depend project="xml-xalan2"/>
  +        <depend project="xalan"/>
   
           <!-- optional dependencies -->
           <option project="checkstyle" inherit="runtime"/>
  @@ -660,7 +658,7 @@
           <depend project="ant" inherit="runtime"/>
           <depend project="junit"/>
           <depend project="xml-xerces"/>
  -        <depend project="xml-xalan2"/>
  +        <depend project="xalan"/>
   
           <!-- optional dependencies -->
           <option project="checkstyle" inherit="runtime"/>
  @@ -689,7 +687,7 @@
           <depend project="ant" inherit="runtime"/>
           <depend project="junit"/>
           <depend project="xml-xerces"/>
  -        <depend project="xml-xalan2"/>
  +        <depend project="xalan"/>
   
           <!-- optional dependencies -->
           <option project="checkstyle" inherit="runtime"/>
  @@ -744,7 +742,7 @@
           <depend project="ant" inherit="runtime"/>
           <depend project="junit"/>
           <depend project="xml-xerces"/>
  -        <depend project="xml-xalan2"/>
  +        <depend project="xalan"/>
   
           <!-- optional dependencies -->
           <option project="checkstyle" inherit="runtime"/>
  @@ -782,7 +780,7 @@
           <depend project="ant" inherit="runtime"/>
           <depend project="junit"/>
           <depend project="xml-xerces"/>
  -        <depend project="xml-xalan2"/>
  +        <depend project="xalan"/>
           <depend project="excalibur-lifecycle-api" />
   
           <!-- optional dependencies -->
  @@ -824,7 +822,7 @@
   -->
           <depend project="junit"/>
           <depend project="xml-xerces"/>
  -        <depend project="xml-xalan2"/>
  +        <depend project="xalan"/>
   
           <mkdir dir="containerkit/logger/target/classes"/>
           
  @@ -848,7 +846,7 @@
           <depend project="excalibur-pool" inherit="runtime"/>
           <depend project="excalibur-sourceresolve" inherit="runtime"/>
           <depend project="xml-xerces"/>
  -        <depend project="xml-xalan2"/>
  +        <depend project="xalan"/>
   
           <!-- build-time dependencies -->
   
  @@ -895,7 +893,7 @@
           <depend project="avalon-framework-api" runtime="true"/>
   
           <depend project="xml-xerces"/>
  -        <depend project="xml-xalan2"/>
  +        <depend project="xalan"/>
   
           <depend project="junit"/>
           <depend project="junitperf"/>
  @@ -924,7 +922,7 @@
           <option project="checkstyle" inherit="runtime"/>
           <depend project="concurrent"/>
           <depend project="xml-xerces"/>
  -        <depend project="xml-xalan2"/>
  +        <depend project="xalan"/>
   
           <depend project="junit"/>
           <depend project="junitperf"/>
  @@ -955,7 +953,7 @@
           <option project="checkstyle" inherit="runtime"/>
           <depend project="concurrent"/>
           <depend project="xml-xerces"/>
  -        <depend project="xml-xalan2"/>
  +        <depend project="xalan"/>
   
           <depend project="junit"/>
           <depend project="junitperf"/>
  @@ -987,7 +985,7 @@
           <option project="checkstyle" inherit="runtime"/>
           <depend project="junit"/>
           <depend project="xml-xerces"/>
  -        <depend project="xml-xalan2"/>
  +        <depend project="xalan"/>
   
           <mkdir dir="components/sourceresolve/target/classes"/>
           <mkdir dir="components/sourceresolve/target/test-classes"/>
  @@ -1020,7 +1018,7 @@
           <depend project="excalibur-fortress-meta" runtime="true"/>
           <depend project="excalibur-instrument-api"/>
           <depend project="xml-xerces"/>
  -        <depend project="xml-xalan2"/>
  +        <depend project="xalan"/>
           <depend project="jisp"/>
           <depend project="concurrent"/>
   
  @@ -1056,7 +1054,7 @@
           <depend project="avalon-framework-legacy" runtime="true"/>
           <depend project="avalon-framework-impl" runtime="true"/>
           <depend project="xml-xerces"/>
  -        <depend project="xml-xalan2"/>
  +        <depend project="xalan"/>
   
           <!-- test-time dependencies -->
           <depend project="junit"/>
  @@ -1087,7 +1085,7 @@
           <depend project="concurrent"/>
           <depend project="ant"/>
           <depend project="xml-xerces"/>
  -        <depend project="xml-xalan2"/>
  +        <depend project="xalan"/>
   
           <depend project="junitperf"/>
           <depend project="junit"/>
  @@ -1123,7 +1121,7 @@
   
           <depend project="ant" inherit="runtime"/>
           <depend project="xml-xerces"/>
  -        <depend project="xml-xalan2"/>
  +        <depend project="xalan"/>
   
           <!-- test-time dependencies -->
           <depend project="junit"/>
  @@ -1166,11 +1164,11 @@
           <depend project="saxon7"/>
           <depend project="saxon7-sql"/>
           <depend project="saxon7-jdom"/>
  -        <depend project="saxon6"/>
  +        <depend project="saxon"/>
           <depend project="saxpath"/>
  -        <depend id="xml-resolver" project="xml-commons-resolver"/>
  -        <depend id="xerces" project="xml-xerces"/>
  -        <depend id="xalan" project="xml-xalan2"/>
  +        <depend project="xml-resolver"/>
  +        <depend project="xml-xerces"/>
  +        <depend project="xalan"/>
           
           <option project="checkstyle" inherit="runtime"/>
           
  
  
  
  1.3       +3 -3      gump/project/forrest.xml
  
  Index: forrest.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/forrest.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- forrest.xml	14 Oct 2004 05:02:00 -0000	1.2
  +++ forrest.xml	16 Oct 2004 14:26:10 -0000	1.3
  @@ -38,7 +38,7 @@
       <depend project="ant"/>
       <depend project="ant-contrib"/>
       <depend project="xml-xerces"/>
  -    <depend project="xml-xalan2"/>
  +    <depend project="xalan"/>
       <depend project="cocoon" inherit="all"/>
       <depend project="jakarta-oro"/>
       <depend project="nekopull"/>
  @@ -87,7 +87,7 @@
       <depend project="ant"/>
       <depend project="ant-contrib"/>
       <depend project="xml-xerces"/>
  -    <depend project="xml-xalan2"/>
  +    <depend project="xalan"/>
       <depend project="antlr"/>
       <jar id="forrestdoc-anttools" name="xml-forrest-scratchpad-forrestdoc-anttools-@@DATE@@.jar"/>
       <jar id="forrestdoc" name="xml-forrest-scratchpad-forrestdoc-@@DATE@@.jar"/>
  @@ -101,7 +101,7 @@
       <depend project="ant"/>
       <depend project="ant-contrib"/>
       <depend project="xml-xerces"/>
  -    <depend project="xml-xalan2"/>
  +    <depend project="xalan"/>
       <depend project="antlr"/>
       <javadoc parent="scratchpad/forrestdoc/build/forrestdoc/forrestdoc"/>
       <nag from="Gump Integration Build &lt;dev@forrest.apache.org&gt;" to="dev@forrest.apache.org"/>
  
  
  
  1.31      +1 -1      gump/project/incubator-altrmi.xml
  
  Index: incubator-altrmi.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/incubator-altrmi.xml,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- incubator-altrmi.xml	16 Oct 2004 08:21:05 -0000	1.30
  +++ incubator-altrmi.xml	16 Oct 2004 14:26:10 -0000	1.31
  @@ -36,7 +36,7 @@
           <depend project="avalon-framework-legacy" runtime="true"/>
           <depend project="avalon-framework-impl" runtime="true"/>
           <depend project="xml-xerces"/>
  -        <depend project="xml-xalan2"/>
  +        <depend project="xalan"/>
           <depend project="bcel"/>
           <depend project="logging-log4j"/>
           <depend project="commons-attributes" inherit="runtime"/>
  
  
  
  1.49      +1 -1      gump/project/jakarta-cactus.xml
  
  Index: jakarta-cactus.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/jakarta-cactus.xml,v
  retrieving revision 1.48
  retrieving revision 1.49
  diff -u -r1.48 -r1.49
  --- jakarta-cactus.xml	10 Oct 2004 05:06:39 -0000	1.48
  +++ jakarta-cactus.xml	16 Oct 2004 14:26:10 -0000	1.49
  @@ -608,7 +608,7 @@
   
       <depend project="ant" inherit="runtime"/>
       <depend project="xml-xerces"/>
  -    <depend project="xml-xalan2"/>
  +    <depend project="xalan"/>
   
       <!-- Dependencies to make sure this project is not built if one of the
          dependent project fails. This is because the documentation project
  
  
  
  1.177     +1 -1      gump/project/jakarta-commons-sandbox.xml
  
  Index: jakarta-commons-sandbox.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/jakarta-commons-sandbox.xml,v
  retrieving revision 1.176
  retrieving revision 1.177
  diff -u -r1.176 -r1.177
  --- jakarta-commons-sandbox.xml	6 Oct 2004 07:06:20 -0000	1.176
  +++ jakarta-commons-sandbox.xml	16 Oct 2004 14:26:10 -0000	1.177
  @@ -235,7 +235,7 @@
       <depend project="commons-discovery"/>
       <depend project="commons-logging"/>
       <depend project="jakarta-servletapi-4"/>
  -    <depend project="xml-xalan2"/>
  +    <depend project="xalan"/>
       <depend project="junit"/>
       <depend project="ibatis"/>
   
  
  
  
  1.150     +2 -2      gump/project/jakarta-commons.xml
  
  Index: jakarta-commons.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/jakarta-commons.xml,v
  retrieving revision 1.149
  retrieving revision 1.150
  diff -u -r1.149 -r1.150
  --- jakarta-commons.xml	15 Oct 2004 17:47:09 -0000	1.149
  +++ jakarta-commons.xml	16 Oct 2004 14:26:10 -0000	1.150
  @@ -448,7 +448,7 @@
         <depend property="junit.jar" project="junit"/>
         <depend property="j2ee.jar"      project="jakarta-servletapi"/>
         <depend property="jaxp.jaxp.jar" project="xml-xerces" id="xml-apis"/>
  -      <depend property="jaxp.xslt.jar" project="xml-xalan2" id="transformer"/>
  +      <depend property="jaxp.xslt.jar" project="xalan" id="transformer"/>
       </ant>
       <depend project="ant" inherit="runtime"/>
       <depend project="jakarta-site2" inherit="all"/>
  @@ -488,7 +488,7 @@
       </ant>
       <depend project="ant" inherit="runtime"/>
       <depend project="xml-xerces"/>
  -    <depend project="xml-xalan2"/>
  +    <depend project="xalan"/>
       <depend project="commons-httpclient" inherit="runtime"/>
       <depend project="logging-log4j"/>
       <depend project="jakarta-regexp"/>
  
  
  
  1.28      +1 -1      gump/project/jakarta-jetspeed.xml
  
  Index: jakarta-jetspeed.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/jakarta-jetspeed.xml,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- jakarta-jetspeed.xml	27 Feb 2004 09:22:56 -0000	1.27
  +++ jakarta-jetspeed.xml	16 Oct 2004 14:26:10 -0000	1.28
  @@ -44,7 +44,7 @@
       <depend project="jakarta-velocity" inherit="runtime"/>
       <depend project="commons-logging"/>
       <depend project="jakarta-ecs"/>
  -    <depend project="xml-xalan2"/>
  +    <depend project="xalan"/>
       <depend project="javamail"/>
       <depend project="jaf"/>
       <depend project="jdbc"/>
  
  
  
  1.109     +10 -10    gump/project/jakarta-jmeter.xml
  
  Index: jakarta-jmeter.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/jakarta-jmeter.xml,v
  retrieving revision 1.108
  retrieving revision 1.109
  diff -u -r1.108 -r1.109
  --- jakarta-jmeter.xml	8 Oct 2004 17:07:50 -0000	1.108
  +++ jakarta-jmeter.xml	16 Oct 2004 14:26:10 -0000	1.109
  @@ -54,7 +54,7 @@
         <depend property="junit.jar" project="junit"/>
         <depend property="logkit.jar" project="avalon-logkit"/>
         <!-- are the x jars still needed ? -->
  -      <depend property="xalan.jar" project="xml-xalan2" id="transformer"/>
  +      <depend property="xalan.jar" project="xalan" id="transformer"/>
         <depend property="xerces.jar" project="xml-xerces" id="xml-parser"/>
         <depend property="xml-apis.jar" project="xml-apis"/>
         
  
  
  
  1.72      +1 -1      gump/project/jakarta-slide.xml
  
  Index: jakarta-slide.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/jakarta-slide.xml,v
  retrieving revision 1.71
  retrieving revision 1.72
  diff -u -r1.71 -r1.72
  --- jakarta-slide.xml	10 Oct 2004 02:59:25 -0000	1.71
  +++ jakarta-slide.xml	16 Oct 2004 14:26:10 -0000	1.72
  @@ -65,7 +65,7 @@
       <depend project="jaxen"/>
       <depend project="dist-ant" />
       <depend project="xml-xerces"/>
  -    <depend project="xml-xalan2"/>
  +    <depend project="xalan"/>
       <depend project="j2ee-connector"/>
       <option project="jmx"/>
       <depend project="jakarta-tomcat-4.0"/>
  
  
  
  1.52      +1 -1      gump/project/jakarta-struts.xml
  
  Index: jakarta-struts.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/jakarta-struts.xml,v
  retrieving revision 1.51
  retrieving revision 1.52
  diff -u -r1.51 -r1.52
  --- jakarta-struts.xml	8 Oct 2004 17:07:50 -0000	1.51
  +++ jakarta-struts.xml	16 Oct 2004 14:26:10 -0000	1.52
  @@ -44,7 +44,7 @@
   
       </ant>
   
  -    <depend project="xml-xalan2"/>
  +    <depend project="xalan"/>
       <depend project="ant" inherit="runtime"/>
       <depend project="xml-xerces"/>
       <work nested="target/library/classes"/>
  
  
  
  1.71      +7 -11     gump/project/jakarta-taglibs.xml
  
  Index: jakarta-taglibs.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/jakarta-taglibs.xml,v
  retrieving revision 1.70
  retrieving revision 1.71
  diff -u -r1.70 -r1.71
  --- jakarta-taglibs.xml	16 Oct 2004 11:46:11 -0000	1.70
  +++ jakarta-taglibs.xml	16 Oct 2004 14:26:10 -0000	1.71
  @@ -68,8 +68,7 @@
         <property name="dist.dir" path="dist"/>
       </ant>
       <depend project="ant" inherit="runtime"/>
  -    <depend project="xml-xalan2"/>
  -    <depend project="xml-xalan2" ids="serializer" />
  +    <depend project="xalan"/>
       <depend project="xml-xerces"/>
       <javadoc nested="dist/doc/doc/bsf-doc/javadoc"/>
       <jar name="dist/bsf/taglibs-bsf.jar"/>
  @@ -89,8 +88,7 @@
         <property name="dist.dir" path="dist"/>
       </ant>
       <depend project="ant" inherit="runtime"/>
  -    <depend project="xml-xalan2"/>
  -    <depend project="xml-xalan2" ids="serializer" />
  +    <depend project="xalan"/>
       <depend project="xml-xerces"/>
       <javadoc nested="dist/doc/doc/cache-doc/javadoc"/>
       <jar name="dist/cache/taglibs-cache.jar"/>
  @@ -387,7 +385,7 @@
         <depend property="sax.jar" project="jaxp" id="sax"/>
         <depend property="jsp20.jar" project="jakarta-servletapi-5-jsp"/>
         <depend property="servlet24.jar" project="jakarta-servletapi-5-servlet"/>
  -      <depend property="xalan.jar" project="xml-xalan2" id="transformer"/>
  +      <depend property="xalan.jar" project="xalan" id="transformer"/>
         <depend property="xercesImpl.jar" project="xml-xerces" id="xml-parser"/>
         <property name="build.dir" path="build"/>
         <property name="dist.dir" path="dist"/>
  @@ -416,8 +414,7 @@
         <property name="dist.dir" path="dist"/>
       </ant>
       <depend project="ant" inherit="runtime"/>
  -    <depend project="xml-xalan2"/>
  -        <depend project="xml-xalan2" ids="serializer" />
  +    <depend project="xalan"/>
       <depend project="xml-xerces"/>
       <javadoc nested="dist/doc/doc/string-doc/javadoc"/>
       <jar name="dist/string/taglibs-string.jar"/>
  @@ -449,13 +446,13 @@
         <depend property="dom4j.jar" project="dom4j"/>
         <depend property="jaxp.jar" project="xml-xerces" id="xml-apis"/>
         <depend property="servlet.jar" project="jakarta-servletapi-4"/>
  -      <depend property="xalan.jar" project="xml-xalan2" id="transformer"/>
  +      <depend property="xalan.jar" project="xalan" id="transformer"/>
         <property name="build.dir" path="build"/>
         <property name="dist.dir" path="dist"/>
       </ant>
       <depend project="ant" inherit="runtime"/>
       <depend project="xml-xerces"/>
  -    <depend project="xml-xalan2" runtime="true"/>
  +    <depend project="xalan" runtime="true"/>
       <depend project="jaxen"/>
       <javadoc nested="dist/doc/doc/xtags-doc/javadoc"/>
       <jar name="dist/xtags/taglibs-xtags.jar"/>
  @@ -490,8 +487,7 @@
         <property name="dist.dir" path="dist"/>
       </ant>
       <depend project="ant" inherit="runtime"/>
  -    <depend project="xml-xalan2"/>
  -    <depend project="xml-xalan2" ids="serializer" />
  +    <depend project="xalan"/>
       <depend project="xml-xerces"/>
       <nag to="taglibs-dev@jakarta.apache.org"
            from="Martin Cooper &lt;martinc@apache.org&gt;"/>
  
  
  
  1.56      +1 -2      gump/project/jakarta-tomcat-40.xml
  
  Index: jakarta-tomcat-40.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/jakarta-tomcat-40.xml,v
  retrieving revision 1.55
  retrieving revision 1.56
  diff -u -r1.55 -r1.56
  --- jakarta-tomcat-40.xml	15 Oct 2004 19:49:45 -0000	1.55
  +++ jakarta-tomcat-40.xml	16 Oct 2004 14:26:10 -0000	1.56
  @@ -112,8 +112,7 @@
       <depend project="javamail"/>
       <depend project="jmx"/>
       <depend project="jsse" runtime="true"/>
  -    <depend project="xml-xalan2"/>
  -    <depend project="xml-xalan2" ids="serializer" />
  +    <depend project="xalan"/>
       <option project="avalon-framework-api"/>
       <option project="avalon-phoenix"/>
       <depend project="jakarta-tomcat-util" runtime="true"/>
  
  
  
  1.37      +1 -1      gump/project/jakarta-tomcat-5.xml
  
  Index: jakarta-tomcat-5.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/jakarta-tomcat-5.xml,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- jakarta-tomcat-5.xml	13 Oct 2004 07:01:25 -0000	1.36
  +++ jakarta-tomcat-5.xml	16 Oct 2004 14:26:10 -0000	1.37
  @@ -96,7 +96,7 @@
       <depend project="javamail"/>
       <depend project="jmx"/>
       <depend project="jsse" runtime="true"/>
  -    <depend project="xml-xalan2"/>
  +    <depend project="xalan"/>
       <depend project="jakarta-tomcat-coyote"/>
       <depend project="jakarta-tomcat-catalina"/>
       <depend project="jakarta-tomcat-jasper_tc5"/>
  
  
  
  1.26      +1 -2      gump/project/jakarta-tomcat-catalina.xml
  
  Index: jakarta-tomcat-catalina.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/jakarta-tomcat-catalina.xml,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- jakarta-tomcat-catalina.xml	15 Oct 2004 19:49:45 -0000	1.25
  +++ jakarta-tomcat-catalina.xml	16 Oct 2004 14:26:10 -0000	1.26
  @@ -80,8 +80,7 @@
       <depend project="javamail"/>
       <depend project="jmx"/>
       <depend project="jsse" runtime="true"/>
  -    <depend project="xml-xalan2"/>
  -    <depend project="xml-xalan2" ids="serializer" />
  +    <depend project="xalan"/>
       <depend project="jakarta-tomcat-util" runtime="true"/>
       <depend project="jakarta-servletapi-5-servlet"/>
       <depend project="jakarta-servletapi-5-jsp"/>
  
  
  
  1.34      +1 -1      gump/project/jakarta-turbine-2.xml
  
  Index: jakarta-turbine-2.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/jakarta-turbine-2.xml,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- jakarta-turbine-2.xml	10 Oct 2004 05:06:39 -0000	1.33
  +++ jakarta-turbine-2.xml	16 Oct 2004 14:26:10 -0000	1.34
  @@ -71,7 +71,7 @@
       <depend project="ws-xmlrpc"/>
       <depend project="xml-xerces"/>
       <depend project="xml-apis"/>
  -    <depend project="xml-xalan2"/>
  +    <depend project="xalan"/>
       <depend project="commons-httpclient"/>
       <depend project="httpunit"/>
       <depend project="jakarta-cactus-framework-12"/>
  
  
  
  1.15      +1 -1      gump/project/jdom.xml
  
  Index: jdom.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/jdom.xml,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- jdom.xml	6 Oct 2004 07:06:20 -0000	1.14
  +++ jdom.xml	16 Oct 2004 14:26:10 -0000	1.15
  @@ -30,7 +30,7 @@
       <ant/>
       <depend project="ant" inherit="runtime"/>
       <depend project="xml-xerces"/>
  -    <depend project="xml-xalan2"/>
  +    <depend project="xalan"/>
       <home nested="build"/>
       <jar name="jdom.jar" id="jdom"/>
       <license name="LICENSE.txt"/>
  
  
  
  1.68      +2 -2      gump/project/jelly-tags.xml
  
  Index: jelly-tags.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/jelly-tags.xml,v
  retrieving revision 1.67
  retrieving revision 1.68
  diff -u -r1.67 -r1.68
  --- jelly-tags.xml	14 Sep 2004 06:59:24 -0000	1.67
  +++ jelly-tags.xml	16 Oct 2004 14:26:10 -0000	1.68
  @@ -702,7 +702,7 @@
       </ant>
   
       <depend project="commons-jelly" inherit="all"/>
  -    <depend project="xml-xalan2"/>
  +    <depend project="xalan"/>
   
       <depend project="commons-jelly-tags-junit" inherit="runtime"/>
   
  @@ -728,7 +728,7 @@
       <depend project="commons-jelly-tags-junit"/>
   
       <depend project="xmlunit"/>
  -    <depend project="xml-xalan2"/>
  +    <depend project="xalan"/>
   
       <work nested="xmlunit/target/classes"/>
       <work nested="xmlunit/target/test-classes"/>
  
  
  
  1.14      +1 -1      gump/project/jgen.xml
  
  Index: jgen.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/jgen.xml,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- jgen.xml	12 Oct 2004 18:35:49 -0000	1.13
  +++ jgen.xml	16 Oct 2004 14:26:10 -0000	1.14
  @@ -42,7 +42,7 @@
       <depend project="commons-jexl"/>
       <depend project="xml-batik"/>
       <depend project="xml-fop-maintenance" inherit="runtime"/>
  -    <depend project="xml-xalan2"/>
  +    <depend project="xalan"/>
       <depend project="xml-apis"/>
       <depend project="rhino"/>
       <depend project="resin"/>
  
  
  
  1.9       +1 -1      gump/project/jstl-jsp-12.xml
  
  Index: jstl-jsp-12.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/jstl-jsp-12.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- jstl-jsp-12.xml	8 Oct 2004 17:07:50 -0000	1.8
  +++ jstl-jsp-12.xml	16 Oct 2004 14:26:10 -0000	1.9
  @@ -31,7 +31,7 @@
         <depend property="jaxp-api.jar" project="jaxp" id="jaxp-api"/>
         <depend property="sax.jar" project="jaxp" id="sax"/>
         <depend property="servlet23.jar" project="jakarta-servletapi-4"/>
  -      <depend property="xalan.jar" project="xml-xalan2" id="transformer"/>
  +      <depend property="xalan.jar" project="xalan" id="transformer"/>
         <depend property="xercesImpl.jar" project="xml-xerces" id="xml-parser"/>
         <property name="build.dir" path="build"/>
         <property name="build.library" path="build/standard/standard"/>
  
  
  
  1.34      +2 -2      gump/project/mx4j.xml
  
  Index: mx4j.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/mx4j.xml,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- mx4j.xml	16 Oct 2004 08:21:05 -0000	1.33
  +++ mx4j.xml	16 Oct 2004 14:26:10 -0000	1.34
  @@ -67,7 +67,7 @@
       <depend project="jakarta-servletapi-5-servlet"/>
       <depend project="jetty"/>
       <depend project="mx4j" inherit="all"/>
  -    <depend project="xml-xalan2"/>
  +    <depend project="xalan"/>
   
       <work nested="classes/core"/>
       <work nested="classes/tools"/>
  @@ -88,7 +88,7 @@
       <depend project="jakarta-servletapi-5-servlet"/>
       <depend project="mx4j" inherit="all"/>
       <depend project="packaged-jetty"/>
  -    <depend project="xml-xalan2"/>
  +    <depend project="xalan"/>
   
       <work nested="classes/core"/>
       <work nested="classes/tools"/>
  
  
  
  1.11      +1 -2      gump/project/struts.xml
  
  Index: struts.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/struts.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- struts.xml	15 Oct 2004 19:49:45 -0000	1.10
  +++ struts.xml	16 Oct 2004 14:26:10 -0000	1.11
  @@ -49,8 +49,7 @@
   
       </ant>
   
  -    <depend project="xml-xalan2"/>
  -    <depend project="xml-xalan2" ids="serializer" />
  +    <depend project="xalan"/>
       <depend project="ant" inherit="runtime"/>
       <depend project="xml-xerces"/>
       <work nested="target/library/classes"/>
  
  
  
  1.23      +2 -2      gump/project/ws-axis.xml
  
  Index: ws-axis.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/ws-axis.xml,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- ws-axis.xml	8 Oct 2004 17:07:50 -0000	1.22
  +++ ws-axis.xml	16 Oct 2004 14:26:10 -0000	1.23
  @@ -39,7 +39,7 @@
         <property name="env.ANT_HOME" reference="home" project="ant"/>
         <depend name="wsdl4j.jar" project="wsdl4j" id="wsdl4j"/>
         <depend name="log4j-core.jar" project="logging-log4j" id="log4j"/>
  -      <depend property="xalan.jar" project="xml-xalan2" id="transformer"/>
  +      <depend property="xalan.jar" project="xalan" id="transformer"/>
         <depend property="xercesImpl.jar" project="xml-xerces" id="xml-parser"/>
         <depend property="xmlParserAPIs.jar" project="xml-xerces" id="xml-parser"/>
         <sysproperty name="build.clonevm" value="true"/>
  @@ -90,7 +90,7 @@
         <property name="env.ANT_HOME" reference="home" project="ant"/>
         <depend name="wsdl4j.jar" project="wsdl4j" id="wsdl4j"/>
         <depend name="log4j-core.jar" project="logging-log4j" id="log4j"/>
  -      <depend property="xalan.jar" project="xml-xalan2" id="transformer"/>
  +      <depend property="xalan.jar" project="xalan" id="transformer"/>
         <depend property="xercesImpl.jar" project="xml-xerces" id="xml-parser"/>
         <depend property="xmlParserAPIs.jar" project="xml-xerces" id="xml-parser"/>
         <sysproperty name="build.clonevm" value="true"/>
  
  
  
  1.16      +1 -1      gump/project/wss4j.xml
  
  Index: wss4j.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/wss4j.xml,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- wss4j.xml	10 Oct 2004 05:06:39 -0000	1.15
  +++ wss4j.xml	16 Oct 2004 14:26:10 -0000	1.16
  @@ -44,7 +44,7 @@
       <depend property="log4j.jar" project="logging-log4j" id="log4j"/>
       <depend project="javamail"/>
       <depend project="wsdl4j"/>
  -    <depend project="xml-xalan2" inherit="runtime"/>
  +    <depend project="xalan" inherit="runtime"/>
       <depend project="xml-security" inherit="runtime"/>
   
       <work nested="build/classes"/>
  
  
  
  1.74      +1 -2      gump/project/xdoclet.xml
  
  Index: xdoclet.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/xdoclet.xml,v
  retrieving revision 1.73
  retrieving revision 1.74
  diff -u -r1.73 -r1.74
  --- xdoclet.xml	16 Oct 2004 08:21:05 -0000	1.73
  +++ xdoclet.xml	16 Oct 2004 14:26:10 -0000	1.74
  @@ -158,8 +158,7 @@
       <depend project="xdoclet-web-module-prepare" inherit="all"/>
       <depend project="xdoclet-xdoclet-module-prepare" inherit="all"/>
   
  -    <depend project="xml-xalan2"/>
  -    <depend project="xml-xalan2" ids="serializer" />
  +    <depend project="xalan"/>
       <depend project="javacc"/>
       <depend project="jmx"/>
       <depend project="jms"/>
  
  
  
  1.25      +1 -1      gump/project/xml-batik.xml
  
  Index: xml-batik.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/xml-batik.xml,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- xml-batik.xml	27 Feb 2004 09:22:57 -0000	1.24
  +++ xml-batik.xml	16 Oct 2004 14:26:10 -0000	1.25
  @@ -34,7 +34,7 @@
       <depend project="xml-xerces"/>
       <depend project="rhino"/>
       <depend project="xml-stylebook2"/>
  -    <depend project="xml-xalan2"/>
  +    <depend project="xalan"/>
   
       <home nested="batik-@@DATE@@"/>
       <jar name="lib/batik-awt-util.jar"/>
  
  
  
  1.7       +1 -1      gump/project/xml-fop-maintenance.xml
  
  Index: xml-fop-maintenance.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/xml-fop-maintenance.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- xml-fop-maintenance.xml	22 Aug 2004 12:10:20 -0000	1.6
  +++ xml-fop-maintenance.xml	16 Oct 2004 14:26:10 -0000	1.7
  @@ -31,7 +31,7 @@
       <mkdir dir="build/classes"/>
       <ant target="gump"/>
       <depend project="xml-xerces"/>
  -    <depend project="xml-xalan2"/>
  +    <depend project="xalan"/>
       <depend project="ant" inherit="runtime"/>
       <depend project="xml-batik"/>
   
  
  
  
  1.33      +1 -1      gump/project/xml-fop.xml
  
  Index: xml-fop.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/xml-fop.xml,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- xml-fop.xml	16 Oct 2004 12:23:40 -0000	1.32
  +++ xml-fop.xml	16 Oct 2004 14:26:10 -0000	1.33
  @@ -32,7 +32,7 @@
       <mkdir dir="build/test-classes"/>
       <ant target="gump"/>
       <depend project="xml-xerces"/>
  -    <depend project="xml-xalan2"/>
  +    <depend project="xalan"/>
       <depend project="ant" inherit="runtime"/>
       <depend project="xml-batik"/>
       <!--depend project="avalon-logkit" runtime="true"/-->
  
  
  
  1.32      +1 -2      gump/project/xml-security.xml
  
  Index: xml-security.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/xml-security.xml,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- xml-security.xml	15 Oct 2004 19:49:45 -0000	1.31
  +++ xml-security.xml	16 Oct 2004 14:26:10 -0000	1.32
  @@ -40,8 +40,7 @@
       <depend project="ant" inherit="runtime"/>
       <depend project="xml-xerces"/>
       <depend project="jce"/>
  -    <depend project="xml-xalan2" runtime="true"/>
  -    <depend project="xml-xalan2" ids="serializer" />
  +    <depend project="xalan" runtime="true"/>
       <depend project="commons-logging"/>
       <!-- included in JDK 1.4 depend project="jce" runtime="true"/-->
       <option project="junit"/>
  
  
  
  1.13      +1 -1      gump/project/xml-stylebook.xml
  
  Index: xml-stylebook.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/xml-stylebook.xml,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- xml-stylebook.xml	27 Feb 2004 09:22:57 -0000	1.12
  +++ xml-stylebook.xml	16 Oct 2004 14:26:10 -0000	1.13
  @@ -29,7 +29,7 @@
       </ant>
       <depend project="bootstrap-ant"/>
       <depend project="xml-xerces"/>
  -    <depend project="xml-xalan2"/>
  +    <depend project="xalan"/>
       <jar name="bin/stylebook-1.0-b3_xalan-2.jar"/>
       <license name="LICENSE.txt"/>
     </project>
  
  
  
  1.60      +11 -5     gump/project/xml-xalan.xml
  
  Index: xml-xalan.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/xml-xalan.xml,v
  retrieving revision 1.59
  retrieving revision 1.60
  diff -u -r1.59 -r1.60
  --- xml-xalan.xml	16 Oct 2004 08:21:05 -0000	1.59
  +++ xml-xalan.xml	16 Oct 2004 14:26:10 -0000	1.60
  @@ -23,7 +23,14 @@
   
     <cvs repository="xml"/>
   
  +  <!-- Name has changed to 'xalan' to match the Maven repository name. 
  +       xml-xalan2 is kept for compatibility.
  +  -->
     <project name="xml-xalan2">
  +    <depend project="xalan" inherit="jars" />
  +  </project>
  +  
  +  <project name="xalan2">
       <package>org.apache.xalan</package>
   
       <ant basedir="java" target="unbundledjar"/>
  @@ -53,8 +60,7 @@
       <depend project="ant" inherit="runtime"/>
       <depend project="xml-xerces"/>
       <depend project="jakarta-servletapi"/>
  -    <depend project="xml-xalan2"/>
  -    <depend project="xml-xalan2" ids="serializer" />
  +    <depend project="xalan"/>
       <depend project="xml-stylebook2"/>
       <option project="bsf"/>
       <depend project="ejb"/>
  @@ -65,7 +71,7 @@
       <home nested="java/build/xalan-j_@@DATE@@"/>
       <jar  name="bin/xalan.jar" type="boot"/>
       <javadoc nested="java/build/xalan-j_@@DATE@@/docs/apidocs" 
  -      project="xml-xalan2"/>
  +      project="xalan"/>
   
       <nag from="Sam Ruby &lt;rubys@us.ibm.com&gt;"
            to="xalan-dev@xml.apache.org"/>
  @@ -79,7 +85,7 @@
   
       <depend project="ant" inherit="runtime"/>
       <depend project="xml-xerces"/>
  -    <depend project="xml-xalan2"/>
  +    <depend project="xalan"/>
   
       <home nested="test/java/build"/>
       <jar name="qetest.jar"/>
  @@ -96,7 +102,7 @@
    
       <depend project="ant" inherit="runtime"/>
       <depend project="xml-xerces"/>
  -    <depend project="xml-xalan2"/>
  +    <depend project="xalan"/>
       <depend project="xml-xalan2-smoketest-tools"/> <!-- Only needed to get taskdef name="xalantest" working in GUMP Jun-02 -sc -->
       <depend project="jtidy"/> <!-- Only needed for XSLTC testing currently Jun-02 -sc -->
       <work nested="test/java/build"/>
  
  
  
  1.24      +1 -1      gump/project/xml-xerces.xml
  
  Index: xml-xerces.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/xml-xerces.xml,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- xml-xerces.xml	8 Oct 2004 17:07:50 -0000	1.23
  +++ xml-xerces.xml	16 Oct 2004 14:26:10 -0000	1.24
  @@ -39,7 +39,7 @@
     <project name="dist-xerces1">
       <ant basedir="java" target="pack-bin"/>
       <depend project="ant" inherit="runtime"/>
  -    <depend project="xml-xalan2"/>
  +    <depend project="xalan"/>
       <depend project="xml-xerces1"/>
       <depend project="xml-stylebook2"/>
       <depend project="xml-site"/>
  
  
  
  1.36      +1 -2      gump/project/xml-xerces2.xml
  
  Index: xml-xerces2.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/xml-xerces2.xml,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- xml-xerces2.xml	15 Oct 2004 19:49:45 -0000	1.35
  +++ xml-xerces2.xml	16 Oct 2004 14:26:10 -0000	1.36
  @@ -49,8 +49,7 @@
       </ant>
       <depend project="ant" inherit="runtime"/>
       <depend project="xjavac"/>
  -    <depend project="xml-xalan2"/>
  -    <depend project="xml-xalan2" ids="serializer" />
  +    <depend project="xalan"/>
       <depend project="xml-xerces"/>
       <depend project="xml-stylebook2"/>
       <depend project="xml-site"/>
  
  
  
  1.33      +1 -1      gump/project/xml-xindice.xml
  
  Index: xml-xindice.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/xml-xindice.xml,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- xml-xindice.xml	24 Jun 2004 07:23:35 -0000	1.32
  +++ xml-xindice.xml	16 Oct 2004 14:26:10 -0000	1.33
  @@ -35,7 +35,7 @@
       <depend project="xml-xerces"/>
       <depend project="xmldb"/>
       <depend project="junitperf"/>
  -    <depend project="xml-xalan2"/>
  +    <depend project="xalan"/>
       <depend project="ws-xmlrpc"/>
       <depend project="commons-logging"/>
       <depend project="jakarta-servletapi"/>
  
  
  
  1.20      +1 -1      gump/project/xmlunit.xml
  
  Index: xmlunit.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/xmlunit.xml,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- xmlunit.xml	16 Oct 2004 05:44:18 -0000	1.19
  +++ xmlunit.xml	16 Oct 2004 14:26:10 -0000	1.20
  @@ -33,7 +33,7 @@
       </ant>
       <depend project="ant" inherit="runtime"/>
       <depend project="xml-xerces"/>
  -    <depend project="xml-xalan2" runtime="true"/>
  +    <depend project="xalan" runtime="true"/>
       <work nested="classes"/>
       <jar name="lib/xmlunit-@@DATE@@.jar"/>
       <license name="LICENSE.txt"/>
  
  
  

Mime
View raw message