rwaldhoff    01/04/22 10:05:08

  Modified:    collections build.xml
               dbcp     build.xml
               pool     build.xml
  Log:
  * reads properties from ../build.properties
  * changed order of prop files to match beanutils--now component, then commons, then 
user
  
  Revision  Changes    Path
  1.4       +6 -7      jakarta-commons/collections/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/build.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.xml 2001/04/22 16:38:58     1.3
  +++ build.xml 2001/04/22 17:05:03     1.4
  @@ -1,4 +1,4 @@
  -<!-- $Id: build.xml,v 1.3 2001/04/22 16:38:58 rwaldhoff Exp $ -->
  +<!-- $Id: build.xml,v 1.4 2001/04/22 17:05:03 rwaldhoff Exp $ -->
   <project name="commons-collections" default="test" basedir=".">
   
      <!-- patternset describing files to be copied from the doc directory -->
  @@ -26,11 +26,6 @@
      <target name="init">
         <tstamp/>
   
  -      <!-- read properties from the ${user.home}/propfile, if any -->
  -      <property name="user-propfile" value="${user.home}/build.properties"/>
  -      <property file="${user-propfile}"/>
  -      <property name="user-classpath" value=""/>
  -
         <!-- read properties from the build.properties, if any -->
         <property name="component-propfile" value="${basedir}/build.properties"/>
         <property file="${component-propfile}"/>
  @@ -39,11 +34,15 @@
         <property name="commons-propfile" value="${basedir}/../build.properties"/>
         <property file="${commons-propfile}"/>
   
  +      <!-- read properties from the ${user.home}/propfile, if any -->
  +      <property name="user-propfile" value="${user.home}/build.properties"/>
  +      <property file="${user-propfile}"/>
  +
         <!-- command line classpath, if any -->
         <property name="cp" value=""/>
   
         <!-- now combine the classpaths -->
  -      <property name="classpath" value="${cp}:${user-classpath}:${junit.jar}"/>
  +      <property name="classpath" value="${cp}:${junit.jar}"/>
   
         <property name="name" value="commons-collections"/>
         <property name="Name" value="Commons-Collections"/>
  
  
  
  1.2       +11 -6     jakarta-commons/dbcp/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/dbcp/build.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- build.xml 2001/04/14 17:15:05     1.1
  +++ build.xml 2001/04/22 17:05:06     1.2
  @@ -1,4 +1,4 @@
  -<!-- $Id: build.xml,v 1.1 2001/04/14 17:15:05 rwaldhoff Exp $ -->
  +<!-- $Id: build.xml,v 1.2 2001/04/22 17:05:06 rwaldhoff Exp $ -->
   <project name="jakarta-commons-dbcp" default="test" basedir=".">
   
      <!-- patternset describing files to be copied from the doc directory -->
  @@ -26,18 +26,23 @@
      <target name="init">
         <tstamp/>
   
  +      <!-- read properties from the build.properties, if any -->
  +      <property name="component-propfile" value="${basedir}/build.properties"/>
  +      <property file="${component-propfile}"/>
  +
  +      <!-- read properties from the commons build.properties, if any -->
  +      <property name="commons-propfile" value="${basedir}/../build.properties"/>
  +      <property file="${commons-propfile}"/>
  +
         <!-- read properties from the ${user.home}/propfile, if any -->
         <property name="user-propfile" value="${user.home}/build.properties"/>
         <property file="${user-propfile}"/>
  -      <property name="user-classpath" value=""/>
  -      <!-- read properties from the build.properties, if any -->
  -      <property file="${basedir}/build.properties"/>
   
         <!-- command line classpath, if any -->
         <property name="cp" value=""/>
   
         <!-- now combine the classpaths -->
  -      <property name="classpath" 
value="${cp}:${user-classpath}:${commons-pool.jar}:${commons-collections.jar}:${j2ee.jar}:${sax2.jar}:${junit.jar}"/>
  +      <property name="classpath" 
value="${cp}:${commons-pool.jar}:${commons-collections.jar}:${j2ee.jar}:${sax2.jar}:${junit.jar}"/>
   
         <property name="name" value="commons-dbcp"/>
         <property name="Name" value="Commons-DBCP"/>
  @@ -140,7 +145,7 @@
                  bottom="&lt;small&gt;Copyright &amp;copy; 2001 Apache Software 
Foundation. Documenation generated ${TODAY}&lt;/small&gt;."
                  public="true"
                  version="true"
  -               author="false"
  +               author="true"
                  splitindex="false"
                  nodeprecated="true"
                  nodeprecatedlist="true"
  
  
  
  1.2       +11 -6     jakarta-commons/pool/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/pool/build.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- build.xml 2001/04/14 16:40:37     1.1
  +++ build.xml 2001/04/22 17:05:07     1.2
  @@ -1,4 +1,4 @@
  -<!-- $Id: build.xml,v 1.1 2001/04/14 16:40:37 rwaldhoff Exp $ -->
  +<!-- $Id: build.xml,v 1.2 2001/04/22 17:05:07 rwaldhoff Exp $ -->
   <project name="commons-pool" default="test" basedir=".">
   
      <!-- patternset describing files to be copied from the doc directory -->
  @@ -26,18 +26,23 @@
      <target name="init">
         <tstamp/>
   
  +      <!-- read properties from the build.properties, if any -->
  +      <property name="component-propfile" value="${basedir}/build.properties"/>
  +      <property file="${component-propfile}"/>
  +
  +      <!-- read properties from the commons build.properties, if any -->
  +      <property name="commons-propfile" value="${basedir}/../build.properties"/>
  +      <property file="${commons-propfile}"/>
  +
         <!-- read properties from the ${user.home}/propfile, if any -->
         <property name="user-propfile" value="${user.home}/build.properties"/>
         <property file="${user-propfile}"/>
  -      <property name="user-classpath" value=""/>
  -      <!-- read properties from the build.properties, if any -->
  -      <property file="${basedir}/build.properties"/>
   
         <!-- command line classpath, if any -->
         <property name="cp" value=""/>
   
         <!-- now combine the classpaths -->
  -      <property name="classpath" 
value="${cp}:${user-classpath}:${commons-collections.jar}:${junit.jar}"/>
  +      <property name="classpath" 
value="${cp}:${commons-collections.jar}:${junit.jar}"/>
   
         <property name="name" value="commons-pool"/>
         <property name="Name" value="Commons-Pool"/>
  @@ -140,7 +145,7 @@
                  bottom="&lt;small&gt;Copyright &amp;copy; 2001 Apache Software 
Foundation. Documenation generated ${TODAY}&lt;/small&gt;."
                  public="true"
                  version="true"
  -               author="false"
  +               author="true"
                  splitindex="false"
                  nodeprecated="true"
                  nodeprecatedlist="true"
  
  
  

Reply via email to