This is an automated email from the git hooks/post-receive script. xhaakon-guest pushed a commit to branch master in repository jetty9.
commit 29b49219a478c93c93006c258972d1bac39ef7a8 Author: Jakub Adam <[email protected]> Date: Tue Aug 4 21:55:59 2015 +0200 Refresh patches --- debian/patches/adjust-configuration.patch | 12 ---- debian/patches/annotations-find-asm-commons.patch | 12 ++-- debian/patches/disable-modules.patch | 81 +++++++++++++--------- debian/patches/disable-osgi-tests.patch | 10 ++- .../fix-servletcontext-security-check.patch | 67 ------------------ debian/patches/initialize-tomcat-jasper.patch | 42 +++-------- debian/patches/maven-bundle-plugin-version.patch | 11 ++- debian/patches/series | 2 - 8 files changed, 83 insertions(+), 154 deletions(-) diff --git a/debian/patches/adjust-configuration.patch b/debian/patches/adjust-configuration.patch deleted file mode 100644 index 8267bed..0000000 --- a/debian/patches/adjust-configuration.patch +++ /dev/null @@ -1,12 +0,0 @@ -Description: Adjust the configuration of the default distribution -Author: Emmanuel Bourg <[email protected]> -Forwarded: not-needed ---- a/jetty-distribution/src/main/resources/start.ini -+++ b/jetty-distribution/src/main/resources/start.ini -@@ -64,5 +64,5 @@ - #etc/jetty-overlay.xml - etc/jetty-webapps.xml - etc/jetty-contexts.xml --etc/jetty-testrealm.xml -+#etc/jetty-testrealm.xml - #=========================================================== diff --git a/debian/patches/annotations-find-asm-commons.patch b/debian/patches/annotations-find-asm-commons.patch index 8a3eafe..9802e33 100644 --- a/debian/patches/annotations-find-asm-commons.patch +++ b/debian/patches/annotations-find-asm-commons.patch @@ -3,14 +3,16 @@ Date: Thu, 1 Mar 2012 21:28:39 +0100 Subject: annotations-find-asm-commons --- - jetty-annotations/pom.xml | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) + jetty-annotations/pom.xml | 5 +++++ + 1 file changed, 5 insertions(+) +diff --git a/jetty-annotations/pom.xml b/jetty-annotations/pom.xml +index 70368a0..fc2b430 100644 --- a/jetty-annotations/pom.xml +++ b/jetty-annotations/pom.xml -@@ -105,5 +105,10 @@ - <groupId>org.eclipse.jetty.orbit</groupId> - <artifactId>org.objectweb.asm</artifactId> +@@ -68,5 +68,10 @@ + <groupId>org.ow2.asm</groupId> + <artifactId>asm-commons</artifactId> </dependency> + <dependency> + <groupId>asm</groupId> diff --git a/debian/patches/disable-modules.patch b/debian/patches/disable-modules.patch index c447c4f..419bb91 100644 --- a/debian/patches/disable-modules.patch +++ b/debian/patches/disable-modules.patch @@ -1,40 +1,53 @@ From: Jakub Adam <[email protected]> Date: Thu, 1 Mar 2012 21:33:06 +0100 Subject: disable-modules + +--- + pom.xml | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/pom.xml b/pom.xml +index 741c4bb..5e87d4f 100644 --- a/pom.xml +++ b/pom.xml -@@ -425,19 +425,19 @@ +@@ -507,7 +507,7 @@ + </repository> + </repositories> + <modules> +- <module>jetty-ant</module> ++ <!--module>jetty-ant</module--> + <module>jetty-util</module> + <module>jetty-jmx</module> + <module>jetty-io</module> +@@ -522,11 +522,11 @@ + <module>jetty-fcgi</module> + <module>jetty-websocket</module> + <module>jetty-servlets</module> +- <module>jetty-util-ajax</module> ++ <!--module>jetty-util-ajax</module> + <module>apache-jsp</module> + <module>apache-jstl</module> + <module>jetty-maven-plugin</module> +- <module>jetty-jspc-maven-plugin</module> ++ <module>jetty-jspc-maven-plugin</module--> + <module>jetty-deploy</module> <module>jetty-start</module> - <module>jetty-nested</module> - <module>jetty-overlay-deployer</module> -- <module>jetty-osgi</module> -+ <!--module>jetty-osgi</module> - <module>jetty-nosql</module> -- <module>jetty-http-spi</module> -+ <module>jetty-http-spi</module--> - <module>jetty-jsp</module> -- <module>jetty-distribution</module> -- <module>test-continuation</module> -+ <!--module>jetty-distribution</module> -+ <module>test-continuation</module--> - <!--module>test-continuation-jetty6</module--> - <module>test-jetty-servlet</module> -- <module>test-jetty-webapp</module> -+ <!--module>test-jetty-webapp</module> - <module>test-jetty-nested</module> - <module>example-jetty-embedded</module> - <module>example-async-rest</module> -- <module>tests</module> -+ <module>tests</module--> - </modules> - <dependencyManagement> - <dependencies> -@@ -579,7 +579,7 @@ - <jdk>[1.7,)</jdk> - </activation> - <modules> -- <module>jetty-spdy</module> -+ <!--module>jetty-spdy</module--> - </modules> - </profile> - <profile> + <module>jetty-plus</module> +@@ -539,7 +539,7 @@ + <module>jetty-proxy</module> + <module>jetty-jaspi</module> + <module>jetty-rewrite</module> +- <module>jetty-nosql</module> ++ <!--module>jetty-nosql</module> + <module>jetty-infinispan</module> + <module>tests</module> + <module>examples</module> +@@ -549,7 +549,7 @@ + <module>jetty-monitor</module> + <module>jetty-http-spi</module> + <module>jetty-osgi</module> +- <module>jetty-alpn</module> ++ <module>jetty-alpn</module--> + + <!-- modules that need fixed and added back, or simply dropped and not maintained + <module>jetty-rhttp</module> diff --git a/debian/patches/disable-osgi-tests.patch b/debian/patches/disable-osgi-tests.patch index 14104d8..345d861 100644 --- a/debian/patches/disable-osgi-tests.patch +++ b/debian/patches/disable-osgi-tests.patch @@ -1,15 +1,23 @@ From: Jakub Adam <[email protected]> Date: Thu, 1 Mar 2012 21:29:17 +0100 Subject: disable-osgi-tests + +--- + jetty-osgi/pom.xml | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/jetty-osgi/pom.xml b/jetty-osgi/pom.xml +index 50a3cce..1a8e55e 100644 --- a/jetty-osgi/pom.xml +++ b/jetty-osgi/pom.xml -@@ -24,9 +24,11 @@ +@@ -23,10 +23,12 @@ <module>jetty-osgi-boot-jsp</module> <module>jetty-osgi-boot-warurl</module> <module>jetty-osgi-httpservice</module> +<!-- <module>test-jetty-osgi-webapp</module> <module>test-jetty-osgi-context</module> + <module>jetty-osgi-alpn</module> <module>test-jetty-osgi</module> +--> </modules> diff --git a/debian/patches/fix-servletcontext-security-check.patch b/debian/patches/fix-servletcontext-security-check.patch deleted file mode 100644 index 7a5a31b..0000000 --- a/debian/patches/fix-servletcontext-security-check.patch +++ /dev/null @@ -1,67 +0,0 @@ -Description: ServletContext.getClassLoader should only check privileges if a SecurityManager exists. - This modification is required to use the JSP compiler from Tomcat 7 -Origin: backport, https://eclipse.googlesource.com/jetty/org.eclipse.jetty.project/+/d4368d1%5E!/#F0 -Bug: https://bugs.eclipse.org/427068 ---- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java -+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java -@@ -21,6 +21,8 @@ - import java.io.File; - import java.io.IOException; - import java.io.InputStream; -+import java.lang.reflect.InvocationTargetException; -+import java.lang.reflect.Method; - import java.net.MalformedURLException; - import java.net.URL; - import java.net.URLClassLoader; -@@ -2384,11 +2386,46 @@ - } - } - -- @Override -- public ClassLoader getClassLoader() -- { -- AccessController.checkPermission(new RuntimePermission("getClassLoader")); -- return _classLoader; -+ @Override -+ public ClassLoader getClassLoader() -+ { -+ if (!_enabled) -+ throw new UnsupportedOperationException(); -+ -+ //no security manager just return the classloader -+ if (System.getSecurityManager() == null) -+ return _classLoader; -+ else -+ { -+ //check to see if the classloader of the caller is the same as the context -+ //classloader, or a parent of it -+ try -+ { -+ Class reflect = Loader.loadClass(getClass(), "sun.reflect.Reflection"); -+ Method getCallerClass = reflect.getMethod("getCallerClass", Integer.TYPE); -+ Class caller = (Class)getCallerClass.invoke(null, 2); -+ -+ boolean ok = false; -+ ClassLoader callerLoader = caller.getClassLoader(); -+ while (!ok && callerLoader != null) -+ { -+ if (callerLoader == _classLoader) -+ ok = true; -+ else -+ callerLoader = callerLoader.getParent(); -+ } -+ -+ if (ok) -+ return _classLoader; -+ } -+ catch (Exception e) -+ { -+ LOG.warn("Unable to check classloader of caller",e); -+ } -+ -+ AccessController.checkPermission(new RuntimePermission("getClassLoader")); -+ return _classLoader; -+ } - } - - @Override diff --git a/debian/patches/initialize-tomcat-jasper.patch b/debian/patches/initialize-tomcat-jasper.patch index cedfa53..a26860d 100644 --- a/debian/patches/initialize-tomcat-jasper.patch +++ b/debian/patches/initialize-tomcat-jasper.patch @@ -1,36 +1,16 @@ -Description: Add an InstanceManager in the ServletContext to integrate Tomcat Jasper with Jetty. -Author: Emmanuel Bourg <[email protected]> -Forwarded: not-needed +From: Debian Java Maintainers <[email protected]> +Date: Tue, 4 Aug 2015 21:31:28 +0200 +Subject: initialize-tomcat-jasper + +--- + .../org/eclipse/jetty/webapp/WebAppContext.java | 22 ++++++++++++++++++++++ + 1 file changed, 22 insertions(+) + +diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java +index cfccb05..a7cce58 100644 --- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java +++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java -@@ -196,6 +196,8 @@ - _scontext=new Context(); - setErrorHandler(new ErrorPageErrorHandler()); - setProtectedTargets(__dftProtectedTargets); -+ -+ initializeJasper(); - } - - /* ------------------------------------------------------------ */ -@@ -211,6 +213,8 @@ - setWar(webApp); - setErrorHandler(new ErrorPageErrorHandler()); - setProtectedTargets(__dftProtectedTargets); -+ -+ initializeJasper(); - } - - /* ------------------------------------------------------------ */ -@@ -226,6 +230,8 @@ - setWar(webApp); - setErrorHandler(new ErrorPageErrorHandler()); - setProtectedTargets(__dftProtectedTargets); -+ -+ initializeJasper(); - } - - /* ------------------------------------------------------------ */ -@@ -243,6 +249,28 @@ +@@ -258,6 +258,28 @@ public class WebAppContext extends ServletContextHandler implements WebAppClassL _scontext = new Context(); setErrorHandler(errorHandler != null ? errorHandler : new ErrorPageErrorHandler()); setProtectedTargets(__dftProtectedTargets); diff --git a/debian/patches/maven-bundle-plugin-version.patch b/debian/patches/maven-bundle-plugin-version.patch index f0ef566..7d842ed 100644 --- a/debian/patches/maven-bundle-plugin-version.patch +++ b/debian/patches/maven-bundle-plugin-version.patch @@ -1,13 +1,20 @@ From: Jakub Adam <[email protected]> Date: Thu, 1 Mar 2012 21:32:54 +0100 Subject: maven-bundle-plugin-version + +--- + pom.xml | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/pom.xml b/pom.xml +index 12e89a2..741c4bb 100644 --- a/pom.xml +++ b/pom.xml -@@ -281,6 +281,7 @@ +@@ -316,6 +316,7 @@ <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> + <version>2.3.5</version> <extensions>true</extensions> <configuration> - <instructions> + <supportedProjectTypes> diff --git a/debian/patches/series b/debian/patches/series index c4e9a09..5b6490a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,6 +3,4 @@ disable-osgi-tests.patch maven-bundle-plugin-version.patch disable-modules.patch aggregate-doc.patch -adjust-configuration.patch -fix-servletcontext-security-check.patch initialize-tomcat-jasper.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jetty9.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
