From 1f5c7240671ba042ec5c00242575cdefcae76d49 Mon Sep 17 00:00:00 2001
From: fhanik <fhanik@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 25 Oct 2008 00:06:20 +0000
Subject: [PATCH] move over to an independent module

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@707794 13f79535-47bb-0310-9956-ffa450edef68
---
 extras.xml                                         |  27 ----
 modules/jdbc-pool/build.xml                        | 170 +++++++++++++++++++++
 .../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
 .../java}/org/apache/tomcat/jdbc/pool/Driver.java  |   0
 .../apache/tomcat/jdbc/pool/JdbcInterceptor.java   |   0
 .../apache/tomcat/jdbc/pool/PoolProperties.java    |   0
 .../apache/tomcat/jdbc/pool/PooledConnection.java  |   0
 .../apache/tomcat/jdbc/pool/ProxyConnection.java   |   0
 .../jdbc/pool/interceptor/ConnectionState.java     |   0
 .../jdbc/pool/interceptor/SlowQueryReport.java     |   0
 .../tomcat/jdbc/pool/jmx/ConnectionPool.java       |   0
 .../tomcat/jdbc/pool/jmx/ConnectionPoolMBean.java  |   0
 .../tomcat/jdbc/test/CheckOutThreadTest.java       |   0
 .../apache/tomcat/jdbc/test/DefaultProperties.java |   0
 .../apache/tomcat/jdbc/test/DefaultTestCase.java   |   0
 .../org/apache/tomcat/jdbc/test/TestGCClose.java   |   0
 .../org/apache/tomcat/jdbc/test/TestTimeout.java   |   0
 20 files changed, 170 insertions(+), 27 deletions(-)
 create mode 100644 modules/jdbc-pool/build.xml
 rename {java => modules/jdbc-pool/java}/org/apache/tomcat/jdbc/pool/ConnectionPool.java (100%)
 rename {java => modules/jdbc-pool/java}/org/apache/tomcat/jdbc/pool/DataSource.java (100%)
 rename {java => modules/jdbc-pool/java}/org/apache/tomcat/jdbc/pool/DataSourceFactory.java (100%)
 rename {java => modules/jdbc-pool/java}/org/apache/tomcat/jdbc/pool/DataSourceProxy.java (100%)
 rename {java => modules/jdbc-pool/java}/org/apache/tomcat/jdbc/pool/Driver.java (100%)
 rename {java => modules/jdbc-pool/java}/org/apache/tomcat/jdbc/pool/JdbcInterceptor.java (100%)
 rename {java => modules/jdbc-pool/java}/org/apache/tomcat/jdbc/pool/PoolProperties.java (100%)
 rename {java => modules/jdbc-pool/java}/org/apache/tomcat/jdbc/pool/PooledConnection.java (100%)
 rename {java => modules/jdbc-pool/java}/org/apache/tomcat/jdbc/pool/ProxyConnection.java (100%)
 rename {java => modules/jdbc-pool/java}/org/apache/tomcat/jdbc/pool/interceptor/ConnectionState.java (100%)
 rename {java => modules/jdbc-pool/java}/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java (100%)
 rename {java => modules/jdbc-pool/java}/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java (100%)
 rename {java => modules/jdbc-pool/java}/org/apache/tomcat/jdbc/pool/jmx/ConnectionPoolMBean.java (100%)
 rename {test => modules/jdbc-pool/test}/org/apache/tomcat/jdbc/test/CheckOutThreadTest.java (100%)
 rename {test => modules/jdbc-pool/test}/org/apache/tomcat/jdbc/test/DefaultProperties.java (100%)
 rename {test => modules/jdbc-pool/test}/org/apache/tomcat/jdbc/test/DefaultTestCase.java (100%)
 rename {test => modules/jdbc-pool/test}/org/apache/tomcat/jdbc/test/TestGCClose.java (100%)
 rename {test => modules/jdbc-pool/test}/org/apache/tomcat/jdbc/test/TestTimeout.java (100%)

diff --git a/extras.xml b/extras.xml
index be34de17a..12a0ae1fa 100644
--- a/extras.xml
+++ b/extras.xml
@@ -82,8 +82,6 @@
   <property name="cometd.war" value="${tomcat.extras}/cometd.war"/>
   <property name="tomcat-bayeux-samples.jar" value="${tomcat.extras}/tomcat-bayeux-samples.jar"/>
 
