--- rt.equinox.bundles/bundles/org.eclipse.equinox.http/pom.xml.bak 2012-09-06 16:02:03.000000000 +0200
+++ rt.equinox.bundles/bundles/org.eclipse.equinox.http/pom.xml 2012-09-07 11:37:32.943823238 +0200
@@ -41,19 +41,6 @@
<removeAll />
</filter>
</filters>
- <dependency-resolution>
- <extraRequirements>
- <!--
- new methods were introduced in ServletContext and possibly other interfaces implemented by this bundle
- in javax.servlet 3.0. Because of this we need to make sure to compile against earlier version.
- -->
- <requirement>
- <type>eclipse-plugin</type>
- <id>javax.servlet</id>
- <versionRange>[2.4.0,2.6.0)</versionRange>
- </requirement>
- </extraRequirements>
- </dependency-resolution>
</configuration>
</plugin>
</plugins>
diff --git rt.equinox.bundles/bundles/org.eclipse.equinox.http/META-INF/MANIFEST.MF rt.equinox.bundles/bundles/org.eclipse.equinox.http/META-INF/MANIFEST.MF
index 8b76fdc..b730678 100644
--- rt.equinox.bundles/bundles/org.eclipse.equinox.http/META-INF/MANIFEST.MF
+++ rt.equinox.bundles/bundles/org.eclipse.equinox.http/META-INF/MANIFEST.MF
@@ -1,18 +1,19 @@
Bundle-ManifestVersion: 2
Bundle-Vendor: %bundleVendor
-Bundle-Version: 1.0.500.qualifier
+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,
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 rt.equinox.bundles/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/HttpServletRequestImpl.java rt.equinox.bundles/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/HttpServletRequestImpl.java
index d1520e0..3b5788c 100644
--- rt.equinox.bundles/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/HttpServletRequestImpl.java
+++ rt.equinox.bundles/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/HttpServletRequestImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 1999, 2009 IBM Corporation and others.
+ * Copyright (c) 1999, 2012 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -7,14 +7,14 @@
*
* Contributors:
* IBM Corporation - initial API and implementation
+ * Red Hat, Inc. - Bug 389033 - get rid off javax.servlet < 2.6 dependency
*******************************************************************************/
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 +1435,64 @@ public class HttpServletRequestImpl implements HttpServletRequest {
public int getRemotePort() {
throw new UnsupportedOperationException(HttpMsg.HTTP_ONLY_SUPPORTS_2_1);
}
+
+ public AsyncContext getAsyncContext() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public DispatcherType getDispatcherType() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public ServletContext getServletContext() {
+ // 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 startAsync() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public AsyncContext startAsync(ServletRequest arg0, ServletResponse arg1) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public boolean authenticate(HttpServletResponse arg0) throws IOException, ServletException {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ public Part getPart(String arg0) throws IOException, IllegalStateException, ServletException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Collection getParts() throws IOException, IllegalStateException, ServletException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public void login(String arg0, String arg1) throws ServletException {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void logout() throws ServletException {
+ // TODO Auto-generated method stub
+
+ }
}
diff --git rt.equinox.bundles/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/HttpServletResponseImpl.java rt.equinox.bundles/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/HttpServletResponseImpl.java
index 12020c0..8bb68ee 100644
--- rt.equinox.bundles/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/HttpServletResponseImpl.java
+++ rt.equinox.bundles/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 String getHeader(String arg0) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Collection getHeaderNames() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Collection getHeaders(String arg0) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public int getStatus() {
+ // TODO Auto-generated method stub
+ return 0;
+ }
}
diff --git rt.equinox.bundles/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/RequestDispatcherImpl.java rt.equinox.bundles/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/RequestDispatcherImpl.java
index 09fca65..d75e450 100644
--- rt.equinox.bundles/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/RequestDispatcherImpl.java
+++ rt.equinox.bundles/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/RequestDispatcherImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 1999, 2009 IBM Corporation and others.
+ * Copyright (c) 1999, 2012 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -7,11 +7,13 @@
*
* Contributors:
* IBM Corporation - initial API and implementation
+ * Red Hat, Inc. - Bug 389033 - get rid off javax.servlet < 2.6 dependency
*******************************************************************************/
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 +200,26 @@ public class RequestDispatcherImpl implements RequestDispatcher {
}
+ public String getHeader(String arg0) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Collection getHeaderNames() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Collection getHeaders(String arg0) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public int getStatus() {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
}
public RequestDispatcherImpl(Registration reg, String requestURI) {
diff --git rt.equinox.bundles/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/ServletContextImpl.java rt.equinox.bundles/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/ServletContextImpl.java
index 015e488..02ef245 100644
--- rt.equinox.bundles/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/ServletContextImpl.java
+++ rt.equinox.bundles/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/servlet/ServletContextImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 1999, 2009 IBM Corporation and others.
+ * Copyright (c) 1999, 2012 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
*
* Contributors:
* IBM Corporation - initial API and implementation
+ * Red Hat, Inc. - Bug 389033 - get rid off javax.servlet < 2.6 dependency
*******************************************************************************/
package org.eclipse.equinox.http.servlet;
@@ -16,7 +17,11 @@ import java.net.MalformedURLException;
import java.net.URL;
import java.util.*;
import javax.servlet.*;
+import javax.servlet.FilterRegistration.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 +452,134 @@ public class ServletContextImpl implements ServletContext {
throw new UnsupportedOperationException(HttpMsg.HTTP_ONLY_SUPPORTS_2_1);
}
+ public Dynamic addFilter(String arg0, String arg1) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Dynamic addFilter(String arg0, Filter arg1) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Dynamic addFilter(String arg0, Class arg1) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public void addListener(Class arg0) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void addListener(String arg0) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void addListener(EventListener arg0) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public javax.servlet.ServletRegistration.Dynamic addServlet(String arg0, String arg1) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public javax.servlet.ServletRegistration.Dynamic addServlet(String arg0, Servlet arg1) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public javax.servlet.ServletRegistration.Dynamic addServlet(String arg0, Class arg1) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Filter createFilter(Class arg0) throws ServletException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public EventListener createListener(Class arg0) throws ServletException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Servlet createServlet(Class arg0) throws ServletException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public void declareRoles(String[] arg0) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public ClassLoader getClassLoader() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Set getDefaultSessionTrackingModes() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public int getEffectiveMajorVersion() {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ public int getEffectiveMinorVersion() {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ public Set getEffectiveSessionTrackingModes() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public FilterRegistration getFilterRegistration(String arg0) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Map getFilterRegistrations() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public JspConfigDescriptor getJspConfigDescriptor() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public ServletRegistration getServletRegistration(String arg0) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Map getServletRegistrations() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public SessionCookieConfig getSessionCookieConfig() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public boolean setInitParameter(String arg0, String arg1) {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ public void setSessionTrackingModes(Set arg0) throws IllegalStateException, IllegalArgumentException {
+ // TODO Auto-generated method stub
+
+ }
+
}