From 156e781facd5a9519206a127ec69595ac5ce0898 Mon Sep 17 00:00:00 2001
From: fhanik <fhanik@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 30 Mar 2011 21:40:59 +0000
Subject: [PATCH] Add in ability to build with Maven

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1087090 13f79535-47bb-0310-9956-ffa450edef68
---
 modules/jdbc-pool/.classpath                       |   2 +-
 modules/jdbc-pool/build.xml                        |  30 +++---
 modules/jdbc-pool/pom.xml                          | 110 +++++++++++++++++++++
 .../jdbc/naming/GenericNamingResourcesFactory.java |   0
 .../apache/tomcat/jdbc/pool/ConnectionPool.java    |   0
 .../org/apache/tomcat/jdbc/pool/DataSource.java    |   0
 .../apache/tomcat/jdbc/pool/DataSourceFactory.java |   0
 .../apache/tomcat/jdbc/pool/DataSourceProxy.java   |   0
 .../apache/tomcat/jdbc/pool/FairBlockingQueue.java |   0
 .../apache/tomcat/jdbc/pool/JdbcInterceptor.java   |   0
 .../jdbc/pool/MultiLockFairBlockingQueue.java      |   0
 .../apache/tomcat/jdbc/pool/PoolConfiguration.java |   0
 .../apache/tomcat/jdbc/pool/PoolProperties.java    |   0
 .../org/apache/tomcat/jdbc/pool/PoolUtilities.java |   0
 .../apache/tomcat/jdbc/pool/PooledConnection.java  |   0
 .../apache/tomcat/jdbc/pool/ProxyConnection.java   |   0
 .../org/apache/tomcat/jdbc/pool/Validator.java     |   0
 .../org/apache/tomcat/jdbc/pool/XADataSource.java  |   0
 .../AbstractCreateStatementInterceptor.java        |   0
 .../jdbc/pool/interceptor/AbstractQueryReport.java |   0
 .../jdbc/pool/interceptor/ConnectionState.java     |   0
 .../jdbc/pool/interceptor/ResetAbandonedTimer.java |   0
 .../jdbc/pool/interceptor/SlowQueryReport.java     |   0
 .../jdbc/pool/interceptor/SlowQueryReportJmx.java  |   0
 .../pool/interceptor/SlowQueryReportJmxMBean.java  |   0
 .../jdbc/pool/interceptor/StatementCache.java      |   0
 .../interceptor/StatementDecoratorInterceptor.java |   0
 .../jdbc/pool/interceptor/StatementFinalizer.java  |   0
 .../jdbc/pool/interceptor/mbeans-descriptors.xml   |   0
 .../tomcat/jdbc/pool/jmx/ConnectionPool.java       |   0
 .../tomcat/jdbc/pool/jmx/ConnectionPoolMBean.java  |   0
 .../apache/tomcat/jdbc/pool/mbeans-descriptors.xml |   0
 .../jdbc/pool/interceptor/TestInterceptor.java     |   0
 .../tomcat/jdbc/test/AbandonPercentageTest.java    |   0
 .../tomcat/jdbc/test/AlternateUsernameTest.java    |   0
 .../tomcat/jdbc/test/Async0IdleTestBug50477.java   |   0
 .../apache/tomcat/jdbc/test/BorrowWaitTest.java    |   0
 .../org/apache/tomcat/jdbc/test/Bug50571.java      |   0
 .../org/apache/tomcat/jdbc/test/Bug50805.java      |   0
 .../tomcat/jdbc/test/CheckOutThreadTest.java       |   0
 .../apache/tomcat/jdbc/test/ConnectCountTest.java  |   0
 .../apache/tomcat/jdbc/test/CreateTestTable.java   |   0
 .../apache/tomcat/jdbc/test/DefaultProperties.java |   0
 .../apache/tomcat/jdbc/test/DefaultTestCase.java   |   0
 .../org/apache/tomcat/jdbc/test/FairnessTest.java  |   0
 .../apache/tomcat/jdbc/test/JmxPasswordTest.java   |   0
 .../tomcat/jdbc/test/SimplePOJOAsyncExample.java   |   0
 .../apache/tomcat/jdbc/test/SimplePOJOExample.java |   0
 .../apache/tomcat/jdbc/test/StarvationTest.java    |   0
 .../tomcat/jdbc/test/StatementFinalizerTest.java   |   0
 .../apache/tomcat/jdbc/test/TestAsyncQueue.java    |   0
 .../apache/tomcat/jdbc/test/TestConcurrency.java   |   0
 .../tomcat/jdbc/test/TestConnectionState.java      |   0
 .../org/apache/tomcat/jdbc/test/TestException.java |   0
 .../org/apache/tomcat/jdbc/test/TestGCClose.java   |   0
 .../apache/tomcat/jdbc/test/TestGetConnection.java |   0
 .../tomcat/jdbc/test/TestInterceptorShortName.java |   0
 .../tomcat/jdbc/test/TestSizePreservation.java     |   0
 .../tomcat/jdbc/test/TestSlowQueryReport.java      |   0
 .../tomcat/jdbc/test/TestStatementCache.java       |   0
 .../tomcat/jdbc/test/TestSuspectTimeout.java       |   0
 .../org/apache/tomcat/jdbc/test/TestTimeout.java   |   0
 .../apache/tomcat/jdbc/test/TwoDataSources.java    |   0
 .../apache/tomcat/jdbc/test/driver/Connection.java |   0
 .../org/apache/tomcat/jdbc/test/driver/Driver.java |   0
 .../apache/tomcat/jdbc/test/driver/ResultSet.java  |   0
 .../apache/tomcat/jdbc/test/driver/Statement.java  |   0
 67 files changed, 126 insertions(+), 16 deletions(-)
 create mode 100644 modules/jdbc-pool/pom.xml
 rename modules/jdbc-pool/{ => src/main}/java/org/apache/tomcat/jdbc/naming/GenericNamingResourcesFactory.java (100%)
 rename modules/jdbc-pool/{ => src/main}/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java (100%)
 rename modules/jdbc-pool/{ => src/main}/java/org/apache/tomcat/jdbc/pool/DataSource.java (100%)
 rename modules/jdbc-pool/{ => src/main}/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java (100%)
 rename modules/jdbc-pool/{ => src/main}/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java (100%)
 rename modules/jdbc-pool/{ => src/main}/java/org/apache/tomcat/jdbc/pool/FairBlockingQueue.java (100%)
 rename modules/jdbc-pool/{ => src/main}/java/org/apache/tomcat/jdbc/pool/JdbcInterceptor.java (100%)
 rename modules/jdbc-pool/{ => src/main}/java/org/apache/tomcat/jdbc/pool/MultiLockFairBlockingQueue.java (100%)
 rename modules/jdbc-pool/{ => src/main}/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java (100%)
 rename modules/jdbc-pool/{ => src/main}/java/org/apache/tomcat/jdbc/pool/PoolProperties.java (100%)
 rename modules/jdbc-pool/{ => src/main}/java/org/apache/tomcat/jdbc/pool/PoolUtilities.java (100%)
 rename modules/jdbc-pool/{ => src/main}/java/org/apache/tomcat/jdbc/pool/PooledConnection.java (100%)
 rename modules/jdbc-pool/{ => src/main}/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java (100%)
 rename modules/jdbc-pool/{ => src/main}/java/org/apache/tomcat/jdbc/pool/Validator.java (100%)
 rename modules/jdbc-pool/{ => src/main}/java/org/apache/tomcat/jdbc/pool/XADataSource.java (100%)
 rename modules/jdbc-pool/{ => src/main}/java/org/apache/tomcat/jdbc/pool/interceptor/AbstractCreateStatementInterceptor.java (100%)
 rename modules/jdbc-pool/{ => src/main}/java/org/apache/tomcat/jdbc/pool/interceptor/AbstractQueryReport.java (100%)
 rename modules/jdbc-pool/{ => src/main}/java/org/apache/tomcat/jdbc/pool/interceptor/ConnectionState.java (100%)
 rename modules/jdbc-pool/{ => src/main}/java/org/apache/tomcat/jdbc/pool/interceptor/ResetAbandonedTimer.java (100%)
 rename modules/jdbc-pool/{ => src/main}/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java (100%)
 rename modules/jdbc-pool/{ => src/main}/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReportJmx.java (100%)
 rename modules/jdbc-pool/{ => src/main}/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReportJmxMBean.java (100%)
 rename modules/jdbc-pool/{ => src/main}/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java (100%)
 rename modules/jdbc-pool/{ => src/main}/java/org/apache/tomcat/jdbc/pool/interceptor/StatementDecoratorInterceptor.java (100%)
 rename modules/jdbc-pool/{ => src/main}/java/org/apache/tomcat/jdbc/pool/interceptor/StatementFinalizer.java (100%)
 rename modules/jdbc-pool/{ => src/main}/java/org/apache/tomcat/jdbc/pool/interceptor/mbeans-descriptors.xml (100%)
 rename modules/jdbc-pool/{ => src/main}/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java (100%)
 rename modules/jdbc-pool/{ => src/main}/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPoolMBean.java (100%)
 rename modules/jdbc-pool/{ => src/main}/java/org/apache/tomcat/jdbc/pool/mbeans-descriptors.xml (100%)
 rename modules/jdbc-pool/{test => src/test/java}/org/apache/tomcat/jdbc/pool/interceptor/TestInterceptor.java (100%)
 rename modules/jdbc-pool/{test => src/test/java}/org/apache/tomcat/jdbc/test/AbandonPercentageTest.java (100%)
 rename modules/jdbc-pool/{test => src/test/java}/org/apache/tomcat/jdbc/test/AlternateUsernameTest.java (100%)
 rename modules/jdbc-pool/{test => src/test/java}/org/apache/tomcat/jdbc/test/Async0IdleTestBug50477.java (100%)
 rename modules/jdbc-pool/{test => src/test/java}/org/apache/tomcat/jdbc/test/BorrowWaitTest.java (100%)
 rename modules/jdbc-pool/{test => src/test/java}/org/apache/tomcat/jdbc/test/Bug50571.java (100%)
 rename modules/jdbc-pool/{test => src/test/java}/org/apache/tomcat/jdbc/test/Bug50805.java (100%)
 rename modules/jdbc-pool/{test => src/test/java}/org/apache/tomcat/jdbc/test/CheckOutThreadTest.java (100%)
 rename modules/jdbc-pool/{test => src/test/java}/org/apache/tomcat/jdbc/test/ConnectCountTest.java (100%)
 rename modules/jdbc-pool/{test => src/test/java}/org/apache/tomcat/jdbc/test/CreateTestTable.java (100%)
 rename modules/jdbc-pool/{test => src/test/java}/org/apache/tomcat/jdbc/test/DefaultProperties.java (100%)
 rename modules/jdbc-pool/{test => src/test/java}/org/apache/tomcat/jdbc/test/DefaultTestCase.java (100%)
 rename modules/jdbc-pool/{test => src/test/java}/org/apache/tomcat/jdbc/test/FairnessTest.java (100%)
 rename modules/jdbc-pool/{test => src/test/java}/org/apache/tomcat/jdbc/test/JmxPasswordTest.java (100%)
 rename modules/jdbc-pool/{test => src/test/java}/org/apache/tomcat/jdbc/test/SimplePOJOAsyncExample.java (100%)
 rename modules/jdbc-pool/{test => src/test/java}/org/apache/tomcat/jdbc/test/SimplePOJOExample.java (100%)
 rename modules/jdbc-pool/{test => src/test/java}/org/apache/tomcat/jdbc/test/StarvationTest.java (100%)
 rename modules/jdbc-pool/{test => src/test/java}/org/apache/tomcat/jdbc/test/StatementFinalizerTest.java (100%)
 rename modules/jdbc-pool/{test => src/test/java}/org/apache/tomcat/jdbc/test/TestAsyncQueue.java (100%)
 rename modules/jdbc-pool/{test => src/test/java}/org/apache/tomcat/jdbc/test/TestConcurrency.java (100%)
 rename modules/jdbc-pool/{test => src/test/java}/org/apache/tomcat/jdbc/test/TestConnectionState.java (100%)
 rename modules/jdbc-pool/{test => src/test/java}/org/apache/tomcat/jdbc/test/TestException.java (100%)
 rename modules/jdbc-pool/{test => src/test/java}/org/apache/tomcat/jdbc/test/TestGCClose.java (100%)
 rename modules/jdbc-pool/{test => src/test/java}/org/apache/tomcat/jdbc/test/TestGetConnection.java (100%)
 rename modules/jdbc-pool/{test => src/test/java}/org/apache/tomcat/jdbc/test/TestInterceptorShortName.java (100%)
 rename modules/jdbc-pool/{test => src/test/java}/org/apache/tomcat/jdbc/test/TestSizePreservation.java (100%)
 rename modules/jdbc-pool/{test => src/test/java}/org/apache/tomcat/jdbc/test/TestSlowQueryReport.java (100%)
 rename modules/jdbc-pool/{test => src/test/java}/org/apache/tomcat/jdbc/test/TestStatementCache.java (100%)
 rename modules/jdbc-pool/{test => src/test/java}/org/apache/tomcat/jdbc/test/TestSuspectTimeout.java (100%)
 rename modules/jdbc-pool/{test => src/test/java}/org/apache/tomcat/jdbc/test/TestTimeout.java (100%)
 rename modules/jdbc-pool/{test => src/test/java}/org/apache/tomcat/jdbc/test/TwoDataSources.java (100%)
 rename modules/jdbc-pool/{test => src/test/java}/org/apache/tomcat/jdbc/test/driver/Connection.java (100%)
 rename modules/jdbc-pool/{test => src/test/java}/org/apache/tomcat/jdbc/test/driver/Driver.java (100%)
 rename modules/jdbc-pool/{test => src/test/java}/org/apache/tomcat/jdbc/test/driver/ResultSet.java (100%)
 rename modules/jdbc-pool/{test => src/test/java}/org/apache/tomcat/jdbc/test/driver/Statement.java (100%)

