You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ps...@apache.org on 2013/06/08 04:39:38 UTC
svn commit: r1490907 - in /commons/proper/dbcp/branches/DBCP_1_5_x_BRANCH:
build-1.4.xml pom-1.4.xml
Author: psteitz
Date: Sat Jun 8 02:39:38 2013
New Revision: 1490907
URL: http://svn.apache.org/r1490907
Log:
Added 1.4 compat build files.
Added:
commons/proper/dbcp/branches/DBCP_1_5_x_BRANCH/build-1.4.xml
commons/proper/dbcp/branches/DBCP_1_5_x_BRANCH/pom-1.4.xml
Added: commons/proper/dbcp/branches/DBCP_1_5_x_BRANCH/build-1.4.xml
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/branches/DBCP_1_5_x_BRANCH/build-1.4.xml?rev=1490907&view=auto
==============================================================================
--- commons/proper/dbcp/branches/DBCP_1_5_x_BRANCH/build-1.4.xml (added)
+++ commons/proper/dbcp/branches/DBCP_1_5_x_BRANCH/build-1.4.xml Sat Jun 8 02:39:38 2013
@@ -0,0 +1,256 @@
+<!--
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+ -->
+
+<!-- $Id: build.xml 887831 2009-12-07 03:56:29Z psteitz $ -->
+<project name="commons-dbcp" default="test" basedir=".">
+
+ <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="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}:${junit.jar}:
+ ${naming-common.jar}:${naming-java.jar}:${commons-logging.jar}:
+ ${xerces.jar}:${jta-spec.jar}:${jta-impl.jar}:
+ ${backport-util-concurrent.jar}:${ejb-spec.jar}"/>
+
+ <property name="name" value="commons-dbcp"/>
+ <property name="title" value="Apache Commons Database Pooling Package"/>
+ <property name="version" value="1.4.1"/>
+ <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-2013 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.6" />
+
+ <available property="jndi.present" classname="javax.naming.Context"/>
+ </target>
+
+ <target name="check_jar">
+ <available file="${file}" property="found"/>
+ <antcall target="check_message"/>
+ </target>
+
+ <target name="check_message" unless="found">
+ <!-- echo could be replaced with fail if required -->
+ <echo message="Could not find ${file}"/>
+ </target>
+
+ <!-- Check that all the dependencies exist -->
+ <target name="check_depends" depends="init">
+ <echo>Checking dependencies</echo>
+ <antcall target="check_jar">
+ <param name="file" value="${commons-pool.jar}"/>
+ </antcall>
+ <antcall target="check_jar">
+ <param name="file" value="${junit.jar}"/>
+ </antcall>
+ <antcall target="check_jar">
+ <param name="file" value="${naming-common.jar}"/>
+ </antcall>
+ <antcall target="check_jar">
+ <param name="file" value="${naming-java.jar}"/>
+ </antcall>
+ <antcall target="check_jar">
+ <param name="file" value="${commons-logging.jar}"/>
+ </antcall>
+ <antcall target="check_jar">
+ <param name="file" value="${xerces.jar}"/>
+ </antcall>
+ <antcall target="check_jar">
+ <param name="file" value="${jta-spec.jar}"/>
+ </antcall>
+ <antcall target="check_jar">
+ <param name="file" value="${jta-impl.jar}"/>
+ </antcall>
+ <antcall target="check_jar">
+ <param name="file" value="${backport-util-concurrent.jar}"/>
+ </antcall>
+ <antcall target="check_jar">
+ <param name="file" value="${ejb-spec.jar}"/>
+ </antcall>
+ </target>
+
+ <!-- ######################################################### -->
+
+ <target name="clean" depends="init" description="removes generated files">
+ <delete dir="${build.dir}"/>
+ <delete dir="${dist.dir}"/>
+ </target>
+
+ <target name="filter-sources">
+ <echo message="Comment out the jdbc4.1 additional methods."/>
+ <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"/>
+
+ <replace dir="${src.java.dir}" token="/* JDBC_4_1_ANT_KEY_BEGIN */" value="/*"/>
+ <replace dir="${src.java.dir}" token="/* JDBC_4_1_ANT_KEY_END */" value="*/"/>
+
+ <replace dir="${src.test.dir}" token="/* JDBC_4_1_ANT_KEY_BEGIN */" value="/*"/>
+ <replace dir="${src.test.dir}" token="/* JDBC_4_1_ANT_KEY_END */" value="*/"/>
+ </target>
+
+ <target name="prepare" depends="init,filter-sources"/>
+
+ <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://commons.apache.org/pool/apidocs"/>
+ </javadoc>
+ </target>
+
+ <!-- ######################################################### -->
+
+ <target name="compile" depends="check_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">
+ <echo message="${classpath}"/>
+ <mkdir dir="${build.dir}/ant-reports"/>
+ <junit printsummary="true" showoutput="true" fork="yes" haltonfailure="${test.failonerror}">
+ <classpath>
+ <pathelement location="${build.classes.dir}" />
+ <pathelement location="${build.test-classes.dir}" />
+ <pathelement path="${classpath}" />
+ </classpath>
+ <formatter type="plain" usefile="false" />
+ <batchtest todir="${build.dir}/ant-reports">
+ <fileset dir="${src.test.dir}">
+ <include name="**/*Test*.java"/>
+ <!-- Test support files -->
+ <exclude name="**/Tester*.java"/>
+ <!-- Ant JUnit does not handle abstract classes -->
+ <exclude name="**/TestConnectionPool.java"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </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>
Added: commons/proper/dbcp/branches/DBCP_1_5_x_BRANCH/pom-1.4.xml
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/branches/DBCP_1_5_x_BRANCH/pom-1.4.xml?rev=1490907&view=auto
==============================================================================
--- commons/proper/dbcp/branches/DBCP_1_5_x_BRANCH/pom-1.4.xml (added)
+++ commons/proper/dbcp/branches/DBCP_1_5_x_BRANCH/pom-1.4.xml Sat Jun 8 02:39:38 2013
@@ -0,0 +1,345 @@
+<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-parent</artifactId>
+ <version>15</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <version>1.3</version>
+ <name>Commons DBCP</name>
+
+ <inceptionYear>2001</inceptionYear>
+ <description>Commons Database Connection Pooling</description>
+ <url>http://commons.apache.org/dbcp/</url>
+
+ <distributionManagement>
+ <site>
+ <id>people.apache.org</id>
+ <name>Commons DBCP</name>
+ <url>scp://people.apache.org/www/commons.apache.org/dbcp</url>
+ </site>
+ </distributionManagement>
+
+ <issueManagement>
+ <system>jira</system>
+ <url>http://issues.apache.org/jira/browse/DBCP</url>
+ </issueManagement>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/dbcp/trunk</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/dbcp/branches/DBCP_1_3_BRANCH</developerConnection>
+ <url>http://svn.apache.org/viewvc/commons/proper/dbcp/branches/DBCP_1_3_BRANCH</url>
+ </scm>
+
+ <developers>
+ <developer>
+ <name>Morgan Delagrange</name>
+ <id>morgand</id>
+ <email></email>
+ <organization></organization>
+ </developer>
+ <developer>
+ <name>Geir Magnusson</name>
+ <id>geirm</id>
+ <email></email>
+ <organization></organization>
+ </developer>
+ <developer>
+ <name>Craig McClanahan</name>
+ <id>craigmcc</id>
+ <email></email>
+ <organization></organization>
+ </developer>
+ <developer>
+ <name>John McNally</name>
+ <id>jmcnally</id>
+ <email></email>
+ <organization></organization>
+ </developer>
+ <developer>
+ <name>Martin Poeschl</name>
+ <id>mpoeschl</id>
+ <email>mpoeschl@marmot.at</email>
+ <organization>tucana.at</organization>
+ </developer>
+ <developer>
+ <name>Rodney Waldhoff</name>
+ <id>rwaldhoff</id>
+ <email></email>
+ <organization></organization>
+ </developer>
+ <developer>
+ <name>David Weinrich</name>
+ <id>dweinr1</id>
+ <email></email>
+ <organization></organization>
+ </developer>
+ <developer>
+ <name>Dirk Verbeeck</name>
+ <id>dirkv</id>
+ <email></email>
+ <organization></organization>
+ </developer>
+ <developer>
+ <name>Yoav Shapira</name>
+ <id>yoavs</id>
+ <email>yoavs@apache.org</email>
+ <organization>Apache Software Foundation</organization>
+ </developer>
+ <developer>
+ <name>Phil Steitz</name>
+ <id>psteitz</id>
+ <email></email>
+ <organization></organization>
+ </developer>
+ <developer>
+ <name>Jörg Schaible</name>
+ <id>joehni</id>
+ <email>joerg.schaible@gmx.de</email>
+ <organization></organization>
+ <timezone>+1</timezone>
+ </developer>
+ <developer>
+ <name>Mark Thomas</name>
+ <id>markt</id>
+ <email>markt@apache.org</email>
+ <organization>Apache Software Foundation</organization>
+ </developer>
+ </developers>
+ <contributors>
+ <contributor>
+ <name>Todd Carmichael</name>
+ <email>toddc@concur.com</email>
+ </contributor>
+ <contributor>
+ <name>Wayne Woodfield</name>
+ </contributor>
+ <contributor>
+ <name>Dain Sundstrom</name>
+ <email>dain@apache.org</email>
+ </contributor>
+ <contributor>
+ <name>Philippe Mouawad</name>
+ </contributor>
+ </contributors>
+
+ <dependencies>
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <version>1.5.4</version>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- For managed connections -->
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <version>1.1</version>
+ <optional>true</optional>
+ </dependency>
+
+ <!-- tomcat naming jars for jndi reference tests -->
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>naming-common</artifactId>
+ <version>5.0.28</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>naming-java</artifactId>
+ <version>5.0.28</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- dragged in by tomcat-naming jars - only for jndi tests -->
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.1</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- for testing of managed connections -->
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-transaction</artifactId>
+ <version>1.2-beta</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- required under jdk 1.4 so jocl can have a sax parser -->
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>1.3.04</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.4.0</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <properties>
+ <maven.compile.source>1.6</maven.compile.source>
+ <maven.compile.target>1.6</maven.compile.target>
+ <commons.componentid>dbcp</commons.componentid>
+ <commons.release.version>1.4</commons.release.version>
+ <commons.jira.id>DBCP</commons.jira.id>
+ <commons.jira.pid>12310469</commons.jira.pid>
+ </properties>
+
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <testSourceDirectory>src/test</testSourceDirectory>
+ <resources>
+ <resource>
+ <directory>src/test</directory>
+ <includes>
+ <include>testpool.jocl</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>.</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>NOTICE.txt</include>
+ <include>LICENSE.txt</include>
+ </includes>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <directory>${basedir}/src/test</directory>
+ <includes>
+ <include>testpool.jocl</include>
+ </includes>
+ </testResource>
+ </testResources>
+ <plugins>
+ <!-- Specify cobertura version for "cobertura:cobertura" goal -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ <version>2.3</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <reportFormat>plain</reportFormat>
+ <excludes>
+ <!-- Test support files -->
+ <exclude>**/Tester*.java</exclude>
+ <!-- Exclude nested classes which Surefire cannot handle -->
+ <exclude>**/Test*$*.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assembly/bin.xml</descriptor>
+ <descriptor>src/assembly/src.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+ <links>
+ <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
+ <link>http://commons.apache.org/pool/api-1.5.4</link>
+ <link>http://java.sun.com/j2ee/sdk_1.3/techdocs/api</link>
+ </links>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-changes-plugin</artifactId>
+ <version>2.0</version>
+ <configuration>
+ <xmlPath>${basedir}/src/changes/changes.xml</xmlPath>
+ <issueLinkTemplate>%URL%/%ISSUE%</issueLinkTemplate>
+ </configuration>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>changes-report</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.1</version>
+ <configuration>
+ <configLocation>${basedir}/checkstyle.xml</configLocation>
+ <enableRulesSummary>false</enableRulesSummary>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+ <rulesets>
+ <ruleset>checkstyle.xml</ruleset>
+ </rulesets>
+ <targetJdk>${maven.compile.target}</targetJdk>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>clirr-maven-plugin</artifactId>
+ <version>2.2.2</version>
+ <configuration>
+ <comparisonVersion>1.2.2</comparisonVersion>
+ <minSeverity>info</minSeverity>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+</project>