Attachment #203091 for bug #357286

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

View | Details | Raw Unified | Return to bug 357286
Collapse All | Expand All




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,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,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"

Lines 6-13 Bundle-Localization: plugin Link Here

(-)a/bundles/org.eclipse.equinox.http.jetty6/META-INF/MANIFEST.MF (-2 / +2 lines)
6	Bundle-SymbolicName: org.eclipse.equinox.http.jetty	6	Bundle-SymbolicName: org.eclipse.equinox.http.jetty
7	Bundle-Version: 2.0.100.qualifier	7	Bundle-Version: 2.0.100.qualifier
8	Bundle-Activator: org.eclipse.equinox.http.jetty.internal.Activator	8	Bundle-Activator: org.eclipse.equinox.http.jetty.internal.Activator
9	Import-Package: javax.servlet;version="[2.5.0,2.6.0)",	9	Import-Package: javax.servlet;version="[2.5.0,3.6.0)",
10	javax.servlet.http;version="[2.5.0,2.6.0)",	10	javax.servlet.http;version="[2.5.0,3.6.0)",
11	org.eclipse.equinox.http.servlet;version="1.0.0",	11	org.eclipse.equinox.http.servlet;version="1.0.0",
12	org.mortbay.component;version="[6.1.0,7.0.0)",	12	org.mortbay.component;version="[6.1.0,7.0.0)",
13	org.mortbay.jetty;version="[6.1.0,7.0.0)",	13	org.mortbay.jetty;version="[6.1.0,7.0.0)",

Lines 10-15 Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0, Link Here

(-)a/bundles/org.eclipse.equinox.http.servlet/META-INF/MANIFEST.MF (+1 lines)
10	J2SE-1.3	10	J2SE-1.3
11	Export-Package: org.eclipse.equinox.http.servlet;version="1.1.0"	11	Export-Package: org.eclipse.equinox.http.servlet;version="1.1.0"
12	Import-Package: javax.servlet;version="2.3",	12	Import-Package: javax.servlet;version="2.3",
		13	javax.servlet.descriptor;version="3.0.0",
13	javax.servlet.http;version="2.3",	14	javax.servlet.http;version="2.3",
14	org.osgi.framework;version="1.3.0",	15	org.osgi.framework;version="1.3.0",
15	org.osgi.service.http;version="[1.2,1.3)"	16	org.osgi.service.http;version="[1.2,1.3)"

Lines 11-22 Link Here

(-)a/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/ServletContextAdaptor.java (-1 / +136 lines)
11	*******************************************************************************/	11	*******************************************************************************/
12	package org.eclipse.equinox.http.servlet.internal;	12	package org.eclipse.equinox.http.servlet.internal;
13		13
14	import java.io.*;	14	import java.io.IOException;
		15	import java.io.InputStream;
15	import java.lang.reflect.Method;	16	import java.lang.reflect.Method;
16	import java.net.URL;	17	import java.net.URL;
17	import java.security.*;	18	import java.security.*;
18	import java.util.*;	19	import java.util.*;
19	import javax.servlet.*;	20	import javax.servlet.*;
		21	import javax.servlet.ServletRegistration.Dynamic;
		22	import javax.servlet.FilterRegistration;
		23	import javax.servlet.ServletRegistration;
		24	import javax.servlet.descriptor.JspConfigDescriptor;
