Author: fhanik
Date: Mon Jan 25 21:00:41 2010
New Revision: 902972
URL: http://svn.apache.org/viewvc?rev=902972&view=rev
Log:
Update sandbox to successfully build
Added:
tomcat/sandbox/gdev6x/java/org/apache/tomcat/buildutil/
tomcat/sandbox/gdev6x/java/org/apache/tomcat/buildutil/Txt2Html.java
(with props)
tomcat/sandbox/gdev6x/res/META-INF/
tomcat/sandbox/gdev6x/res/META-INF/bootstrap.jar.manifest (with props)
tomcat/sandbox/gdev6x/res/META-INF/default.license
tomcat/sandbox/gdev6x/res/META-INF/default.manifest (with props)
tomcat/sandbox/gdev6x/res/META-INF/default.notice
tomcat/sandbox/gdev6x/res/META-INF/jasper-jdt.jar.license
tomcat/sandbox/gdev6x/res/META-INF/jasper-jdt.jar.notice
tomcat/sandbox/gdev6x/res/META-INF/jsp-api.jar.manifest (with props)
tomcat/sandbox/gdev6x/res/META-INF/servlet-api.jar.manifest (with props)
Removed:
tomcat/sandbox/gdev6x/java/org/apache/tomcat/util/net/puretls/
Modified:
tomcat/sandbox/gdev6x/build.properties.default
tomcat/sandbox/gdev6x/build.xml
tomcat/sandbox/gdev6x/dist.xml
tomcat/sandbox/gdev6x/extras.xml
Modified: tomcat/sandbox/gdev6x/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/gdev6x/build.properties.default?rev=902972&r1=902971&r2=902972&view=diff
==============================================================================
--- tomcat/sandbox/gdev6x/build.properties.default (original)
+++ tomcat/sandbox/gdev6x/build.properties.default Mon Jan 25 21:00:41 2010
@@ -1,4 +1,19 @@
# -----------------------------------------------------------------------------
+# 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
@@ -9,12 +24,12 @@
# $Id$
# -----------------------------------------------------------------------------
-# ----- Vesion Control Flags -----
+# ----- Version Control Flags -----
version.major=6
version.minor=0
version.build=0
version.patch=0
-version=6.0-snapshot
+version.suffix=-dev
# ----- Default Base Path for Dependent Packages -----
# Please note this path must be absolute, not relative,
@@ -28,11 +43,13 @@
compile.target=1.5
compile.debug=true
-base-jakarta.loc=http://archive.apache.org/dist/jakarta
+base-commons.loc=http://archive.apache.org/dist/commons
base-tomcat.loc=http://archive.apache.org/dist/tomcat
+base-sf.loc=http://downloads.sourceforge.net
# ----- Commons Logging, version 1.1 or later -----
-commons-logging-src.loc=${base-jakarta.loc}/commons/logging/source/commons-logging-1.1-src.tar.gz
+commons-logging-version=1.1.1
+commons-logging-src.loc=${base-commons.loc}/logging/source/commons-logging-${commons-logging-version}-src.tar.gz
# ----- Webservices -----
jaxrpc-src.loc=http://repo1.maven.org/maven2/geronimo-spec/geronimo-spec-jaxrpc/1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar
@@ -42,40 +59,35 @@
jdt.home=${base.path}/eclipse/plugins
jdt.lib=${jdt.home}
jdt.jar=${jdt.lib}/org.eclipse.jdt.core_3.3.1.v_780_R33x.jar
-jdt.loc=http://sunsite.informatik.rwth-aachen.de/eclipse/downloads/drops/R-3.3.1-200709211145/eclipse-JDT-3.3.1.zip
+jdt.loc=http://archive.eclipse.org/eclipse/downloads/drops/R-3.3.1-200709211145/eclipse-JDT-3.3.1.zip
# ----- Tomcat native library -----
-tomcat-native.home=${base.path}/tomcat-native-1.1.10
+tomcat-native.version=1.1.19
+tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
-tomcat-native.loc=${base-tomcat.loc}/tomcat-connectors/native/tomcat-native-1.1.10-src.tar.gz
+tomcat-native.loc=${base-tomcat.loc}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
+tomcat-native.dll=${base-tomcat.loc}/tomcat-connectors/native/${tomcat-native.version}/binaries
# ----- Commons DBCP, version 1.1 or later -----
commons-dbcp.version=1.2.2
commons-dbcp.home=${base.path}/commons-dbcp-1.2.2-src
-commons-dbcp-src.loc=${base-jakarta.loc}/commons/dbcp/source/commons-dbcp-1.2.2-src.tar.gz
+commons-dbcp-src.loc=${base-commons.loc}/dbcp/source/commons-dbcp-1.2.2-src.tar.gz
# ----- Commons Pool, version 1.1 or later -----
-commons-pool.home=${base.path}/commons-pool-1.3-src
-commons-pool-src.loc=${base-jakarta.loc}/commons/pool/source/commons-pool-1.3-src.tar.gz
-
-# ----- Commons Collections, version 2.0 or later -----
-commons-collections.home=${base.path}/commons-collections-3.2-src
-commons-collections.lib=${commons-collections.home}
-commons-collections.jar=${commons-collections.lib}/commons-collections-3.2.jar
-commons-collections.loc=${base-jakarta.loc}/commons/collections/binaries/commons-collections-3.2.tar.gz
-commons-collections-src.loc=${base-jakarta.loc}/commons/collections/source/commons-collections-3.2-src.tar.gz
+commons-pool.home=${base.path}/commons-pool-1.5.4-src
+commons-pool-src.loc=${base-commons.loc}/pool/source/commons-pool-1.5.4-src.tar.gz
# ----- NSIS, version 2.0 or later -----
-nsis.home=${base.path}/nsis-2.22
+nsis.home=${base.path}/nsis-2.45
nsis.exe=${nsis.home}/makensis.exe
nsis.installoptions.dll=${nsis.home}/Plugins/InstallOptions.dll
nsis.nsexec.dll=${nsis.home}/Plugins/nsExec.dll
nsis.nsisdl.dll=${nsis.home}/Plugins/NSISdl.dll
-nsis.loc=${base-sf.loc}/nsis/nsis-2.22-setup.exe
+nsis.loc=${base-sf.loc}/nsis/nsis-2.45.zip
# ----- Commons Daemon, version 1.0-Alpha or later -----
commons-daemon.home=${base.path}/commons-daemon-1.0.1
commons-daemon.lib=${commons-daemon.home}
commons-daemon.jar=${commons-daemon.lib}/commons-daemon.jar
-commons-daemon.loc=${base-jakarta.loc}/commons/daemon/binaries/commons-daemon-1.0.1.tar.gz
+commons-daemon.loc=${base-commons.loc}/daemon/binaries/commons-daemon-1.0.1.tar.gz
commons-daemon.jsvc.tar.gz=${commons-daemon.lib}/bin/jsvc.tar.gz
Modified: tomcat/sandbox/gdev6x/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/gdev6x/build.xml?rev=902972&r1=902971&r2=902972&view=diff
==============================================================================
--- tomcat/sandbox/gdev6x/build.xml (original)
+++ tomcat/sandbox/gdev6x/build.xml Mon Jan 25 21:00:41 2010
@@ -1,39 +1,75 @@
<?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 6.0" default="deploy" basedir=".">
<!-- ===================== Initialize Property Values =================== -->
- <!-- See "build.properties.sample" in the top level directory for all -->
- <!-- 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" in the top level directory for some
-->
+ <!-- property values you may customize.
-->
<property file="${user.home}/build.properties"/>
<property file="build.properties"/>
<property file="build.properties.default"/>
<!-- Project Properties -->
+ <property name="project" value="apache-tomcat" />
<property name="name" value="Apache Tomcat" />
- <property name="year" value="2007" />
+ <tstamp>
+ <format property="year" pattern="yyyy" locale="en"/>
+ </tstamp>
<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.suffix" value="-dev" />
+
+ <property name="version"
value="${version.major}.${version.minor}.${version.build}${version.suffix}" />
<property name="version.number"
value="${version.major}.${version.minor}.${version.build}.${version.patch}" />
+ <property name="version.major.minor"
value="${version.major}.${version.minor}" />
- <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="test.failonerror" value="true"/>
- <property name="test.runner" value="junit.textui.TestRunner"/>
+ <property name="tomcat.home" value="${basedir}"/>
+ <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.tmp" value="${basedir}/output/tmp"/>
+ <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"/>
+ <!-- Can't be higher - must run on 1.5 -->
+ <property name="compile.target" value="1.5"/>
+
+ <!-- Exact spec versions (for the manifests) -->
+ <property name="servlet.revision" value="MR2" />
+ <property name="jsp.revision" value="FR" />
<!-- JAR artifacts -->
<property name="bootstrap.jar" value="${tomcat.build}/bin/bootstrap.jar"/>
@@ -47,16 +83,17 @@
<property name="catalina-tribes.jar"
value="${tomcat.build}/lib/catalina-tribes.jar"/>
<property name="catalina-ha.jar"
value="${tomcat.build}/lib/catalina-ha.jar"/>
<property name="catalina-ant.jar"
value="${tomcat.build}/lib/catalina-ant.jar"/>
- <property name="catalina-ant-jmx.jar"
value="${tomcat.build}/lib/catalina-ant-jmx.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.home"
value="${base.path}/tomcat${version.major}-deps/dbcp" />
+ <property name="jasper-jdt.home"
value="${base.path}/tomcat${version.major}-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"/>
+ <available property="tomcat-dbcp.present" file="${tomcat-dbcp.jar}" />
+ <available property="jdk16.present" classname="javax.sql.StatementEvent" />
<!-- Classpath -->
<path id="tomcat.classpath">
@@ -64,6 +101,20 @@
<pathelement location="${jdt.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_NUMBER" value="${version.number}"/>
+ <filter token="VERSION_MAJOR" value="${version.major}"/>
+ <filter token="VERSION_MAJOR_MINOR" value="${version.major.minor}"/>
+ <filter token="VERSION_BUILT" value="${TODAY} ${TSTAMP}"/>
+ </filterset>
+
<!-- Just build Tomcat -->
<target name="build-prepare">
@@ -74,10 +125,11 @@
<delete dir="${tomcat.build}/temp" />
<delete dir="${tomcat.build}/work" />
- <mkdir dir="${tomcat.build}"/>
+ <mkdir dir="${tomcat.build}"/>
<mkdir dir="${tomcat.build}/bin"/>
<mkdir dir="${tomcat.build}/conf"/>
<mkdir dir="${tomcat.build}/lib"/>
+ <mkdir dir="${tomcat.build}/logs"/>
<mkdir dir="${tomcat.build}/temp"/>
<mkdir dir="${tomcat.build}/webapps"/>
@@ -90,22 +142,19 @@
debug="${compile.debug}"
deprecation="${compile.deprecation}"
source="${compile.source}"
+ target="${compile.target}"
optimize="${compile.optimize}"
- excludes="**/CVS/**,**/.svn/**">
-<!-- Comment this in to show unchecked warnings: <compilerarg
value="-Xlint:unchecked"/> -->
+ excludes="**/CVS/**,**/.svn/**"
+ encoding="ISO-8859-1">
+<!-- Comment this in to show unchecked warnings:
+ <compilerarg value="-Xlint:unchecked"/>
+ -->
<classpath refid="tomcat.classpath" />
- <exclude name="org/apache/tomcat/util/net/puretls/**" />
<exclude name="org/apache/naming/factory/webservices/**" />
</javac>
- <tstamp>
- <format property="TODAY" pattern="MMM d yyyy" locale="en"/>
- <format property="TSTAMP" pattern="hh:mm:ss"/>
- </tstamp>
<!-- Copy static resource files -->
- <filter token="VERSION" value="${version}"/>
- <filter token="VERSION_NUMBER" value="${version.number}"/>
- <filter token="VERSION_BUILT" value="${TODAY} ${TSTAMP}"/>
- <copy todir="${tomcat.classes}" filtering="true">
+ <copy todir="${tomcat.classes}" encoding="ISO-8859-1">
+ <filterset refid="version.filters"/>
<fileset dir="java">
<include name="**/*.properties"/>
<include name="**/*.dtd"/>
@@ -119,187 +168,239 @@
<target name="build-only" depends="build-prepare,compile,package" />
- <target name="package" >
+ <!-- Pattern sets for jar files -->
+ <patternset id="files.annotations-api">
+ <include name="javax/annotation/*" />
+ <include name="javax/annotation/security/*" />
+ <include name="javax/ejb/*" />
+ <include name="javax/persistence/*" />
+ <include name="javax/xml/ws/*" />
+ </patternset>
+
+ <patternset id="files.servlet-api">
+ <include name="javax/servlet/*" />
+ <include name="javax/servlet/http/*" />
+ <include name="javax/servlet/resources/*" />
+ </patternset>
+
+ <patternset id="files.jsp-api">
+ <include name="javax/servlet/jsp/**" />
+ </patternset>
+
+ <patternset id="files.el-api">
+ <include name="javax/el/*" />
+ </patternset>
+
+ <patternset id="files.bootstrap">
+ <include name="org/apache/catalina/startup/Bootstrap.*" />
+ <include name="org/apache/catalina/startup/catalina.properties" />
+ <include name="org/apache/catalina/startup/CatalinaProperties.*" />
+ <include name="org/apache/catalina/startup/ClassLoaderFactory.*" />
+ <include name="org/apache/catalina/startup/Tool.*" />
+ <include name="org/apache/catalina/loader/StandardClassLoader*.*" />
+ <include name="org/apache/catalina/loader/Extension.*" />
+ <include name="org/apache/catalina/loader/Reloader.*" />
+ <include name="org/apache/catalina/security/SecurityClassLoad.*" />
+ <include name="org/apache/naming/JndiPermission.*" />
+ <include name="org/apache/tomcat/util/compat/*" />
+ </patternset>
+
+ <patternset id="files.tomcat-juli">
+ <include name="org/apache/juli/**" />
+ </patternset>
+
+ <patternset id="files.catalina">
+ <include name="org/apache/*" />
+ <include name="org/apache/catalina/**" />
+ <include name="org/apache/naming/**" />
+ <!-- Modules -->
+ <exclude name="org/apache/catalina/ant/**" />
+ <exclude name="org/apache/catalina/cluster/**" />
+ <exclude name="org/apache/catalina/ha/**" />
+ <exclude name="org/apache/catalina/mbeans/JmxRemote*" />
+ <exclude name="org/apache/catalina/tribes/**" />
+ <exclude name="org/apache/catalina/launcher/**" />
+ <exclude name="org/apache/catalina/storeconfig/**" />
+ <exclude name="org/apache/naming/factory/webservices/**" />
+ </patternset>
+
+ <patternset id="files.catalina-tribes">
+ <include name="org/apache/catalina/tribes/**" />
+ </patternset>
+
+ <patternset id="files.catalina-ha">
+ <include name="org/apache/catalina/ha/**" />
+ </patternset>
+
+ <patternset id="files.catalina-ant">
+ <include name="org/apache/catalina/ant/*" />
+ <include name="org/apache/catalina/ant/jmx/*" />
+ <include name="org/apache/catalina/util/Base64.*" />
+ </patternset>
+
+ <patternset id="files.tomcat-coyote">
+ <include name="org/apache/coyote/**" />
+ <include name="org/apache/tomcat/jni/**" />
+ <include name="org/apache/jk/**" />
+ <include name="org/apache/tomcat/util/**" />
+ </patternset>
+
+ <patternset id="files.jasper">
+ <include name="org/apache/*" />
+ <include name="org/apache/jasper/**" />
+ </patternset>
+
+ <patternset id="files.jasper-el">
+ <include name="org/apache/el/**" />
+ </patternset>
+
+
+ <macrodef name="jarIt" description="utility macro for standard JAR
packaging">
+ <attribute name="jarfile" description="the name of the JAR file to
create"/>
+ <attribute name="filesId" description="the patternset id of the files to
use"/>
+ <attribute name="manifest" description="the manifest file use"/>
+ <attribute name="notice" description="the LICENSE file to use"/>
+ <attribute name="license" description="the NOTICE file to use"/>
+ <sequential>
+ <jar jarfile="@{jarfile}" manifest="@{manifest}">
+ <fileset dir="${tomcat.classes}">
+ <patternset refid="@{filesId}"/>
+ <!-- Javadoc and i18n exclusions -->
+ <exclude name="**/package.html" />
+ <exclude name="**/LocalStrings_*" />
+ </fileset>
+ <zipfileset file="@{notice}" fullpath="META-INF/NOTICE" />
+ <zipfileset file="@{license}" fullpath="META-INF/LICENSE" />
+ </jar>
+ </sequential>
+ </macrodef>
+
+ <target name="build-manifests" >
+ <!-- Filtering tokens for JAR manifests-->
+ <filter token="source.jdk" value="${compile.source}"/>
+ <filter token="target.jdk" value="${compile.target}"/>
+ <filter token="servlet.revision" value="${servlet.revision}"/>
+ <filter token="jsp.revision" value="${jsp.revision}"/>
+
+ <mkdir dir="${tomcat.tmp}" />
+ <copy todir="${tomcat.tmp}" overwrite="yes" filtering="yes"
+ encoding="ISO-8859-1">
+ <filterset refid="version.filters"/>
+ <fileset dir="res/META-INF" includes="*.manifest" />
+ </copy>
+
+ </target>
+ <target name="package" depends="build-manifests" >
<!-- Common Annotations 1.0 JAR File -->
- <jar jarfile="${annotations-api.jar}">
- <fileset dir="${tomcat.classes}">
- <include name="javax/annotation/*" />
- <include name="javax/annotation/security/*" />
- <include name="javax/ejb/*" />
- <include name="javax/persistence/*" />
- <include name="javax/xml/ws/*" />
- <!-- Javadoc and i18n exclusions -->
- <exclude name="**/package.html" />
- <exclude name="**/LocalStrings_*" />
- </fileset>
- </jar>
+ <jarIt jarfile="${annotations-api.jar}" filesId="files.annotations-api"
+ manifest="${tomcat.tmp}/default.manifest"
+ notice="res/META-INF/default.notice"
+ license="res/META-INF/default.license" />
<!-- Servlet 2.5 Implementation JAR File -->
- <jar jarfile="${servlet-api.jar}">
- <fileset dir="${tomcat.classes}">
- <include name="javax/servlet/*" />
- <include name="javax/servlet/http/*" />
- <include name="javax/servlet/resources/*" />
- <!-- Javadoc and i18n exclusions -->
- <exclude name="**/package.html" />
- <exclude name="**/LocalStrings_*" />
- </fileset>
- </jar>
+ <jarIt jarfile="${servlet-api.jar}" filesId="files.servlet-api"
+ manifest="${tomcat.tmp}/servlet-api.jar.manifest"
+ notice="res/META-INF/default.notice"
+ license="res/META-INF/default.license" />
<!-- JSP 2.1 Implementation JAR File -->
- <jar jarfile="${jsp-api.jar}">
- <fileset dir="${tomcat.classes}">
- <include name="javax/servlet/jsp/**" />
- <!-- Javadoc and i18n exclusions -->
- <exclude name="**/package.html" />
- <exclude name="**/LocalStrings_*" />
- </fileset>
- </jar>
+ <jarIt jarfile="${jsp-api.jar}" filesId="files.jsp-api"
+ manifest="${tomcat.tmp}/jsp-api.jar.manifest"
+ notice="res/META-INF/default.notice"
+ license="res/META-INF/default.license" />
+
<!-- JSP 2.1 EL Implementation JAR File -->
- <jar jarfile="${el-api.jar}">
- <fileset dir="${tomcat.classes}">
- <include name="javax/el/*" />
- <!-- Javadoc and i18n exclusions -->
- <exclude name="**/package.html" />
- <exclude name="**/LocalStrings_*" />
- </fileset>
- </jar>
+ <jarIt jarfile="${el-api.jar}" filesId="files.el-api"
+ manifest="${tomcat.tmp}/default.manifest"
+ notice="res/META-INF/default.notice"
+ license="res/META-INF/default.license" />
<!-- Bootstrap JAR File -->
- <jar jarfile="${bootstrap.jar}"
- manifest="res/bootstrap.jar.manifest">
- <fileset dir="${tomcat.classes}">
- <include name="org/apache/catalina/startup/Bootstrap.class" />
- <include name="org/apache/catalina/startup/catalina.properties" />
- <include name="org/apache/catalina/startup/CatalinaProperties.class" />
- <include name="org/apache/catalina/startup/ClassLoaderFactory.class" />
- <include name="org/apache/catalina/startup/Tool.class" />
- <include name="org/apache/catalina/loader/StandardClassLoader*.class"
/>
- <include name="org/apache/catalina/loader/Extension.class" />
- <include name="org/apache/catalina/loader/Reloader.class" />
- <include name="org/apache/catalina/security/SecurityClassLoad.class" />
- <include name="org/apache/naming/JndiPermission.class" />
- <include name="org/apache/tomcat/util/compat/*" />
- <include name="org/apache/catalina/loader/NamedClassLoader.class" />
- <!-- Javadoc and i18n exclusions -->
- <exclude name="**/package.html" />
- <exclude name="**/LocalStrings_*" />
- </fileset>
- </jar>
+ <jarIt jarfile="${bootstrap.jar}" filesId="files.bootstrap"
+ manifest="${tomcat.tmp}/bootstrap.jar.manifest"
+ notice="res/META-INF/default.notice"
+ license="res/META-INF/default.license" />
<!-- Tomcat-juli JAR File -->
- <jar jarfile="${tomcat-juli.jar}">
- <fileset dir="${tomcat.classes}">
- <include name="org/apache/juli/**" />
- <!-- Javadoc and i18n exclusions -->
- <exclude name="**/package.html" />
- <exclude name="**/LocalStrings_*" />
- </fileset>
- </jar>
+ <jarIt jarfile="${tomcat-juli.jar}" filesId="files.tomcat-juli"
+ manifest="${tomcat.tmp}/default.manifest"
+ notice="res/META-INF/default.notice"
+ license="res/META-INF/default.license" />
<!-- Catalina Main JAR File -->
- <jar jarfile="${catalina.jar}">
- <fileset dir="${tomcat.classes}">
- <include name="org/apache/*" />
- <include name="org/apache/catalina/**" />
- <include name="org/apache/naming/**" />
- <!-- Javadoc and i18n exclusions -->
- <exclude name="**/package.html" />
- <exclude name="**/LocalStrings_*" />
- <!-- Modules -->
- <exclude name="org/apache/catalina/ant/**" />
- <exclude name="org/apache/catalina/cluster/**" />
- <exclude name="org/apache/catalina/ha/**" />
- <exclude name="org/apache/catalina/tribes/**" />
- <exclude name="org/apache/catalina/launcher/**" />
- <exclude name="org/apache/catalina/storeconfig/**" />
- <exclude name="org/apache/naming/factory/webservices/**" />
- <exclude name="org/apache/catalina/loader/NamedClassLoader.class" />
- </fileset>
- </jar>
-
+ <jarIt jarfile="${catalina.jar}" filesId="files.catalina"
+ manifest="${tomcat.tmp}/default.manifest"
+ notice="res/META-INF/default.notice"
+ license="res/META-INF/default.license" />
+
<!-- Catalina GroupCom/Tribes JAR File -->
- <jar jarfile="${catalina-tribes.jar}">
- <fileset dir="${tomcat.classes}">
- <exclude name="**/package.html" />
- <exclude name="**/LocalStrings_*" />
- <!-- Modules -->
- <include name="org/apache/catalina/tribes/**" />
- </fileset>
- </jar>
+ <jarIt jarfile="${catalina-tribes.jar}" filesId="files.catalina-tribes"
+ manifest="${tomcat.tmp}/default.manifest"
+ notice="res/META-INF/default.notice"
+ license="res/META-INF/default.license" />
+
<!-- Catalina Cluster/HA JAR File -->
- <jar jarfile="${catalina-ha.jar}">
- <fileset dir="${tomcat.classes}">
- <exclude name="**/package.html" />
- <exclude name="**/LocalStrings_*" />
- <!-- Modules -->
- <include name="org/apache/catalina/ha/**" />
- </fileset>
- </jar>
+ <jarIt jarfile="${catalina-ha.jar}" filesId="files.catalina-ha"
+ manifest="${tomcat.tmp}/default.manifest"
+ notice="res/META-INF/default.notice"
+ license="res/META-INF/default.license" />
<!-- Catalina Ant Tasks JAR File -->
- <jar jarfile="${catalina-ant.jar}">
- <fileset dir="${tomcat.classes}">
- <include name="org/apache/catalina/ant/*" />
- <include name="org/apache/catalina/ant/jmx/*" />
- <include name="org/apache/catalina/util/Base64.class" />
- <!-- Javadoc and i18n exclusions -->
- <exclude name="**/package.html" />
- <exclude name="**/LocalStrings_*" />
- </fileset>
- </jar>
+ <jarIt jarfile="${catalina-ant.jar}" filesId="files.catalina-ant"
+ manifest="${tomcat.tmp}/default.manifest"
+ notice="res/META-INF/default.notice"
+ license="res/META-INF/default.license" />
<!-- Protocol handlers - Coyote -->
- <jar jarfile="${tomcat-coyote.jar}">
- <fileset dir="${tomcat.classes}">
- <include name="org/apache/coyote/**" />
- <include name="org/apache/tomcat/jni/**" />
- <include name="org/apache/jk/**" />
- <include name="org/apache/tomcat/util/**" />
- <!-- Javadoc and i18n exclusions -->
- <exclude name="**/package.html" />
- <exclude name="**/LocalStrings_*" />
- </fileset>
- </jar>
+ <jarIt jarfile="${tomcat-coyote.jar}" filesId="files.tomcat-coyote"
+ manifest="${tomcat.tmp}/default.manifest"
+ notice="res/META-INF/default.notice"
+ license="res/META-INF/default.license" />
<!-- Jasper Implementation JAR File -->
- <jar jarfile="${jasper.jar}">
- <fileset dir="${tomcat.classes}">
- <include name="org/apache/*" />
- <include name="org/apache/jasper/**" />
- <!-- Javadoc and i18n exclusions -->
- <exclude name="**/package.html" />
- <exclude name="**/LocalStrings_*" />
- </fileset>
- </jar>
+ <jarIt jarfile="${jasper.jar}" filesId="files.jasper"
+ manifest="${tomcat.tmp}/default.manifest"
+ notice="res/META-INF/default.notice"
+ license="res/META-INF/default.license" />
<!-- Jasper EL Implementation JAR File -->
- <jar jarfile="${jasper-el.jar}">
- <fileset dir="${tomcat.classes}">
- <include name="org/apache/el/**" />
- <!-- Javadoc and i18n exclusions -->
- <exclude name="**/package.html" />
- <exclude name="**/LocalStrings_*" />
- </fileset>
- </jar>
+ <jarIt jarfile="${jasper-el.jar}" filesId="files.jasper-el"
+ manifest="${tomcat.tmp}/default.manifest"
+ notice="res/META-INF/default.notice"
+ license="res/META-INF/default.license" />
<!-- i18n JARs -->
- <jar jarfile="${tomcat.build}/lib/tomcat-i18n-es.jar">
+ <jar jarfile="${tomcat.build}/lib/tomcat-i18n-es.jar"
+ manifest="${tomcat.tmp}/default.manifest" >
<fileset dir="${tomcat.classes}">
<include name="**/LocalStrings_es.properties" />
</fileset>
+ <zipfileset file="res/META-INF/default.notice"
+ fullpath="META-INF/NOTICE" />
+ <zipfileset file="res/META-INF/default.license"
+ fullpath="META-INF/LICENSE" />
</jar>
- <jar jarfile="${tomcat.build}/lib/tomcat-i18n-fr.jar">
+ <jar jarfile="${tomcat.build}/lib/tomcat-i18n-fr.jar"
+ manifest="${tomcat.tmp}/default.manifest" >
<fileset dir="${tomcat.classes}">
<include name="**/LocalStrings_fr.properties" />
</fileset>
+ <zipfileset file="res/META-INF/default.notice"
+ fullpath="META-INF/NOTICE" />
+ <zipfileset file="res/META-INF/default.license"
+ fullpath="META-INF/LICENSE" />
</jar>
- <jar jarfile="${tomcat.build}/lib/tomcat-i18n-ja.jar">
+ <jar jarfile="${tomcat.build}/lib/tomcat-i18n-ja.jar"
+ manifest="${tomcat.tmp}/default.manifest" >
<fileset dir="${tomcat.classes}">
<include name="**/LocalStrings_ja.properties" />
</fileset>
+ <zipfileset file="res/META-INF/default.notice"
+ fullpath="META-INF/NOTICE" />
+ <zipfileset file="res/META-INF/default.license"
+ fullpath="META-INF/LICENSE" />
</jar>
</target>
@@ -319,141 +420,81 @@
<exclude name="docs/architecture/*.xml"/>
</fileset>
</copy>
- <copy todir="${tomcat.build}/webapps/docs">
+ <copy todir="${tomcat.build}/webapps/docs" encoding="ISO-8859-1">
+ <filterset refid="version.filters"/>
<fileset dir=".">
<include name="BUILDING.txt"/>
- <include name="NOTICE"/>
<include name="RUNNING.txt"/>
</fileset>
</copy>
- <filter token="VERSION" value="${version}"/>
- <copy tofile="${tomcat.build}/webapps/docs/RELEASE-NOTES.txt"
file="RELEASE-NOTES"
- filtering="true" />
+ <copy tofile="${tomcat.build}/webapps/docs/RELEASE-NOTES.txt"
file="RELEASE-NOTES" encoding="ISO-8859-1">
+ <filterset refid="version.filters"/>
+ </copy>
<copy tofile="${tomcat.build}/webapps/docs/appdev/sample/build.xml"
file="webapps/docs/appdev/build.xml.txt"/>
-
- <mkdir dir="${tomcat.build}/webapps/docs/funcspec" />
-
- <!-- XSL processing -->
- <style basedir="webapps/docs"
+
+ <mkdir dir="${tomcat.build}/webapps/docs/funcspecs" />
+
+ <!-- XSL processing -->
+ <xslt basedir="webapps/docs"
destdir="${tomcat.build}/webapps/docs"
extension=".html"
style="webapps/docs/tomcat-docs.xsl"
excludes="build.xml project.xml"
includes="*.xml">
<param name="relative-path" expression="."/>
- </style>
- <style basedir="webapps/docs/appdev"
+ </xslt>
+ <xslt basedir="webapps/docs/appdev"
destdir="${tomcat.build}/webapps/docs/appdev"
extension=".html"
style="webapps/docs/tomcat-docs.xsl"
excludes="project.xml"
includes="*.xml">
<param name="relative-path" expression=".."/>
- </style>
- <style basedir="webapps/docs/funcspecs"
+ </xslt>
+ <xslt basedir="webapps/docs/funcspecs"
destdir="${tomcat.build}/webapps/docs/funcspecs"
extension=".html"
style="webapps/docs/tomcat-docs.xsl"
excludes="project.xml"
includes="*.xml">
- <param name="relative-path" expression="../.."/>
- </style>
- <style basedir="webapps/docs/config"
+ <param name="relative-path" expression=".."/>
+ </xslt>
+ <xslt basedir="webapps/docs/config"
destdir="${tomcat.build}/webapps/docs/config"
extension=".html"
style="webapps/docs/tomcat-docs.xsl"
excludes="project.xml"
includes="*.xml">
<param name="relative-path" expression=".."/>
- </style>
- <style basedir="webapps/docs/architecture"
+ </xslt>
+ <xslt basedir="webapps/docs/architecture"
destdir="${tomcat.build}/webapps/docs/architecture"
extension=".html"
style="webapps/docs/tomcat-docs.xsl"
excludes="project.xml"
includes="*.xml">
<param name="relative-path" expression=".."/>
- </style>
-
- <style basedir="webapps/docs/tribes"
+ </xslt>
+
+ <xslt basedir="webapps/docs/tribes"
destdir="${tomcat.build}/webapps/docs/tribes"
extension=".html"
style="webapps/docs/tomcat-docs.xsl"
excludes="project.xml"
includes="*.xml">
<param name="relative-path" expression=".."/>
- </style>
-
- <!-- Print friendly version -->
- <mkdir dir="${tomcat.build}/webapps/docs/printer" />
- <copy todir="${tomcat.build}/webapps/docs/printer">
- <fileset dir=".">
- <include name="BUILDING.txt"/>
- <include name="NOTICE"/>
- <include name="RUNNING.txt"/>
- </fileset>
- </copy>
- <mkdir dir="${tomcat.build}/webapps/docs/appdev/printer" />
- <copy todir="${tomcat.build}/webapps/docs/appdev/printer">
- <fileset dir="webapps">
- <include name="docs/appdev/*.txt"/>
- </fileset>
- </copy>
- <mkdir dir="${tomcat.build}/webapps/docs/funcspecs/printer" />
- <mkdir dir="${tomcat.build}/webapps/docs/architecture/printer"/>
- <mkdir dir="${tomcat.build}/webapps/docs/config/printer"/>
-
- <style basedir="webapps/docs"
- destdir="${tomcat.build}/webapps/docs/printer"
- extension=".html"
- style="webapps/docs/tomcat-docs.xsl"
- excludes="build.xml project.xml"
- includes="*.xml">
- <param name="relative-path" expression="./.."/>
- <param name="project-menu" expression="nomenu"/>
- </style>
- <style basedir="webapps/docs/appdev"
- destdir="${tomcat.build}/webapps/docs/appdev/printer"
- extension=".html"
- style="webapps/docs/tomcat-docs.xsl"
- excludes="project.xml"
- includes="*.xml">
- <param name="relative-path" expression="../.."/>
- <param name="project-menu" expression="nomenu"/>
- </style>
- <style basedir="webapps/docs/funcspecs"
- destdir="${tomcat.build}/webapps/docs/funcspecs/printer"
- extension=".html"
- style="webapps/docs/tomcat-docs.xsl"
- excludes="project.xml"
- includes="*.xml">
- <param name="relative-path" expression="../../.."/>
- <param name="project-menu" expression="nomenu"/>
- </style>
- <style basedir="webapps/docs/config"
- destdir="${tomcat.build}/webapps/docs/config/printer"
- extension=".html"
- style="webapps/docs/tomcat-docs.xsl"
- excludes="project.xml"
- includes="*.xml">
- <param name="relative-path" expression="../.."/>
- <param name="project-menu" expression="nomenu"/>
- </style>
- <style basedir="webapps/docs/architecture"
- destdir="${tomcat.build}/webapps/docs/architecture/printer"
- extension=".html"
- style="webapps/docs/tomcat-docs.xsl"
- excludes="project.xml"
- includes="*.xml">
- <param name="relative-path" expression="../.."/>
- <param name="project-menu" expression="nomenu"/>
- </style>
+ </xslt>
+ </target>
+ <target name="warn.dbcp" unless="tomcat-dbcp.present">
+ <echo>WARNING: tomcat-dbcp.jar not included, this build can't be used
+ in a release. Please run 'ant download' with JDK1.5 if you are
+ building a tomcat release.</echo>
</target>
- <target name="deploy" depends="build-only,build-docs">
+ <target name="deploy" depends="build-only,build-docs,warn.dbcp">
<copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
file="${tomcat-native.tar.gz}" />
@@ -461,15 +502,27 @@
<copy todir="${tomcat.build}/bin" file="${commons-daemon.jar}" />
<copy todir="${tomcat.build}/bin" file="${commons-daemon.jsvc.tar.gz}" />
- <!-- Copy scripts -->
+ <!-- Copy scripts -->
<copy todir="${tomcat.build}/bin">
<fileset dir="bin">
<exclude name="**/*.launch"/>
+ <exclude name="**/*.sh"/>
+ <exclude name="**/*.bat"/>
</fileset>
</copy>
+ <copy todir="${tomcat.build}/bin" encoding="ISO-8859-1">
+ <filterset refid="version.filters"/>
+ <fileset dir="bin">
+ <include name="**/*.sh"/>
+ <include name="**/*.bat"/>
+ </fileset>
+ </copy>
+ <!-- Copy doesn't retain permissions -->
+ <chmod dir="${tomcat.build}/bin" includes="*.sh" perm="+x"/>
- <!-- Copy static resource files -->
- <copy todir="${tomcat.build}/conf">
+ <!-- Copy static resource files -->
+ <copy todir="${tomcat.build}/conf" encoding="ISO-8859-1">
+ <filterset refid="version.filters"/>
<fileset dir="conf">
<include name="**/*.policy"/>
<include name="**/*.xml"/>
@@ -481,47 +534,142 @@
<copy todir="${tomcat.build}/webapps">
<fileset dir="webapps">
<include name="ROOT/**"/>
+ <exclude name="ROOT/index.html"/>
+ <exclude name="ROOT/index.jsp"/>
<include name="examples/**"/>
<include name="manager/**"/>
<include name="host-manager/**"/>
</fileset>
</copy>
+ <copy todir="${tomcat.build}/webapps" encoding="ISO-8859-1">
+ <filterset refid="version.filters" />
+ <fileset dir="webapps">
+ <include name="ROOT/index.html"/>
+ <include name="ROOT/index.jsp"/>
+ </fileset>
+ </copy>
- <filter token="VERSION" value="${version}"/>
- <copy tofile="${tomcat.build}/webapps/ROOT/RELEASE-NOTES.txt"
file="RELEASE-NOTES"
- filtering="true" />
+ <copy tofile="${tomcat.build}/webapps/ROOT/RELEASE-NOTES.txt"
file="RELEASE-NOTES" encoding="ISO-8859-1">
+ <filterset refid="version.filters"/>
+ </copy>
<!-- Build classes for examples webapp -->
- <javac srcdir="webapps/examples/WEB-INF/classes"
+ <javac srcdir="webapps/examples/WEB-INF/classes"
destdir="${tomcat.build}/webapps/examples/WEB-INF/classes"
debug="${compile.debug}" deprecation="${compile.deprecation}"
+ source="${compile.source}"
+ target="${compile.target}"
optimize="${compile.optimize}"
- classpath="${tomcat.classes}"
- excludes="**/CVS/**,**/.svn/**">
+ classpath="${tomcat.classes}"
+ excludes="**/CVS/**,**/.svn/**"
+ encoding="ISO-8859-1">
</javac>
-
- <javac srcdir="webapps/examples/jsp/plugin/applet"
+
+ <javac srcdir="webapps/examples/jsp/plugin/applet"
destdir="${tomcat.build}/webapps/examples/jsp/plugin/applet"
debug="${compile.debug}" deprecation="${compile.deprecation}"
+ source="${compile.source}"
+ target="${compile.target}"
optimize="${compile.optimize}"
- classpath="$tomcat.lcasses}"
- excludes="**/CVS/**,**/.svn/**">
+ classpath="$tomcat.lcasses}"
+ excludes="**/CVS/**,**/.svn/**"
+ encoding="ISO-8859-1">
</javac>
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib" />
+ <!-- Add sources for examples -->
+ <taskdef name="txt2html"
+ classname="org.apache.tomcat.buildutil.Txt2Html"
+ classpath="${tomcat.classes}" />
+ <txt2html todir="${tomcat.build}/webapps/examples/jsp/jsp2/simpletag">
+ <fileset dir="webapps/examples/WEB-INF/classes/jsp2/examples">
+ <include name="BookBean.java"/>
+ </fileset>
+ <fileset dir="webapps/examples/WEB-INF/classes/jsp2/examples/simpletag">
+ <include name="FindBookSimpleTag.java"/>
+ <include name="RepeatSimpleTag.java"/>
+ <include name="HelloWorldSimpleTag.java"/>
+ </fileset>
+ <fileset dir="webapps/examples/WEB-INF/classes/jsp2/examples/el">
+ <include name="Functions.java"/>
+ </fileset>
+ </txt2html>
+
+ <txt2html todir="${tomcat.build}/webapps/examples/jsp/jsp2/jspattribute">
+ <fileset dir="webapps/examples/WEB-INF/classes/jsp2/examples">
+ <include name="FooBean.java"/>
+ </fileset>
+ <fileset dir="webapps/examples/WEB-INF/classes/jsp2/examples/simpletag">
+ <include name="ShuffleSimpleTag.java"/>
+ <include name="TileSimpleTag.java"/>
+ <include name="HelloWorldSimpleTag.java"/>
+ </fileset>
+ </txt2html>
+
+ <txt2html todir="${tomcat.build}/webapps/examples/jsp/cal">
+ <fileset dir="webapps/examples/WEB-INF/classes/cal">
+ <include name="Entries.java"/>
+ <include name="Entry.java"/>
+ <include name="JspCalendar.java"/>
+ <include name="TableBean.java"/>
+ </fileset>
+ </txt2html>
+
+ <txt2html todir="${tomcat.build}/webapps/examples/jsp/jsptoserv">
+ <fileset dir="webapps/examples/WEB-INF/classes">
+ <include name="servletToJsp.java"/>
+ </fileset>
+ </txt2html>
+
+ <txt2html todir="${tomcat.build}/webapps/examples/jsp/jsp2/el">
+ <fileset dir="webapps/examples/WEB-INF/classes/jsp2/examples/el">
+ <include name="Functions.java"/>
+ </fileset>
+ </txt2html>
+
+ <txt2html todir="${tomcat.build}/webapps/examples/jsp/jsp2/misc">
+ <fileset dir="webapps/examples/WEB-INF/classes/jsp2/examples/simpletag">
+ <include name="EchoAttributesTag.java"/>
+ </fileset>
+ </txt2html>
+
+ <txt2html todir="${tomcat.build}/webapps/examples/jsp/jsp2/tagfiles">
+ <fileset dir="webapps/examples/WEB-INF/tags">
+ <include name="**/*.tag" />
+ </fileset>
+ </txt2html>
+
+ <txt2html todir="${tomcat.build}/webapps/examples">
+ <fileset dir="webapps/examples">
+ <include name="**/*.jsp" />
+ <include name="**/*.jspx" />
+ <include name="**/*.jspf" />
+ <exclude name="error/errorpge.jsp"/>
+ <exclude name="forward/one.jsp"/>
+ <exclude name="include/foo.jsp"/>
+ <exclude name="jsptoserv/hello.jsp"/>
+ <exclude name="security/protected/error.jsp"/>
+ <exclude name="security/protected/index.jsp"/>
+ <exclude name="security/protected/login.jsp"/>
+ <exclude name="source.jsp"/>
+ </fileset>
+ </txt2html>
+
+ <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
+ failonerror="false"/>
<copy file="${jasper-jdt.jar}" todir="${tomcat.build}/lib" />
</target>
-
+
<target name="clean-depend"
- description="Clean depend src components">
- <delete dir="${tomcat-dbcp.home}"/>
- <delete dir="${jasper-jdt.home}"/>
+ description="Clean depend src components">
+ <delete dir="${tomcat-dbcp.home}"/>
+ <delete dir="${jasper-jdt.home}"/>
</target>
-
+
<target name="clean">
<delete dir="${tomcat.classes}" />
<delete dir="${tomcat.build}" />
+ <delete dir="${tomcat.tmp}" />
</target>
<!-- Download and dependency building -->
@@ -569,7 +717,8 @@
</target>
<target name="download"
- description="Builds and download dependent components">
+ description="Download (and build as necessary) dependent components"
+ depends="build-manifests">
<antcall target="downloadfile">
<param name="sourcefile" value="${tomcat-native.loc}"/>
@@ -577,6 +726,24 @@
<param name="destdir" value="${tomcat-native.home}"/>
</antcall>
+ <antcall target="downloadfile">
+ <param name="sourcefile"
value="${tomcat-native.dll}/win32/tcnative-1.dll"/>
+ <param name="destfile" value="${tomcat-native.home}/tcnative-1.dll.x86"/>
+ <param name="destdir" value="${tomcat-native.home}"/>
+ </antcall>
+
+ <antcall target="downloadfile">
+ <param name="sourcefile"
value="${tomcat-native.dll}/win64/x64/tcnative-1.dll"/>
+ <param name="destfile" value="${tomcat-native.home}/tcnative-1.dll.x64"/>
+ <param name="destdir" value="${tomcat-native.home}"/>
+ </antcall>
+
+ <antcall target="downloadfile">
+ <param name="sourcefile"
value="${tomcat-native.dll}/win64/ia64/tcnative-1.dll"/>
+ <param name="destfile" value="${tomcat-native.home}/tcnative-1.dll.i64"/>
+ <param name="destdir" value="${tomcat-native.home}"/>
+ </antcall>
+
<antcall target="downloadgz">
<param name="sourcefile" value="${commons-daemon.loc}"/>
<param name="destfile" value="${commons-daemon.jar}"/>
@@ -584,16 +751,12 @@
<!-- Build Tomcat DBCP bundle -->
<antcall target="downloadgz">
- <param name="sourcefile" value="${commons-collections-src.loc}"/>
- <param name="destfile" value="${tomcat-dbcp.jar}" />
- </antcall>
- <antcall target="downloadgz">
<param name="sourcefile" value="${commons-pool-src.loc}"/>
- <param name="destfile" value="${tomcat-dbcp.jar}" />
+ <param name="destfile" value="${commons-pool.home}/build.xml" />
</antcall>
<antcall target="downloadgz">
<param name="sourcefile" value="${commons-dbcp-src.loc}"/>
- <param name="destfile" value="${tomcat-dbcp.jar}" />
+ <param name="destfile" value="${commons-dbcp.home}/build.xml" />
</antcall>
<mkdir dir="${tomcat-dbcp.home}"/>
<antcall target="build-tomcat-dbcp">
@@ -611,18 +774,16 @@
<param name="basedir" value="${jasper-jdt.home}" />
</antcall>
+ <antcall target="downloadzip">
+ <param name="sourcefile" value="${nsis.loc}"/>
+ <param name="destfile" value="${nsis.exe}"/>
+ <param name="destdir" value="${nsis.home}/.."/>
+ </antcall>
+
</target>
- <target name="build-tomcat-dbcp">
+ <target name="build-tomcat-dbcp" unless="jdk16.present">
<copy todir="${tomcat-dbcp.home}">
- <!--
- <fileset dir="${commons-collections.home}" >
- <include name="**/collections/CursorableLinkedList.java" />
- <include name="**/collections/KeyValue.java" />
- <include name="**/collections/LRUMap.java" />
- <include name="**/collections/SequencedHashMap.java" />
- </fileset>
- -->
<fileset dir="${commons-pool.home}">
<include name="**/*.java" />
<exclude name="**/test/**" />
@@ -632,19 +793,13 @@
<exclude name="**/test/**" />
</fileset>
</copy>
- <!--
- <replace dir="${tomcat-dbcp.home}/src/java/org/apache/commons">
- <replacefilter token="return UnmodifiableList.decorate(l);"
- value="return l;" />
- <replacefilter token="import
org.apache.commons.collections.list.UnmodifiableList;"
- value=" " />
- </replace>
- -->
- <replace dir="${tomcat-dbcp.home}/src/java/org/apache/commons" >
+ <replace dir="${tomcat-dbcp.home}/src/java/org/apache/commons"
+ encoding="ISO-8859-1">
<replacefilter token="org.apache.commons"
value="org.apache.tomcat.dbcp" />
</replace>
- <replace dir="${tomcat-dbcp.home}/src/java/org/apache/commons/pool/impl" >
+ <replace dir="${tomcat-dbcp.home}/src/java/org/apache/commons/pool/impl"
+ encoding="ISO-8859-1">
<replacefilter token="enum"
value="enumeration" />
</replace>
@@ -659,27 +814,39 @@
debug="${compile.debug}"
deprecation="${compile.deprecation}"
source="${compile.source}"
+ target="${compile.target}"
sourcepath="${tomcat-dbcp.home}/src/java"
- srcdir="${tomcat-dbcp.home}/src/java" >
+ srcdir="${tomcat-dbcp.home}/src/java"
+ encoding="ISO-8859-1">
<include name="**" />
</javac>
<jar jarfile="${tomcat-dbcp.jar}"
- index="true">
+ index="true"
+ manifest="${tomcat.tmp}/default.manifest">
<fileset dir="${tomcat-dbcp.home}/classes">
<include name="**/*.class" />
<include name="**/*.properties" />
</fileset>
+ <zipfileset file="${tomcat.home}/res/META-INF/default.notice"
+ fullpath="META-INF/NOTICE" />
+ <zipfileset file="${tomcat.home}/res/META-INF/default.license"
+ fullpath="META-INF/LICENSE" />
</jar>
</target>
<target name="build-jasper-jdt">
<unjar src="${jdt.jar}" dest="${jasper-jdt.home}" />
- <jar destfile="${jasper-jdt.jar}" index="true">
+ <jar destfile="${jasper-jdt.jar}" index="true"
+ manifest="${tomcat.tmp}/default.manifest">
<fileset dir="${jasper-jdt.home}">
<include name="org/eclipse/jdt/core/compiler/**"/>
<include name="org/eclipse/jdt/internal/compiler/**"/>
<include name="org/eclipse/jdt/internal/core/util/CommentRecorder*"/>
</fileset>
+ <zipfileset file="${tomcat.home}/res/META-INF/jasper-jdt.jar.notice"
+ fullpath="META-INF/NOTICE" />
+ <zipfileset file="${tomcat.home}/res/META-INF/jasper-jdt.jar.license"
+ fullpath="META-INF/LICENSE" />
</jar>
</target>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
