[jetty9] 113/135: Refreshed the patches
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu Dec 17 14:53:20 UTC 2015
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository jetty9.
commit 51820285fb5391c4988bc9294e26e2f64cac084f
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Tue Sep 23 17:22:35 2014 +0200
Refreshed the patches
---
debian/patches/adjust-configuration.patch | 12 ----
debian/patches/aggregate-doc.patch | 2 +-
debian/patches/annotations-find-asm-commons.patch | 21 -------
debian/patches/asm-upgrade.patch | 70 ----------------------
.../fix-servletcontext-security-check.patch | 67 ---------------------
debian/patches/initialize-tomcat-jasper.patch | 61 -------------------
debian/patches/series | 5 --
7 files changed, 1 insertion(+), 237 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 <ebourg at apache.org>
-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/aggregate-doc.patch b/debian/patches/aggregate-doc.patch
index 3877cf4..f7a11d4 100644
--- a/debian/patches/aggregate-doc.patch
+++ b/debian/patches/aggregate-doc.patch
@@ -3,7 +3,7 @@ Date: Thu, 12 Apr 2012 22:46:39 +0200
Subject: aggregate-doc
--- a/pom.xml
+++ b/pom.xml
-@@ -329,6 +329,8 @@
+@@ -330,6 +330,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
diff --git a/debian/patches/annotations-find-asm-commons.patch b/debian/patches/annotations-find-asm-commons.patch
deleted file mode 100644
index a28a88c..0000000
--- a/debian/patches/annotations-find-asm-commons.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Jakub Adam <jakub.adam at ktknet.cz>
-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(-)
-
---- 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>
- </dependency>
-+ <dependency>
-+ <groupId>asm</groupId>
-+ <artifactId>asm-commons</artifactId>
-+ <version>4.x</version>
-+ </dependency>
- </dependencies>
- </project>
diff --git a/debian/patches/asm-upgrade.patch b/debian/patches/asm-upgrade.patch
deleted file mode 100644
index 0ebe1fa..0000000
--- a/debian/patches/asm-upgrade.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-Description: Upgrade to ASM 5 and fix the compatibility with Java 8
-Origin: backport, https://github.com/eclipse/jetty.project/commit/f447870.patch
---- a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
-+++ b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
-@@ -38,9 +38,10 @@
- import org.eclipse.jetty.webapp.JarScanner;
- import org.objectweb.asm.AnnotationVisitor;
- import org.objectweb.asm.ClassReader;
-+import org.objectweb.asm.ClassVisitor;
- import org.objectweb.asm.FieldVisitor;
- import org.objectweb.asm.MethodVisitor;
--import org.objectweb.asm.commons.EmptyVisitor;
-+import org.objectweb.asm.Opcodes;
-
- /**
- * AnnotationParser
-@@ -280,13 +281,14 @@
- *
- * ASM Visitor for Annotations
- */
-- public class MyAnnotationVisitor implements AnnotationVisitor
-+ public class MyAnnotationVisitor extends AnnotationVisitor
- {
- List<Value> _annotationValues;
- String _annotationName;
-
- public MyAnnotationVisitor (String annotationName, List<Value> values)
- {
-+ super(Opcodes.ASM5);
- _annotationValues = values;
- _annotationName = annotationName;
- }
-@@ -354,7 +356,7 @@
- *
- * ASM visitor for a class.
- */
-- public class MyClassVisitor extends EmptyVisitor
-+ public class MyClassVisitor extends ClassVisitor
- {
- String _className;
- int _access;
-@@ -363,6 +365,10 @@
- String[] _interfaces;
- int _version;
-
-+ public MyClassVisitor()
-+ {
-+ super(Opcodes.ASM5);
-+ }
-
- public void visit (int version,
- final int access,
-@@ -429,7 +435,7 @@
- final String[] exceptions)
- {
-
-- return new EmptyVisitor ()
-+ return new MethodVisitor (Opcodes.ASM5)
- {
- public AnnotationVisitor visitAnnotation(String desc, boolean visible)
- {
-@@ -463,7 +469,7 @@
- final Object value)
- {
-
-- return new EmptyVisitor ()
-+ return new FieldVisitor (Opcodes.ASM5)
- {
- public AnnotationVisitor visitAnnotation(String desc, boolean visible)
- {
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
deleted file mode 100644
index cedfa53..0000000
--- a/debian/patches/initialize-tomcat-jasper.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Description: Add an InstanceManager in the ServletContext to integrate Tomcat Jasper with Jetty.
-Author: Emmanuel Bourg <ebourg at apache.org>
-Forwarded: not-needed
---- 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 @@
- _scontext = new Context();
- setErrorHandler(errorHandler != null ? errorHandler : new ErrorPageErrorHandler());
- setProtectedTargets(__dftProtectedTargets);
-+
-+ initializeJasper();
-+ }
-+
-+ private void initializeJasper() {
-+ // check if Jasper is on the classpath
-+ boolean jasperFound = false;
-+ try {
-+ Class.forName("org.apache.jasper.servlet.JspServlet");
-+ jasperFound = true;
-+ } catch (ClassNotFoundException e) {
-+ }
-+
-+ // initialize an InstanceManager required by Jasper
-+ if (jasperFound) {
-+ try {
-+ Object instanceManager = Class.forName("org.apache.tomcat.SimpleInstanceManager").newInstance();
-+ setAttribute("org.apache.tomcat.InstanceManager", instanceManager);
-+ } catch (Exception e) {
-+ LOG.warn("Couldn't initialize the InstanceManager required by Tomcat Jasper", e);
-+ }
-+ }
- }
-
- /* ------------------------------------------------------------ */
diff --git a/debian/patches/series b/debian/patches/series
index 2260846..ab91aaf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,2 @@
-annotations-find-asm-commons.patch
maven-bundle-plugin-version.patch
aggregate-doc.patch
-adjust-configuration.patch
-fix-servletcontext-security-check.patch
-initialize-tomcat-jasper.patch
-asm-upgrade.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jetty9.git
More information about the pkg-java-commits
mailing list