20	import org.osgi.service.http.HttpContext;	25	import org.osgi.service.http.HttpContext;
21		26
22	public class ServletContextAdaptor implements ServletContext {	27	public class ServletContextAdaptor implements ServletContext {
Lines 183-186 public class ServletContextAdaptor implements ServletContext { Link Here
183	}	188	}
184	return null;	189	return null;
185	}	190	}
		191
		192	public int getEffectiveMajorVersion() {
		193	// TODO Auto-generated method stub
		194	return 0;
		195	}
		196
		197	public int getEffectiveMinorVersion() {
		198	// TODO Auto-generated method stub
		199	return 0;
		200	}
		201
		202	public boolean setInitParameter(String name, String value) {
		203	// TODO Auto-generated method stub
		204	return false;
		205	}
		206
		207	public Dynamic addServlet(String servletName, String className) {
		208	// TODO Auto-generated method stub
		209	return null;
		210	}
		211
		212	public Dynamic addServlet(String servletName, Servlet servlet) {
		213	// TODO Auto-generated method stub
		214	return null;
		215	}
		216
		217	public Dynamic addServlet(String servletName, Class servletClass) {
		218	// TODO Auto-generated method stub
		219	return null;
		220	}
		221
		222	public Servlet createServlet(Class clazz) throws ServletException {
		223	// TODO Auto-generated method stub
		224	return null;
		225	}
		226
		227	public ServletRegistration getServletRegistration(String servletName) {
		228	// TODO Auto-generated method stub
		229	return null;
		230	}
		231
		232	public Map getServletRegistrations() {
		233	// TODO Auto-generated method stub
		234	return null;
		235	}
		236
		237	public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, String className) {
		238	// TODO Auto-generated method stub
		239	return null;
		240	}
		241
		242	public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, Filter filter) {
		243	// TODO Auto-generated method stub
		244	return null;
		245	}
		246
		247	public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, Class filterClass) {
		248	// TODO Auto-generated method stub
		249	return null;
		250	}
		251
		252	public Filter createFilter(Class clazz) throws ServletException {
		253	// TODO Auto-generated method stub
		254	return null;
255	}
256
257	public FilterRegistration getFilterRegistration(String filterName) {
258	// TODO Auto-generated method stub
259	return null;
260	}
261
262	public Map getFilterRegistrations() {
263	// TODO Auto-generated method stub
264	return null;
265	}
266
267	public SessionCookieConfig getSessionCookieConfig() {
268	// TODO Auto-generated method stub
269	return null;
270	}
271
272	public void setSessionTrackingModes(Set sessionTrackingModes) {
273	// TODO Auto-generated method stub
274
275	}
276
277	public Set getDefaultSessionTrackingModes() {
278	// TODO Auto-generated method stub
279	return null;
280	}
281
282	public Set getEffectiveSessionTrackingModes() {
283	// TODO Auto-generated method stub
284	return null;
285	}
286
287	public void addListener(String className) {
288	// TODO Auto-generated method stub
289
290	}
291
292	public void addListener(EventListener t) {
293	// TODO Auto-generated method stub
294
295	}
296
297	public void addListener(Class listenerClass) {
298	// TODO Auto-generated method stub
299
300	}
301
302	public EventListener createListener(Class clazz) throws ServletException {
303	// TODO Auto-generated method stub
304	return null;
305	}
306
307	public JspConfigDescriptor getJspConfigDescriptor() {
308	// TODO Auto-generated method stub
309	return null;
310	}
311
312	public ClassLoader getClassLoader() {
313	// TODO Auto-generated method stub
314	return null;
315	}
316
317	public void declareRoles(String[] roleNames) {
318	// TODO Auto-generated method stub
319
320	}
186	}	321	}




Bundle-Activator: org.eclipse.equinox.http.Activator
Bundle-SymbolicName: org.eclipse.equinox.http
Bundle-Name: %bundleName
Import-Package: javax.net;resolution:=optional,
 javax.servlet,
 javax.servlet.descriptor;version="3.0.0",
 javax.servlet.http,
 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
Export-Package: org.eclipse.equinox.http;x-internal:=true,
 org.eclipse.equinox.http.servlet;x-internal:=true,
 org.eclipse.equinox.socket;x-internal:=true,




import java.io.*;
import java.security.Principal;
import java.util.*;
import javax.servlet.*;
import javax.servlet.ServletInputStream;
import javax.servlet.http.*;
import org.eclipse.equinox.http.*;
import org.eclipse.equinox.socket.SocketInterface;

	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;
	}
}




		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;
	}
}





