You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by ps...@apache.org on 2006/11/25 07:46:35 UTC
svn commit: r479091 - in /jakarta/commons/proper/dbcp/trunk:
build.properties.sample build.xml project.xml
Author: psteitz
Date: Fri Nov 24 22:46:35 2006
New Revision: 479091
URL: http://svn.apache.org/viewvc?view=rev&rev=479091
Log:
Replaced hand-crafted ant build with maven-generated build.xml.
Removed:
jakarta/commons/proper/dbcp/trunk/build.properties.sample
Modified:
jakarta/commons/proper/dbcp/trunk/build.xml
jakarta/commons/proper/dbcp/trunk/project.xml
Modified: jakarta/commons/proper/dbcp/trunk/build.xml
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/dbcp/trunk/build.xml?view=diff&rev=479091&r1=479090&r2=479091
==============================================================================
--- jakarta/commons/proper/dbcp/trunk/build.xml (original)
+++ jakarta/commons/proper/dbcp/trunk/build.xml Fri Nov 24 22:46:35 2006
@@ -1,192 +1,337 @@
-<!-- $Id$ -->
-<project name="commons-dbcp" default="test" basedir=".">
+<?xml version="1.0" encoding="UTF-8"?>
- <target name="init">
- <tstamp/>
+<!--build.xml generated by maven from project.xml version 1.2.2-SNAPSHOT
+ on date November 24 2006, time 2334-->
- <!-- 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="commons-collections.jar" value="${basedir}/../collections/dist/commons-collections.jar"/>
- <property name="commons-pool.jar" value="${basedir}/../pool/dist/commons-pool.jar"/>
-
- <!-- command line classpath, if any -->
- <property name="cp" value=""/>
-
- <!-- now combine the classpaths -->
- <property name="classpath" value="${cp}:${commons-pool.jar}:${commons-collections.jar}:${jdbc20ext.jar}:${junit.jar}:${jndi.jar}:${sax2.jar}"/>
-
- <property name="name" value="commons-dbcp"/>
- <property name="title" value="Jakarta Commons Database Pooling Package"/>
- <property name="version" value="Nightly-${DSTAMP}${TSTAMP}"/>
- <property name="package" value="org.apache.commons.dbcp.*"/>
-
- <property name="build.dir" value="${basedir}/build"/>
- <property name="build.classes.dir" value="${build.dir}/classes"/>
- <property name="build.test-classes.dir" value="${build.dir}/test-classes"/>
- <property name="dist.dir" value="${basedir}/dist"/>
- <property name="dist.jar" value="${dist.dir}/${name}.jar"/>
-
- <property name="test.entry" value="org.apache.commons.dbcp.TestAll"/>
- <property name="test.failonerror" value="true" />
- <property name="test.runner" value="junit.textui.TestRunner" />
-
- <property name="javadoc.dir" value="${dist.dir}/docs/api"/>
- <property name="javadoc.bottom" value="<small>Copyright &copy; 2001-2004 Apache Software Foundation. Documenation generated ${TODAY}</small>."/>
- <property name="javadoc.overview" value="${basedir}/src/java/org/apache/commons/dbcp/overview.html"/>
-
- <property name="javac.optimize" value="false"/>
- <property name="javac.debug" value="true"/>
- <property name="javac.deprecation" value="false"/>
- <property name="javac.source" value="1.4" />
-
- <available property="jndi.present" classname="javax.naming.Context"/>
- <available property="jdbc3.present" classname="java.sql.Savepoint"/>
- </target>
-
- <!-- ######################################################### -->
-
- <target name="clean" depends="init" description="removes generated files">
- <delete dir="${build.dir}"/>
- <delete dir="${dist.dir}"/>
- </target>
-
- <target name="prepare-nojdbc3" depends="init" unless="jdbc3.present">
- <echo message="Commenting out the jdbc3 additional methods since JDBC 3 was not detected."/>
- <property name="src.dir" value="${build.dir}/src"/>
- <property name="src.java.dir" value="${src.dir}/java"/>
- <property name="src.test.dir" value="${src.dir}/test"/>
-
- <mkdir dir="${src.dir}"/>
- <copy todir="${src.dir}" filtering="yes">
- <fileset dir="${basedir}/src" defaultexcludes="no">
- <include name="**/*.java"/>
- <include name="**/*.xml"/>
- <include name="**/*.properties"/>
- <include name="**/*.jocl"/>
- <include name="**/package.html"/>
- </fileset>
- </copy>
- <replace dir="${src.dir}" token="/* JDBC_3_ANT_KEY_BEGIN */" value="/*"/>
- <replace dir="${src.dir}" token="/* JDBC_3_ANT_KEY_END */" value="*/"/>
- </target>
-
- <target name="prepare-jdbc3" depends="init" if="jdbc3.present">
- <echo message="JDBC 3 was detected."/>
- <property name="src.dir" value="${basedir}/src"/>
- <property name="src.java.dir" value="${src.dir}/java"/>
- <property name="src.test.dir" value="${src.dir}/test"/>
- </target>
-
- <target name="prepare" depends="init,prepare-nojdbc3,prepare-jdbc3"/>
-
- <target name="javadoc" depends="prepare" description="generates javadocs">
- <mkdir dir="${javadoc.dir}"/>
- <javadoc packagenames="org.*"
- sourcepath="${src.java.dir}"
- classpath="${classpath}"
- destdir="${javadoc.dir}"
- windowtitle="${title}"
- doctitle="${title}"
- bottom="${javadoc.bottom}"
- overview="${javadoc.overview}"
- public="true"
- version="true"
- author="true"
- splitindex="false"
- nodeprecated="true"
- nodeprecatedlist="true"
- notree="true"
- noindex="false"
- nohelp="true"
- nonavbar="false"
- serialwarn="false">
- <link href="http://java.sun.com/j2se/1.5.0/docs/api"/>
- <link href="http://jakarta.apache.org/commons/pool/apidocs"/>
- </javadoc>
- </target>
-
- <!-- ######################################################### -->
-
- <target name="compile" depends="prepare" description="compiles source files">
- <mkdir dir="${build.classes.dir}"/>
- <javac destdir="${build.classes.dir}"
- srcdir="${src.java.dir}"
- classpath="${classpath}"
- debug="${javac.debug}"
- deprecation="${javac.deprecation}"
- optimize="${javac.optimize}"
- source="${javac.source}">
- <exclude name="org/apache/commons/dbcp/BasicDataSourceFactory.java"
- unless="jndi.present"/>
- <exclude name="org/apache/commons/dbcp/datasources/**"
- unless="jndi.present"/>
- <exclude name="org/apache/commons/dbcp/cpdsadapter/**"
- unless="jndi.present"/>
- </javac>
- </target>
-
- <target name="compile-test" depends="compile">
- <mkdir dir="${build.test-classes.dir}"/>
- <javac destdir="${build.test-classes.dir}"
- srcdir="${src.test.dir}"
- debug="${javac.debug}"
- deprecation="${javac.deprecation}"
- optimize="${javac.optimize}"
- source="${javac.source}">
- <classpath>
- <pathelement location="${build.classes.dir}" />
- <pathelement location="${build.test-classes.dir}" />
- <pathelement path="${classpath}" />
- </classpath>
- </javac>
- <copy todir="${build.test-classes.dir}" file="${src.test.dir}/testpool.jocl"/>
- </target>
-
- <target name="test" depends="compile-test" description="runs (junit) unit tests">
- <java classname="${test.runner}" fork="yes" failonerror="${test.failonerror}">
- <arg value="${test.entry}"/>
- <classpath>
- <pathelement location="${build.classes.dir}" />
- <pathelement location="${build.test-classes.dir}" />
- <pathelement path="${classpath}" />
- </classpath>
- </java>
- </target>
-
- <target name="build-jar" depends="compile">
- <mkdir dir="${dist.dir}"/>
- <jar jarfile="${dist.jar}">
- <fileset dir="${build.classes.dir}"/>
- <metainf dir="${basedir}" includes="LICENSE.txt,NOTICE.txt"/>
- <manifest>
- <attribute name="Built-By" value="${user.name}"/>
- <attribute name="Package" value="${package}"/>
- <attribute name="Extension-Name" value="${name}"/>
- <attribute name="Specification-Vendor" value="Apache Software Foundation"/>
- <attribute name="Specification-Title" value="${title}"/>
- <attribute name="Implementation-Version" value="${version}"/>
- <attribute name="Implementation-Vendor" value="Apache Software Foundation"/>
- </manifest>
- </jar>
- </target>
-
- <target name="build" depends="clean,build-jar,javadoc">
- <copy todir="${dist.dir}" file="${basedir}/LICENSE.txt"/>
- <copy todir="${dist.dir}" file="${basedir}/NOTICE.txt"/>
- <copy todir="${dist.dir}" file="${basedir}/README.txt"/>
- </target>
-
- <target name="dist" depends="build" description="gump target"/>
-
-</project>
+<project default="jar" name="commons-dbcp" basedir=".">
+ <!--Load local and user build preferences-->
+ <property file="build.properties">
+ </property>
+ <property file="${user.home}/build.properties">
+ </property>
+ <!--Build properties-->
+
+ <property name="defaulttargetdir" value="${basedir}/target">
+ </property>
+ <property name="libdir" value="${user.home}/.maven/repository">
+ </property>
+ <property name="classesdir" value="${basedir}/target/classes">
+ </property>
+ <property name="testclassesdir" value="${basedir}/target/test-classes">
+ </property>
+ <property name="testreportdir" value="${basedir}/target/test-reports">
+ </property>
+ <property name="distdir" value="${basedir}/dist">
+ </property>
+ <property name="javadocdir" value="${basedir}/dist/docs/api">
+ </property>
+ <property name="final.name" value="commons-dbcp-1.2.2-SNAPSHOT">
+ </property>
+ <property name="proxy.host" value="">
+ </property>
+ <property name="proxy.port" value="">
+ </property>
+ <property name="proxy.username" value="">
+ </property>
+ <property name="proxy.password" value="">
+ </property>
+ <path id="build.classpath">
+ <pathelement location="${libdir}/commons-pool/jars/commons-pool-1.3.jar">
+ </pathelement>
+ <pathelement location="${libdir}/junit/jars/junit-3.8.1.jar">
+ </pathelement>
+ <pathelement location="${libdir}/tomcat/jars/naming-common-5.0.28.jar">
+ </pathelement>
+ <pathelement location="${libdir}/tomcat/jars/naming-java-5.0.28.jar">
+ </pathelement>
+ <pathelement location="${libdir}/xerces/jars/xercesImpl-2.8.0.jar">
+ </pathelement>
+ <pathelement location="${libdir}/commons-logging/jars/commons-logging-1.0.3.jar">
+ </pathelement>
+ <pathelement location="${libdir}/maven/plugins/maven-xdoc-plugin-1.9.2.jar">
+ </pathelement>
+ </path>
+ <target name="init" description="o Initializes some properties">
+ <mkdir dir="${libdir}">
+ </mkdir>
+ <condition property="noget">
+ <equals arg2="only" arg1="${build.sysclasspath}">
+ </equals>
+ </condition>
+ <!--Test if JUNIT is present in ANT classpath-->
+
+ <available property="Junit.present" classname="junit.framework.Test">
+ </available>
+ <!--Test if user defined a proxy-->
+
+ <condition property="useProxy">
+ <and>
+ <isset property="proxy.host">
+ </isset>
+ <not>
+ <equals trim="true" arg2="" arg1="${proxy.host}">
+ </equals>
+ </not>
+ </and>
+ </condition>
+ </target>
+ <target name="compile" description="o Compile the code" depends="get-deps">
+ <mkdir dir="${classesdir}">
+ </mkdir>
+ <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
+ <src>
+ <pathelement location="${basedir}/src/java">
+ </pathelement>
+ </src>
+ <classpath refid="build.classpath">
+ </classpath>
+ </javac>
+ <copy todir="${classesdir}">
+ <fileset dir="${basedir}/src/test">
+ <include name="testpool.jocl">
+ </include>
+ </fileset>
+ </copy>
+ <mkdir dir="${classesdir}/META-INF">
+ </mkdir>
+ <copy todir="${classesdir}/META-INF">
+ <fileset dir="${basedir}/.">
+ <include name="NOTICE.txt">
+ </include>
+ </fileset>
+ </copy>
+ </target>
+ <target name="jar" description="o Create the jar" depends="compile,test">
+ <jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}">
+ </jar>
+ </target>
+ <target name="clean" description="o Clean up the generated directories">
+ <delete dir="${defaulttargetdir}">
+ </delete>
+ <delete dir="${distdir}">
+ </delete>
+ </target>
+ <target name="dist" description="o Create a distribution" depends="jar, javadoc">
+ <mkdir dir="dist">
+ </mkdir>
+ <copy todir="dist">
+ <fileset dir="${defaulttargetdir}" includes="*.jar">
+ </fileset>
+ <fileset dir="${basedir}" includes="LICENSE*, README*">
+ </fileset>
+ </copy>
+ </target>
+ <target name="test" description="o Run the test cases" if="test.failure" depends="internal-test">
+ <fail message="There were test failures.">
+ </fail>
+ </target>
+ <target name="internal-test" if="Junit.present" depends="junit-present,compile-tests">
+ <mkdir dir="${testreportdir}">
+ </mkdir>
+ <junit dir="${basedir}" failureproperty="test.failure" printSummary="yes" fork="true" haltonerror="true">
+ <sysproperty key="basedir" value=".">
+ </sysproperty>
+ <formatter type="xml">
+ </formatter>
+ <formatter usefile="false" type="plain">
+ </formatter>
+ <classpath>
+ <path refid="build.classpath">
+ </path>
+ <pathelement path="${testclassesdir}">
+ </pathelement>
+ <pathelement path="${classesdir}">
+ </pathelement>
+ </classpath>
+ <batchtest todir="${testreportdir}">
+ <fileset dir="${basedir}/src/test">
+ <include name="org/apache/commons/dbcp/TestAbandonedObjectPool.java">
+ </include>
+ <include name="org/apache/commons/jocl/TestJOCLContentHandler.java">
+ </include>
+ <include name="org/apache/commons/dbcp/TestDelegatingConnection.java">
+ </include>
+ <include name="org/apache/commons/dbcp/TestPoolableConnection.java">
+ </include>
+ <include name="org/apache/commons/dbcp/TestDelegatingPreparedStatement.java">
+ </include>
+ <include name="org/apache/commons/dbcp/TestDelegatingStatement.java">
+ </include>
+ <include name="org/apache/commons/dbcp/TestJOCLed.java">
+ </include>
+ <include name="org/apache/commons/dbcp/TestManual.java">
+ </include>
+ <include name="org/apache/commons/dbcp/TestBasicDataSourceFactory.java">
+ </include>
+ <include name="org/apache/commons/dbcp/TestBasicDataSource.java">
+ </include>
+ <include name="org/apache/commons/dbcp/TestAbandonedBasicDataSource.java">
+ </include>
+ <include name="org/apache/commons/dbcp/TestPStmtPoolingBasicDataSource.java">
+ </include>
+ <include name="org/apache/commons/dbcp/TestPoolingDataSource.java">
+ </include>
+ <include name="org/apache/commons/dbcp/TestJndi.java">
+ </include>
+ <include name="org/apache/commons/dbcp/datasources/TestFactory.java">
+ </include>
+ <include name="org/apache/commons/dbcp/datasources/TestPerUserPoolDataSource.java">
+ </include>
+ <include name="org/apache/commons/dbcp/datasources/TestSharedPoolDataSource.java">
+ </include>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+ <target name="junit-present" unless="Junit.present" depends="init">
+ <echo>================================= WARNING ================================</echo>
+ <echo>Junit isn't present in your ${ANT_HOME}/lib directory. Tests not executed.</echo>
+ <echo>==========================================================================</echo>
+ </target>
+ <target name="compile-tests" if="Junit.present" depends="junit-present,compile">
+ <mkdir dir="${testclassesdir}">
+ </mkdir>
+ <javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
+ <src>
+ <pathelement location="${basedir}/src/test">
+ </pathelement>
+ </src>
+ <classpath>
+ <path refid="build.classpath">
+ </path>
+ <pathelement path="${classesdir}">
+ </pathelement>
+ </classpath>
+ </javac>
+ <copy todir="${testclassesdir}">
+ <fileset dir="${basedir}/src/test">
+ <include name="testpool.jocl">
+ </include>
+ </fileset>
+ </copy>
+ </target>
+ <target name="javadoc" description="o Generate javadoc" depends="get-deps">
+ <mkdir dir="${javadocdir}">
+ </mkdir>
+ <tstamp>
+ <format pattern="2001-yyyy" property="year">
+ </format>
+ </tstamp>
+ <property name="copyright" value="Copyright &copy; The Apache Software Foundation. All Rights Reserved.">
+ </property>
+ <property name="title" value="Commons DBCP 1.2.2-SNAPSHOT API">
+ </property>
+ <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="${basedir}/src/java" packagenames="org.apache.commons.dbcp.*">
+ <classpath>
+ <path refid="build.classpath">
+ </path>
+ </classpath>
+ </javadoc>
+ </target>
+ <target name="get-dep-commons-pool.jar" description="o Download the dependency : commons-pool.jar" unless="commons-pool.jar" depends="init,setProxy,noProxy,get-custom-dep-commons-pool.jar">
+ <mkdir dir="${libdir}/commons-pool/jars/">
+ </mkdir>
+ <get dest="${libdir}/commons-pool/jars/commons-pool-1.3.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-pool/jars/commons-pool-1.3.jar">
+ </get>
+ </target>
+ <target name="get-custom-dep-commons-pool.jar" if="commons-pool.jar" depends="init,setProxy,noProxy">
+ <mkdir dir="${libdir}/commons-pool/jars/">
+ </mkdir>
+ <get dest="${libdir}/commons-pool/jars/commons-pool-1.3.jar" usetimestamp="true" ignoreerrors="true" src="${commons-pool.jar}">
+ </get>
+ </target>
+ <target name="get-dep-junit.jar" description="o Download the dependency : junit.jar" unless="junit.jar" depends="init,setProxy,noProxy,get-custom-dep-junit.jar">
+ <mkdir dir="${libdir}/junit/jars/">
+ </mkdir>
+ <get dest="${libdir}/junit/jars/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/junit/jars/junit-3.8.1.jar">
+ </get>
+ </target>
+ <target name="get-custom-dep-junit.jar" if="junit.jar" depends="init,setProxy,noProxy">
+ <mkdir dir="${libdir}/junit/jars/">
+ </mkdir>
+ <get dest="${libdir}/junit/jars/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true" src="${junit.jar}">
+ </get>
+ </target>
+ <target name="get-dep-naming-common.jar" description="o Download the dependency : naming-common.jar" unless="naming-common.jar" depends="init,setProxy,noProxy,get-custom-dep-naming-common.jar">
+ <mkdir dir="${libdir}/tomcat/jars/">
+ </mkdir>
+ <get dest="${libdir}/tomcat/jars/naming-common-5.0.28.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/tomcat/jars/naming-common-5.0.28.jar">
+ </get>
+ </target>
+ <target name="get-custom-dep-naming-common.jar" if="naming-common.jar" depends="init,setProxy,noProxy">
+ <mkdir dir="${libdir}/tomcat/jars/">
+ </mkdir>
+ <get dest="${libdir}/tomcat/jars/naming-common-5.0.28.jar" usetimestamp="true" ignoreerrors="true" src="${naming-common.jar}">
+ </get>
+ </target>
+ <target name="get-dep-naming-java.jar" description="o Download the dependency : naming-java.jar" unless="naming-java.jar" depends="init,setProxy,noProxy,get-custom-dep-naming-java.jar">
+ <mkdir dir="${libdir}/tomcat/jars/">
+ </mkdir>
+ <get dest="${libdir}/tomcat/jars/naming-java-5.0.28.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/tomcat/jars/naming-java-5.0.28.jar">
+ </get>
+ </target>
+ <target name="get-custom-dep-naming-java.jar" if="naming-java.jar" depends="init,setProxy,noProxy">
+ <mkdir dir="${libdir}/tomcat/jars/">
+ </mkdir>
+ <get dest="${libdir}/tomcat/jars/naming-java-5.0.28.jar" usetimestamp="true" ignoreerrors="true" src="${naming-java.jar}">
+ </get>
+ </target>
+ <target name="get-dep-xercesImpl.jar" description="o Download the dependency : xercesImpl.jar" unless="xercesImpl.jar" depends="init,setProxy,noProxy,get-custom-dep-xercesImpl.jar">
+ <mkdir dir="${libdir}/xerces/jars/">
+ </mkdir>
+ <get dest="${libdir}/xerces/jars/xercesImpl-2.8.0.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/xerces/jars/xercesImpl-2.8.0.jar">
+ </get>
+ </target>
+ <target name="get-custom-dep-xercesImpl.jar" if="xercesImpl.jar" depends="init,setProxy,noProxy">
+ <mkdir dir="${libdir}/xerces/jars/">
+ </mkdir>
+ <get dest="${libdir}/xerces/jars/xercesImpl-2.8.0.jar" usetimestamp="true" ignoreerrors="true" src="${xercesImpl.jar}">
+ </get>
+ </target>
+ <target name="get-dep-commons-logging.jar" description="o Download the dependency : commons-logging.jar" unless="commons-logging.jar" depends="init,setProxy,noProxy,get-custom-dep-commons-logging.jar">
+ <mkdir dir="${libdir}/commons-logging/jars/">
+ </mkdir>
+ <get dest="${libdir}/commons-logging/jars/commons-logging-1.0.3.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-logging/jars/commons-logging-1.0.3.jar">
+ </get>
+ </target>
+ <target name="get-custom-dep-commons-logging.jar" if="commons-logging.jar" depends="init,setProxy,noProxy">
+ <mkdir dir="${libdir}/commons-logging/jars/">
+ </mkdir>
+ <get dest="${libdir}/commons-logging/jars/commons-logging-1.0.3.jar" usetimestamp="true" ignoreerrors="true" src="${commons-logging.jar}">
+ </get>
+ </target>
+ <target name="get-dep-maven-xdoc-plugin.jar" description="o Download the dependency : maven-xdoc-plugin.jar" unless="maven-xdoc-plugin.jar" depends="init,setProxy,noProxy,get-custom-dep-maven-xdoc-plugin.jar">
+ <mkdir dir="${libdir}/maven/plugins/">
+ </mkdir>
+ <get dest="${libdir}/maven/plugins/maven-xdoc-plugin-1.9.2.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/maven/plugins/maven-xdoc-plugin-1.9.2.jar">
+ </get>
+ </target>
+ <target name="get-custom-dep-maven-xdoc-plugin.jar" if="maven-xdoc-plugin.jar" depends="init,setProxy,noProxy">
+ <mkdir dir="${libdir}/maven/plugins/">
+ </mkdir>
+ <get dest="${libdir}/maven/plugins/maven-xdoc-plugin-1.9.2.jar" usetimestamp="true" ignoreerrors="true" src="${maven-xdoc-plugin.jar}">
+ </get>
+ </target>
+ <target name="get-deps" unless="noget" depends="get-dep-commons-pool.jar,get-dep-junit.jar,get-dep-naming-common.jar,get-dep-naming-java.jar,get-dep-xercesImpl.jar,get-dep-commons-logging.jar,get-dep-maven-xdoc-plugin.jar">
+ </target>
+ <target name="setProxy" if="useProxy" depends="init">
+ <!--Proxy settings works only with a JDK 1.2 and higher.-->
+
+ <echo>Proxy used :</echo>
+ <echo>Proxy host [${proxy.host}]</echo>
+ <echo>Proxy port [${proxy.port}]</echo>
+ <echo>Proxy user [${proxy.username}]</echo>
+ <setproxy proxyuser="${proxy.username}" proxyport="${proxy.port}" proxypassword="${proxy.password}" proxyhost="${proxy.host}">
+ </setproxy>
+ </target>
+ <target name="noProxy" unless="useProxy" depends="init">
+ <echo>Proxy not used.</echo>
+ </target>
+ <target name="install-maven">
+ <get dest="${user.home}/maven-install-latest.jar" usetimestamp="true" src="${repo}/maven/maven-install-latest.jar">
+ </get>
+ <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
+ </unjar>
+ </target>
+</project>
\ No newline at end of file
Modified: jakarta/commons/proper/dbcp/trunk/project.xml
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/dbcp/trunk/project.xml?view=diff&rev=479091&r1=479090&r2=479091
==============================================================================
--- jakarta/commons/proper/dbcp/trunk/project.xml (original)
+++ jakarta/commons/proper/dbcp/trunk/project.xml Fri Nov 24 22:46:35 2006
@@ -209,6 +209,19 @@
</properties>
</dependency>
+ <!-- Dependency needed for generated ant build. Uncomment before
+ regenerating ant build
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.8.0</version>
+ <properties>
+ <scope>test</scope>
+ <comment>Only required for jocl tests under ant</comment>
+ </properties>
+ </dependency>
+ -->
+
<!-- dragged in by tomcat-naming jars - only for jndi tests -->
<dependency>
<groupId>commons-logging</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org