Author: fhanik
Date: Wed Mar 30 21:40:59 2011
New Revision: 1087090
URL: http://svn.apache.org/viewvc?rev=1087090&view=rev
Log:
Add in ability to build with Maven
Added:
tomcat/trunk/modules/jdbc-pool/pom.xml
tomcat/trunk/modules/jdbc-pool/src/
tomcat/trunk/modules/jdbc-pool/src/main/
tomcat/trunk/modules/jdbc-pool/src/main/java/
- copied from r1086702, tomcat/trunk/modules/jdbc-pool/java/
tomcat/trunk/modules/jdbc-pool/src/test/
tomcat/trunk/modules/jdbc-pool/src/test/java/
- copied from r1086702, tomcat/trunk/modules/jdbc-pool/test/
Removed:
tomcat/trunk/modules/jdbc-pool/java/
tomcat/trunk/modules/jdbc-pool/test/
Modified:
tomcat/trunk/modules/jdbc-pool/.classpath
tomcat/trunk/modules/jdbc-pool/build.xml
Modified: tomcat/trunk/modules/jdbc-pool/.classpath
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/.classpath?rev=1087090&r1=1087089&r2=1087090&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/.classpath (original)
+++ tomcat/trunk/modules/jdbc-pool/.classpath Wed Mar 30 21:40:59 2011
@@ -6,6 +6,6 @@
<classpathentry kind="var"
path="TOMCAT_LIBS_BASE/tomcat7-deps/dbcp/tomcat-dbcp.jar"
sourcepath="/TOMCAT_LIBS_BASE/tomcat6-deps/dbcp/src/java"/>
<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="includes/h2/bin/h2-1.2.129.jar"/>
- <classpathentry combineaccessrules="false" kind="src"
path="/tomcat-trunk"/>
+ <classpathentry combineaccessrules="false" kind="src"
path="/tomcat-7.0.x"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: tomcat/trunk/modules/jdbc-pool/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/build.xml?rev=1087090&r1=1087089&r2=1087090&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/build.xml (original)
+++ tomcat/trunk/modules/jdbc-pool/build.xml Wed Mar 30 21:40:59 2011
@@ -114,7 +114,7 @@
<target name="javadoc" depends="prepare">
<xslt basedir="${tomcat.pool}/doc"
- destdir="${basedir}/java/org/apache/tomcat/jdbc/pool"
+ destdir="${basedir}/src/main/java/org/apache/tomcat/jdbc/pool"
extension=".html"
style="${basedir}/doc/package.xsl"
excludes="build.xml"
@@ -122,9 +122,9 @@
<param name="relative-path"
expression="http://tomcat.apache.org/tomcat-6.0-doc"/>
<param name="apache-logo" expression="/images/asf-logo.gif"/>
</xslt>
- <move tofile="${basedir}/java/org/apache/tomcat/jdbc/pool/package.html"
- file="${basedir}/java/org/apache/tomcat/jdbc/pool/jdbc-pool.html"/>
- <javadoc sourcepath="${basedir}/java" destdir="${tomcat.api}"
verbose="false"
+ <move
tofile="${basedir}/src/main/java/org/apache/tomcat/jdbc/pool/package.html"
+
file="${basedir}/src/main/java/org/apache/tomcat/jdbc/pool/jdbc-pool.html"/>
+ <javadoc sourcepath="${basedir}/src/main/java" destdir="${tomcat.api}"
verbose="false"
link="http://java.sun.com/javase/6/docs/api/";>
<classpath refid="tomcat.jdbc.classpath"/>
</javadoc>
@@ -133,13 +133,13 @@
<fileset dir="${tomcat.api}"/>
<fileset refid="license.notice"/>
</jar>
- <delete file="${basedir}/java/org/apache/tomcat/jdbc/pool/package.html"/>
+ <delete
file="${basedir}/src/main/java/org/apache/tomcat/jdbc/pool/package.html"/>
</target>
<target name="build" depends="prepare,download">
<mkdir dir="${tomcat.pool}"/>
<!-- compile org.apache.tomcat.jdbc-->
- <javac srcdir="${basedir}/java" destdir="${tomcat.classes}"
+ <javac srcdir="${basedir}/src/main/java" destdir="${tomcat.classes}"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
source="${compile.source}"
@@ -155,7 +155,7 @@
<fileset dir="${tomcat.classes}">
<include name="org/apache/tomcat/jdbc/**" />
</fileset>
- <fileset dir="${basedir}/java">
+ <fileset dir="${basedir}/src/main/java">
<include name="org/apache/tomcat/jdbc/**/*.xml" />
</fileset>
<fileset refid="license.notice"/>
@@ -163,7 +163,7 @@
<!-- connection pool source file-->
<jar jarfile="${tomcat-jdbc-src.jar}" update="true">
- <fileset dir="${basedir}/java">
+ <fileset dir="${basedir}/src/main/java">
<include name="org/apache/tomcat/jdbc/**" />
</fileset>
<fileset refid="license.notice"/>
@@ -173,7 +173,7 @@
<target name="build-test" depends="prepare, build, download-test">
<mkdir dir="${tomcat.pool}"/>
<!-- compile org.apache.tomcat.jdbc-->
- <javac srcdir="${basedir}/test" destdir="${tomcat.testclasses}"
+ <javac srcdir="${basedir}/src/test/java" destdir="${tomcat.testclasses}"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
source="${compile.source}"
@@ -189,13 +189,13 @@
<fileset dir="${tomcat.testclasses}">
<include name="org/apache/tomcat/jdbc/**" />
</fileset>
- <fileset dir="${basedir}/test">
+ <fileset dir="${basedir}/src/test/java">
<include name="org/apache/tomcat/jdbc/**/*.xml" />
</fileset>
<fileset refid="license.notice"/>
</jar>
<jar jarfile="${tomcat-jdbc-test-src.jar}" update="true">
- <fileset dir="${basedir}/test">
+ <fileset dir="${basedir}/src/test/java">
<include name="org/apache/tomcat/jdbc/**" />
</fileset>
<fileset refid="license.notice"/>
@@ -439,7 +439,7 @@
<classpath refid="tomcat.jdbc.classpath"/>
<classpath refid="test.classpath"/>
<batchtest fork="yes" todir="${tomcat.testclasses}">
- <fileset dir="${basedir}/test">
+ <fileset dir="${basedir}/src/test/java">
<include name="**/CreateTestTable*"/>
</fileset>
</batchtest>
@@ -453,7 +453,7 @@
<classpath refid="tomcat.jdbc.classpath"/>
<classpath refid="test.classpath"/>
<batchtest fork="yes" todir="${tomcat.testclasses}">
- <fileset dir="${basedir}/test">
+ <fileset dir="${basedir}/src/test/java">
<include
name="org/apache/tomcat/jdbc/test/*CheckOutThreadTest*.java"/>
<include name="org/apache/tomcat/jdbc/test/FairnessTest*.java"/>
<exclude name="**/CreateTestTable*"/>
@@ -470,7 +470,7 @@
<classpath refid="tomcat.jdbc.classpath"/>
<classpath refid="test.classpath"/>
<batchtest fork="yes" todir="${tomcat.testclasses}">
- <fileset dir="${basedir}/test">
+ <fileset dir="${basedir}/src/test/java">
<include name="org/apache/tomcat/jdbc/test/*Test*.java"/>
<exclude
name="org/apache/tomcat/jdbc/test/*CheckOutThreadTest*.java"/>
<exclude name="**/CreateTestTable*"/>
@@ -495,7 +495,7 @@
<classpath refid="tomcat.jdbc.classpath"/>
<classpath refid="test.classpath"/>
<batchtest fork="yes" todir="${tomcat.testclasses}">
- <fileset dir="${basedir}/test">
+ <fileset dir="${basedir}/src/test/java">
<include name="org/apache/tomcat/jdbc/test/*${test}*.java"/>
<exclude name="**/CreateTestTable*"/>
<exclude name="**/DefaultTestCase*"/>
Added: tomcat/trunk/modules/jdbc-pool/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/pom.xml?rev=1087090&view=auto
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/pom.xml (added)
+++ tomcat/trunk/modules/jdbc-pool/pom.xml Wed Mar 30 21:40:59 2011
@@ -0,0 +1,110 @@
+<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/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>jdbc-pool</artifactId>
+ <version>1.2-SNAPSHOT</version>
+ <packaging>jar</packaging>
+
+ <name>jdbc-pool</name>
+ <url>http://people.apache.org/~fhanik/jdbc-pool/</url>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+ <mailingLists>
+ <mailingList>
+ <name>Development List</name>
+ <subscribe>[email protected]</subscribe>
+ <unsubscribe>[email protected]</unsubscribe>
+ <post>[email protected]</post>
+ </mailingList>
+ <mailingList>
+ <name>Users List</name>
+ <subscribe>[email protected]</subscribe>
+ <unsubscribe>[email protected]</unsubscribe>
+ <post>[email protected]</post>
+ </mailingList>
+ </mailingLists>
+
+ <distributionManagement>
+ <snapshotRepository>
+ <id>apache.snapshots.https</id>
+ <name>Apache Development Snapshot Repository</name>
+ <url>https://repository.apache.org/content/repositories/snapshots</url>
+ <uniqueVersion>false</uniqueVersion>
+ </snapshotRepository>
+ </distributionManagement>
+
+ <scm>
+
<connection>scm:svn:https://svn.apache.org/repos/asf/tomcat/trunk/modules/jdbc-pool</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/tomcat/trunk/modules/jdbc-pool</developerConnection>
+ <url>http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool</url>
+ </scm>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>juli</artifactId>
+ <version>6.0.32</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>dbcp</artifactId>
+ <version>6.0.32</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <version>1.3.152</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ <optimize>true</optimize>
+ <debug>true</debug>
+ <showDeprecation>true</showDeprecation>
+ <showWarnings>true</showWarnings>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>1.2</version>
+ <executions>
+ <execution>
+ <id>sign-artifacts</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <version>2.5.1</version>
+ <configuration>
+ <downloadSources>true</downloadSources>
+ <downloadJavadocs>false</downloadJavadocs>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
