Author: rjung
Date: Sat Jan 2 15:22:41 2010
New Revision: 895204
URL: http://svn.apache.org/viewvc?rev=895204&view=rev
Log:
Borrow a few things from the main Tomcat build.xml:
- use general version filter
- automatically set year to the current year
- use patch version property without dot.
The dot is added when combining it into a version number
I don't know whether the double '@' are intended for the
ant replacement markers in MANIFEST.MF (the outer ones remain
after ant filtering), but that is unchanged from the previous
behaviour.
Modified:
tomcat/trunk/modules/jdbc-pool/build.properties.default
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/resources/MANIFEST.MF
Modified: tomcat/trunk/modules/jdbc-pool/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/build.properties.default?rev=895204&r1=895203&r2=895204&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/build.properties.default (original)
+++ tomcat/trunk/modules/jdbc-pool/build.properties.default Sat Jan 2 15:22:41
2010
@@ -28,7 +28,7 @@
version.major=1
version.minor=0
version.build=8
-version.patch=.3
+version.patch=3
version.suffix=
# ----- Default Base Path for Dependent Packages -----
Modified: tomcat/trunk/modules/jdbc-pool/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/build.xml?rev=895204&r1=895203&r2=895204&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/build.xml (original)
+++ tomcat/trunk/modules/jdbc-pool/build.xml Sat Jan 2 15:22:41 2010
@@ -21,15 +21,26 @@
<!-- ===================== Initialize Property Values =================== -->
- <!-- property values you must customize for successful building!!! -->
+ <!-- We read customizable properties from the file
"build.properties.default" -->
+ <!-- and also from "build.properties" if it exists.
-->
+ <!-- The values in "build.properties" have stronger preference.
-->
+ <!-- If you want to customize your build, you can either change the values
-->
+ <!-- directly in the default file, or create a new build.properties and set
-->
+ <!-- the values there. This way you don't have to change a file which is
part -->
+ <!-- of the original project source code.
-->
+ <!-- See "build.properties.default" for some property values you may
-->
+ <!-- customize.
-->
<property file="${user.home}/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}" />
+ <property name="version"
value="${version.major}.${version.minor}.${version.build}.${version.patch}" />
+ <property name="version.major.minor"
value="${version.major}.${version.minor}" />
<!-- Project Properties -->
<property name="name" value="Apache Tomcat JDBC Pool" />
- <property name="year" value="2010" />
+ <tstamp>
+ <format property="year" pattern="yyyy" locale="en"/>
+ </tstamp>
<property name="project" value="apache-tomcat-jdbc-pool" />
<property name="final.name" value="${project}-${version}" />
@@ -65,11 +76,24 @@
<pathelement location="${h2.jar}"/>
</path>
+ <!-- Version info filter set -->
+ <tstamp>
+ <format property="TODAY" pattern="MMM d yyyy" locale="en"/>
+ <format property="TSTAMP" pattern="hh:mm:ss"/>
+ </tstamp>
+ <filterset id="version.filters">
+ <filter token="YEAR" value="${year}"/>
+ <filter token="VERSION" value="${version}"/>
+ <filter token="VERSION_MAJOR" value="${version.major}"/>
+ <filter token="VERSION_MAJOR_MINOR" value="${version.major.minor}"/>
+ <filter token="VERSION_BUILT" value="${TODAY} ${TSTAMP}"/>
+ <filter token="TOMCAT_PROJECT_DEST" value="${tomcat.project.dest}"/>
+ </filterset>
+
<target name="prepare">
<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"/>
@@ -78,10 +102,7 @@
<include name="doc/*.xml"/>
<include name="resources/MANIFEST.MF"/>
</fileset>
- <filterset>
- <filter token="tomcat.project.dest" value="${project.xml}"/>
- <filter token="version" value="${version}"/>
- </filterset>
+ <filterset refid="version.filters"/>
</copy>
</target>
Modified: tomcat/trunk/modules/jdbc-pool/doc/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/doc/changelog.xml?rev=895204&r1=895203&r2=895204&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/doc/changelog.xml (original)
+++ tomcat/trunk/modules/jdbc-pool/doc/changelog.xml Sat Jan 2 15:22:41 2010
@@ -16,7 +16,7 @@
limitations under the License.
-->
<!DOCTYPE document [
- <!ENTITY project SYSTEM "@tomcat.project.dest@">
+ <!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=895204&r1=895203&r2=895204&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml (original)
+++ tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml Sat Jan 2 15:22:41 2010
@@ -16,7 +16,7 @@
limitations under the License.
-->
<!DOCTYPE document [
- <!ENTITY project SYSTEM "@tomcat.project.dest@">
+ <!ENTITY project SYSTEM "@TOMCAT_PROJECT_DEST@">
]>
<document url="jdbc-pool.html">
Modified: tomcat/trunk/modules/jdbc-pool/resources/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/resources/MANIFEST.MF?rev=895204&r1=895203&r2=895204&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/resources/MANIFEST.MF (original)
+++ tomcat/trunk/modules/jdbc-pool/resources/MANIFEST.MF Sat Jan 2 15:22:41
2010
@@ -1,15 +1,15 @@
Manifest-Version: 1.0
Export-Package:
- org.apache.tomcat.jdbc.pool;version="@@version@@";
+ org.apache.tomcat.jdbc.pool;version="@@VERSION@@";
uses:="javax.management,javax.naming,javax.naming.spi,javax.sql,
org.apache.tomcat.jdbc.pool.jmx",
- org.apache.tomcat.jdbc.pool.interceptor;version="@@version@@";
+ org.apache.tomcat.jdbc.pool.interceptor;version="@@VERSION@@";
uses:="javax.management.openmbean,org.apache.tomcat.jdbc.pool",
- org.apache.tomcat.jdbc.pool.jmx;version="@@version@@";
+ org.apache.tomcat.jdbc.pool.jmx;version="@@VERSION@@";
uses:="javax.management,org.apache.tomcat.jdbc.pool"
Ant-Version: Apache Ant 1.7.0
Bundle-Vendor: Apache Software Foundation
-Bundle-Version: @@version@@
+Bundle-Version: @@VERSION@@
Bundle-Name: Apache Tomcat JDBC Connection Pool
Bundle-ManifestVersion: 2
Created-By: 11.0-b16 (Sun Microsystems Inc.)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
