Skip to content
Commits on Source (7)
Show whitespace changes
Inline Side-by-side
MERGE.txt
View file @ ab49f735
......@@ -55,9 +55,9 @@ the patch file has been applied and committed
FileUpload
----------
Sub-tree:
src/main/java/org/apache/commons/fileupload
src/main/java/org/apache/commons/fileupload2
The SHA1 ID for the most recent commit to be merged to Tomcat is:
b1498c9877d751f8bc4635a6f252ebdfcba28518
2cf7d09fefb17c59e5a776fd6850aebdf41046b2
Note: Tomcat's copy of fileupload also includes classes copied manually (rather
than svn copied) from Commons IO.
......@@ -69,7 +69,7 @@ Sub-tree
src/main/java/org/apache/commons/dbcp2
src/main/resources/org/apache/commons/dbcp2
The SHA1 ID for the most recent commit to be merged to Tomcat is:
171528a88cca65f5b192be643c2425458d1edfbb
de20b7779214cf8b0056aa61bb6d56c94ed3afb7
Pool2
Sub-tree
......
NOTICE
View file @ ab49f735
Apache Tomcat
Copyright 1999-2018 The Apache Software Foundation
Copyright 1999-2019 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (https://www.apache.org/).
......
RUNNING.txt
View file @ ab49f735
......@@ -457,7 +457,7 @@ For further reading:
https://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/setup.html
* Windows service HOW-TO
* Windows Service How-To
https://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/windows-service-howto.html
......
TOMCAT-NEXT.txt
View file @ ab49f735
......@@ -47,3 +47,13 @@ New items for 10.0.x onwards:
5. Consider applying the delayed log file opening (until there is something to
log). See BZ 53620.
6. Consider including
<request-character-encoding>UTF-8</request-character-encoding>
in conf/web.xml
7. Consider including
<response-character-encoding>UTF-8</response-character-encoding>
in conf/web.xml
8. RFC 3986 states (section 2.2) that a %nn encoded delimiter is NOT equivalent
to the decoded form. Provide an option no to decode delimiters in %nn form.
bin/catalina.sh
View file @ ab49f735
......@@ -476,7 +476,7 @@ elif [ "$1" = "start" ] ; then
-Dcatalina.home="\"$CATALINA_HOME\"" \
-Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \
org.apache.catalina.startup.Bootstrap "$@" start \
2\>\&1 \& echo \$! \>\"$catalina_pid_file\" \; \} $catalina_out_command "&"
2\>\&1 \&\& echo \$! \>\"$catalina_pid_file\" \; \} $catalina_out_command "&"
else
eval \{ $_NOHUP "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \
......@@ -486,7 +486,7 @@ elif [ "$1" = "start" ] ; then
-Dcatalina.home="\"$CATALINA_HOME\"" \
-Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \
org.apache.catalina.startup.Bootstrap "$@" start \
2\>\&1 \& echo \$! \>\"$catalina_pid_file\" \; \} $catalina_out_command "&"
2\>\&1 \&\& echo \$! \>\"$catalina_pid_file\" \; \} $catalina_out_command "&"
fi
......
build.properties.default
View file @ ab49f735
......@@ -25,7 +25,7 @@
# ----- Version Control Flags -----
version.major=9
version.minor=0
version.build=14
version.build=16
version.patch=0
version.suffix=
......@@ -141,13 +141,13 @@ jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
# ----- Tomcat native library -----
tomcat-native.version=1.2.19
tomcat-native.version=1.2.21
tomcat-native.src.checksum.enabled=true
tomcat-native.src.checksum.algorithm=SHA-512
tomcat-native.src.checksum.value=7d69acd5dd684eee9a85c08357b7288a9f083c15a12a9524ba6344f1b9dcdc6ccc512a37b64b9f15b0e697609833e6c68591a60976dcfecce124ec29eb532dba
tomcat-native.src.checksum.value=7f43f815785e5bc3e43f5b2e9ad1c90576a3c1528d57230328b7175bf475eb5f4e1f91b66fae74ad32cd76f044d7705f98a79109f6f84e5af75dc32bc8830b29
tomcat-native.win.checksum.enabled=true
tomcat-native.win.checksum.algorithm=SHA-512
tomcat-native.win.checksum.value=0b6349303b84632f4ce053e5ed1390571c17748f3527091936a197dcc9a686f768f913e86a431fe13dc7e0e1c3152fd13a5e501fbf95e82a096b27da6b942239
tomcat-native.win.checksum.value=bd5e7bb6584cba635d780216b87d453ecca5034235f018ba8a7429b82d653aa58cf26b89520c60271e10f242bd8a10fce401f362ecfe0fab597c7b6983ad97ce
tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
......@@ -156,10 +156,10 @@ tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-nativ
tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1a-win32-bin.zip
# ----- NSIS, version 3.0 or later -----
nsis.version=3.03
nsis.version=3.04
nsis.checksum.enabled=true
nsis.checksum.algorithm=MD5|SHA-1
nsis.checksum.value=d4919dc089ec256a7264e97ada299b64|ea69aa8d538916c9e8630dfd0106b063f7bb5d46
nsis.checksum.value=434e89380742d415ca9b91676cb92540|ed241f7384f4e59d84b9a62c71d1f6955b6a719a
nsis.home=${base.path}/nsis-${nsis.version}
nsis.exe=${nsis.home}/makensis.exe
nsis.arch.dir=x86-unicode/
......
build.xml
View file @ ab49f735
......@@ -76,8 +76,6 @@
<property name="tomcat.dist" value="${tomcat.output}/dist"/>
<property name="tomcat.embed" value="${tomcat.output}/embed"/>
<property name="tomcat.embed.sources" value="${tomcat.output}/embed-src-jars"/>
<property name="tomcat.extras" value="${tomcat.output}/extras"/>
<property name="tomcat.extras.sources" value="${tomcat.output}/extras-src-jars"/>
<property name="tomcat.manifests" value="${tomcat.output}/manifests"/>
<property name="tomcat.release" value="${tomcat.output}/release"/>
<property name="tomcat.src.jars" value="${tomcat.output}/src-jars"/>
......@@ -161,13 +159,6 @@
<property name="tomcat-embed-el-sources.jar" value="${tomcat.embed.sources}/tomcat-embed-el-src.jar"/>
<property name="tomcat-embed-websocket-sources.jar" value="${tomcat.embed.sources}/tomcat-embed-websocket-src.jar"/>
<!-- Extras JARs & source JARs -->
<property name="catalina-ws.jar" value="${tomcat.extras}/catalina-ws.jar"/>
<property name="catalina-jmx-remote.jar" value="${tomcat.extras}/catalina-jmx-remote.jar"/>
<property name="catalina-ws-src.jar" value="${tomcat.extras.sources}/catalina-ws-src.jar"/>
<property name="catalina-jmx-remote-src.jar" value="${tomcat.extras.sources}/catalina-jmx-remote-src.jar"/>
<!-- jdbc-pool JARs & source JARs -->
<property name="tomcat-jdbc.jar" value="${tomcat.pool}/tomcat-jdbc.jar"/>
<property name="tomcat-jdbc-src.jar" value="${tomcat.pool}/tomcat-jdbc-src.jar"/>
......@@ -213,6 +204,8 @@
<path id="compile.classpath">
<pathelement location="${jdt.jar}"/>
<pathelement location="${saaj-api.jar}"/>
<pathelement location="${jaxrpc-lib.jar}"/>
<pathelement location="${wsdl4j-lib.jar}"/>
</path>
<path id="tomcat.classpath">
......@@ -231,14 +224,6 @@
<path refid="tomcat.classpath" />
</path>
<path id="tomcat.webservices.classpath">
<path refid="tomcat.classpath" />
<fileset dir="${tomcat.extras}/webservices">
<include name="jaxrpc.jar"/>
<include name="wsdl4j.jar"/>
</fileset>
</path>
<!-- Version info filter set -->
<tstamp>
<format property="year" pattern="yyyy" locale="en" timezone="UTC"/>
......@@ -413,10 +398,8 @@
<!-- Modules -->
<exclude name="org/apache/catalina/ant/**" />
<exclude name="org/apache/catalina/ha/**" />
<exclude name="org/apache/catalina/mbeans/JmxRemote*" />
<exclude name="org/apache/catalina/tribes/**" />
<exclude name="org/apache/catalina/storeconfig/**" />
<exclude name="org/apache/naming/factory/webservices/**" />
</patternset>
<patternset id="files.catalina-tribes">
......@@ -505,15 +488,6 @@
<!-- See BZ 61439 -->
<!--<patternset refid="files.annotations-api" />-->
<!-- Pattern sets for extras JARs -->
<patternset id="files.tomcat-extras-ws">
<include name="org/apache/naming/factory/webservices/**" />
</patternset>
<patternset id="files.tomcat-extras-jmxremote">
<include name="org/apache/catalina/mbeans/JmxRemote*" />
</patternset>
<!-- =========================== Build targets =========================== -->
<target name="build-prepare">
......@@ -704,7 +678,6 @@
<compilerarg value="-Xlint:unchecked"/>
-->
<classpath refid="compile.classpath" />
<exclude name="org/apache/naming/factory/webservices/**" />
</javac>
<!-- Copy static resource files -->
<copy todir="${tomcat.classes}" encoding="ISO-8859-1">
......@@ -902,6 +875,16 @@
addOSGi="true" />
<!-- i18n JARs -->
<jar jarfile="${tomcat.build}/lib/tomcat-i18n-cs.jar"
manifest="${tomcat.manifests}/default.manifest">
<fileset dir="${tomcat.classes}">
<include name="**/LocalStrings_cs.properties" />
</fileset>
<zipfileset file="${tomcat.manifests}/default.notice"
fullpath="META-INF/NOTICE" />
<zipfileset file="${tomcat.manifests}/default.license"
fullpath="META-INF/LICENSE" />
</jar>
<jar jarfile="${tomcat.build}/lib/tomcat-i18n-de.jar"
manifest="${tomcat.manifests}/default.manifest">
<fileset dir="${tomcat.classes}">
......@@ -1337,7 +1320,6 @@
<exclude name="security/protected/error.jsp"/>
<exclude name="security/protected/index.jsp"/>
<exclude name="security/protected/login.jsp"/>
<exclude name="source.jsp"/>
</fileset>
</txt2html>
</target>
......@@ -1458,6 +1440,9 @@
<include name="org/apache/**" />
<include name="javax/**" />
<include name="util/**" />
<!-- Exclude these by default as Gump can't run them because the -->
<!-- classes on which they depend are not in any output JAR. -->
<exclude name="org/apache/tomcat/buildutil/**"/>
</javac>
<copy todir="${test.classes}">
<fileset dir="test">
......@@ -1607,6 +1592,8 @@
<exclude name="org/apache/tomcat/util/net/openssl/ciphers/**" unless="${test.openssl.exists}" />
<!-- Exclude performance tests. E.g. on systems with slow/inconsistent timing -->
<exclude name="**/*Performance.java" if="${test.excludePerformance}" />
<!-- Exclude tests that Gump can't compile -->
<exclude name="org/apache/tomcat/buildutil/**" />
<!-- Exclude a configurable list of tests -->
<exclude name="${test.exclude}" />
</fileset>
......@@ -1724,92 +1711,6 @@
</findbugs>
</target>
<target name="extras-prepare" >
<mkdir dir="${tomcat.extras}"/>
<mkdir dir="${tomcat.extras.sources}"/>
<mkdir dir="${tomcat.embed}"/>
<mkdir dir="${tomcat.embed.sources}"/>
<mkdir dir="${tomcat.extras}/webservices"/>
</target>
<target name="extras-webservices-prepare"
depends="extras-prepare"
description="Prepare to build web services extras package">
<antcall target="downloadfile">
<param name="sourcefile" value="${jaxrpc-lib.loc}"/>
<param name="destfile" value="${jaxrpc-lib.jar}"/>
<param name="destdir" value="${jaxrpc-lib.home}"/>
<param name="checksum.enabled" value="${jaxrpc-lib.checksum.enabled}"/>
<param name="checksum.algorithm" value="${jaxrpc-lib.checksum.algorithm}"/>
<param name="checksum.value" value="${jaxrpc-lib.checksum.value}"/>
</antcall>
<antcall target="downloadfile">
<param name="sourcefile" value="${wsdl4j-lib.loc}"/>
<param name="destfile" value="${wsdl4j-lib.jar}"/>
<param name="destdir" value="${wsdl4j-lib.home}"/>
<param name="checksum.enabled" value="${wsdl4j-lib.checksum.enabled}"/>
<param name="checksum.algorithm" value="${wsdl4j-lib.checksum.algorithm}"/>
<param name="checksum.value" value="${wsdl4j-lib.checksum.value}"/>
</antcall>
<copy file="${jaxrpc-lib.jar}"
tofile="${tomcat.extras}/webservices/jaxrpc.jar" />
<copy file="${wsdl4j-lib.jar}"
tofile="${tomcat.extras}/webservices/wsdl4j.jar" />
</target>
<target name="extras-webservices"
depends="extras-webservices-prepare,compile,build-manifests"
description="Build web services extras package">
<!-- Compile web services classes components -->
<javac srcdir="java" destdir="${tomcat.classes}"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
source="${compile.source}"
target="${compile.target}"
release="${compile.release}"
encoding="ISO-8859-1"
includeantruntime="false">
<classpath refid="tomcat.webservices.classpath" />
<include name="org/apache/naming/factory/webservices/**" />
</javac>
<jarIt jarfile="${catalina-ws.jar}"
filesDir="${tomcat.classes}"
filesId="files.tomcat-extras-ws" />
<hashAndSign file="${catalina-ws.jar}" />
<jarIt jarfile="${catalina-ws-src.jar}"
filesDir="java"
filesId="files.tomcat-extras-ws" />
</target>
<target name="extras-jmx-remote"
depends="extras-prepare,compile,build-manifests"
description="Build JMX remote extras package">
<jarIt jarfile="${catalina-jmx-remote.jar}"
filesDir="${tomcat.classes}"
filesId="files.tomcat-extras-jmxremote" />
<hashAndSign file="${catalina-jmx-remote.jar}" />
<jarIt jarfile="${catalina-jmx-remote-src.jar}"
filesDir="java"
filesId="files.tomcat-extras-jmxremote" />
</target>
<target name="extras"
depends="extras-webservices,extras-jmx-remote"
description="Build all extras packages">
</target>
<target name="dist-prepare" depends="download-dist">
<mkdir dir="${tomcat.dist}"/>
<mkdir dir="${tomcat.dist}/bin"/>
......@@ -1823,7 +1724,7 @@
<mkdir dir="${tomcat.release}/v${version}/src" />
</target>
<target name="dist-static" depends="dist-prepare, deploy, extras, embed">
<target name="dist-static" depends="dist-prepare, deploy, embed">
<!-- Copy the top-level documentation files -->
<copy todir="${tomcat.dist}" encoding="ISO-8859-1">
......@@ -1896,7 +1797,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
</target>
<target name="javadoc" depends="dist-source,extras-webservices-prepare"
<target name="javadoc" depends="dist-source"
description="Create the Tomcat javadoc" >
<javadoc packagenames="javax.servlet.*"
excludepackagenames="javax.servlet.jsp.*"
......@@ -1916,7 +1817,6 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
failonwarning="true">
<classpath>
<path refid="compile.classpath"/>
<path refid="tomcat.webservices.classpath"/>
<path location="${ant.core.lib}"/>
</classpath>
</javadoc>
......@@ -1937,7 +1837,6 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
failonwarning="true">
<classpath>
<path refid="compile.classpath"/>
<path refid="tomcat.webservices.classpath"/>
<path location="${ant.core.lib}"/>
</classpath>
</javadoc>
......@@ -1958,7 +1857,6 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
failonwarning="true">
<classpath>
<path refid="compile.classpath"/>
<path refid="tomcat.webservices.classpath"/>
<path location="${ant.core.lib}"/>
</classpath>
</javadoc>
......@@ -1979,7 +1877,6 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
failonwarning="true">
<classpath>
<path refid="compile.classpath"/>
<path refid="tomcat.webservices.classpath"/>
<path location="${ant.core.lib}"/>
</classpath>
</javadoc>
......@@ -1999,7 +1896,6 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
failonwarning="true">
<classpath>
<path refid="compile.classpath"/>
<path refid="tomcat.webservices.classpath"/>
<path location="${ant.core.lib}"/>
</classpath>
<link href="../servletapi"/>
......@@ -2290,13 +2186,6 @@ skip.installer property in build.properties" />
<filterset refid="version.filters"/>
</copy>
<mkdir dir="${tomcat.release}/v${version}/bin/extras" />
<copy todir="${tomcat.release}/v${version}/bin/extras">
<fileset dir="${tomcat.extras}">
<include name="*.*"/>
</fileset>
</copy>
<mkdir dir="${tomcat.release}/v${version}/bin/embed" />
<copy todir="${tomcat.release}/v${version}/bin/embed">
<fileset dir="${tomcat.embed}">
......@@ -2760,6 +2649,25 @@ skip.installer property in build.properties" />
<param name="checksum.value" value="${saaj-api.checksum.value}"/>
</antcall>
<!-- Download WS API -->
<antcall target="downloadfile">
<param name="sourcefile" value="${jaxrpc-lib.loc}"/>
<param name="destfile" value="${jaxrpc-lib.jar}"/>
<param name="destdir" value="${jaxrpc-lib.home}"/>
<param name="checksum.enabled" value="${jaxrpc-lib.checksum.enabled}"/>
<param name="checksum.algorithm" value="${jaxrpc-lib.checksum.algorithm}"/>
<param name="checksum.value" value="${jaxrpc-lib.checksum.value}"/>
</antcall>
<antcall target="downloadfile">
<param name="sourcefile" value="${wsdl4j-lib.loc}"/>
<param name="destfile" value="${wsdl4j-lib.jar}"/>
<param name="destdir" value="${wsdl4j-lib.home}"/>
<param name="checksum.enabled" value="${wsdl4j-lib.checksum.enabled}"/>
<param name="checksum.algorithm" value="${wsdl4j-lib.checksum.algorithm}"/>
<param name="checksum.value" value="${wsdl4j-lib.checksum.value}"/>
</antcall>
</target>
<target name="download-test-compile"
......@@ -3170,7 +3078,7 @@ skip.installer property in build.properties" />
<!-- ============================ Eclipse ================================ -->
<target name="ide-eclipse"
depends="download-compile, extras-webservices-prepare, download-test-compile"
depends="download-compile, download-test-compile"
description="Prepares the source tree to be built in Eclipse">
<!-- Copy the sample project files into the root directory -->
......@@ -3188,7 +3096,7 @@ Read the Building page on the Apache Tomcat documentation site for details on ho
<!-- ============================ IntelliJ IDEA=========================== -->
<target name="ide-intellij"
depends="download-compile, extras-webservices-prepare, download-test-compile"
depends="download-compile, download-test-compile"
description="Creates project directory .idea for IntelliJ IDEA">
<copy todir="${tomcat.home}/.idea">
......
conf/catalina.properties
View file @ ab49f735
......@@ -172,6 +172,7 @@ tagsoup-*.jar,\
tomcat-api.jar,\
tomcat-coyote.jar,\
tomcat-dbcp.jar,\
tomcat-i18n-cs.jar,\
tomcat-i18n-de.jar,\
tomcat-i18n-en.jar,\
tomcat-i18n-es.jar,\
......
debian/changelog
View file @ ab49f735
tomcat9 (9.0.16-1) unstable; urgency=medium
* New upstream release
- Refreshed the patches
- Install the new Chinese, Czech, German, Korean and Portuguese translations
- No longer build the extra WS and JMX jars
* Standards-Version updated to 4.3.0
-- Emmanuel Bourg <ebourg@apache.org> Fri, 08 Feb 2019 08:26:48 +0100
tomcat9 (9.0.14-1) unstable; urgency=medium
* New upstream release
......
debian/control
View file @ ab49f735
......@@ -24,7 +24,7 @@ Build-Depends:
libwsdl4j-java,
lsb-release,
maven-repo-helper
Standards-Version: 4.2.1
Standards-Version: 4.3.0
Vcs-Git: https://salsa.debian.org/java-team/tomcat9.git
Vcs-Browser: https://salsa.debian.org/java-team/tomcat9
Homepage: http://tomcat.apache.org
......
debian/libtomcat9-java.poms
View file @ ab49f735
......@@ -3,14 +3,18 @@ debian/poms/tomcat-api.pom --java-lib --usj-name=tomcat9-api
debian/poms/tomcat-catalina.pom --java-lib --usj-name=tomcat9-catalina --artifact=output/build/lib/catalina.jar
debian/poms/tomcat-catalina-ant.pom --java-lib --usj-name=tomcat9-catalina-ant --artifact=output/build/lib/catalina-ant.jar
debian/poms/tomcat-catalina-ha.pom --java-lib --usj-name=tomcat9-catalina-ha --artifact=output/build/lib/catalina-ha.jar
debian/poms/tomcat-catalina-ws.pom --java-lib --usj-name=tomcat9-catalina-ws --artifact=output/extras/catalina-ws.jar
debian/poms/tomcat-coyote.pom --java-lib --usj-name=tomcat9-coyote --artifact=output/build/lib/tomcat-coyote.jar
debian/poms/tomcat-dbcp.pom --java-lib --usj-name=tomcat9-dbcp --artifact=output/build/lib/tomcat-dbcp.jar
debian/poms/tomcat-el-api.pom --java-lib --usj-name=tomcat9-el-api --artifact=output/build/lib/el-api.jar
debian/poms/tomcat-i18n-cs.pom --java-lib --usj-name=tomcat9-i18n-cs --artifact=output/build/lib/tomcat-i18n-cs.jar
debian/poms/tomcat-i18n-de.pom --java-lib --usj-name=tomcat9-i18n-de --artifact=output/build/lib/tomcat-i18n-de.jar
debian/poms/tomcat-i18n-es.pom --java-lib --usj-name=tomcat9-i18n-es --artifact=output/build/lib/tomcat-i18n-es.jar
debian/poms/tomcat-i18n-fr.pom --java-lib --usj-name=tomcat9-i18n-fr --artifact=output/build/lib/tomcat-i18n-fr.jar
debian/poms/tomcat-i18n-ja.pom --java-lib --usj-name=tomcat9-i18n-ja --artifact=output/build/lib/tomcat-i18n-ja.jar
debian/poms/tomcat-i18n-ko.pom --java-lib --usj-name=tomcat9-i18n-ko --artifact=output/build/lib/tomcat-i18n-ko.jar
debian/poms/tomcat-i18n-pt-BR.pom --java-lib --usj-name=tomcat9-i18n-pt-BR --artifact=output/build/lib/tomcat-i18n-pt-BR.jar
debian/poms/tomcat-i18n-ru.pom --java-lib --usj-name=tomcat9-i18n-ru --artifact=output/build/lib/tomcat-i18n-ru.jar
debian/poms/tomcat-i18n-zh-CN.pom --java-lib --usj-name=tomcat9-i18n-zh-CN --artifact=output/build/lib/tomcat-i18n-zh-CN.jar
debian/poms/tomcat-jasper.pom --java-lib --usj-name=tomcat9-jasper --artifact=output/build/lib/jasper.jar
debian/poms/tomcat-jasper-el.pom --java-lib --usj-name=tomcat9-jasper-el --artifact=output/build/lib/jasper-el.jar
debian/poms/tomcat-jaspic-api.pom --java-lib --usj-name=tomcat9-jaspic-api --artifact=output/build/lib/jaspic-api.jar
......@@ -25,4 +29,3 @@ debian/poms/tomcat-util.pom --java-lib --usj-name=tomcat9-util
debian/poms/tomcat-util-scan.pom --java-lib --usj-name=tomcat9-util-scan --artifact=output/build/lib/tomcat-util-scan.jar
debian/poms/tomcat-websocket.pom --java-lib --usj-name=tomcat9-websocket --artifact=output/build/lib/tomcat-websocket.jar
debian/poms/tomcat-websocket-api.pom --java-lib --usj-name=tomcat9-websocket-api --artifact=output/build/lib/websocket-api.jar
debian/poms/tomcat-catalina-jmx-remote.pom --java-lib --usj-name=tomcat9-catalina-jmx-remote --artifact=output/extras/catalina-jmx-remote.jar
debian/patches/0004-split-deploy-webapps-target-from-deploy-target.patch
View file @ ab49f735
......@@ -3,7 +3,7 @@ Date: Mon, 28 Jun 2010 21:32:35 +0200
Subject: [PATCH] split deploy-webapps target from deploy target
--- a/build.xml
+++ b/build.xml
@@ -1129,7 +1129,7 @@
@@ -1112,7 +1112,7 @@
</xslt>
</target>
......@@ -12,7 +12,7 @@ Subject: [PATCH] split deploy-webapps target from deploy target
description="Default. Builds a working Tomcat instance">
<copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
@@ -1163,6 +1163,10 @@
@@ -1146,6 +1146,10 @@
</fileset>
</copy>
......
debian/patches/0005-skip-test-failures.patch
View file @ ab49f735
......@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg@apache.org>
Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
@@ -1508,8 +1508,10 @@
@@ -1493,8 +1493,10 @@
</filterchain>
</concat>
......
debian/patches/0010-debianize-build-xml.patch
View file @ ab49f735
......@@ -5,7 +5,7 @@ Last-Update: 2011-05-16
--- a/build.xml
+++ b/build.xml
@@ -689,7 +689,7 @@
@@ -663,7 +663,7 @@
</copy>
</target>
......@@ -14,7 +14,7 @@ Last-Update: 2011-05-16
<!-- Compile internal server components -->
<javac srcdir="java" destdir="${tomcat.classes}"
debug="${compile.debug}"
@@ -1131,9 +1131,9 @@
@@ -1114,9 +1114,9 @@
<target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples,deploy-webapps"
description="Default. Builds a working Tomcat instance">
......
debian/patches/0013-dont-look-for-build-properties-in-user-home.patch
View file @ ab49f735
......@@ -5,7 +5,7 @@ Author: Jakub Adam <jakub.adam@ktknet.cz>
Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
@@ -537,7 +537,6 @@
@@ -511,7 +511,6 @@
<!-- Property that determines if manifests need updating -->
<uptodate property="manifests.uptodate"
targetfile="${tomcat.manifests}/default.manifest" >
......@@ -13,7 +13,7 @@ Forwarded: not-needed
<srcfiles file="${basedir}/build.properties" />
<srcfiles file="${basedir}/build.properties.default" />
<srcfiles file="${basedir}/build.xml" />
@@ -551,7 +550,6 @@
@@ -525,7 +524,6 @@
<!-- Property that determines if OSGI bnd files need updating -->
<uptodate property="bnd.uptodate"
targetfile="${tomcat.bnd}/annotations-api.bnd" >
......
debian/patches/0019-add-distribution-to-error-page.patch
View file @ ab49f735
......@@ -16,7 +16,7 @@ Bug-Debian: http://bugs.debian.org/729840
\ No newline at end of file
--- a/build.xml
+++ b/build.xml
@@ -250,6 +250,7 @@
@@ -235,6 +235,7 @@
<filter token="YEAR" value="${year}"/>
<filter token="VERSION" value="${version}"/>
<filter token="VERSION_NUMBER" value="${version.number}"/>
......
debian/rules
View file @ ab49f735
......@@ -8,7 +8,7 @@ JAVA_HOME := /usr/lib/jvm/default-java
dh $@ --with maven-repo-helper --with javahelper
override_dh_auto_build:
dh_auto_build -- -Ddistribution.name=$(shell lsb_release -si) extras-webservices extras-jmx-remote deploy embed-jars
dh_auto_build -- -Ddistribution.name=$(shell lsb_release -si) deploy embed-jars
# Prepare the Maven artifacts
mkdir -p debian/poms
......
java/javax/el/ExpressionFactory.java
View file @ ab49f735
......@@ -149,9 +149,7 @@ public abstract class ExpressionFactory {
writeLock.unlock();
}
} catch (ClassNotFoundException e) {
throw new ELException(
"Unable to find ExpressionFactory of type: " + className,
e);
throw new ELException(Util.message(null, "expressionFactory.cannotFind", className), e);
}
}
......@@ -178,13 +176,9 @@ public abstract class ExpressionFactory {
} catch (InvocationTargetException e) {
Throwable cause = e.getCause();
Util.handleThrowable(cause);
throw new ELException(
"Unable to create ExpressionFactory of type: " + clazz.getName(),
e);
throw new ELException(Util.message(null, "expressionFactory.cannotCreate", clazz.getName()), e);
} catch (ReflectiveOperationException | IllegalArgumentException e) {
throw new ELException(
"Unable to create ExpressionFactory of type: " + clazz.getName(),
e);
throw new ELException(Util.message(null, "expressionFactory.cannotCreate", clazz.getName()), e);
}
return result;
......@@ -397,8 +391,7 @@ public abstract class ExpressionFactory {
// Should never happen with UTF-8
// If it does - ignore & return null
} catch (IOException e) {
throw new ELException("Failed to read " + SERVICE_RESOURCE_NAME,
e);
throw new ELException(Util.message(null, "expressionFactory.readFailed", SERVICE_RESOURCE_NAME), e);
} finally {
try {
is.close();
......@@ -422,7 +415,7 @@ public abstract class ExpressionFactory {
} catch (FileNotFoundException e) {
// Should not happen - ignore it if it does
} catch (IOException e) {
throw new ELException("Failed to read " + PROPERTY_FILE, e);
throw new ELException(Util.message(null, "expressionFactory.readFailed", PROPERTY_FILE), e);
}
}
return null;
......
java/javax/el/ImportHandler.java
View file @ ab49f735
......@@ -164,6 +164,7 @@ public class ImportHandler {
javaLangClassNames.add("Compiler");
javaLangClassNames.add("Double");
javaLangClassNames.add("Enum");
javaLangClassNames.add("Enum.EnumDesc");
javaLangClassNames.add("Float");
javaLangClassNames.add("InheritableThreadLocal");
javaLangClassNames.add("Integer");
......
java/javax/el/LocalStrings.properties
View file @ ab49f735
......@@ -22,6 +22,10 @@ elProcessor.defineFunctionInvalidParameterTypeName=The parameter type [{0}] for
elProcessor.defineFunctionNoMethod=A public static method [{0}] on class [{1}] could not be found
elProcessor.defineFunctionNullParams=One or more of the input parameters was null
expressionFactory.cannotCreate=Unable to create ExpressionFactory of type [{0}]
expressionFactory.cannotFind=Unable to find ExpressionFactory of type [{0}]
expressionFactory.readFailed=Failed to read [{0}]
importHandler.ambiguousImport=The class [{0}] could not be imported as it conflicts with [{1}] which has already been imported
importHandler.ambiguousStaticImport=The static import [{0}] could not be processed as it conflicts with [{1}] which has already been imported
importHandler.classNotFound=The class [{0}] could not be imported as it could not be found
......