doh, thanks Mike..
Saludos ,
Ignacio J. Ortega
> -----Mensaje original-----
> De: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]
> Enviado el: martes 19 de junio de 2001 2:35
> Para: [EMAIL PROTECTED]
> Asunto: cvs commit: jakarta-tomcat build.xml
>
>
> mmanders 01/06/18 17:34:38
>
> Modified: . build.xml
> Log:
> Updated conditionals for commons-dbcp. This will now build
> properly even if jakarta-commons isn't available.
>
> Revision Changes Path
> 1.135 +29 -30 jakarta-tomcat/build.xml
>
> Index: build.xml
> ===================================================================
> RCS file: /home/cvs/jakarta-tomcat/build.xml,v
> retrieving revision 1.134
> retrieving revision 1.135
> diff -u -r1.134 -r1.135
> --- build.xml 2001/06/17 18:59:39 1.134
> +++ build.xml 2001/06/19 00:34:37 1.135
> @@ -38,10 +38,16 @@
>
> <property name="jakarta-tomcat-jasper"
> location="${ws}/jakarta-tomcat-jasper" />
> +
> + <property name="jakarta-commons"
> + location="${ws}/jakarta-commons" />
>
> <!-- External packages we depend on -->
> <!-- Tomcat depends on:
> - - Ant ( latest binary install in jakarta-ant-1.3 )
> + - Ant ( latest 1.3 binary install in jakarta-ant,
> peer to jakarta-tomcat )
> + - jakarta-tomcat-connectors ( latest src, peer to
> jakarta-tomcat )
> + - jakarta-tomcat-jasper ( latest src, peer to
> jakarta-tomcat )
> + - jakarta-commons (optional, latest src, peer to
> jakarta-tomcat )
> - Jaxp ( optional, the jar files from ant can be
> used instead )
> - Jsse ( optional )
> -->
> @@ -54,18 +60,6 @@
> <property name="ant.lib" value="${ant.home}/lib"/>
> <property name="jsse.lib" value="${jsse.home}/lib"/>
>
> - <path id="commons-dbcp">
> - <fileset dir="../jakarta-commons/dbcp">
> - <include name="**/build/*.jar"/>
> - </fileset>
> - <fileset dir="../jakarta-commons/pool">
> - <include name="**/build/*.jar"/>
> - </fileset>
> - <fileset dir="../jakarta-commons/collections">
> - <include name="**/build/*.jar"/>
> - </fileset>
> - </path>
> -
> <!-- Binaries checked in ( servlet.jar is not likely to change,
> the 2.2 spec is final -->
> <property name="servlet22.jar" value="bin/servlet22.jar"/>
> @@ -80,8 +74,7 @@
> <available property="jsse.present"
> file="${jsse.lib}/jsse.jar"/>
> <available property="commons-dbcp.present"
> -
> classname="org.apache.commons.dbcp.DriverManagerConnectionFactory"
> - classpathref="commons-dbcp"/>
> +
> file="${jakarta-commons}/dbcp/dist/commons-dbcp.jar" />
> <available property="jdk12.present"
> classname="java.security.PrivilegedAction"/>
> <available property="jakarta-tomcat-connectors-present"
> @@ -109,6 +102,7 @@
> <target name="msg.jtj" unless="jakarta-tomcat-jasper-present" >
> <fail message="Can't find jakarta-tomcat-jasper
> repository, you must check it out before building tomcat" />
> </target>
> +
> <target name="init"
> depends="detect,msg.jdk12,msg.jsse,msg.jtc,msg.jtj,msg.commons-dbcp" >
> </target>
>
> @@ -380,23 +374,26 @@
> </target>
>
>
> - <target name="commons-prepare" if="commons-dbcp.present" >
> -<!--
> + <target name="commons-prepare" depends="prepare"
> if="commons-dbcp.present" >
> + <!-- Because of way the build.xml files are set up, we
> can't call them from
> + inside this file. They need to be run before this
> script is executed
> + if you want the PooledJDBCRealm code to be built.
> <ant
> antfile="../jakarta-commons/collections/build.xml" target="dist"/>
> <ant antfile="../jakarta-commons/pool/build.xml"
> target="dist"/>
> <ant antfile="../jakarta-commons/dbcp/build.xml"
> target="dist"/>
> --->
> - <copy todir="${tomcat.build}/lib/container" flatten="yes">
> - <fileset dir="../jakarta-commons/dbcp">
> - <include name="**/build/*.jar"/>
> - </fileset>
> - <fileset dir="../jakarta-commons/pool">
> - <include name="**/build/*.jar"/>
> - </fileset>
> - <fileset dir="../jakarta-commons/collections">
> - <include name="**/build/*.jar"/>
> - </fileset>
> - </copy>
> +-->
> + <echo message="copying commons jars"/>
> + <copy todir="${tomcat.build}/lib/container" flatten="yes">
> + <fileset dir="../jakarta-commons/dbcp">
> + <include name="**/dist/*.jar"/>
> + </fileset>
> + <fileset dir="../jakarta-commons/pool">
> + <include name="**/dist/*.jar"/>
> + </fileset>
> + <fileset dir="../jakarta-commons/collections">
> + <include name="**/dist/*.jar"/>
> + </fileset>
> + </copy>
> </target>
>
> <!-- ==================== "Standard" interceptors
> ========== -->
> @@ -410,8 +407,10 @@
> <pathelement
> location="${tomcat.build}/lib/common/connector_util.jar"/>
> <pathelement
> location="${tomcat.build}/lib/container/tomcat_util.jar"/>
> <pathelement
> location="${tomcat.build}/lib/common/tomcat_core.jar"/>
> + <fileset dir="${tomcat.build}/lib/container">
> + <include name="*.jar"/>
> + </fileset>
> </classpath>
> - <classpath refid="commons-dbcp"/>
> <include name="org/apache/tomcat/modules/**"/>
> <exclude
>
> name="org/apache/tomcat/modules/config/LoaderInterceptor12.java"
>
>
>
>