-  <property name="tomcat-jdbc.jar" value="${tomcat.extras}/tomcat-jdbc.jar"/>
-
   <property name="catalina-jmx-remote.jar" value="${tomcat.extras}/catalina-jmx-remote.jar"/>
 	
   <!-- Classpath -->
@@ -333,31 +331,6 @@ To run the sample application, copy the following applications into your CATALIN
     </echo>
   </target>
 
-  <target name="conpool">
-    <mkdir dir="${tomcat.extras}"/>
-    <path id="tomcat.jdbc.classpath">
-      <pathelement path="${tomcat.classpath}"/>
-    </path>
-
-    <!-- compile org.apache.tomcat.jdbc-->
-    <javac srcdir="java" destdir="${tomcat.classes}"
-           debug="${compile.debug}"
-           deprecation="${compile.deprecation}"
-           source="${compile.source}"
-           optimize="${compile.optimize}">
-      <classpath refid="tomcat.jdbc.classpath"/>
-      <include name="org/apache/tomcat/jdbc/**" />
-    </javac>
-    
-    <!-- Cometd API JAR File -->
-    <jar jarfile="${tomcat-jdbc.jar}">
-      <fileset dir="${tomcat.classes}">
-        <include name="org/apache/tomcat/jdbc/**" />
-      </fileset>
-    </jar>
-    <!-- create checksums -->
-    <checksum file="${tomcat-jdbc.jar}" forceOverwrite="yes" fileext=".md5" />
-  </target>
 
 
   <target name="jmx-remote" >