import java.io.IOException;
import java.io.PrintWriter;
import java.util.Collection;
import java.util.Locale;
import javax.servlet.*;
import javax.servlet.http.Cookie;


		}

		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) {

Lines 16-22 import java.net.MalformedURLException; Link Here

(-)a/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/ServletContextImpl.java (+134 lines)
16	import java.net.URL;	16	import java.net.URL;
17	import java.util.*;	17	import java.util.*;
18	import javax.servlet.*;	18	import javax.servlet.*;
		19	import javax.servlet.ServletRegistration.Dynamic;
		20	import javax.servlet.ServletRegistration;
		21	import javax.servlet.descriptor.JspConfigDescriptor;
19	import org.eclipse.equinox.http.*;	22	import org.eclipse.equinox.http.*;
		23	import org.eclipse.equinox.http.Registration;
20	import org.osgi.service.http.HttpContext;	24	import org.osgi.service.http.HttpContext;
21		25
22	public class ServletContextImpl implements ServletContext {	26	public class ServletContextImpl implements ServletContext {
Lines 447-450 public class ServletContextImpl implements ServletContext { Link Here
447	throw new UnsupportedOperationException(HttpMsg.HTTP_ONLY_SUPPORTS_2_1);	451	throw new UnsupportedOperationException(HttpMsg.HTTP_ONLY_SUPPORTS_2_1);
448	}	452	}
449		453
		454	public int getEffectiveMajorVersion() {
		455	// TODO Auto-generated method stub
		456	return 0;
		457	}
		458
		459	public int getEffectiveMinorVersion() {
		460	// TODO Auto-generated method stub
		461	return 0;
		462	}
		463
		464	public boolean setInitParameter(String name, String value) {
		465	// TODO Auto-generated method stub
		466	return false;
		467	}
		468
		469	public Dynamic addServlet(String servletName, String className) {
		470	// TODO Auto-generated method stub
		471	return null;
		472	}
		473
		474	public Dynamic addServlet(String servletName, Servlet servlet) {
		475	// TODO Auto-generated method stub
		476	return null;
		477	}
		478
		479	public Dynamic addServlet(String servletName, Class servletClass) {
		480	// TODO Auto-generated method stub
		481	return null;
		482	}
		483
		484	public Servlet createServlet(Class clazz) throws ServletException {
		485	// TODO Auto-generated method stub
		486	return null;
		487	}
		488
		489	public ServletRegistration getServletRegistration(String servletName) {
		490	// TODO Auto-generated method stub
		491	return null;
		492	}
		493
		494	public Map getServletRegistrations() {
		495	// TODO Auto-generated method stub
		496	return null;
		497	}
		498
		499	public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, String className) {
		500	// TODO Auto-generated method stub
		501	return null;
		502	}
		503
		504	public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, Filter filter) {
		505	// TODO Auto-generated method stub
		506	return null;
		507	}
		508
		509	public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, Class filterClass) {
		510	// TODO Auto-generated method stub
		511	return null;
		512	}
		513
		514	public Filter createFilter(Class clazz) throws ServletException {
		515	// TODO Auto-generated method stub
		516	return null;
		517	}
518
519	public FilterRegistration getFilterRegistration(String filterName) {
520	// TODO Auto-generated method stub
521	return null;
522	}
523
524	public Map getFilterRegistrations() {
525	// TODO Auto-generated method stub
526	return null;
527	}
528
529	public SessionCookieConfig getSessionCookieConfig() {
530	// TODO Auto-generated method stub
531	return null;
532	}
533
534	public void setSessionTrackingModes(Set sessionTrackingModes) {
535	// TODO Auto-generated method stub
536
537	}
538
539	public Set getDefaultSessionTrackingModes() {
540	// TODO Auto-generated method stub
541	return null;
542	}
543
544	public Set getEffectiveSessionTrackingModes() {
545	// TODO Auto-generated method stub
546	return null;
547	}
548
549	public void addListener(String className) {
550	// TODO Auto-generated method stub
551
552	}
553
554	public void addListener(EventListener t) {
555	// TODO Auto-generated method stub
556
557	}
558
559	public void addListener(Class listenerClass) {
560	// TODO Auto-generated method stub
561
562	}
563
564	public EventListener createListener(Class clazz) throws ServletException {
565	// TODO Auto-generated method stub
566	return null;
567	}
568
569	public JspConfigDescriptor getJspConfigDescriptor() {
570	// TODO Auto-generated method stub
571	return null;
572	}
573
574	public ClassLoader getClassLoader() {
575	// TODO Auto-generated method stub
576	return null;
577	}
578
579	public void declareRoles(String[] roleNames) {
580	// TODO Auto-generated method stub
581
582	}
583
450	}	584	}

