Author: fhanik
Date: Thu Jul 7 21:40:05 2011
New Revision: 1144061
URL: http://svn.apache.org/viewvc?rev=1144061&view=rev
Log:
Include jdbc-pool into tomcat release.
Added:
tomcat/trunk/res/maven/tomcat-jdbc.pom
Modified:
tomcat/trunk/build.xml
tomcat/trunk/modules/jdbc-pool/build.xml
tomcat/trunk/res/maven/mvn-pub.xml
tomcat/trunk/webapps/docs/project.xml
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1144061&r1=1144060&r2=1144061&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Thu Jul 7 21:40:05 2011
@@ -69,6 +69,8 @@
<property name="test.classes" value="${tomcat.output}/testclasses"/>
<property name="test.temp" value="${tomcat.output}/test-tmp"/>
<property name="test.apr.loc" value="${tomcat.build}/bin/native"/>
+ <!-- base directory for jdbc-pool -->
+ <property name="tomcat.jdbc.dir" value="${basedir}/modules/jdbc-pool"/>
<!-- Servlet 3.0 spec requires 1.6+ -->
<property name="compile.source" value="1.6"/>
@@ -128,7 +130,7 @@
<property name="tomcat-embed-juli-sources.jar"
value="${tomcat.embed.sources}/tomcat-embed-logging-juli-src.jar"/>
<property name="tomcat-embed-dbcp-sources.jar"
value="${tomcat.embed.sources}/tomcat-dbcp-src.jar"/>
- <!-- Extras JARs & source JRAs -->
+ <!-- Extras JARs & source JARs -->
<property name="tomcat-juli-extras.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"/>
@@ -141,6 +143,11 @@
<property name="catalina-jmx-remote-src.jar"
value="${tomcat.extras.sources}/catalina-jmx-remote-src.jar"/>
<property name="tomcat-embed-log4j-src.jar"
value="${tomcat.embed.sources}/tomcat-embed-logging-log4j-src.jar"/>
+ <!-- jdbc-pool JARs & source JARs -->
+ <property name="tomcat-jdbc.jar"
value="${tomcat.jdbc.dir}/output/tomcat-jdbc.jar"/>
+ <property name="tomcat-jdbc-src.jar"
value="${tomcat.jdbc.dir}/output/tomcat-jdbc-src.jar"/>
+
+
<!-- Tests To Run -->
<property name="test.name" value="**/Test*.java"/>
<property name="test.formatter"
value="-Dorg.apache.juli.formatter=java.util.logging.SimpleFormatter"/>
@@ -501,6 +508,8 @@
</copy>
</target>
+
+
<target name="build-manifests" unless="manifests.uptodate"
depends="build-prepare">
@@ -680,6 +689,12 @@
<mkdir dir="${tomcat.build}/webapps/docs/funcspecs" />
<!-- XSL processing -->
+ <copy tofile="webapps/docs/jdbc-pool.xml"
file="${tomcat.jdbc.dir}/doc/jdbc-pool.xml" overwrite="true">
+ <!-- jdbc-pool documentation -->
+ <filterset>
+ <filter token="TOMCAT_PROJECT_DEST" value="project.xml"/>
+ </filterset>
+ </copy>
<xslt basedir="webapps/docs"
destdir="${tomcat.build}/webapps/docs"
extension=".html"
@@ -691,6 +706,8 @@
<param name="build-date" expression="${today}"/>
<param name="year" expression="${year}"/>
</xslt>
+ <!-- remove jdbc-pool documentation -->
+ <delete file="webapps/docs/jdbc-pool.xml"/>
<xslt basedir="webapps/docs/appdev"
destdir="${tomcat.build}/webapps/docs/appdev"
extension=".html"
@@ -840,8 +857,16 @@
failonerror="false"/>
<copy file="${jdt.jar}" todir="${tomcat.build}/lib" />
- </target>
+ <!-- build the jdbc-pool jar and source jar-->
+ <echo message="Building Tomcat JDBC pool libraries"/>
+ <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
inheritall="false" target="clean-and-build">
+ <property name="tomcat.juli.jar" value="${tomcat-juli.jar}"></property>
+ <property name="skip.download" value="set"/>
+ </ant>
+ <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"
overwrite="true"/>
+ </target>
+
<target name="examples-sources" description="Create examples sources"
unless="examples.sources.skip" >
<taskdef name="txt2html"
@@ -1517,7 +1542,6 @@ Apache Tomcat ${version} native binaries
</classpath>
</javadoc>
<javadoc packagenames="org.apache.*"
- sourcepath="${tomcat.dist}/src/java"
destdir="${tomcat.dist}/webapps/docs/api"
version="true"
windowtitle="Apache Tomcat ${version} API Documentation"
@@ -1538,6 +1562,11 @@ Apache Tomcat ${version} native binaries
<link href="http://download.oracle.com/javase/6/docs/api/"/>
<link href="http://commons.apache.org/io/api-release/"/>
<link href="http://download-llnw.oracle.com/javaee/6/api/"/>
+ <sourcepath>
+ <path location="${tomcat.dist}/src/java"/>
+ <!--jdbc-pool src files for javadoc-->
+ <path location="${tomcat.dist}/src/modules/jdbc-pool/src/main/java"/>
+ </sourcepath>
</javadoc>
</target>
@@ -1605,7 +1634,18 @@ Apache Tomcat ${version} native binaries
<exclude name="build.properties"/>
</fileset>
</copy>
-
+ <!--jdbc-pool sources -->
+ <copy todir="${tomcat.dist}/src">
+ <fileset dir="${basedir}" defaultexcludes="true">
+ <include name="modules/jdbc-pool/LICENSE"/>
+ <include name="modules/jdbc-pool/NOTICE"/>
+ <include name="modules/jdbc-pool/src/**"/>
+ <include name="modules/jdbc-pool/build.*"/>
+ <include name="modules/jdbc-pool/doc/**"/>
+ <include name="modules/jdbc-pool/resources/**"/>
+ <include name="modules/jdbc-pool/pom.xml"/>
+ </fileset>
+ </copy>
</target>
<target name="installer" description="Create Windows installer"
@@ -2089,7 +2129,8 @@ Apache Tomcat ${version} native binaries
<!-- Repackaged DBCP -->
<copy file="${tomcat-dbcp-src.jar}" todir="${tomcat.src.jars}" />
-
+ <!-- jdbc-pool JAR File -->
+ <copy file="${tomcat-jdbc-src.jar}" todir="${tomcat.src.jars}" />
</target>
<!-- ========================= Cleaning Targets ==========================
-->
Modified: tomcat/trunk/modules/jdbc-pool/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/build.xml?rev=1144061&r1=1144060&r2=1144061&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/build.xml (original)
+++ tomcat/trunk/modules/jdbc-pool/build.xml Thu Jul 7 21:40:05 2011
@@ -483,9 +483,9 @@
</target>
- <target name="simplebuild" depends="build">
- </target>
-
+ <target name="simplebuild" depends="build"/>
+ <target name="clean-and-build" depends="clean,build"/>
+
<target name="onetest" depends="build,build-test">
<echo>Testing:${test}</echo>
Modified: tomcat/trunk/res/maven/mvn-pub.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/mvn-pub.xml?rev=1144061&r1=1144060&r2=1144061&view=diff
==============================================================================
--- tomcat/trunk/res/maven/mvn-pub.xml (original)
+++ tomcat/trunk/res/maven/mvn-pub.xml Thu Jul 7 21:40:05 2011
@@ -225,6 +225,11 @@
<doMavenDeploy artifactId="tomcat-tribes"
jarFileName="catalina-tribes.jar"
srcJarFileName="catalina-tribes-src.jar"/>
+
+ <doMavenDeploy artifactId="tomcat-jdbc"
+ jarFileName="tomcat-jdbc.jar"
+ srcJarFileName="tomcat-jdbc-src.jar"/>
+
<doMavenDeploy artifactId="tomcat-el-api"
jarFileName="el-api.jar"
Added: tomcat/trunk/res/maven/tomcat-jdbc.pom
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-jdbc.pom?rev=1144061&view=auto
==============================================================================
--- tomcat/trunk/res/maven/tomcat-jdbc.pom (added)
+++ tomcat/trunk/res/maven/tomcat-jdbc.pom Thu Jul 7 21:40:05 2011
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jdbc</artifactId>
+ <version>@MAVEN.DEPLOY.VERSION@</version>
+ <description>Tomcat JDBC Pool Package</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jdbc</artifactId>
+ <version>@MAVEN.DEPLOY.VERSION@</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+</project>
Modified: tomcat/trunk/webapps/docs/project.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/project.xml?rev=1144061&r1=1144060&r2=1144061&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/project.xml (original)
+++ tomcat/trunk/webapps/docs/project.xml Thu Jul 7 21:40:05 2011
@@ -70,6 +70,8 @@
<item name="29) Windows Service" href="windows-service-howto.html"/>
<item name="30) Windows Authentication"
href="windows-auth-howto.html"/>
+ <item name="31) Tomcat's JDBC Pool"
+ href="jdbc-pool.html"/>
</menu>
<menu name="Reference">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
