Author: fhanik
Date: Mon Jun 22 20:29:20 2009
New Revision: 787385
URL: http://svn.apache.org/viewvc?rev=787385&view=rev
Log:
Refactor to be more independent, so that one can build from source archive
without too many hooplas as suggested by sebb
Added:
tomcat/trunk/modules/jdbc-pool/build.properties.default
Modified:
tomcat/trunk/modules/jdbc-pool/.classpath
tomcat/trunk/modules/jdbc-pool/build.xml
tomcat/trunk/modules/jdbc-pool/doc/changelog.xml
tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml
tomcat/trunk/modules/jdbc-pool/sign.sh
Modified: tomcat/trunk/modules/jdbc-pool/.classpath
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/.classpath?rev=787385&r1=787384&r2=787385&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/.classpath (original)
+++ tomcat/trunk/modules/jdbc-pool/.classpath Mon Jun 22 20:29:20 2009
@@ -5,8 +5,8 @@
<classpathentry combineaccessrules="false" kind="src"
path="/tomcat-trunk"/>
<classpathentry kind="con"
path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
<classpathentry kind="var"
path="TOMCAT_LIBS_BASE/tomcat6-deps/dbcp/tomcat-dbcp.jar"
sourcepath="/TOMCAT_LIBS_BASE/tomcat6-deps/dbcp/src/java"/>
- <classpathentry kind="lib" path="mysql-connector-java-5.1.6-bin.jar"/>
<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="c3p0-0.9.1.2.jar"
sourcepath="c3p0-0.9.1.2.src.jar"/>
+ <classpathentry kind="lib"
path="includes/c3p0-0.9.1.2/lib/c3p0-0.9.1.2.jar"/>
+ <classpathentry kind="lib"
path="includes/mysql-connector-java-5.1.7/mysql-connector-java-5.1.7-bin.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Added: tomcat/trunk/modules/jdbc-pool/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/build.properties.default?rev=787385&view=auto
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/build.properties.default (added)
+++ tomcat/trunk/modules/jdbc-pool/build.properties.default Mon Jun 22 20:29:20
2009
@@ -0,0 +1,72 @@
+# -----------------------------------------------------------------------------
+# 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.
+# -----------------------------------------------------------------------------
+# build.properties.sample
+#
+# This is an example "build.properties" file, used to customize building
+# Tomcat JDBC Pool for your local environment. It defines the location of all
external
+# modules that Tomcat JDBC Pool depends on. Copy this file to
"build.properties"
+# in the top-level source directory, and customize it as needed.
+#
+# $Id: build.properties.default 786496 2009-06-19 13:11:00Z markt $
+# -----------------------------------------------------------------------------
+
+# ----- Vesion Control Flags -----
+version.major=1
+version.minor=0
+version.build=5
+version.patch=
+version.suffix=
+
+# ----- Default Base Path for Dependent Packages -----
+# Please note this path must be absolute, not relative,
+# as it is referenced with different working directory
+# contexts by the various build scripts.
+base.path=${basedir}/includes
+
+compile.source=1.5
+compile.target=1.5
+compile.debug=true
+
+# ----- JUnit Unit Test Suite, version 3.7 or later -----
+junit.home=${base.path}/junit3.8.2
+junit.lib=${junit.home}
+junit.jar=${junit.lib}/junit.jar
+junit.loc=http://downloads.sourceforge.net/junit/junit3.8.2.zip
+
+c3p0.home=${base.path}/c3p0-0.9.1.2
+c3p0.jar=${c3p0.home}/lib/c3p0-0.9.1.2.jar
+c3p0.loc=http://superb-east.dl.sourceforge.net/sourceforge/c3p0/c3p0-0.9.1.2.bin.zip
+
+mysql.home=${base.path}/mysql-connector-java-5.1.7
+mysql.jar=${mysql.home}/mysql-connector-java-5.1.7-bin.jar
+mysql.loc=http://mysql.mirrors.pair.com/Downloads/Connector-J/mysql-connector-java-5.1.7.zip
+
+dbcp.home=${base.path}/commons-dbcp-1.2
+dbcp.jar=${dbcp.home}/commons-dbcp-1.2.jar
+dbcp.loc=http://archive.apache.org/dist/commons/dbcp/binaries/commons-dbcp-1.2.zip
+
+tomcat.home=${base.path}/apache-tomcat-6.0.20
+tomcat.dbcp.jar=${tomcat.home}/lib/tomcat-dbcp.jar
+tomcat.coyote.jar=${tomcat.home}/lib/tomcat-coyote.jar
+tomcat.juli.jar=${tomcat.home}/bin/tomcat-juli.jar
+tomcat.loc=http://archive.apache.org/dist/tomcat/tomcat-6/v6.0.20/bin/apache-tomcat-6.0.20.zip
+
+tomcat.project.loc=http://svn.apache.org/repos/asf/tomcat/trunk/webapps/docs/project.xml
+tomcat.project.dest=${base.path}/project.xml
+
+tomcat.xsl.loc=http://svn.apache.org/repos/asf/tomcat/trunk/webapps/docs/tomcat-docs.xsl
+tomcat.xsl.dest=${base.path}/tomcat-docs.xsl
\ No newline at end of file
Modified: tomcat/trunk/modules/jdbc-pool/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/build.xml?rev=787385&r1=787384&r2=787385&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/build.xml (original)
+++ tomcat/trunk/modules/jdbc-pool/build.xml Mon Jun 22 20:29:20 2009
@@ -16,23 +16,16 @@
limitations under the License.
-->
<!-- Basedir points at tomcat-trunk directory -->
-<project name="Tomcat JDBC Pool" default="build" basedir="../..">
+<project name="Tomcat JDBC Pool" default="build" basedir=".">
<!-- ===================== Initialize Property Values =================== -->
- <!-- See "build.properties.sample" in the top level directory for all -->
- <property name="version.major" value="1" />
- <property name="version.minor" value="0" />
- <property name="version.build" value="4" />
- <property name="version.patch" value="" />
- <property name="version"
value="${version.major}.${version.minor}.${version.build}${version.patch}" />
<!-- property values you must customize for successful building!!! -->
<property file="${user.home}/build.properties"/>
- <property file="${basedir}/modules/jdbc-pool/build.properties"/>
<property file="${basedir}/build.properties"/>
-
<property file="${basedir}/build.properties.default"/>
+ <property name="version"
value="${version.major}.${version.minor}.${version.build}${version.patch}" />
<!-- Project Properties -->
<property name="name" value="Apache Tomcat JDBC Pool" />
@@ -43,88 +36,118 @@
<property name="final-src.name" value="${project}-${version}-src" />
<!-- Build Defaults -->
- <property name="tomcat.pool" value="${basedir}/modules/jdbc-pool/output"/>
- <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="tomcat-dbcp.home" value="${base.path}/tomcat7-deps/dbcp" />
- <property name="tomcat-dbcp.jar"
value="${tomcat-dbcp.home}/tomcat-dbcp.jar"/>
+ <property name="tomcat.pool" value="${basedir}/./output"/>
+ <property name="tomcat.build" value="${tomcat.pool}/build"/>
+ <property name="tomcat.classes" value="${tomcat.pool}/classes"/>
+ <property name="tomcat.testclasses" value="${tomcat.pool}/testclasses"/>
+
+ <!-- JAR Artifacts -->
<property name="tomcat-jdbc.jar" value="${tomcat.pool}/tomcat-jdbc.jar"/>
<property name="tomcat-jdbc-src.jar"
value="${tomcat.pool}/tomcat-jdbc-src.jar"/>
+ <property name="tomcat-jdbc-test.jar"
value="${tomcat.pool}/tomcat-jdbc-test.jar"/>
+ <property name="tomcat-jdbc-test-src.jar"
value="${tomcat.pool}/tomcat-jdbc-test-src.jar"/>
<!-- Classpath -->
- <path id="tomcat.classpath">
+ <path id="tomcat.jdbc.classpath">
<pathelement location="${tomcat.classes}"/>
+ <pathelement location="${tomcat.coyote.jar}"/>
+ <pathelement location="${tomcat.juli.jar}"/>
</path>
<path id="test.classpath">
<pathelement location="${tomcat-jdbc.jar}"/>
<pathelement location="${tomcat.classes}"/>
- <pathelement location="${basedir}/modules/jdbc-pool/c3p0-0.9.1.2.jar"/>
- <fileset dir="${base.path}">
- <include name="**/tomcat-dbcp.jar"/>
- <include name="**/junit.jar"/>
- <include name="**/mysql-connector-java-5.0.7-bin.jar"/>
- </fileset>
+ <pathelement location="${c3p0.jar}"/>
+ <pathelement location="${mysql.jar}"/>
+ <pathelement location="${dbcp.jar}"/>
+ <pathelement location="${junit.jar}"/>
+ <pathelement location="${tomcat.dbcp.jar}"/>
</path>
-
+
<target name="prepare">
- <mkdir dir="${tomcat.pool}"/>
+ <mkdir dir="${tomcat.build}"/>
+ <mkdir dir="${tomcat.classes}"/>
+ <mkdir dir="${tomcat.testclasses}"/>
+ <property name="project.xml" location="${tomcat.project.dest}"/>
+ <copy todir="${tomcat.pool}">
+ <fileset dir="${basedir}">
+ <include name="LICENSE"/>
+ <include name="NOTICE"/>
+ <include name="build.xml"/>
+ <include name="doc/*.xml"/>
+ </fileset>
+ <filterset>
+ <filter token="tomcat.project.dest" value="${project.xml}"/>
+ </filterset>
+ </copy>
</target>
- <target name="build">
+ <target name="build" depends="prepare">
<mkdir dir="${tomcat.pool}"/>
- <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}"
+ <javac srcdir="${basedir}/java" destdir="${tomcat.classes}"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
- source="1.5"
- target="1.5"
+ source="${compile.source}"
+ target="${compile.target}"
optimize="${compile.optimize}">
<classpath refid="tomcat.jdbc.classpath"/>
<include name="org/apache/tomcat/jdbc/**" />
</javac>
+ <javac srcdir="${basedir}/test" destdir="${tomcat.testclasses}"
+ debug="${compile.debug}"
+ deprecation="${compile.deprecation}"
+ source="${compile.source}"
+ target="${compile.target}"
+ optimize="${compile.optimize}">
+ <classpath refid="tomcat.jdbc.classpath"/>
+ <classpath refid="test.classpath"/>
+ <include name="org/apache/tomcat/jdbc/**" />
+ </javac>
<!-- connection pool JAR File -->
- <jar jarfile="${tomcat-jdbc.jar}">
+ <jar jarfile="${tomcat-jdbc.jar}" update="true">
<fileset dir="${tomcat.classes}">
<include name="org/apache/tomcat/jdbc/**" />
</fileset>
- <fileset dir="${basedir}/modules/jdbc-pool/java">
+ <fileset dir="${basedir}/java">
<include name="org/apache/tomcat/jdbc/**/*.xml" />
</fileset>
</jar>
+ <jar jarfile="${tomcat-jdbc-test.jar}" update="true">
+ <fileset dir="${tomcat.testclasses}">
+ <include name="org/apache/tomcat/jdbc/**" />
+ </fileset>
+ <fileset dir="${basedir}/test">
+ <include name="org/apache/tomcat/jdbc/**/*.xml" />
+ </fileset>
+ </jar>
+
<!-- connection pool source file-->
- <jar jarfile="${tomcat-jdbc-src.jar}">
- <fileset dir="${basedir}/modules/jdbc-pool/java">
+ <jar jarfile="${tomcat-jdbc-src.jar}" update="true">
+ <fileset dir="${basedir}/java">
+ <include name="org/apache/tomcat/jdbc/**" />
+ </fileset>
+ </jar>
+ <jar jarfile="${tomcat-jdbc-test-src.jar}" update="true">
+ <fileset dir="${basedir}/test">
<include name="org/apache/tomcat/jdbc/**" />
</fileset>
</jar>
<!-- create checksums -->
<checksum file="${tomcat-jdbc.jar}" forceOverwrite="yes" fileext=".md5" />
<checksum file="${tomcat-jdbc-src.jar}" forceOverwrite="yes"
fileext=".md5" />
+ <checksum file="${tomcat-jdbc-test.jar}" forceOverwrite="yes"
fileext=".md5" />
+ <checksum file="${tomcat-jdbc-test-src.jar}" forceOverwrite="yes"
fileext=".md5" />
</target>
<target name="clean">
- <delete file="${tomcat-jdbc.jar}"/>
+ <mkdir dir="${tomcat.pool}"/>
+ <delete file="${tomcat-jdbc.jar}" />
<delete file="${tomcat-jdbc.jar}.md5"/>
<delete file="${tomcat-jdbc-src.jar}"/>
<delete file="${tomcat-jdbc-src.jar}.md5"/>
- <delete includeemptydirs="true">
+ <delete includeemptydirs="true" failonerror="false">
<fileset dir="${tomcat.classes}">
<include name="org/apache/tomcat/jdbc/**"/>
</fileset>
@@ -134,35 +157,16 @@
<include name="NOTICE"/>
</fileset>
</delete>
+ <delete dir="${tomcat.pool}/doc"/>
+ <delete dir="${tomcat.classes}"/>
+ <delete dir="${tomcat.testclasses}"/>
</target>
- <target name="test-compile" depends="build">
- <!-- compile org.apache.tomcat.jdbc-->
- <javac srcdir="${basedir}/modules/jdbc-pool/test"
destdir="${tomcat.classes}"
- debug="${compile.debug}"
- deprecation="${compile.deprecation}"
- source="${compile.source}"
- target="${compile.source}"
- optimize="${compile.optimize}">
- <classpath refid="test.classpath"/>
- <include name="org/apache/tomcat/jdbc/**" />
- </javac>
- </target>
-
- <target name="test" depends="test-compile">
- <java classname="org.junit.runner.JUnitCore" classpathref="test.classpath"
fork="false">
- <arg line="org.apache.tomcat.jdbc.test.CheckOutThreadTest" />
- </java>
- <java classname="org.junit.runner.JUnitCore" classpathref="test.classpath"
fork="false">
- <arg line="org.apache.tomcat.jdbc.test.FairnessTest" />
- </java>
- </target>
-
- <target name="docs">
- <xslt basedir="${basedir}/modules/jdbc-pool/doc"
+ <target name="docs" depends="prepare">
+ <xslt basedir="${tomcat.pool}/doc"
destdir="${tomcat.pool}/"
extension=".html"
- style="webapps/docs/tomcat-docs.xsl"
+ style="${tomcat.xsl.dest}"
excludes="build.xml project.xml"
includes="*.xml">
<param name="relative-path"
expression="http://tomcat.apache.org/tomcat-6.0-doc"/>
@@ -171,53 +175,80 @@
</target>
<target name="dist" depends="clean, build, docs">
- <copy todir="${tomcat.pool}">
- <fileset dir="${basedir}/modules/jdbc-pool">
- <include name="LICENSE"/>
- <include name="NOTICE"/>
- </fileset>
- </copy>
<property name="destdir" value="${tomcat.pool}/release/v${version}"/>
<mkdir dir="${destdir}"/>
- <zip destfile="${destdir}/apache-tomcat-jdbc-${version}.zip">
+ <zip destfile="${destdir}/apache-tomcat-jdbc-${version}-bin.zip">
<fileset dir="${tomcat.pool}">
<include name="jdbc-pool.html"/>
<include name="changelog.html"/>
<include name="LICENSE"/>
<include name="NOTICE"/>
- <include name="images/**"/>
<include name="tomcat-jdbc.jar"/>
- <include name="tomcat-jdbc-src.jar"/>
<include name="tomcat-jdbc.jar.md5"/>
+ <include name="tomcat-jdbc-test.jar"/>
+ <include name="tomcat-jdbc-test.jar.md5"/>
+ <include name="tomcat-jdbc-src.jar"/>
<include name="tomcat-jdbc-src.jar.md5"/>
+ <include name="tomcat-jdbc-test-src.jar"/>
+ <include name="tomcat-jdbc-test-src.jar.md5"/>
</fileset>
- <fileset dir="${basedir}/output/build/bin">
+ <fileset dir="${tomcat.home}/bin">
<include name="tomcat-juli.jar"/>
</fileset>
</zip>
- <tar destfile="${destdir}/apache-tomcat-jdbc-${version}.tar">
+ <tar destfile="${destdir}/apache-tomcat-jdbc-${version}-bin.tar">
<fileset dir="${tomcat.pool}">
<include name="jdbc-pool.html"/>
<include name="changelog.html"/>
<include name="LICENSE"/>
<include name="NOTICE"/>
- <include name="images/**"/>
<include name="tomcat-jdbc.jar"/>
- <include name="tomcat-jdbc-src.jar"/>
<include name="tomcat-jdbc.jar.md5"/>
+ <include name="tomcat-jdbc-test.jar"/>
+ <include name="tomcat-jdbc-test.jar.md5"/>
+ <include name="tomcat-jdbc-src.jar"/>
<include name="tomcat-jdbc-src.jar.md5"/>
+ <include name="tomcat-jdbc-test-src.jar"/>
+ <include name="tomcat-jdbc-test-src.jar.md5"/>
</fileset>
- <fileset dir="${basedir}/output/build/bin">
+ <fileset dir="${tomcat.home}/bin">
<include name="tomcat-juli.jar"/>
- </fileset>
+ </fileset>
+ </tar>
+ <gzip src="${destdir}/apache-tomcat-jdbc-${version}-bin.tar"
+ destfile="${destdir}/apache-tomcat-jdbc-${version}-bin.tar.gz"/>
+ <delete file="${destdir}/apache-tomcat-jdbc-${version}-bin.tar"/>
+
+ <zip destfile="${destdir}/apache-tomcat-jdbc-${version}-src.zip">
+ <zipfileset src="${tomcat-jdbc-src.jar}" prefix="java"/>
+ <zipfileset src="${tomcat-jdbc-test-src.jar}" prefix="test"/>
+ <fileset dir="${basedir}">
+ <include name="build.*"/>
+ <include name="doc/*.xml"/>
+ <include name="LICENSE"/>
+ <include name="NOTICE"/>
+ </fileset>
+ </zip>
+ <tar destfile="${destdir}/apache-tomcat-jdbc-${version}-src.tar">
+ <zipfileset src="${tomcat-jdbc-src.jar}" prefix="java"/>
+ <zipfileset src="${tomcat-jdbc-test-src.jar}" prefix="test"/>
+ <fileset dir="${basedir}">
+ <include name="build.*"/>
+ <include name="doc/*.xml"/>
+ <include name="LICENSE"/>
+ <include name="NOTICE"/>
+ </fileset>
</tar>
- <gzip src="${destdir}/apache-tomcat-jdbc-${version}.tar"
- destfile="${destdir}/apache-tomcat-jdbc-${version}.tar.gz"/>
- <delete file="${destdir}/apache-tomcat-jdbc-${version}.tar"/>
+ <gzip src="${destdir}/apache-tomcat-jdbc-${version}-src.tar"
+ destfile="${destdir}/apache-tomcat-jdbc-${version}-src.tar.gz"/>
+
+ <delete file="${destdir}/apache-tomcat-jdbc-${version}-src.tar"/>
<echo message="Options +Indexes" file="${destdir}/.htaccess"/>
- <checksum file="${destdir}/apache-tomcat-jdbc-${version}.tar.gz"
forceOverwrite="yes" fileext=".md5" />
- <checksum file="${destdir}/apache-tomcat-jdbc-${version}.zip"
forceOverwrite="yes" fileext=".md5" />
+ <checksum file="${destdir}/apache-tomcat-jdbc-${version}-bin.tar.gz"
forceOverwrite="yes" fileext=".md5" />
+ <checksum file="${destdir}/apache-tomcat-jdbc-${version}-bin.zip"
forceOverwrite="yes" fileext=".md5" />
+ <checksum file="${destdir}/apache-tomcat-jdbc-${version}-src.tar.gz"
forceOverwrite="yes" fileext=".md5" />
+ <checksum file="${destdir}/apache-tomcat-jdbc-${version}-src.zip"
forceOverwrite="yes" fileext=".md5" />
</target>
@@ -257,8 +288,53 @@
<delete file="${base.path}/file.tar"/>
<delete file="${base.path}/file.tar.gz"/>
</target>
- <target name="f">
- <echoproperties/>
+
+ <target name="downloadzip" unless="exist" depends="setproxy,testexist">
+ <!-- Download and extract the package -->
+ <get src="${sourcefile}" dest="${base.path}/file.zip" />
+ <mkdir dir="${destdir}" />
+ <unzip src="${base.path}/file.zip" dest="${destdir}"/>
+ <delete file="${base.path}/file.zip"/>
+ </target>
+
+ <target name="download">
+ <mkdir dir="${base.path}"/>
+ <antcall target="downloadzip">
+ <param name="sourcefile" value="${c3p0.loc}"/>
+ <param name="destfile" value="${c3p0.jar}"/>
+ <param name="destdir" value="${base.path}"/>
+ </antcall>
+ <antcall target="downloadzip">
+ <param name="sourcefile" value="${mysql.loc}"/>
+ <param name="destfile" value="${mysql.jar}"/>
+ <param name="destdir" value="${base.path}"/>
+ </antcall>
+ <antcall target="downloadzip">
+ <param name="sourcefile" value="${dbcp.loc}"/>
+ <param name="destfile" value="${dbcp.jar}"/>
+ <param name="destdir" value="${base.path}"/>
+ </antcall>
+ <antcall target="downloadzip">
+ <param name="sourcefile" value="${junit.loc}"/>
+ <param name="destfile" value="${junit.jar}"/>
+ <param name="destdir" value="${base.path}"/>
+ </antcall>
+ <antcall target="downloadzip">
+ <param name="sourcefile" value="${tomcat.loc}"/>
+ <param name="destfile" value="${tomcat.juli.jar}"/>
+ <param name="destdir" value="${base.path}"/>
+ </antcall>
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${tomcat.xsl.loc}"/>
+ <param name="destfile" value="${tomcat.xsl.dest}"/>
+ <param name="destdir" value="${base.path}"/>
+ </antcall>
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${tomcat.project.loc}"/>
+ <param name="destfile" value="${tomcat.project.dest}"/>
+ <param name="destdir" value="${base.path}"/>
+ </antcall>
</target>
+
</project>
Modified: tomcat/trunk/modules/jdbc-pool/doc/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/doc/changelog.xml?rev=787385&r1=787384&r2=787385&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/doc/changelog.xml (original)
+++ tomcat/trunk/modules/jdbc-pool/doc/changelog.xml Mon Jun 22 20:29:20 2009
@@ -16,7 +16,7 @@
limitations under the License.
-->
<!DOCTYPE document [
- <!ENTITY project SYSTEM "../../../webapps/docs/project.xml">
+ <!ENTITY project SYSTEM "@tomcat.project.dest@">
]>
<document url="changelog.html">
Modified: tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml?rev=787385&r1=787384&r2=787385&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml (original)
+++ tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml Mon Jun 22 20:29:20 2009
@@ -16,7 +16,7 @@
limitations under the License.
-->
<!DOCTYPE document [
- <!ENTITY project SYSTEM "../../../webapps/docs/project.xml">
+ <!ENTITY project SYSTEM "@tomcat.project.dest@">
]>
<document url="jdbc-pool.html">
@@ -680,6 +680,7 @@
</section>
<section name="Building">
+ <p>We build the JDBC pool code with 1.6, but it is backwards compatible down
to 1.5 for runtime environment. For unit test, we use 1.6 and higher</p>
<p>Other examples of Tomcat configuration for JDBC usage can be found <a
href="http://tomcat.apache.org/tomcat-6.0-doc/jndi-datasource-examples-howto.html";>in
the Tomcat documentation</a>. </p>
<subsection name="Building from source">
<p>Building is pretty simple. The pool has a dependency on
<code>tomcat-juli.jar</code> and in case you want the
<code>SlowQueryReportJmx</code>
@@ -691,8 +692,16 @@
</source>
<p>
A build file can be found in the Tomcat <a
href="http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/";>source
repository</a>.
- It depends on the entire Tomcat <a
href="http://svn.apache.org/repos/asf/tomcat/trunk/";>trunk</a> being checked
out.
- </p>
+ </p>
+ <p>
+ As a convenience, a build file is also included where a simple build
command will generate all files needed.
+ <source>
+ ant download (downloads dependencies)
+ ant build (compiles and generates .jar files)
+ ant dist (creates a release package)
+ ant test (runs tests, expects a test database to be setup)
+ </source>
+ </p>
</subsection>
</section>
</body>
Modified: tomcat/trunk/modules/jdbc-pool/sign.sh
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/sign.sh?rev=787385&r1=787384&r2=787385&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/sign.sh (original)
+++ tomcat/trunk/modules/jdbc-pool/sign.sh Mon Jun 22 20:29:20 2009
@@ -15,7 +15,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-VERSION=v1.0.4
+VERSION=v1.0.5
for i in $(find output/release/$VERSION -name "*.zip" -o -name "*.tar.gz"); do
echo Signing $i
echo $1|gpg --passphrase-fd 0 -a -b $i
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