Lines 6-15 Bundle-Localization: plugin Link Here

(-)a/bundles/org.eclipse.equinox.jsp.jasper/META-INF/MANIFEST.MF (-4 / +6 lines)
6	Bundle-SymbolicName: org.eclipse.equinox.jsp.jasper	6	Bundle-SymbolicName: org.eclipse.equinox.jsp.jasper
7	Bundle-Version: 1.0.300.qualifier	7	Bundle-Version: 1.0.300.qualifier
8	Bundle-Activator: org.eclipse.equinox.internal.jsp.jasper.Activator	8	Bundle-Activator: org.eclipse.equinox.internal.jsp.jasper.Activator
9	Import-Package: javax.servlet;version="[2.4, 3.0)",	9	Import-Package: javax.servlet;version="[2.4,3.0]",
10	javax.servlet.http;version="[2.4, 3.0)",	10	javax.servlet.descriptor;version="3.0.0",
11	javax.servlet.jsp;version="[2.0, 2.1)",	11	javax.servlet.http;version="[2.4,3.0]",
12	org.apache.jasper.servlet;version="[0, 6)",	12	javax.servlet.jsp;version="[2.0,2.2]",
		13	org.apache.jasper.servlet;version="[0,8)",
		14	org.apache.tomcat;version="[0,8)",
13	org.osgi.framework;version="1.3.0",	15	org.osgi.framework;version="1.3.0",
14	org.osgi.service.http;version="1.2.0",	16	org.osgi.service.http;version="1.2.0",
15	org.osgi.service.packageadmin;version="1.2.0",	17	org.osgi.service.packageadmin;version="1.2.0",

Lines 22-39 import java.security.Permission; Link Here

(-)a/bundles/org.eclipse.equinox.jsp.jasper/src/org/eclipse/equinox/jsp/jasper/JspServlet.java (+142 lines)
22	import java.security.PermissionCollection;	22	import java.security.PermissionCollection;
23	import java.util.Collections;	23	import java.util.Collections;
24	import java.util.Enumeration;	24	import java.util.Enumeration;
		25	import java.util.EventListener;
25	import java.util.HashSet;	26	import java.util.HashSet;
		27	import java.util.Map;
26	import java.util.Set;	28	import java.util.Set;
27		29
		30	import javax.servlet.Filter;
		31	import javax.servlet.FilterRegistration;
28	import javax.servlet.RequestDispatcher;	32	import javax.servlet.RequestDispatcher;
29	import javax.servlet.Servlet;	33	import javax.servlet.Servlet;
30	import javax.servlet.ServletConfig;	34	import javax.servlet.ServletConfig;
31	import javax.servlet.ServletContext;	35	import javax.servlet.ServletContext;
32	import javax.servlet.ServletException;	36	import javax.servlet.ServletException;
		37	import javax.servlet.ServletRegistration;
		38	import javax.servlet.ServletRegistration.Dynamic;
		39	import javax.servlet.SessionCookieConfig;
		40	import javax.servlet.descriptor.JspConfigDescriptor;
