This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository tomcat8.
commit 79f5213f6528a9bcb4e0aa2f7bd331a6e8345ea9 Author: Emmanuel Bourg <[email protected]> Date: Thu Sep 12 17:12:25 2013 +0200 Refreshed the patches --- debian/changelog | 1 + ...1-set-UTF-8-as-default-character-encoding.patch | 10 +---- ...02-do-not-load-AJP13-connector-by-default.patch | 10 +---- .../patches/0003-disable-APR-library-loading.patch | 11 +---- ...-deploy-webapps-target-from-deploy-target.patch | 13 ++---- .../0006-add-JARs-below-var-to-class-loader.patch | 7 +--- ...-java.security.policy-file-in-catalina.sh.patch | 43 +++++++++----------- debian/patches/0010-debianize-build-xml.patch | 8 ++-- .../0011-fix-classpath-lintian-warnings.patch | 20 ++++----- debian/patches/0012-java7-compat.patch | 2 +- ...nt-look-for-build-properties-in-user-home.patch | 7 +--- debian/patches/0014-JDTCompiler.patch | 4 +- .../0015_disable_test_TestCometProcessor.patch | 4 +- debian/patches/0017-use-jdbc-pool-default.patch | 27 ++++++------ ...r-webapp.path => 0018-fix-manager-webapp.patch} | 32 +++++++-------- debian/patches/series | 2 +- 16 files changed, 78 insertions(+), 123 deletions(-) diff --git a/debian/changelog b/debian/changelog index 960c26d..8539a98 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ tomcat8 (8.0.0~RC1-1) UNRELEASED; urgency=low - Updated the version of the Servlet, JSP and EL APIs - Switch to Java 7 - Updated the watch file to match the Tomcat 8 releases + - Refreshed the patches * Use XZ compression for the upstream tarball * Replaced Sun Microsystems with Oracle diff --git a/debian/patches/0001-set-UTF-8-as-default-character-encoding.patch b/debian/patches/0001-set-UTF-8-as-default-character-encoding.patch index b63dd41..9695ae8 100644 --- a/debian/patches/0001-set-UTF-8-as-default-character-encoding.patch +++ b/debian/patches/0001-set-UTF-8-as-default-character-encoding.patch @@ -1,11 +1,5 @@ -From: Thomas Koch <[email protected]> -Date: Mon, 28 Jun 2010 21:32:15 +0200 -Subject: [PATCH] set UTF-8 as default character encoding - ---- - conf/server.xml | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - +Description: Set UTF-8 as default character encoding +Author: Thomas Koch <[email protected]> --- a/conf/server.xml +++ b/conf/server.xml @@ -69,6 +69,7 @@ diff --git a/debian/patches/0002-do-not-load-AJP13-connector-by-default.patch b/debian/patches/0002-do-not-load-AJP13-connector-by-default.patch index fe812e3..6b6471e 100644 --- a/debian/patches/0002-do-not-load-AJP13-connector-by-default.patch +++ b/debian/patches/0002-do-not-load-AJP13-connector-by-default.patch @@ -1,11 +1,5 @@ -From: Thierry Carrez <[email protected]> -Date: Mon, 28 Jun 2010 21:32:21 +0200 -Subject: [PATCH] do not load AJP13 connector by default - ---- - conf/server.xml | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - +Description: Do not load AJP13 connector by default +Author: Thierry Carrez <[email protected]> --- a/conf/server.xml +++ b/conf/server.xml @@ -89,7 +89,9 @@ diff --git a/debian/patches/0003-disable-APR-library-loading.patch b/debian/patches/0003-disable-APR-library-loading.patch index 4577a28..7f5cd6c 100644 --- a/debian/patches/0003-disable-APR-library-loading.patch +++ b/debian/patches/0003-disable-APR-library-loading.patch @@ -1,12 +1,5 @@ -From: Thierry Carrez <[email protected]> -Date: Mon, 28 Jun 2010 21:32:28 +0200 -Subject: [PATCH] disable APR library loading - - ... until we properly provide it. ---- - conf/server.xml | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - +Description: Disables APR library loading until we properly provide it. +Author: Thierry Carrez <[email protected]> --- a/conf/server.xml +++ b/conf/server.xml @@ -24,7 +24,9 @@ diff --git a/debian/patches/0004-split-deploy-webapps-target-from-deploy-target.patch b/debian/patches/0004-split-deploy-webapps-target-from-deploy-target.patch index ea0516e..3e29b20 100644 --- a/debian/patches/0004-split-deploy-webapps-target-from-deploy-target.patch +++ b/debian/patches/0004-split-deploy-webapps-target-from-deploy-target.patch @@ -1,23 +1,18 @@ From: Debian Java Maintainers <[email protected]> Date: Mon, 28 Jun 2010 21:32:35 +0200 Subject: [PATCH] split deploy-webapps target from deploy target - ---- - build.xml | 13 ++++++++----- - 1 files changed, 8 insertions(+), 5 deletions(-) - --- a/build.xml +++ b/build.xml -@@ -851,7 +851,7 @@ +@@ -920,7 +920,7 @@ </xslt> </target> -- <target name="deploy" depends="package,build-docs" -+ <target name="deploy" depends="package,build-docs,deploy-webapps" +- <target name="deploy" depends="package,build-docs,build-tomcat-jdbc" ++ <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,deploy-webapps" description="Default. Builds a working Tomcat instance"> <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz" -@@ -889,6 +889,10 @@ +@@ -958,6 +958,10 @@ </fileset> </copy> diff --git a/debian/patches/0006-add-JARs-below-var-to-class-loader.patch b/debian/patches/0006-add-JARs-below-var-to-class-loader.patch index 2b735f6..3c4e472 100644 --- a/debian/patches/0006-add-JARs-below-var-to-class-loader.patch +++ b/debian/patches/0006-add-JARs-below-var-to-class-loader.patch @@ -1,11 +1,6 @@ From: Debian Java Maintainers <[email protected]> Date: Mon, 28 Jun 2010 21:32:57 +0200 Subject: [PATCH] add JARs below /var to class loader - ---- - conf/catalina.properties | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - --- a/conf/catalina.properties +++ b/conf/catalina.properties @@ -44,7 +44,7 @@ @@ -33,5 +28,5 @@ Subject: [PATCH] add JARs below /var to class loader -shared.loader= +shared.loader=${catalina.home}/shared/classes,${catalina.home}/shared/*.jar - # List of JAR files that should not be scanned using the JarScanner + # Default list of JAR files that should not be scanned using the JarScanner # functionality. This is typically used to scan JARs for configuration diff --git a/debian/patches/0009-Use-java.security.policy-file-in-catalina.sh.patch b/debian/patches/0009-Use-java.security.policy-file-in-catalina.sh.patch index 8337de7..1da8d66 100644 --- a/debian/patches/0009-Use-java.security.policy-file-in-catalina.sh.patch +++ b/debian/patches/0009-Use-java.security.policy-file-in-catalina.sh.patch @@ -1,20 +1,15 @@ From: Adam Guthrie <[email protected]> Date: Mon, 28 Jun 2010 21:53:50 +0200 Subject: [PATCH] Use java.security.policy file in catalina.sh - -Make sure catalina.sh uses the Debian/Ubuntu java.security.policy -file location when Tomcat is started with a security manager. + Make sure catalina.sh uses the Debian/Ubuntu java.security.policy + file location when Tomcat is started with a security manager. Bug-Ubuntu: https://bugs.launchpad.net/bugs/591802 Bug-Debian: http://bugs.debian.org/585379 Forwarded: not-needed ---- - bin/catalina.sh | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - --- a/bin/catalina.sh +++ b/bin/catalina.sh -@@ -285,7 +285,7 @@ if [ "$1" = "debug" ] ; then +@@ -285,7 +285,7 @@ -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \ -sourcepath "$CATALINA_HOME"/../../java \ -Djava.security.manager \ @@ -23,21 +18,21 @@ Forwarded: not-needed -Dcatalina.base="$CATALINA_BASE" \ -Dcatalina.home="$CATALINA_HOME" \ -Djava.io.tmpdir="$CATALINA_TMPDIR" \ -@@ -312,7 +312,7 @@ elif [ "$1" = "run" ]; then - eval exec \"$_RUNJAVA\" \"$LOGGING_CONFIG\" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \ - -Djava.endorsed.dirs=\"$JAVA_ENDORSED_DIRS\" -classpath \"$CLASSPATH\" \ +@@ -312,7 +312,7 @@ + eval exec "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \ + -Djava.endorsed.dirs="\"$JAVA_ENDORSED_DIRS\"" -classpath "\"$CLASSPATH\"" \ -Djava.security.manager \ -- -Djava.security.policy==\"$CATALINA_BASE/conf/catalina.policy\" \ -+ -Djava.security.policy==\"$CATALINA_BASE/work/catalina.policy\" \ - -Dcatalina.base=\"$CATALINA_BASE\" \ - -Dcatalina.home=\"$CATALINA_HOME\" \ - -Djava.io.tmpdir=\"$CATALINA_TMPDIR\" \ -@@ -376,7 +376,7 @@ elif [ "$1" = "start" ] ; then - eval \"$_RUNJAVA\" \"$LOGGING_CONFIG\" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \ - -Djava.endorsed.dirs=\"$JAVA_ENDORSED_DIRS\" -classpath \"$CLASSPATH\" \ +- -Djava.security.policy=="\"$CATALINA_BASE/conf/catalina.policy\"" \ ++ -Djava.security.policy=="\"$CATALINA_BASE/work/catalina.policy\"" \ + -Dcatalina.base="\"$CATALINA_BASE\"" \ + -Dcatalina.home="\"$CATALINA_HOME\"" \ + -Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \ +@@ -376,7 +376,7 @@ + eval "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER $JAVA_OPTS $CATALINA_OPTS \ + -Djava.endorsed.dirs="\"$JAVA_ENDORSED_DIRS\"" -classpath "\"$CLASSPATH\"" \ -Djava.security.manager \ -- -Djava.security.policy==\"$CATALINA_BASE/conf/catalina.policy\" \ -+ -Djava.security.policy==\"$CATALINA_BASE/work/catalina.policy\" \ - -Dcatalina.base=\"$CATALINA_BASE\" \ - -Dcatalina.home=\"$CATALINA_HOME\" \ - -Djava.io.tmpdir=\"$CATALINA_TMPDIR\" \ +- -Djava.security.policy=="\"$CATALINA_BASE/conf/catalina.policy\"" \ ++ -Djava.security.policy=="\"$CATALINA_BASE/work/catalina.policy\"" \ + -Dcatalina.base="\"$CATALINA_BASE\"" \ + -Dcatalina.home="\"$CATALINA_HOME\"" \ + -Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \ diff --git a/debian/patches/0010-debianize-build-xml.patch b/debian/patches/0010-debianize-build-xml.patch index 5c187e9..21e2823 100644 --- a/debian/patches/0010-debianize-build-xml.patch +++ b/debian/patches/0010-debianize-build-xml.patch @@ -5,17 +5,17 @@ Last-Update: 2011-05-16 --- a/build.xml +++ b/build.xml -@@ -553,7 +553,7 @@ +@@ -598,7 +598,7 @@ </copy> </target> -- <target name="compile" depends="build-prepare,download-compile,compile-prepare,validate"> +- <target name="compile" depends="download-compile,validate"> + <target name="compile" depends="build-prepare,compile-prepare"> <!-- Compile internal server components --> <javac srcdir="java" destdir="${tomcat.classes}" debug="${compile.debug}" -@@ -854,12 +854,14 @@ - <target name="deploy" depends="package,build-docs,deploy-webapps" +@@ -923,12 +923,14 @@ + <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,deploy-webapps" description="Default. Builds a working Tomcat instance"> + <!-- diff --git a/debian/patches/0011-fix-classpath-lintian-warnings.patch b/debian/patches/0011-fix-classpath-lintian-warnings.patch index d29bdad..242e8c8 100644 --- a/debian/patches/0011-fix-classpath-lintian-warnings.patch +++ b/debian/patches/0011-fix-classpath-lintian-warnings.patch @@ -5,17 +5,15 @@ Last-Update: 2011-05-16 --- a/build.xml +++ b/build.xml -@@ -686,7 +686,8 @@ - <!-- Jasper Implementation JAR File --> +@@ -755,6 +755,7 @@ <jarIt jarfile="${jasper.jar}" filesDir="${tomcat.classes}" -- filesId="files.jasper" /> -+ filesId="files.jasper" -+ manifest="${tomcat.manifests}/jasper.jar.manifest" /> + filesId="files.jasper" ++ manifest="${tomcat.manifests}/jasper.jar.manifest" + meta-inf="${tomcat.manifests}/jasper.jar"/> <!-- Jasper EL Implementation JAR File --> - <jarIt jarfile="${jasper-el.jar}" -@@ -694,8 +695,7 @@ +@@ -763,8 +764,7 @@ filesId="files.jasper-el" /> <!-- i18n JARs --> @@ -25,7 +23,7 @@ Last-Update: 2011-05-16 <fileset dir="${tomcat.classes}"> <include name="**/LocalStrings_es.properties" /> </fileset> -@@ -703,9 +703,8 @@ +@@ -772,9 +772,8 @@ fullpath="META-INF/NOTICE" /> <zipfileset file="${tomcat.manifests}/default.license" fullpath="META-INF/LICENSE" /> @@ -37,7 +35,7 @@ Last-Update: 2011-05-16 <fileset dir="${tomcat.classes}"> <include name="**/LocalStrings_fr.properties" /> </fileset> -@@ -713,9 +712,8 @@ +@@ -782,9 +781,8 @@ fullpath="META-INF/NOTICE" /> <zipfileset file="${tomcat.manifests}/default.license" fullpath="META-INF/LICENSE" /> @@ -49,7 +47,7 @@ Last-Update: 2011-05-16 <fileset dir="${tomcat.classes}"> <include name="**/LocalStrings_ja.properties" /> </fileset> -@@ -723,7 +721,7 @@ +@@ -792,7 +790,7 @@ fullpath="META-INF/NOTICE" /> <zipfileset file="${tomcat.manifests}/default.license" fullpath="META-INF/LICENSE" /> @@ -70,4 +68,4 @@ Last-Update: 2011-05-16 +Implementation-Vendor: Apache Software Foundation +X-Compile-Source-JDK: @source.jdk@ +X-Compile-Target-JDK: @target.jdk@ -+Class-Path: ecj.jar tomcat-el-api-2.2.jar tomcat-servlet-api-3.0.jar tomcat-jsp-api-2.2.jar ++Class-Path: ecj.jar tomcat-el-api-3.0.jar tomcat-servlet-api-3.1.jar tomcat-jsp-api-2.3.jar diff --git a/debian/patches/0012-java7-compat.patch b/debian/patches/0012-java7-compat.patch index a3c1f4f..cedbbc3 100644 --- a/debian/patches/0012-java7-compat.patch +++ b/debian/patches/0012-java7-compat.patch @@ -1,4 +1,4 @@ -Description: Compatibility patch to support compilation of tomcat7 +Description: Compatibility patch to support compilation of tomcat8 using openjdk-7 Author: James Page <[email protected]> Forwarded: not-needed diff --git a/debian/patches/0013-dont-look-for-build-properties-in-user-home.patch b/debian/patches/0013-dont-look-for-build-properties-in-user-home.patch index 6b34b4b..03d2d5b 100644 --- a/debian/patches/0013-dont-look-for-build-properties-in-user-home.patch +++ b/debian/patches/0013-dont-look-for-build-properties-in-user-home.patch @@ -1,14 +1,9 @@ From: Jakub Adam <[email protected]> Date: Mon, 9 Jul 2012 20:53:38 +0000 Subject: 0013-dont-look-for-build-properties-in-user-home - ---- - build.xml | 1 - - 1 file changed, 1 deletion(-) - --- a/build.xml +++ b/build.xml -@@ -427,7 +427,6 @@ +@@ -470,7 +470,6 @@ <!-- Property that determines if manifests need updating --> <uptodate property="manifests.uptodate" targetfile="${tomcat.manifests}/default.manifest" > diff --git a/debian/patches/0014-JDTCompiler.patch b/debian/patches/0014-JDTCompiler.patch index 750088d..68b1d78 100644 --- a/debian/patches/0014-JDTCompiler.patch +++ b/debian/patches/0014-JDTCompiler.patch @@ -1,8 +1,6 @@ -diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java b/java/org/apache/jasper/compiler/JDTCompiler.java -index 2ee9e95..75f3c67 100644 --- a/java/org/apache/jasper/compiler/JDTCompiler.java +++ b/java/org/apache/jasper/compiler/JDTCompiler.java -@@ -166,7 +166,7 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler { +@@ -165,7 +165,7 @@ return result; } diff --git a/debian/patches/0015_disable_test_TestCometProcessor.patch b/debian/patches/0015_disable_test_TestCometProcessor.patch index 5fa28f6..bc12712 100644 --- a/debian/patches/0015_disable_test_TestCometProcessor.patch +++ b/debian/patches/0015_disable_test_TestCometProcessor.patch @@ -1,6 +1,6 @@ --- a/test/org/apache/catalina/comet/TestCometProcessor.java +++ b/test/org/apache/catalina/comet/TestCometProcessor.java -@@ -34,6 +34,7 @@ import static org.junit.Assert.fail; +@@ -34,6 +34,7 @@ import org.junit.Assert; import org.junit.Test; @@ -8,7 +8,7 @@ import org.apache.catalina.Context; import org.apache.catalina.Wrapper; -@@ -191,6 +192,7 @@ public class TestCometProcessor extends +@@ -191,6 +192,7 @@ } @Test diff --git a/debian/patches/0017-use-jdbc-pool-default.patch b/debian/patches/0017-use-jdbc-pool-default.patch index 16c996b..ab18dbc 100644 --- a/debian/patches/0017-use-jdbc-pool-default.patch +++ b/debian/patches/0017-use-jdbc-pool-default.patch @@ -9,38 +9,37 @@ Description: Make jdbc-pool module default Author: James Page <[email protected]> Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/tomcat7/+bug/1071817 Forwarded: not-needed ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ - --- a/java/org/apache/naming/factory/Constants.java +++ b/java/org/apache/naming/factory/Constants.java -@@ -49,7 +49,7 @@ public final class Constants { +@@ -49,7 +49,7 @@ Package + ".HandlerFactory"; - public static final String DBCP_DATASOURCE_FACTORY = -- "org.apache.tomcat.dbcp.dbcp.BasicDataSourceFactory"; + public static final String DBCP_DATASOURCE_FACTORY = +- "org.apache.tomcat.dbcp.dbcp2.BasicDataSourceFactory"; + "org.apache.tomcat.jdbc.pool.DataSourceFactory"; - public static final String OPENEJB_EJB_FACTORY = + public static final String OPENEJB_EJB_FACTORY = Package + ".OpenEjbFactory"; --- a/webapps/docs/config/systemprops.xml +++ b/webapps/docs/config/systemprops.xml -@@ -581,7 +581,7 @@ +@@ -595,9 +595,7 @@ <property name="javax.sql.DataSource.Factory"> <p>The class name of the factory to use to create resources of type <code>javax.sql.DataSource</code>. If not specified the default of -- <code>org.apache.tomcat.dbcp.dbcp.BasicDataSourceFactory</code> is used -+ <code>org.apache.tomcat.jdbc.pool.DataSourceFactory</code> is used - which is a package renamed (to avoid conflictions) copy of - <a href="http://commons.apache.org/dbcp";>Apache Commons DBCP</a>.</p> +- <code>org.apache.tomcat.dbcp.dbcp2.BasicDataSourceFactory</code> is used +- which is a package renamed (to avoid conflictions) copy of +- <a href="http://commons.apache.org/dbcp";>Apache Commons DBCP</a>.</p> ++ <code>org.apache.tomcat.jdbc.pool.DataSourceFactory</code> is used.</p> </property> + + <property name="javax.mail.Session.Factory"> --- a/webapps/docs/jndi-resources-howto.xml +++ b/webapps/docs/jndi-resources-howto.xml -@@ -684,7 +684,7 @@ conn.close(); +@@ -684,7 +684,7 @@ <p>The configuration properties for Tomcat's standard data source resource factory -- (<code>org.apache.tomcat.dbcp.dbcp.BasicDataSourceFactory</code>) are +- (<code>org.apache.tomcat.dbcp.dbcp2.BasicDataSourceFactory</code>) are + (<code>org.apache.tomcat.jdbc.pool.DataSourceFactory</code>) are as follows:</p> <ul> diff --git a/debian/patches/fix-manager-webapp.path b/debian/patches/0018-fix-manager-webapp.patch similarity index 69% rename from debian/patches/fix-manager-webapp.path rename to debian/patches/0018-fix-manager-webapp.patch index e94ea42..59931a7 100644 --- a/debian/patches/fix-manager-webapp.path +++ b/debian/patches/0018-fix-manager-webapp.patch @@ -1,41 +1,39 @@ -DESCRIPTION: this patch changes the manager path from webapps/manager to -../tomcat7-admin/manager - +Description: This patch changes the manager path from webapps/manager to + ../tomcat8-admin/manager Author: TJ <[email protected]>, Gianfranco Costamagna <[email protected]> Bug-Ubuntu: https://bugs.launchpad.net/bugs/1128067 Reviewed-By: Gianfranco Costamagna <[email protected]> -Last-Update: <2013-08-01> - ---- tomcat7-7.0.42.orig/webapps/host-manager/manager.xml -+++ tomcat7-7.0.42/webapps/host-manager/manager.xml +Last-Update: 2013-08-01 +--- a/webapps/host-manager/manager.xml ++++ b/webapps/host-manager/manager.xml @@ -24,7 +24,7 @@ --> -<Context docBase="${catalina.home}/webapps/manager" -+<Context docBase="${catalina.home}/../tomcat7-admin/manager" ++<Context docBase="${catalina.home}/../tomcat8-admin/manager" privileged="true" antiResourceLocking="false" antiJARLocking="false"> </Context> ---- tomcat7-7.0.42.orig/webapps/docs/manager-howto.xml -+++ tomcat7-7.0.42/webapps/docs/manager-howto.xml -@@ -72,7 +72,7 @@ Manager web application <code>Context</c +--- a/webapps/docs/manager-howto.xml ++++ b/webapps/docs/manager-howto.xml +@@ -72,7 +72,7 @@ example:</p> <pre> <Context privileged="true" antiResourceLocking="false" - docBase="${catalina.home}/webapps/manager"> -+ docBase="${catalina.home}/../tomcat7-admin/manager"> ++ docBase="${catalina.home}/../tomcat8-admin/manager"> <Valve className="org.apache.catalina.valves.RemoteAddrValve" allow="127\.0\.0\.1" /> </Context> ---- tomcat7-7.0.42.orig/conf/catalina.policy -+++ tomcat7-7.0.42/conf/catalina.policy -@@ -196,14 +196,14 @@ grant { +--- a/conf/catalina.policy ++++ b/conf/catalina.policy +@@ -196,14 +196,14 @@ // - default CATALINA_HOME == CATALINA_BASE // - CATALINA_HOME != CATALINA_BASE, per instance Manager in CATALINA_BASE // - CATALINA_HOME != CATALINA_BASE, shared Manager in CATALINA_HOME -grant codeBase "file:${catalina.base}/webapps/manager/-" { -+grant codeBase "file:${catalina.base}/../tomcat7-admin/manager/-" { ++grant codeBase "file:${catalina.base}/../tomcat8-admin/manager/-" { permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina"; permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina.ha.session"; permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina.manager"; @@ -43,7 +41,7 @@ Last-Update: <2013-08-01> permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina.util"; }; -grant codeBase "file:${catalina.home}/webapps/manager/-" { -+grant codeBase "file:${catalina.home}/../tomcat7-admin/manager/-" { ++grant codeBase "file:${catalina.home}/../tomcat8-admin/manager/-" { permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina"; permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina.ha.session"; permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina.manager"; diff --git a/debian/patches/series b/debian/patches/series index 1821c71..10772b4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -11,4 +11,4 @@ 0014-JDTCompiler.patch 0015_disable_test_TestCometProcessor.patch 0017-use-jdbc-pool-default.patch -fix-manager-webapp.path +0018-fix-manager-webapp.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat8.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
