commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gl...@apache.org
Subject cvs commit: jakarta-commons/dbcp build.properties.sample build.xml
Date Sat, 29 Jun 2002 17:53:29 GMT
glenn       2002/06/29 10:53:29

  Modified:    dbcp     build.properties.sample build.xml
  Log:
  build patches, thanks to jfrederic.clere@fujitsu-siemens.com
  
  Revision  Changes    Path
  1.4       +16 -14    jakarta-commons/dbcp/build.properties.sample
  
  Index: build.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/dbcp/build.properties.sample,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.properties.sample	19 Mar 2002 02:18:04 -0000	1.3
  +++ build.properties.sample	29 Jun 2002 17:53:28 -0000	1.4
  @@ -1,21 +1,23 @@
   # commons-collections.jar - Commons-Collections Classpath
  -commons-collections.home=${basedir}/../collections/dist
  +base.path=/usr/local
  +commons-collections.home=${base.path}/commons-collections-2.0
   commons-collections.jar=${commons-collections.home}/commons-collections.jar
   # commons-pool.jar - Commons-Pool Classpath
  -commons-pool.home=${basedir}/../pool/dist
  +commons-pool.home=${base.path}/commons-pool-1.0
   commons-pool.jar=${commons-pool.home}/commons-pool.jar
   
  -root=/cvs/bcom/bcom/stable/ext/lib/
  -# sax2.jar - SAX2 API Classpath
  -
  -sax2.jar=${root}/sax2.jar
  -# Alternatively, use jaxp.jar which contains SAX2 classes:
  -# jaxp.home=${root}
  -# jaxp.jaxp.jar=${jaxp.home}/jaxp.jar
  -# sax2.jar=${jaxp.jaxp.jar}
  -
   # jdbc20ext.jar - JDBC Optional Package 2.0 (also included in j2ee.jar)
  -jdbc20ext.jar=${root}/jdbc2_0-stdext.jar
  +jdbc20ext.home=${base.path}/jdbc2_0-stdext
  +jdbc20ext.lib=${jdbc20ext.home}
  +jdbc20ext.jar=${jdbc20ext.lib}/jdbc2_0-stdext.jar
  +
   # junit.jar - JUnit 3.2+ Classpath
  -junit.home=/java/junit
  -junit.jar=${junit.home}/junit.jar
  +junit.home=${base.path}/junit3.7
  +junit.lib=${junit.home}
  +junit.jar=${junit.lib}/junit.jar
  +
  +# jndi.jar - Java Naming and Directory Interface (JNDI), version 1.2 or later
  +# Note: Optional with JDK 1.3+
  +#jndi.home=${base.path}/jndi
  +#jndi.lib=${jndi.home}/lib
  +#jndi.jar=${jndi.lib}/jndi.jar
  
  
  
  1.9       +5 -6      jakarta-commons/dbcp/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/dbcp/build.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- build.xml	27 May 2002 13:14:57 -0000	1.8
  +++ build.xml	29 Jun 2002 17:53:28 -0000	1.9
  @@ -42,7 +42,7 @@
         <property name="cp" value=""/>
   
         <!-- now combine the classpaths -->
  -      <property name="classpath" value="${cp}:${commons-pool.jar}:${commons-collections.jar}:${jdbc20ext.jar}:${sax2.jar}:${junit.jar}"/>
  +      <property name="classpath" value="${cp}:${commons-pool.jar}:${commons-collections.jar}:${jdbc20ext.jar}:${junit.jar}:${jndi.jar}"/>
   
         <property name="name" value="commons-dbcp"/>
         <property name="Name" value="Commons-DBCP"/>
  @@ -164,7 +164,6 @@
                  nonavbar="false"
                  serialwarn="false">
             <group title="Jakarta-commons Collections" packages="org.apache.commons.collections"/>
  -          <link href="http://java.sun.com/products/jdk/1.3/docs/api"/>
         </javadoc>
         <delete dir="${workdir}"/>
      </target>
  @@ -176,7 +175,7 @@
      <target name="copy-src" depends="init">
         <mkdir dir="${dest.src}"/>
         <!-- the source code directory -->
  -      <copy todir="${dest.src}/org" filtering="yes">
  +      <copy todir="${dest.src}" filtering="yes">
            <fileset dir="${source.src.java}" defaultexcludes="no">
               <include name="**/*.java"/>
               <include name="**/*.xml"/>
  @@ -199,7 +198,7 @@
                debug="true"
                deprecation="true"
                optimize="true">
  -        <exclude name="org/apache/commons/dbcp/BasicDataSourceFactory"
  +        <exclude name="org/apache/commons/dbcp/BasicDataSourceFactory.java"
                  unless="jndi.present"/>
         </javac>
      </target>
  @@ -207,7 +206,7 @@
      <target name="build-test" depends="init,build-java" if="available-src-test">
         <mkdir dir="${dest.src}"/>
         <!-- the source code directory -->
  -      <copy todir="${dest.src}/org" filtering="yes">
  +      <copy todir="${dest.src}" filtering="yes">
           <fileset dir="${source.src.test}" defaultexcludes="no">
             <include name="**/*.java"/>
           </fileset>
  
  
  

--
To unsubscribe, e-mail:   <mailto:commons-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:commons-dev-help@jakarta.apache.org>


Mime
View raw message