33	import javax.servlet.http.HttpServlet;	41	import javax.servlet.http.HttpServlet;
34	import javax.servlet.http.HttpServletRequest;	42	import javax.servlet.http.HttpServletRequest;
35	import javax.servlet.http.HttpServletResponse;	43	import javax.servlet.http.HttpServletResponse;
36		44
		45	import org.apache.tomcat.InstanceManager;
37	import org.eclipse.equinox.internal.jsp.jasper.JspClassLoader;	46	import org.eclipse.equinox.internal.jsp.jasper.JspClassLoader;
38	import org.osgi.framework.Bundle;	47	import org.osgi.framework.Bundle;
39		48
Lines 107-112 public class JspServlet extends HttpServlet { Link Here
107	}	116	}
108		117
109	public void init(ServletConfig config) throws ServletException {	118	public void init(ServletConfig config) throws ServletException {
		119	// Set the InstanceManager conforming to Apache Tomcat 7
		120	config.getServletContext().setAttribute(InstanceManager.class.getName(), new MyInstanceManager());
		121
110	ClassLoader original = Thread.currentThread().getContextClassLoader();	122	ClassLoader original = Thread.currentThread().getContextClassLoader();
111	try {	123	try {
112	Thread.currentThread().setContextClassLoader(jspLoader);	124	Thread.currentThread().setContextClassLoader(jspLoader);
Lines 363-367 public class JspServlet extends HttpServlet { Link Here
363	}	375	}
364	return null;	376	return null;
365	}	377	}
		378
		379	public int getEffectiveMajorVersion() {
		380	// TODO Auto-generated method stub
		381	return 0;
		382	}
		383
		384	public int getEffectiveMinorVersion() {
		385	// TODO Auto-generated method stub
		386	return 0;
		387	}
		388
		389	public boolean setInitParameter(String name, String value) {
		390	// TODO Auto-generated method stub
		391	return false;
		392	}
		393
		394	public Dynamic addServlet(String servletName, String className) {
		395	// TODO Auto-generated method stub
		396	return null;
		397	}
		398
		399	public Dynamic addServlet(String servletName, Servlet servlet) {
		400	// TODO Auto-generated method stub
		401	return null;
		402	}
		403
		404	public Dynamic addServlet(String servletName, Class servletClass) {
		405	// TODO Auto-generated method stub
		406	return null;
		407	}
		408
		409	public Servlet createServlet(Class clazz) throws ServletException {
		410	// TODO Auto-generated method stub
		411	return null;
		412	}
		413
		414	public ServletRegistration getServletRegistration(String servletName) {
		415	// TODO Auto-generated method stub
		416	return null;
		417	}
		418
		419	public Map getServletRegistrations() {
		420	// TODO Auto-generated method stub
		421	return null;
		422	}
		423
		424	public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, String className) {
		425	// TODO Auto-generated method stub
		426	return null;
		427	}
		428
		429	public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, Filter filter) {
		430	// TODO Auto-generated method stub
		431	return null;
		432	}
		433
		434	public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, Class filterClass) {
		435	// TODO Auto-generated method stub
		436	return null;
		437	}
		438
		439	public Filter createFilter(Class clazz) throws ServletException {
		440	// TODO Auto-generated method stub
		441	return null;
442	}
443
444	public FilterRegistration getFilterRegistration(String filterName) {
445	// TODO Auto-generated method stub
446	return null;
447	}
448
449	public Map getFilterRegistrations() {
450	// TODO Auto-generated method stub
451	return null;
452	}
453
454	public SessionCookieConfig getSessionCookieConfig() {
455	// TODO Auto-generated method stub
456	return null;
457	}
458
459	public void setSessionTrackingModes(Set sessionTrackingModes) {
460	// TODO Auto-generated method stub
461
462	}
463
464	public Set getDefaultSessionTrackingModes() {
465	// TODO Auto-generated method stub
466	return null;
467	}
468
469	public Set getEffectiveSessionTrackingModes() {
470	// TODO Auto-generated method stub
471	return null;
472	}
473
474	public void addListener(String className) {
475	// TODO Auto-generated method stub
476
477	}
478
479	public void addListener(EventListener t) {
480	// TODO Auto-generated method stub
481
482	}
483
484	public void addListener(Class listenerClass) {
485	// TODO Auto-generated method stub
486
487	}
488
489	public EventListener createListener(Class clazz) throws ServletException {
490	// TODO Auto-generated method stub
491	return null;
492	}
493
494	public JspConfigDescriptor getJspConfigDescriptor() {
495	// TODO Auto-generated method stub
496	return null;
497	}
498
499	public ClassLoader getClassLoader() {
500	// TODO Auto-generated method stub
501	return null;
502	}
503
504	public void declareRoles(String[] roleNames) {
505	// TODO Auto-generated method stub
506
507	}
366	}	508	}
367	}	509	}




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

	}
}