diff --git a/modules/jdbc-pool/.classpath b/modules/jdbc-pool/.classpath
index 180fbc72d..1a23a7e18 100644
--- a/modules/jdbc-pool/.classpath
+++ b/modules/jdbc-pool/.classpath
@@ -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>
diff --git a/modules/jdbc-pool/build.xml b/modules/jdbc-pool/build.xml
index 389b91092..6cd65f2c3 100644
--- a/modules/jdbc-pool/build.xml
+++ b/modules/jdbc-pool/build.xml
@@ -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*"/>
diff --git a/modules/jdbc-pool/pom.xml b/modules/jdbc-pool/pom.xml
new file mode 100644
index 000000000..1cc288907
--- /dev/null
+++ b/modules/jdbc-pool/pom.xml
@@ -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>dev-subscribe@tomcat.apache.org</subscribe>
+      <unsubscribe>dev-unsubscribe@tomcat.apache.org</unsubscribe>
+      <post>dev@tomcat.apache.org</post>
+    </mailingList>
+    <mailingList>
+      <name>Users List</name>
+      <subscribe>users-subscribe@tomcat.apache.org</subscribe>
+      <unsubscribe>users-unsubscribe@tomcat.apache.org</unsubscribe>
+      <post>users@tomcat.apache.org</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>
diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/naming/GenericNamingResourcesFactory.java b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/naming/GenericNamingResourcesFactory.java
similarity index 100%
rename from modules/jdbc-pool/java/org/apache/tomcat/jdbc/naming/GenericNamingResourcesFactory.java
rename to modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/naming/GenericNamingResourcesFactory.java
diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
similarity index 100%
rename from modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
rename to modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSource.java b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSource.java
similarity index 100%
rename from modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSource.java
rename to modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSource.java
diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
similarity index 100%
rename from modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
rename to modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
similarity index 100%
rename from modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
rename to modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/FairBlockingQueue.java b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/FairBlockingQueue.java
similarity index 100%
rename from modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/FairBlockingQueue.java
rename to modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/FairBlockingQueue.java
diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/JdbcInterceptor.java b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/JdbcInterceptor.java
similarity index 100%
rename from modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/JdbcInterceptor.java
rename to modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/JdbcInterceptor.java
diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/MultiLockFairBlockingQueue.java b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/MultiLockFairBlockingQueue.java
similarity index 100%
rename from modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/MultiLockFairBlockingQueue.java
rename to modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/MultiLockFairBlockingQueue.java
diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java
similarity index 100%
rename from modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java
rename to modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolConfiguration.java
diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
similarity index 100%
rename from modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
rename to modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolUtilities.java b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolUtilities.java
similarity index 100%
rename from modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolUtilities.java
rename to modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolUtilities.java
diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
similarity index 100%
rename from modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
rename to modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java
similarity index 100%
rename from modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java
rename to modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java
diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/Validator.java b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/Validator.java
similarity index 100%
rename from modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/Validator.java
rename to modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/Validator.java
diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/XADataSource.java b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/XADataSource.java
similarity index 100%
rename from modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/XADataSource.java
rename to modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/XADataSource.java
diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/AbstractCreateStatementInterceptor.java b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/AbstractCreateStatementInterceptor.java
similarity index 100%
rename from modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/AbstractCreateStatementInterceptor.java
rename to modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/AbstractCreateStatementInterceptor.java
diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/AbstractQueryReport.java b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/AbstractQueryReport.java
similarity index 100%
rename from modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/AbstractQueryReport.java
rename to modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/AbstractQueryReport.java
diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/ConnectionState.java b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/ConnectionState.java
similarity index 100%
rename from modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/ConnectionState.java
rename to modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/ConnectionState.java
diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/ResetAbandonedTimer.java b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/ResetAbandonedTimer.java
similarity index 100%
rename from modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/ResetAbandonedTimer.java
rename to modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/ResetAbandonedTimer.java
diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
similarity index 100%
rename from modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
rename to modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReportJmx.java b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReportJmx.java
similarity index 100%
rename from modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReportJmx.java
rename to modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReportJmx.java
diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReportJmxMBean.java b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReportJmxMBean.java
similarity index 100%
rename from modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReportJmxMBean.java
rename to modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReportJmxMBean.java
diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java
similarity index 100%
rename from modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java
rename to modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java
diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/StatementDecoratorInterceptor.java b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementDecoratorInterceptor.java
similarity index 100%
rename from modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/StatementDecoratorInterceptor.java
rename to modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementDecoratorInterceptor.java
diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/StatementFinalizer.java b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementFinalizer.java
similarity index 100%
rename from modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/StatementFinalizer.java
rename to modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementFinalizer.java
diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/mbeans-descriptors.xml b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/mbeans-descriptors.xml
similarity index 100%
rename from modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/mbeans-descriptors.xml
rename to modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/mbeans-descriptors.xml
diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
similarity index 100%
rename from modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
rename to modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPoolMBean.java b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPoolMBean.java
similarity index 100%
rename from modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPoolMBean.java
rename to modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPoolMBean.java
diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/mbeans-descriptors.xml b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/mbeans-descriptors.xml
similarity index 100%
rename from modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/mbeans-descriptors.xml
rename to modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/mbeans-descriptors.xml
diff --git a/modules/jdbc-pool/test/org/apache/tomcat/jdbc/pool/interceptor/TestInterceptor.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestInterceptor.java
similarity index 100%
rename from modules/jdbc-pool/test/org/apache/tomcat/jdbc/pool/interceptor/TestInterceptor.java
rename to modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/interceptor/TestInterceptor.java
diff --git a/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/AbandonPercentageTest.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/AbandonPercentageTest.java
similarity index 100%
rename from modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/AbandonPercentageTest.java
rename to modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/AbandonPercentageTest.java
diff --git a/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/AlternateUsernameTest.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/AlternateUsernameTest.java
similarity index 100%
rename from modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/AlternateUsernameTest.java
rename to modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/AlternateUsernameTest.java
diff --git a/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/Async0IdleTestBug50477.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/Async0IdleTestBug50477.java
similarity index 100%
rename from modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/Async0IdleTestBug50477.java
rename to modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/Async0IdleTestBug50477.java
diff --git a/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/BorrowWaitTest.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/BorrowWaitTest.java
similarity index 100%
rename from modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/BorrowWaitTest.java
rename to modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/BorrowWaitTest.java
diff --git a/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/Bug50571.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/Bug50571.java
similarity index 100%
rename from modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/Bug50571.java
rename to modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/Bug50571.java
diff --git a/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/Bug50805.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/Bug50805.java
similarity index 100%
rename from modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/Bug50805.java
rename to modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/Bug50805.java
diff --git a/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/CheckOutThreadTest.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/CheckOutThreadTest.java
similarity index 100%
rename from modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/CheckOutThreadTest.java
rename to modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/CheckOutThreadTest.java
diff --git a/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/ConnectCountTest.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/ConnectCountTest.java
similarity index 100%
rename from modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/ConnectCountTest.java
rename to modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/ConnectCountTest.java
diff --git a/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/CreateTestTable.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/CreateTestTable.java
similarity index 100%
rename from modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/CreateTestTable.java
rename to modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/CreateTestTable.java
diff --git a/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/DefaultProperties.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/DefaultProperties.java
similarity index 100%
rename from modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/DefaultProperties.java
rename to modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/DefaultProperties.java
diff --git a/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/DefaultTestCase.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/DefaultTestCase.java
similarity index 100%
rename from modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/DefaultTestCase.java
rename to modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/DefaultTestCase.java
diff --git a/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/FairnessTest.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/FairnessTest.java
similarity index 100%
rename from modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/FairnessTest.java
rename to modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/FairnessTest.java
diff --git a/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/JmxPasswordTest.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/JmxPasswordTest.java
similarity index 100%
rename from modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/JmxPasswordTest.java
rename to modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/JmxPasswordTest.java
diff --git a/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/SimplePOJOAsyncExample.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/SimplePOJOAsyncExample.java
similarity index 100%
rename from modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/SimplePOJOAsyncExample.java
rename to modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/SimplePOJOAsyncExample.java
diff --git a/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/SimplePOJOExample.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/SimplePOJOExample.java
similarity index 100%
rename from modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/SimplePOJOExample.java
rename to modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/SimplePOJOExample.java
diff --git a/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/StarvationTest.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/StarvationTest.java
similarity index 100%
rename from modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/StarvationTest.java
rename to modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/StarvationTest.java
diff --git a/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/StatementFinalizerTest.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/StatementFinalizerTest.java
similarity index 100%
rename from modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/StatementFinalizerTest.java
rename to modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/StatementFinalizerTest.java
diff --git a/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestAsyncQueue.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestAsyncQueue.java
similarity index 100%
rename from modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestAsyncQueue.java
rename to modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestAsyncQueue.java
diff --git a/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestConcurrency.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestConcurrency.java
similarity index 100%
rename from modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestConcurrency.java
rename to modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestConcurrency.java
diff --git a/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestConnectionState.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestConnectionState.java
similarity index 100%
rename from modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestConnectionState.java
rename to modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestConnectionState.java
diff --git a/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestException.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestException.java
similarity index 100%
rename from modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestException.java
rename to modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestException.java
diff --git a/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestGCClose.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestGCClose.java
similarity index 100%
rename from modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestGCClose.java
rename to modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestGCClose.java
diff --git a/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestGetConnection.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestGetConnection.java
similarity index 100%
rename from modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestGetConnection.java
rename to modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestGetConnection.java
diff --git a/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestInterceptorShortName.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestInterceptorShortName.java
similarity index 100%
rename from modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestInterceptorShortName.java
rename to modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestInterceptorShortName.java
diff --git a/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestSizePreservation.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSizePreservation.java
similarity index 100%
rename from modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestSizePreservation.java
rename to modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSizePreservation.java
diff --git a/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestSlowQueryReport.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryReport.java
similarity index 100%
rename from modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestSlowQueryReport.java
rename to modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryReport.java
diff --git a/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestStatementCache.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestStatementCache.java
similarity index 100%
rename from modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestStatementCache.java
rename to modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestStatementCache.java
diff --git a/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestSuspectTimeout.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSuspectTimeout.java
similarity index 100%
rename from modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestSuspectTimeout.java
rename to modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSuspectTimeout.java
diff --git a/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestTimeout.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestTimeout.java
similarity index 100%
rename from modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestTimeout.java
rename to modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestTimeout.java
diff --git a/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TwoDataSources.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TwoDataSources.java
similarity index 100%
rename from modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TwoDataSources.java
rename to modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TwoDataSources.java
diff --git a/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/driver/Connection.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/Connection.java
similarity index 100%
rename from modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/driver/Connection.java
rename to modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/Connection.java
diff --git a/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/driver/Driver.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/Driver.java
similarity index 100%
rename from modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/driver/Driver.java
rename to modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/Driver.java
diff --git a/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/driver/ResultSet.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/ResultSet.java
similarity index 100%
rename from modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/driver/ResultSet.java
rename to modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/ResultSet.java
diff --git a/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/driver/Statement.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/Statement.java
similarity index 100%
rename from modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/driver/Statement.java
rename to modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/Statement.java
-- 
2.11.0