diff --git a/modules/jdbc-pool/build.xml b/modules/jdbc-pool/build.xml
new file mode 100644
index 000000000..917cb84bc
--- /dev/null
+++ b/modules/jdbc-pool/build.xml
@@ -0,0 +1,170 @@
+<?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 name="Tomcat Trunk" default="conpool" basedir="../..">
+
+
+  <!-- ===================== Initialize Property Values =================== -->
+
+  <!-- See "build.properties.sample" in the top level directory for all     -->
+  <!-- property values you must customize for successful building!!!        -->
+  <property file="${user.home}/build.properties"/>
+  <property file="${basedir}/build.properties"/>
+
+  <property file="${basedir}/build.properties.default"/>
+
+  <!-- Project Properties -->
+  <property name="name"                  value="Apache Tomcat" />
+  <property name="year"                  value="2007" />
+  <property name="version.major"         value="6" />
+  <property name="version.minor"         value="0" />
+  <property name="version.build"         value="0" />
+  <property name="version.patch"         value="0" />
+  <property name="version"               value="6.0.0-dev" />
+  <property name="version.number"        value="${version.major}.${version.minor}.${version.build}.${version.patch}" />
+
+  <property name="project"               value="apache-tomcat" />
+  <property name="final.name"            value="${project}-${version}" />
+  <property name="final-src.name"        value="${project}-${version}-src" />
+
+  <!-- Build Defaults -->
+  <property name="tomcat.build"      value="${basedir}/output/build"/>
+  <property name="tomcat.classes"    value="${basedir}/output/classes"/>
+  <property name="tomcat.dist"       value="${basedir}/output/dist"/>
+  <property name="tomcat.extras"     value="${basedir}/output/extras"/>
+  <property name="tomcat.deployer"   value="${basedir}/output/deployer"/>
+  <property name="tomcat.release"    value="${basedir}/output/release"/>
+  <property name="test.failonerror"  value="true"/>
+  <property name="test.runner"       value="junit.textui.TestRunner"/>
+
+  <!-- Can't be lower - jsp uses templates -->
+  <property name="compile.source" value="1.5"/>
+
+  <!-- JAR artifacts -->
+  <property name="bootstrap.jar" value="${tomcat.build}/bin/bootstrap.jar"/>
+
+  <property name="annotations-api.jar" value="${tomcat.build}/lib/annotations-api.jar"/>
+  <property name="servlet-api.jar" value="${tomcat.build}/lib/servlet-api.jar"/>
+  <property name="jsp-api.jar" value="${tomcat.build}/lib/jsp-api.jar"/>
+  <property name="el-api.jar" value="${tomcat.build}/lib/el-api.jar"/>
+  <property name="catalina.jar" value="${tomcat.build}/lib/catalina.jar"/>
+  <property name="catalina-ant.jar" value="${tomcat.build}/lib/catalina-ant.jar"/>
+  <property name="tomcat-coyote.jar" value="${tomcat.build}/lib/tomcat-coyote.jar"/>
+
+  <property name="jasper.jar" value="${tomcat.build}/lib/jasper.jar"/>
+  <property name="jasper-el.jar" value="${tomcat.build}/lib/jasper-el.jar"/>
+
+  <property name="tomcat-dbcp.home" value="${base.path}/tomcat6-deps/dbcp" />
+  <property name="jasper-jdt.home" value="${base.path}/tomcat6-deps/jdt" />
+  <property name="tomcat-dbcp.jar" value="${tomcat-dbcp.home}/tomcat-dbcp.jar"/>
+  <property name="jasper-jdt.jar" value="${jasper-jdt.home}/jasper-jdt.jar"/>
+
+  <property name="tomcat-juli.jar" value="${tomcat.extras}/tomcat-juli.jar"/>
+  <property name="tomcat-juli-adapters.jar" value="${tomcat.extras}/tomcat-juli-adapters.jar"/>
+  <property name="catalina-ws.jar" value="${tomcat.extras}/catalina-ws.jar"/>
+
+  <property name="cometd-api.jar" value="${tomcat.extras}/cometd-api.jar"/>
+  <property name="tomcat-bayeux.jar" value="${tomcat.extras}/tomcat-bayeux.jar"/>
+  <property name="cometd.war" value="${tomcat.extras}/cometd.war"/>
+  <property name="tomcat-bayeux-samples.jar" value="${tomcat.extras}/tomcat-bayeux-samples.jar"/>
+
+  <property name="tomcat-jdbc.jar" value="${tomcat.extras}/tomcat-jdbc.jar"/>
+
+  <property name="catalina-jmx-remote.jar" value="${tomcat.extras}/catalina-jmx-remote.jar"/>
+	
+  <!-- Classpath -->
+  <path id="tomcat.classpath">
+    <pathelement location="${tomcat.classes}"/>
+  </path>
+
+  <target name="prepare">
+    <mkdir dir="${tomcat.extras}"/>
+  </target>
+
+  <target name="conpool">
+    <mkdir dir="${tomcat.extras}"/>
+    <path id="tomcat.jdbc.classpath">
+      <pathelement path="${tomcat.classpath}"/>
+    </path>
+
+    <!-- compile org.apache.tomcat.jdbc-->
+    <javac srcdir="${basedir}/modules/jdbc-pool/java" destdir="${tomcat.classes}"
+           debug="${compile.debug}"
+           deprecation="${compile.deprecation}"
+           source="${compile.source}"
+           optimize="${compile.optimize}">
+      <classpath refid="tomcat.jdbc.classpath"/>
+      <include name="org/apache/tomcat/jdbc/**" />
+    </javac>
+    
+    <!-- connection pool JAR File -->
+    <jar jarfile="${tomcat-jdbc.jar}">
+      <fileset dir="${tomcat.classes}">
+        <include name="org/apache/tomcat/jdbc/**" />
+      </fileset>
+    </jar>
+    <!-- create checksums -->
+    <checksum file="${tomcat-jdbc.jar}" forceOverwrite="yes" fileext=".md5" />
+  </target>
+
+  <target name="clean"> 
+      <delete file="${tomcat-jdbc.jar}"/>
+      <delete file="${tomcat-jdbc.jar}.md5"/>
+      <delete includeemptydirs="true">
+          <fileset dir="${tomcat.classes}">
+            <include name="org/apache/tomcat/jdbc/**"/>
+          </fileset>
+      </delete>
+  </target>
+	
+  <!-- Download and dependency building -->
+  <target name="proxyflags">
+    <!-- check proxy parameters. -->
+    <condition property="useproxy">
+      <equals arg1="${proxy.use}" arg2="on" />
+    </condition>
+  </target>
+
+  <target name="setproxy" depends="proxyflags" if="useproxy">
+    <taskdef name="setproxy"
+            classname="org.apache.tools.ant.taskdefs.optional.net.SetProxy" />
+    <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
+              proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
+    <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
+  </target>
+
+  <target name="testexist">
+    <echo message="Testing  for ${destfile}"/>
+    <available file="${destfile}" property="exist"/>
+  </target>
+
+  <target name="downloadfile" unless="exist" depends="setproxy,testexist">
+    <!-- Download extract the file -->
+    <mkdir dir="${destdir}" />
+    <get src="${sourcefile}" dest="${destfile}" />
+  </target>
+	
+  <target name="downloadgz" unless="exist" depends="setproxy,testexist">
+    <!-- Download and extract the package -->
+    <get src="${sourcefile}" dest="${base.path}/file.tar.gz" />
+    <gunzip src="${base.path}/file.tar.gz" dest="${base.path}/file.tar"/>
+    <untar src="${base.path}/file.tar" dest="${base.path}"/>
+    <delete file="${base.path}/file.tar"/>
+    <delete file="${base.path}/file.tar.gz"/>
+  </target>
+
+</project>
diff --git a/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
similarity index 100%
rename from java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
rename to modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
diff --git a/java/org/apache/tomcat/jdbc/pool/DataSource.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSource.java
similarity index 100%
rename from java/org/apache/tomcat/jdbc/pool/DataSource.java
rename to modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSource.java
diff --git a/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
similarity index 100%
rename from java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
rename to modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
diff --git a/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
similarity index 100%
rename from java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
rename to modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
diff --git a/java/org/apache/tomcat/jdbc/pool/Driver.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/Driver.java
similarity index 100%
rename from java/org/apache/tomcat/jdbc/pool/Driver.java
rename to modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/Driver.java
diff --git a/java/org/apache/tomcat/jdbc/pool/JdbcInterceptor.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/JdbcInterceptor.java
similarity index 100%
rename from java/org/apache/tomcat/jdbc/pool/JdbcInterceptor.java
rename to modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/JdbcInterceptor.java
diff --git a/java/org/apache/tomcat/jdbc/pool/PoolProperties.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
similarity index 100%
rename from java/org/apache/tomcat/jdbc/pool/PoolProperties.java
rename to modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
diff --git a/java/org/apache/tomcat/jdbc/pool/PooledConnection.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
similarity index 100%
rename from java/org/apache/tomcat/jdbc/pool/PooledConnection.java
rename to modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
diff --git a/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java
similarity index 100%
rename from java/org/apache/tomcat/jdbc/pool/ProxyConnection.java
rename to modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java
diff --git a/java/org/apache/tomcat/jdbc/pool/interceptor/ConnectionState.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/ConnectionState.java
similarity index 100%
rename from java/org/apache/tomcat/jdbc/pool/interceptor/ConnectionState.java
rename to modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/ConnectionState.java
diff --git a/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
similarity index 100%
rename from java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
rename to modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
diff --git a/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
similarity index 100%
rename from java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
rename to modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
diff --git a/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPoolMBean.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPoolMBean.java
similarity index 100%
rename from java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPoolMBean.java
rename to modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPoolMBean.java
diff --git a/test/org/apache/tomcat/jdbc/test/CheckOutThreadTest.java b/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/CheckOutThreadTest.java
similarity index 100%
rename from test/org/apache/tomcat/jdbc/test/CheckOutThreadTest.java
rename to modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/CheckOutThreadTest.java
diff --git a/test/org/apache/tomcat/jdbc/test/DefaultProperties.java b/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/DefaultProperties.java
similarity index 100%
rename from test/org/apache/tomcat/jdbc/test/DefaultProperties.java
rename to modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/DefaultProperties.java
diff --git a/test/org/apache/tomcat/jdbc/test/DefaultTestCase.java b/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/DefaultTestCase.java
similarity index 100%
rename from test/org/apache/tomcat/jdbc/test/DefaultTestCase.java
rename to modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/DefaultTestCase.java
diff --git a/test/org/apache/tomcat/jdbc/test/TestGCClose.java b/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestGCClose.java
similarity index 100%
rename from test/org/apache/tomcat/jdbc/test/TestGCClose.java
rename to modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestGCClose.java
diff --git a/test/org/apache/tomcat/jdbc/test/TestTimeout.java b/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestTimeout.java
similarity index 100%
rename from test/org/apache/tomcat/jdbc/test/TestTimeout.java
rename to modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestTimeout.java
-- 
2.11.0