Return to bug 357286

Lines 13-20 package org.eclipse.equinox.http.servlet; Link Here

(-)a/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/HttpServletRequestImpl.java (-2 / +61 lines)
13	import java.io.*;	13	import java.io.*;
14	import java.security.Principal;	14	import java.security.Principal;
15	import java.util.*;	15	import java.util.*;
16	import javax.servlet.RequestDispatcher;	16	import javax.servlet.*;
17	import javax.servlet.ServletInputStream;
18	import javax.servlet.http.*;	17	import javax.servlet.http.*;
19	import org.eclipse.equinox.http.*;	18	import org.eclipse.equinox.http.*;
20	import org.eclipse.equinox.socket.SocketInterface;	19	import org.eclipse.equinox.socket.SocketInterface;
Lines 1435-1438 public class HttpServletRequestImpl implements HttpServletRequest { Link Here
1435	public int getRemotePort() {	1434	public int getRemotePort() {
1436	throw new UnsupportedOperationException(HttpMsg.HTTP_ONLY_SUPPORTS_2_1);	1435	throw new UnsupportedOperationException(HttpMsg.HTTP_ONLY_SUPPORTS_2_1);
1437	}	1436	}
		1437
		1438	public ServletContext getServletContext() {
		1439	// TODO Auto-generated method stub
		1440	return null;
		1441	}
		1442
		1443	public AsyncContext startAsync() throws IllegalStateException {
		1444	// TODO Auto-generated method stub
		1445	return null;
		1446	}
		1447
		1448	public AsyncContext startAsync(ServletRequest servletRequest, ServletResponse servletResponse) throws IllegalStateException {
		1449	// TODO Auto-generated method stub
		1450	return null;
		1451	}
		1452
		1453	public boolean isAsyncStarted() {
		1454	// TODO Auto-generated method stub
		1455	return false;
		1456	}
		1457
		1458	public boolean isAsyncSupported() {
		1459	// TODO Auto-generated method stub
		1460	return false;
		1461	}
		1462
		1463	public AsyncContext getAsyncContext() {
		1464	// TODO Auto-generated method stub
		1465	return null;
		1466	}
		1467
		1468	public DispatcherType getDispatcherType() {
		1469	// TODO Auto-generated method stub
		1470	return null;
		1471	}
		1472
		1473	public boolean authenticate(HttpServletResponse response) throws IOException, ServletException {
		1474	// TODO Auto-generated method stub
		1475	return false;
		1476	}
		1477
		1478	public void login(String username, String password) throws ServletException {
		1479	// TODO Auto-generated method stub
		1480
		1481	}
		1482
		1483	public void logout() throws ServletException {
		1484	// TODO Auto-generated method stub
		1485
		1486	}
		1487
		1488	public Collection getParts() throws IOException, ServletException {
		1489	// TODO Auto-generated method stub
		1490	return null;
		1491	}
		1492
		1493	public Part getPart(String name) throws IOException, ServletException {
		1494	// TODO Auto-generated method stub
		1495	return null;
		1496	}
1438	}	1497	}

