Author: psteitz Date: Fri Nov 13 19:42:58 2009 New Revision: 835966 URL: http://svn.apache.org/viewvc?rev=835966&view=rev Log: Changed default jar locations to point to a maven 2 repository. JIRA: DBCP-304. Thanks to Jacques Le Roux.
Modified: commons/proper/dbcp/trunk/build.properties.sample Modified: commons/proper/dbcp/trunk/build.properties.sample URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/build.properties.sample?rev=835966&r1=835965&r2=835966&view=diff ============================================================================== --- commons/proper/dbcp/trunk/build.properties.sample (original) +++ commons/proper/dbcp/trunk/build.properties.sample Fri Nov 13 19:42:58 2009 @@ -15,16 +15,16 @@ ########################################################################## # Sample Ant build.properties file # -# This setup assumes dependent jars are in a local maven 1 repository. +# This setup assumes dependent jars are in a local maven 2 repository. # However the jars are located, the properties ending in ".jar" need # expand to full paths to the jars. ########################################################################## # Repository base path -repository=${user.home}/.maven/repository +repository=${user.home}/.m2/repository # commons-pool.jar - path to commons-pool-1.5.3.jar -commons-pool.home=${repository}/commons-pool/jars +commons-pool.home=${repository}/commons-pool/commons-pool/1.5.3 commons-pool.jar=${commons-pool.home}/commons-pool-1.5.3.jar # JDBC Optional Package 2.0 (also included in j2ee.jar) @@ -33,28 +33,29 @@ jdbc20ext.jar=${jdbc20ext.lib}/jdbc2_0-stdext.jar # JUnit -junit.home=${repository}/junit/jars +junit.home=${repository}/junit/junit/3.8.1 junit.jar=${junit.home}/junit-3.8.1.jar # XML parser -xerces.home=${repository}/xerces/jars +xerces.home=${repository}/xerces/xerces/2.0.2 xerces.jar=${xerces.home}/xerces-2.0.2.jar -xml-apis.home=${repository}/xml-apis/jars +xml-apis.home=${repository}/xml-apis/xml-apis/2.0.2 xml-apis.jar=${xml-apis.home}/xml-apis-2.0.2.jar # Tomcat naming jars - needed only for JNDI tests -naming.home=${repository}/tomcat/jars -naming-common.jar=${naming.home}/naming-common-5.0.28.jar -naming-java.jar=${naming.home}/naming-java-5.0.28.jar +naming.common.home=${repository}/tomcat/naming-common/5.0.28 +naming-common.jar=${naming.common.home}/naming-common-5.0.28.jar +naming.java.home=${repository}/tomcat/naming-java/5.0.28 +naming-java.jar=${naming.java.home}/naming-java-5.0.28.jar # Commons logging - dependency of naming jars -commons-logging.home=${repository}/commons-logging/jars +commons-logging.home=${repository}/commons-logging/commons-logging/1.0.4 commons-logging.jar=${commons-logging.home}/commons-logging-1.0.4.jar # JTA - needed for managed connections -jta-spec.jar=${repository}/org.apache.geronimo.specs/jars/geronimo-jta_1.1_spec-1.1.jar -jta-impl.jar=${repository}/org.apache.geronimo.modules/jars/geronimo-transaction-1.2-beta.jar +jta-spec.jar=${repository}/org/apache/geronimo/specs/geronimo-jta_1.1_spec/1.1/geronimo-jta_1.1_spec-1.1.jar +jta-impl.jar=${repository}/org/apache/geronimo/modules/geronimo-transaction/1.2-beta/geronimo-transaction-1.2-beta.jar # JTA dependencies - required so the test cases run -backport-util-concurrent.jar=${repository}/backport-util-concurrent/jars/backport-util-concurrent-2.2.jar -ejb-spec.jar=${repository}/org.apache.geronimo.specs/jars/geronimo-ejb_2.1_spec-1.1.jar +backport-util-concurrent.jar=${repository}/backport-util-concurrent/backport-util-concurrent/2.2/backport-util-concurrent-2.2.jar +ejb-spec.jar=${repository}/org/apache/geronimo/specs/geronimo-ejb_2.1_spec/1.1/geronimo-ejb_2.1_spec-1.1.jar