Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaymond Auge2015-08-27 14:24:45 +0000
committerRaymond Auge2015-08-27 14:24:45 +0000
commit07540a1895e90c3703f191937cd99395d0688f32 (patch)
tree61d78af5626466f04b2aff68896260a7553b8f84 /bundles/org.eclipse.equinox.http.servlet
parent2500523b5932b3c037a3b649dd4baa7605c37d70 (diff)
downloadrt.equinox.bundles-07540a1895e90c3703f191937cd99395d0688f32.tar.gz
rt.equinox.bundles-07540a1895e90c3703f191937cd99395d0688f32.tar.xz
rt.equinox.bundles-07540a1895e90c3703f191937cd99395d0688f32.zip
Bug 476051 - [http servlet] rename HttpServletRequestBuilderWrapperImpl to HttpServletRequestWrapperImpl
Signed-off-by: Raymond Auge <raymond.auge@liferay.com>
Diffstat (limited to 'bundles/org.eclipse.equinox.http.servlet')
-rw-r--r--bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/context/DispatchTargets.java4
-rw-r--r--bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/servlet/HttpServletRequestWrapperImpl.java (renamed from bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/servlet/HttpServletRequestBuilderWrapperImpl.java)24
-rw-r--r--bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/servlet/ProxyServlet.java2
-rw-r--r--bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/servlet/ResourceServlet.java2
4 files changed, 16 insertions, 16 deletions
diff --git a/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/context/DispatchTargets.java b/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/context/DispatchTargets.java
index ae84f8a5..63ac4771 100644
--- a/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/context/DispatchTargets.java
+++ b/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/context/DispatchTargets.java
@@ -80,12 +80,12 @@ public class DispatchTargets {
request.setAttribute(RequestDispatcher.FORWARD_SERVLET_PATH, request.getServletPath());
}
- HttpServletRequestBuilderWrapperImpl httpRuntimeRequest = HttpServletRequestBuilderWrapperImpl.findHttpRuntimeRequest(request);
+ HttpServletRequestWrapperImpl httpRuntimeRequest = HttpServletRequestWrapperImpl.findHttpRuntimeRequest(request);
boolean pushedState = false;
try {
if (httpRuntimeRequest == null) {
- httpRuntimeRequest = new HttpServletRequestBuilderWrapperImpl(request, this, dispatcherType);
+ httpRuntimeRequest = new HttpServletRequestWrapperImpl(request, this, dispatcherType);
request = httpRuntimeRequest;
response = new HttpServletResponseWrapperImpl(response);
}
diff --git a/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/servlet/HttpServletRequestBuilderWrapperImpl.java b/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/servlet/HttpServletRequestWrapperImpl.java
index 21820a44..e5a6641a 100644
--- a/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/servlet/HttpServletRequestBuilderWrapperImpl.java
+++ b/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/servlet/HttpServletRequestWrapperImpl.java
@@ -20,7 +20,7 @@ import org.eclipse.equinox.http.servlet.internal.context.DispatchTargets;
import org.eclipse.equinox.http.servlet.internal.util.*;
import org.osgi.service.http.HttpContext;
-public class HttpServletRequestBuilderWrapperImpl extends HttpServletRequestWrapper {
+public class HttpServletRequestWrapperImpl extends HttpServletRequestWrapper {
private Stack<DispatchTargets> dispatchTargets = new Stack<DispatchTargets>();
private final HttpServletRequest request;
@@ -32,12 +32,12 @@ public class HttpServletRequestBuilderWrapperImpl extends HttpServletRequestWrap
static final String INCLUDE_SERVLET_PATH_ATTRIBUTE = "javax.servlet.include.servlet_path"; //$NON-NLS-1$
static final String INCLUDE_PATH_INFO_ATTRIBUTE = "javax.servlet.include.path_info"; //$NON-NLS-1$
- public static HttpServletRequestBuilderWrapperImpl findHttpRuntimeRequest(
+ public static HttpServletRequestWrapperImpl findHttpRuntimeRequest(
HttpServletRequest request) {
while (request instanceof HttpServletRequestWrapper) {
- if (request instanceof HttpServletRequestBuilderWrapperImpl) {
- return (HttpServletRequestBuilderWrapperImpl)request;
+ if (request instanceof HttpServletRequestWrapperImpl) {
+ return (HttpServletRequestWrapperImpl)request;
}
request = (HttpServletRequest)((HttpServletRequestWrapper)request).getRequest();
@@ -46,7 +46,7 @@ public class HttpServletRequestBuilderWrapperImpl extends HttpServletRequestWrap
return null;
}
- public HttpServletRequestBuilderWrapperImpl(HttpServletRequest request, DispatchTargets dispatchTargets, DispatcherType dispatcherType) {
+ public HttpServletRequestWrapperImpl(HttpServletRequest request, DispatchTargets dispatchTargets, DispatcherType dispatcherType) {
super(request);
this.request = request;
this.dispatchTargets.push(dispatchTargets);
@@ -143,18 +143,18 @@ public class HttpServletRequestBuilderWrapperImpl extends HttpServletRequestWrap
public Object getAttribute(String attributeName) {
String servletPath = dispatchTargets.peek().getServletPath();
if (dispatcherType == DispatcherType.INCLUDE) {
- if (attributeName.equals(HttpServletRequestBuilderWrapperImpl.INCLUDE_CONTEXT_PATH_ATTRIBUTE)) {
- String contextPath = (String) request.getAttribute(HttpServletRequestBuilderWrapperImpl.INCLUDE_CONTEXT_PATH_ATTRIBUTE);
+ if (attributeName.equals(HttpServletRequestWrapperImpl.INCLUDE_CONTEXT_PATH_ATTRIBUTE)) {
+ String contextPath = (String) request.getAttribute(HttpServletRequestWrapperImpl.INCLUDE_CONTEXT_PATH_ATTRIBUTE);
if (contextPath == null || contextPath.equals(Const.SLASH))
contextPath = Const.BLANK;
- String includeServletPath = (String) request.getAttribute(HttpServletRequestBuilderWrapperImpl.INCLUDE_SERVLET_PATH_ATTRIBUTE);
+ String includeServletPath = (String) request.getAttribute(HttpServletRequestWrapperImpl.INCLUDE_SERVLET_PATH_ATTRIBUTE);
if (includeServletPath == null || includeServletPath.equals(Const.SLASH))
includeServletPath = Const.BLANK;
return contextPath + includeServletPath;
- } else if (attributeName.equals(HttpServletRequestBuilderWrapperImpl.INCLUDE_SERVLET_PATH_ATTRIBUTE)) {
- String attributeServletPath = (String) request.getAttribute(HttpServletRequestBuilderWrapperImpl.INCLUDE_SERVLET_PATH_ATTRIBUTE);
+ } else if (attributeName.equals(HttpServletRequestWrapperImpl.INCLUDE_SERVLET_PATH_ATTRIBUTE)) {
+ String attributeServletPath = (String) request.getAttribute(HttpServletRequestWrapperImpl.INCLUDE_SERVLET_PATH_ATTRIBUTE);
if (attributeServletPath != null) {
return attributeServletPath;
}
@@ -162,8 +162,8 @@ public class HttpServletRequestBuilderWrapperImpl extends HttpServletRequestWrap
return Const.BLANK;
}
return servletPath;
- } else if (attributeName.equals(HttpServletRequestBuilderWrapperImpl.INCLUDE_PATH_INFO_ATTRIBUTE)) {
- String pathInfoAttribute = (String) request.getAttribute(HttpServletRequestBuilderWrapperImpl.INCLUDE_PATH_INFO_ATTRIBUTE);
+ } else if (attributeName.equals(HttpServletRequestWrapperImpl.INCLUDE_PATH_INFO_ATTRIBUTE)) {
+ String pathInfoAttribute = (String) request.getAttribute(HttpServletRequestWrapperImpl.INCLUDE_PATH_INFO_ATTRIBUTE);
if (servletPath.equals(Const.SLASH)) {
return pathInfoAttribute;
}
diff --git a/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/servlet/ProxyServlet.java b/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/servlet/ProxyServlet.java
index 55465dd4..8e88705d 100644
--- a/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/servlet/ProxyServlet.java
+++ b/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/servlet/ProxyServlet.java
@@ -61,7 +61,7 @@ public class ProxyServlet extends HttpServlet {
checkRuntime();
- String alias = HttpServletRequestBuilderWrapperImpl.getDispatchPathInfo(request);
+ String alias = HttpServletRequestWrapperImpl.getDispatchPathInfo(request);
if (alias == null) {
alias = Const.SLASH;
diff --git a/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/servlet/ResourceServlet.java b/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/servlet/ResourceServlet.java
index 82dbc944..e07d4aa1 100644
--- a/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/servlet/ResourceServlet.java
+++ b/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/servlet/ResourceServlet.java
@@ -43,7 +43,7 @@ public class ResourceServlet extends HttpServlet {
public void service(HttpServletRequest req, final HttpServletResponse resp) throws IOException {
String method = req.getMethod();
if (method.equals("GET") || method.equals("POST") || method.equals("HEAD")) { //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
- String pathInfo = HttpServletRequestBuilderWrapperImpl.getDispatchPathInfo(req);
+ String pathInfo = HttpServletRequestWrapperImpl.getDispatchPathInfo(req);
if (pathInfo == null)
pathInfo = Const.BLANK;
String resourcePath = internalName + pathInfo;

Back to the top