Lines 858-861 public class HttpServletResponseImpl implements HttpServletResponse { Link Here

(-)a/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/HttpServletResponseImpl.java (+20 lines)
858	throw new UnsupportedOperationException(HttpMsg.HTTP_ONLY_SUPPORTS_2_1);	858	throw new UnsupportedOperationException(HttpMsg.HTTP_ONLY_SUPPORTS_2_1);
859		859
860	}	860	}
		861
		862	public int getStatus() {
		863	// TODO Auto-generated method stub
		864	return 0;
		865	}
		866
		867	public String getHeader(String name) {
		868	// TODO Auto-generated method stub
		869	return null;
		870	}
		871
		872	public Collection getHeaders(String name) {
		873	// TODO Auto-generated method stub
		874	return null;
		875	}
		876
		877	public Collection getHeaderNames() {
		878	// TODO Auto-generated method stub
		879	return null;
		880	}
861	}	881	}

Lines 4-18 Bundle-Version: 1.0.500.qualifier Link Here

(-)a/bundles/org.eclipse.equinox.http/META-INF/MANIFEST.MF (-4 / +5 lines)
4	Bundle-Activator: org.eclipse.equinox.http.Activator	4	Bundle-Activator: org.eclipse.equinox.http.Activator
5	Bundle-SymbolicName: org.eclipse.equinox.http	5	Bundle-SymbolicName: org.eclipse.equinox.http
6	Bundle-Name: %bundleName	6	Bundle-Name: %bundleName
7	Import-Package: javax.servlet,	7	Import-Package: javax.net;resolution:=optional,
		8	javax.servlet,
		9	javax.servlet.descriptor;version="3.0.0",
8	javax.servlet.http,	10	javax.servlet.http,
9	javax.net; resolution:="optional",	11	org.eclipse.osgi.util,
10	org.osgi.framework;version="1.0",	12	org.osgi.framework;version="1.0",
11	org.osgi.service.cm;version="1.0",	13	org.osgi.service.cm;version="1.0",
12	org.osgi.service.http;version="[1.2,1.3)",	14	org.osgi.service.http;version="[1.2,1.3)",
13	org.osgi.service.log;version="1.0",	15	org.osgi.service.log;version="1.0",
14	org.osgi.util.tracker;version="1.1",	16	org.osgi.util.tracker;version="1.1"
15	org.eclipse.osgi.util
16	Export-Package: org.eclipse.equinox.http;x-internal:=true,	17	Export-Package: org.eclipse.equinox.http;x-internal:=true,
17	org.eclipse.equinox.http.servlet;x-internal:=true,	18	org.eclipse.equinox.http.servlet;x-internal:=true,
18	org.eclipse.equinox.socket;x-internal:=true,	19	org.eclipse.equinox.socket;x-internal:=true,

Added Link Here

(-)a/bundles/org.eclipse.equinox.jsp.jasper/src/org/eclipse/equinox/jsp/jasper/MyInstanceManager.java (-1 / +35 lines)
0	-	1	package org.eclipse.equinox.jsp.jasper;
		2
		3	import org.apache.tomcat.InstanceManager;
		4
		5	public class MyInstanceManager implements InstanceManager {
		6
		7	public Object newInstance(String className) {
		8	// TODO Auto-generated method stub
		9	return null;
		10	}
		11
		12	public Object newInstance(String fqcn, ClassLoader classLoader) throws ClassNotFoundException {
		13
		14	try {
		15	return classLoader.loadClass(fqcn).newInstance();
		16	} catch (InstantiationException e) {
		17	// TODO Auto-generated catch block
		18	e.printStackTrace();
		19	} catch (IllegalAccessException e) {
		20	// TODO Auto-generated catch block
		21	e.printStackTrace();
		22	}
		23	return null;
		24	}
		25
		26	public void newInstance(Object o) {
		27	// TODO Auto-generated method stub
		28
		29	}
		30
		31	public void destroyInstance(Object o) {
		32	// TODO Auto-generated method stub
		33
		34	}
		35	}