Attachment 203091 Details for Bug 357286 – Patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Patch

0001-Support-Tomcat-7-Jasper.patch (text/plain), 25.07 KB, created by Roland Grunberg

on 2011-09-09 16:25:14 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Roland Grunberg

Created: 2011-09-09 16:25:14 EDT

Size: 25.07 KB

patch

obsolete

>From b4a7b51dee62ea50d63a6bfd7950af997fe3053b Mon Sep 17 00:00:00 2001
>From: Roland Grunberg <rgrunber@redhat.com>
>Date: Thu, 8 Sep 2011 15:24:53 -0400
>Subject: [PATCH] Support Tomcat 7 (Jasper)
>
>---
> .../META-INF/MANIFEST.MF                           |   10 +-
> .../META-INF/MANIFEST.MF                           |    4 +-
> .../META-INF/MANIFEST.MF                           |    1 +
> .../servlet/internal/ServletContextAdaptor.java    |  137 +++++++++++++++++++-
> .../org.eclipse.equinox.http/META-INF/MANIFEST.MF  |    9 +-
> .../http/servlet/HttpServletRequestImpl.java       |   63 +++++++++-
> .../http/servlet/HttpServletResponseImpl.java      |   20 +++
> .../http/servlet/RequestDispatcherImpl.java        |   21 +++
> .../equinox/http/servlet/ServletContextImpl.java   |  134 ++++++++++++++++++
> .../META-INF/MANIFEST.MF                           |   10 +-
> .../org/eclipse/equinox/jsp/jasper/JspServlet.java |  142 ++++++++++++++++++++
> .../equinox/jsp/jasper/MyInstanceManager.java      |   35 +++++
> 12 files changed, 568 insertions(+), 18 deletions(-)
> create mode 100644 bundles/org.eclipse.equinox.jsp.jasper/src/org/eclipse/equinox/jsp/jasper/MyInstanceManager.java
>
>diff --git a/bundles/org.eclipse.equinox.http.jetty5/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.http.jetty5/META-INF/MANIFEST.MF
>index e3b49a6..3b0c8ee 100644
>--- a/bundles/org.eclipse.equinox.http.jetty5/META-INF/MANIFEST.MF
>+++ b/bundles/org.eclipse.equinox.http.jetty5/META-INF/MANIFEST.MF
>@@ -6,12 +6,12 @@ Bundle-Localization: plugin
> Bundle-SymbolicName: org.eclipse.equinox.http.jetty
> Bundle-Version: 1.1.100.qualifier
> Bundle-Activator: org.eclipse.equinox.http.jetty.internal.Activator
>-Import-Package: javax.servlet;version="[2.4.0,2.6.0)",
>- javax.servlet.http;version="[2.4.0,2.6.0)",
>+Import-Package: javax.servlet;version="[2.4.0,3.6.0)",
>+ javax.servlet.http;version="[2.4.0,3.6.0)",
>  org.eclipse.equinox.http.servlet;version="1.0.0",
>- org.mortbay.http;version="[5.1.0,6.0.0)",
>- org.mortbay.jetty.servlet;version="[5.1.0,6.0.0)",
>- org.mortbay.util;version="[5.1.0,6.0.0)",
>+ org.mortbay.http;version="[5.1.0,7.0.0)",
>+ org.mortbay.jetty.servlet;version="[5.1.0,7.0.0)",
>+ org.mortbay.util;version="[5.1.0,7.0.0)",
>  org.osgi.framework;version="1.3.0",
>  org.osgi.service.cm;version="1.2.0",
>  org.osgi.service.startlevel;version="1.0"
>diff --git a/bundles/org.eclipse.equinox.http.jetty6/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.http.jetty6/META-INF/MANIFEST.MF
>index 208f79c..7e0f328 100644
>--- a/bundles/org.eclipse.equinox.http.jetty6/META-INF/MANIFEST.MF
>+++ b/bundles/org.eclipse.equinox.http.jetty6/META-INF/MANIFEST.MF
>@@ -6,8 +6,8 @@ Bundle-Localization: plugin
> Bundle-SymbolicName: org.eclipse.equinox.http.jetty
> Bundle-Version: 2.0.100.qualifier
> Bundle-Activator: org.eclipse.equinox.http.jetty.internal.Activator
>-Import-Package: javax.servlet;version="[2.5.0,2.6.0)",
>- javax.servlet.http;version="[2.5.0,2.6.0)",
>+Import-Package: javax.servlet;version="[2.5.0,3.6.0)",
>+ javax.servlet.http;version="[2.5.0,3.6.0)",
>  org.eclipse.equinox.http.servlet;version="1.0.0",
>  org.mortbay.component;version="[6.1.0,7.0.0)",
>  org.mortbay.jetty;version="[6.1.0,7.0.0)",
>diff --git a/bundles/org.eclipse.equinox.http.servlet/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.http.servlet/META-INF/MANIFEST.MF
>index d4d7b61..defb5c5 100644
>--- a/bundles/org.eclipse.equinox.http.servlet/META-INF/MANIFEST.MF
>+++ b/bundles/org.eclipse.equinox.http.servlet/META-INF/MANIFEST.MF
>@@ -10,6 +10,7 @@ Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,
>  J2SE-1.3
> Export-Package: org.eclipse.equinox.http.servlet;version="1.1.0"
> Import-Package: javax.servlet;version="2.3",
>+ javax.servlet.descriptor;version="3.0.0",
>  javax.servlet.http;version="2.3",
>  org.osgi.framework;version="1.3.0",
>  org.osgi.service.http;version="[1.2,1.3)"
>diff --git a/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/ServletContextAdaptor.java b/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/ServletContextAdaptor.java
>index ffdfa83..551825a 100644
>--- a/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/ServletContextAdaptor.java
>+++ b/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/ServletContextAdaptor.java
>@@ -11,12 +11,17 @@
>  *******************************************************************************/
> package org.eclipse.equinox.http.servlet.internal;
> 
>-import java.io.*;
>+import java.io.IOException;
>+import java.io.InputStream;
> import java.lang.reflect.Method;
> import java.net.URL;
> import java.security.*;
> import java.util.*;
> import javax.servlet.*;
>+import javax.servlet.ServletRegistration.Dynamic;
>+import javax.servlet.FilterRegistration;
>+import javax.servlet.ServletRegistration;
>+import javax.servlet.descriptor.JspConfigDescriptor;
> import org.osgi.service.http.HttpContext;
> 
> public class ServletContextAdaptor implements ServletContext {
>@@ -183,4 +188,134 @@ public class ServletContextAdaptor implements ServletContext {
> 		}
> 		return null;
> 	}
>+
>+	public int getEffectiveMajorVersion() {
>+		// TODO Auto-generated method stub
>+		return 0;
>+	}
>+
>+	public int getEffectiveMinorVersion() {
>+		// TODO Auto-generated method stub
>+		return 0;
>+	}
>+
>+	public boolean setInitParameter(String name, String value) {
>+		// TODO Auto-generated method stub
>+		return false;
>+	}
>+
>+	public Dynamic addServlet(String servletName, String className) {
>+		// TODO Auto-generated method stub
>+		return null;
>+	}
>+
>+	public Dynamic addServlet(String servletName, Servlet servlet) {
>+		// TODO Auto-generated method stub
>+		return null;
>+	}
>+
>+	public Dynamic addServlet(String servletName, Class servletClass) {
>+		// TODO Auto-generated method stub
>+		return null;
>+	}
>+
>+	public Servlet createServlet(Class clazz) throws ServletException {
>+		// TODO Auto-generated method stub
>+		return null;
>+	}
>+
>+	public ServletRegistration getServletRegistration(String servletName) {
>+		// TODO Auto-generated method stub
>+		return null;
>+	}
>+
>+	public Map getServletRegistrations() {
>+		// TODO Auto-generated method stub
>+		return null;
>+	}
>+
>+	public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, String className) {
>+		// TODO Auto-generated method stub
>+		return null;
>+	}
>+
>+	public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, Filter filter) {
>+		// TODO Auto-generated method stub
>+		return null;
>+	}
>+
>+	public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, Class filterClass) {
>+		// TODO Auto-generated method stub
>+		return null;
>+	}
>+
>+	public Filter createFilter(Class clazz) throws ServletException {
>+		// TODO Auto-generated method stub
>+		return null;
>+	}
>+
>+	public FilterRegistration getFilterRegistration(String filterName) {
>+		// TODO Auto-generated method stub
>+		return null;
>+	}
>+
>+	public Map getFilterRegistrations() {
>+		// TODO Auto-generated method stub
>+		return null;
>+	}
>+
>+	public SessionCookieConfig getSessionCookieConfig() {
>+		// TODO Auto-generated method stub
>+		return null;
>+	}
>+
>+	public void setSessionTrackingModes(Set sessionTrackingModes) {
>+		// TODO Auto-generated method stub
>+
>+	}
>+
>+	public Set getDefaultSessionTrackingModes() {
>+		// TODO Auto-generated method stub
>+		return null;
>+	}
>+
>+	public Set getEffectiveSessionTrackingModes() {
>+		// TODO Auto-generated method stub
>+		return null;
>+	}
>+
>+	public void addListener(String className) {
>+		// TODO Auto-generated method stub
>+
>+	}
>+
>+	public void addListener(EventListener t) {
>+		// TODO Auto-generated method stub
>+
>+	}
>+
>+	public void addListener(Class listenerClass) {
>+		// TODO Auto-generated method stub
>+
>+	}
>+
>+	public EventListener createListener(Class clazz) throws ServletException {
>+		// TODO Auto-generated method stub
>+		return null;
>+	}
>+
>+	public JspConfigDescriptor getJspConfigDescriptor() {
>+		// TODO Auto-generated method stub
>+		return null;
>+	}
>+
>+	public ClassLoader getClassLoader() {
>+		// TODO Auto-generated method stub
>+		return null;
>+	}
>+
>+	public void declareRoles(String[] roleNames) {
>+		// TODO Auto-generated method stub
>+
>+	}
> }
>diff --git a/bundles/org.eclipse.equinox.http/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.http/META-INF/MANIFEST.MF
>index 8b76fdc..11e6649 100644
>--- a/bundles/org.eclipse.equinox.http/META-INF/MANIFEST.MF
>+++ b/bundles/org.eclipse.equinox.http/META-INF/MANIFEST.MF
>@@ -4,15 +4,16 @@ Bundle-Version: 1.0.500.qualifier
> Bundle-Activator: org.eclipse.equinox.http.Activator
> Bundle-SymbolicName: org.eclipse.equinox.http
> Bundle-Name: %bundleName
>-Import-Package: javax.servlet,
>+Import-Package: javax.net;resolution:=optional,
>+ javax.servlet,
>+ javax.servlet.descriptor;version="3.0.0",
>  javax.servlet.http,
>- javax.net; resolution:="optional",
>+ org.eclipse.osgi.util,
>  org.osgi.framework;version="1.0",
>  org.osgi.service.cm;version="1.0",
>  org.osgi.service.http;version="[1.2,1.3)",
>  org.osgi.service.log;version="1.0",
>- org.osgi.util.tracker;version="1.1",
>- org.eclipse.osgi.util
>+ org.osgi.util.tracker;version="1.1"
> Export-Package: org.eclipse.equinox.http;x-internal:=true,
>  org.eclipse.equinox.http.servlet;x-internal:=true,
>  org.eclipse.equinox.socket;x-internal:=true,
>diff --git a/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/HttpServletRequestImpl.java b/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/HttpServletRequestImpl.java
>index d1520e0..28e1b60 100644
>--- a/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/HttpServletRequestImpl.java
>+++ b/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/HttpServletRequestImpl.java
>@@ -13,8 +13,7 @@ package org.eclipse.equinox.http.servlet;
> import java.io.*;
> import java.security.Principal;
> import java.util.*;
>-import javax.servlet.RequestDispatcher;
>-import javax.servlet.ServletInputStream;
>+import javax.servlet.*;
> import javax.servlet.http.*;
> import org.eclipse.equinox.http.*;
> import org.eclipse.equinox.socket.SocketInterface;
>@@ -1435,4 +1434,64 @@ public class HttpServletRequestImpl implements HttpServletRequest {
> 	public int getRemotePort() {
> 		throw new UnsupportedOperationException(HttpMsg.HTTP_ONLY_SUPPORTS_2_1);
> 	}
>+
>+	public ServletContext getServletContext() {
>+		// TODO Auto-generated method stub
>+		return null;
>+	}
>+
>+	public AsyncContext startAsync() throws IllegalStateException {
>+		// TODO Auto-generated method stub
>+		return null;
>+	}
>+
>+	public AsyncContext startAsync(ServletRequest servletRequest, ServletResponse servletResponse) throws IllegalStateException {
>+		// TODO Auto-generated method stub
>+		return null;
>+	}
>+
>+	public boolean isAsyncStarted() {
>+		// TODO Auto-generated method stub
>+		return false;
>+	}
>+
>+	public boolean isAsyncSupported() {
>+		// TODO Auto-generated method stub
>+		return false;
>+	}
>+
>+	public AsyncContext getAsyncContext() {
>+		// TODO Auto-generated method stub
>+		return null;
>+	}
>+
>+	public DispatcherType getDispatcherType() {
>+		// TODO Auto-generated method stub
>+		return null;
>+	}
>+
>+	public boolean authenticate(HttpServletResponse response) throws IOException, ServletException {
>+		// TODO Auto-generated method stub
>+		return false;
>+	}
>+
>+	public void login(String username, String password) throws ServletException {
>+		// TODO Auto-generated method stub
>+
>+	}
>+
>+	public void logout() throws ServletException {
>+		// TODO Auto-generated method stub
>+
>+	}
>+
>+	public Collection getParts() throws IOException, ServletException {
>+		// TODO Auto-generated method stub
>+		return null;
>+	}
>+
>+	public Part getPart(String name) throws IOException, ServletException {
>+		// TODO Auto-generated method stub
>+		return null;
>+	}
> }
>diff --git a/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/HttpServletResponseImpl.java b/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/HttpServletResponseImpl.java
>index 12020c0..077f161 100644
>--- a/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/HttpServletResponseImpl.java
>+++ b/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/HttpServletResponseImpl.java
>@@ -858,4 +858,24 @@ public class HttpServletResponseImpl implements HttpServletResponse {
> 		throw new UnsupportedOperationException(HttpMsg.HTTP_ONLY_SUPPORTS_2_1);
> 
> 	}
>+
>+	public int getStatus() {
>+		// TODO Auto-generated method stub
>+		return 0;
>+	}
>+
>+	public String getHeader(String name) {
>+		// TODO Auto-generated method stub
>+		return null;
>+	}
>+
>+	public Collection getHeaders(String name) {
>+		// TODO Auto-generated method stub
>+		return null;
>+	}
>+
>+	public Collection getHeaderNames() {
>+		// TODO Auto-generated method stub
>+		return null;
>+	}
> }
>diff --git a/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/RequestDispatcherImpl.java b/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/RequestDispatcherImpl.java
>index 09fca65..6b9f129 100644
>--- a/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/RequestDispatcherImpl.java
>+++ b/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/RequestDispatcherImpl.java
>@@ -12,6 +12,7 @@ package org.eclipse.equinox.http.servlet;
> 
> import java.io.IOException;
> import java.io.PrintWriter;
>+import java.util.Collection;
> import java.util.Locale;
> import javax.servlet.*;
> import javax.servlet.http.Cookie;
>@@ -198,6 +199,26 @@ public class RequestDispatcherImpl implements RequestDispatcher {
> 
> 		}
> 
>+		public int getStatus() {
>+			// TODO Auto-generated method stub
>+			return 0;
>+		}
>+
>+		public String getHeader(String name) {
>+			// TODO Auto-generated method stub
>+			return null;
>+		}
>+
>+		public Collection getHeaders(String name) {
>+			// TODO Auto-generated method stub
>+			return null;
>+		}
>+
>+		public Collection getHeaderNames() {
>+			// TODO Auto-generated method stub
>+			return null;
>+		}
>+
> 	}
> 
> 	public RequestDispatcherImpl(Registration reg, String requestURI) {
>diff --git a/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/ServletContextImpl.java b/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/ServletContextImpl.java
>index 015e488..00c9daf 100644
>--- a/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/ServletContextImpl.java
>+++ b/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/ServletContextImpl.java
>@@ -16,7 +16,11 @@ import java.net.MalformedURLException;
> import java.net.URL;
> import java.util.*;
> import javax.servlet.*;
>+import javax.servlet.ServletRegistration.Dynamic;
>+import javax.servlet.ServletRegistration;
>+import javax.servlet.descriptor.JspConfigDescriptor;
> import org.eclipse.equinox.http.*;
>+import org.eclipse.equinox.http.Registration;
> import org.osgi.service.http.HttpContext;
> 
> public class ServletContextImpl implements ServletContext {
>@@ -447,4 +451,134 @@ public class ServletContextImpl implements ServletContext {
> 		throw new UnsupportedOperationException(HttpMsg.HTTP_ONLY_SUPPORTS_2_1);
> 	}
> 
>+	public int getEffectiveMajorVersion() {
>+		// TODO Auto-generated method stub
>+		return 0;
>+	}
>+
>+	public int getEffectiveMinorVersion() {
>+		// TODO Auto-generated method stub
>+		return 0;
>+	}
>+
>+	public boolean setInitParameter(String name, String value) {
>+		// TODO Auto-generated method stub
>+		return false;
>+	}
>+
>+	public Dynamic addServlet(String servletName, String className) {
>+		// TODO Auto-generated method stub
>+		return null;
>+	}
>+
>+	public Dynamic addServlet(String servletName, Servlet servlet) {
>+		// TODO Auto-generated method stub
>+		return null;
>+	}
>+
>+	public Dynamic addServlet(String servletName, Class servletClass) {
>+		// TODO Auto-generated method stub
>+		return null;
>+	}
>+
>+	public Servlet createServlet(Class clazz) throws ServletException {
>+		// TODO Auto-generated method stub
>+		return null;
>+	}
>+
>+	public ServletRegistration getServletRegistration(String servletName) {
>+		// TODO Auto-generated method stub
>+		return null;
>+	}
>+
>+	public Map getServletRegistrations() {
>+		// TODO Auto-generated method stub
>+		return null;
>+	}
>+
>+	public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, String className) {
>+		// TODO Auto-generated method stub
>+		return null;
>+	}
>+
>+	public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, Filter filter) {
>+		// TODO Auto-generated method stub
>+		return null;
>+	}
>+
>+	public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, Class filterClass) {
>+		// TODO Auto-generated method stub
>+		return null;
>+	}
>+
>+	public Filter createFilter(Class clazz) throws ServletException {
>+		// TODO Auto-generated method stub
>+		return null;
>+	}
>+
>+	public FilterRegistration getFilterRegistration(String filterName) {
>+		// TODO Auto-generated method stub
>+		return null;
>+	}
>+
>+	public Map getFilterRegistrations() {
>+		// TODO Auto-generated method stub
>+		return null;
>+	}
>+
>+	public SessionCookieConfig getSessionCookieConfig() {
>+		// TODO Auto-generated method stub
>+		return null;
>+	}
>+
>+	public void setSessionTrackingModes(Set sessionTrackingModes) {
>+		// TODO Auto-generated method stub
>+
>+	}
>+
>+	public Set getDefaultSessionTrackingModes() {
>+		// TODO Auto-generated method stub
>+		return null;
>+	}
>+
>+	public Set getEffectiveSessionTrackingModes() {
>+		// TODO Auto-generated method stub
>+		return null;
>+	}
>+
>+	public void addListener(String className) {
>+		// TODO Auto-generated method stub
>+
>+	}
>+
>+	public void addListener(EventListener t) {
>+		// TODO Auto-generated method stub
>+
>+	}
>+
>+	public void addListener(Class listenerClass) {
>+		// TODO Auto-generated method stub
>+
>+	}
>+
>+	public EventListener createListener(Class clazz) throws ServletException {
>+		// TODO Auto-generated method stub
>+		return null;
>+	}
>+
>+	public JspConfigDescriptor getJspConfigDescriptor() {
>+		// TODO Auto-generated method stub
>+		return null;
>+	}
>+
>+	public ClassLoader getClassLoader() {
>+		// TODO Auto-generated method stub
>+		return null;
>+	}
>+
>+	public void declareRoles(String[] roleNames) {
>+		// TODO Auto-generated method stub
>+
>+	}
>+
> }
>diff --git a/bundles/org.eclipse.equinox.jsp.jasper/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.jsp.jasper/META-INF/MANIFEST.MF
>index 2e46923..3bec86d 100644
>--- a/bundles/org.eclipse.equinox.jsp.jasper/META-INF/MANIFEST.MF
>+++ b/bundles/org.eclipse.equinox.jsp.jasper/META-INF/MANIFEST.MF
>@@ -6,10 +6,12 @@ Bundle-Localization: plugin
> Bundle-SymbolicName: org.eclipse.equinox.jsp.jasper
> Bundle-Version: 1.0.300.qualifier
> Bundle-Activator: org.eclipse.equinox.internal.jsp.jasper.Activator
>-Import-Package: javax.servlet;version="[2.4, 3.0)",
>- javax.servlet.http;version="[2.4, 3.0)",
>- javax.servlet.jsp;version="[2.0, 2.1)",
>- org.apache.jasper.servlet;version="[0, 6)",
>+Import-Package: javax.servlet;version="[2.4,3.0]",
>+ javax.servlet.descriptor;version="3.0.0",
>+ javax.servlet.http;version="[2.4,3.0]",
>+ javax.servlet.jsp;version="[2.0,2.2]",
>+ org.apache.jasper.servlet;version="[0,8)",
>+ org.apache.tomcat;version="[0,8)",
>  org.osgi.framework;version="1.3.0",
>  org.osgi.service.http;version="1.2.0",
>  org.osgi.service.packageadmin;version="1.2.0",
>diff --git a/bundles/org.eclipse.equinox.jsp.jasper/src/org/eclipse/equinox/jsp/jasper/JspServlet.java b/bundles/org.eclipse.equinox.jsp.jasper/src/org/eclipse/equinox/jsp/jasper/JspServlet.java
>index 0ffb1e2..178d2ef 100644
>--- a/bundles/org.eclipse.equinox.jsp.jasper/src/org/eclipse/equinox/jsp/jasper/JspServlet.java
>+++ b/bundles/org.eclipse.equinox.jsp.jasper/src/org/eclipse/equinox/jsp/jasper/JspServlet.java
>@@ -22,18 +22,27 @@ import java.security.Permission;
> import java.security.PermissionCollection;
> import java.util.Collections;
> import java.util.Enumeration;
>+import java.util.EventListener;
> import java.util.HashSet;
>+import java.util.Map;
> import java.util.Set;
> 
>+import javax.servlet.Filter;
>+import javax.servlet.FilterRegistration;
> import javax.servlet.RequestDispatcher;
> import javax.servlet.Servlet;
> import javax.servlet.ServletConfig;
> import javax.servlet.ServletContext;
> import javax.servlet.ServletException;
>+import javax.servlet.ServletRegistration;
>+import javax.servlet.ServletRegistration.Dynamic;
>+import javax.servlet.SessionCookieConfig;
>+import javax.servlet.descriptor.JspConfigDescriptor;
> import javax.servlet.http.HttpServlet;
> import javax.servlet.http.HttpServletRequest;
> import javax.servlet.http.HttpServletResponse;
> 
>+import org.apache.tomcat.InstanceManager;
> import org.eclipse.equinox.internal.jsp.jasper.JspClassLoader;
> import org.osgi.framework.Bundle;
> 
>@@ -107,6 +116,9 @@ public class JspServlet extends HttpServlet {
> 	}
> 
> 	public void init(ServletConfig config) throws ServletException {
>+		// Set the InstanceManager conforming to Apache Tomcat 7
>+		config.getServletContext().setAttribute(InstanceManager.class.getName(), new MyInstanceManager());
>+
> 		ClassLoader original = Thread.currentThread().getContextClassLoader();
> 		try {
> 			Thread.currentThread().setContextClassLoader(jspLoader);
>@@ -363,5 +375,135 @@ public class JspServlet extends HttpServlet {
> 			}
> 			return null;
> 		}
>+
>+		public int getEffectiveMajorVersion() {
>+			// TODO Auto-generated method stub
>+			return 0;
>+		}
>+
>+		public int getEffectiveMinorVersion() {
>+			// TODO Auto-generated method stub
>+			return 0;
>+		}
>+
>+		public boolean setInitParameter(String name, String value) {
>+			// TODO Auto-generated method stub
>+			return false;
>+		}
>+
>+		public Dynamic addServlet(String servletName, String className) {
>+			// TODO Auto-generated method stub
>+			return null;
>+		}
>+
>+		public Dynamic addServlet(String servletName, Servlet servlet) {
>+			// TODO Auto-generated method stub
>+			return null;
>+		}
>+
>+		public Dynamic addServlet(String servletName, Class servletClass) {
>+			// TODO Auto-generated method stub
>+			return null;
>+		}
>+
>+		public Servlet createServlet(Class clazz) throws ServletException {
>+			// TODO Auto-generated method stub
>+			return null;
>+		}
>+
>+		public ServletRegistration getServletRegistration(String servletName) {
>+			// TODO Auto-generated method stub
>+			return null;
>+		}
>+
>+		public Map getServletRegistrations() {
>+			// TODO Auto-generated method stub
>+			return null;
>+		}
>+
>+		public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, String className) {
>+			// TODO Auto-generated method stub
>+			return null;
>+		}
>+
>+		public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, Filter filter) {
>+			// TODO Auto-generated method stub
>+			return null;
>+		}
>+
>+		public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, Class filterClass) {
>+			// TODO Auto-generated method stub
>+			return null;
>+		}
>+
>+		public Filter createFilter(Class clazz) throws ServletException {
>+			// TODO Auto-generated method stub
>+			return null;
>+		}
>+
>+		public FilterRegistration getFilterRegistration(String filterName) {
>+			// TODO Auto-generated method stub
>+			return null;
>+		}
>+
>+		public Map getFilterRegistrations() {
>+			// TODO Auto-generated method stub
>+			return null;
>+		}
>+
>+		public SessionCookieConfig getSessionCookieConfig() {
>+			// TODO Auto-generated method stub
>+			return null;
>+		}
>+
>+		public void setSessionTrackingModes(Set sessionTrackingModes) {
>+			// TODO Auto-generated method stub
>+
>+		}
>+
>+		public Set getDefaultSessionTrackingModes() {
>+			// TODO Auto-generated method stub
>+			return null;
>+		}
>+
>+		public Set getEffectiveSessionTrackingModes() {
>+			// TODO Auto-generated method stub
>+			return null;
>+		}
>+
>+		public void addListener(String className) {
>+			// TODO Auto-generated method stub
>+
>+		}
>+
>+		public void addListener(EventListener t) {
>+			// TODO Auto-generated method stub
>+
>+		}
>+
>+		public void addListener(Class listenerClass) {
>+			// TODO Auto-generated method stub
>+
>+		}
>+
>+		public EventListener createListener(Class clazz) throws ServletException {
>+			// TODO Auto-generated method stub
>+			return null;
>+		}
>+
>+		public JspConfigDescriptor getJspConfigDescriptor() {
>+			// TODO Auto-generated method stub
>+			return null;
>+		}
>+
>+		public ClassLoader getClassLoader() {
>+			// TODO Auto-generated method stub
>+			return null;
>+		}
>+
>+		public void declareRoles(String[] roleNames) {
>+			// TODO Auto-generated method stub
>+
>+		}
> 	}
> }
>diff --git a/bundles/org.eclipse.equinox.jsp.jasper/src/org/eclipse/equinox/jsp/jasper/MyInstanceManager.java b/bundles/org.eclipse.equinox.jsp.jasper/src/org/eclipse/equinox/jsp/jasper/MyInstanceManager.java
>new file mode 100644
>index 0000000..c618d54
>--- /dev/null
>+++ b/bundles/org.eclipse.equinox.jsp.jasper/src/org/eclipse/equinox/jsp/jasper/MyInstanceManager.java
>@@ -0,0 +1,35 @@
>+package org.eclipse.equinox.jsp.jasper;
>+
>+import org.apache.tomcat.InstanceManager;
>+
>+public class MyInstanceManager implements InstanceManager {
>+
>+	public Object newInstance(String className) {
>+		// TODO Auto-generated method stub
>+		return null;
>+	}
>+
>+	public Object newInstance(String fqcn, ClassLoader classLoader) throws ClassNotFoundException {
>+
>+		try {
>+			return classLoader.loadClass(fqcn).newInstance();
>+		} catch (InstantiationException e) {
>+			// TODO Auto-generated catch block
>+			e.printStackTrace();
>+		} catch (IllegalAccessException e) {
>+			// TODO Auto-generated catch block
>+			e.printStackTrace();
>+		}
>+		return null;
>+	}
>+
>+	public void newInstance(Object o) {
>+		// TODO Auto-generated method stub
>+
>+	}
>+
>+	public void destroyInstance(Object o) {
>+		// TODO Auto-generated method stub
>+
>+	}
>+}
>-- 
>1.7.6
>

Actions: View | Diff

Attachments on bug 357286: 203091 | 203092