Author: markt
Date: Mon Feb 27 16:56:47 2017
New Revision: 1784597
URL: http://svn.apache.org/viewvc?rev=1784597&view=rev
Log:
Rename Mapping to ServletMapping
Added:
tomcat/trunk/java/javax/servlet/http/ServletMapping.java
- copied, changed from r1784596,
tomcat/trunk/java/javax/servlet/http/Mapping.java
Removed:
tomcat/trunk/java/javax/servlet/http/Mapping.java
Modified:
tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java
tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java
tomcat/trunk/java/org/apache/catalina/connector/Request.java
tomcat/trunk/java/org/apache/catalina/connector/RequestFacade.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationMapping.java
tomcat/trunk/test/org/apache/catalina/core/TestApplicationMapping.java
tomcat/trunk/test/org/apache/catalina/filters/TesterHttpServletRequest.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java?rev=1784597&r1=1784596&r2=1784597&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java (original)
+++ tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java Mon Feb 27
16:56:47 2017
@@ -170,8 +170,8 @@ public interface HttpServletRequest exte
*/
public int getIntHeader(String name);
- public default Mapping getMapping() {
- return new Mapping() {
+ public default ServletMapping getServletMapping() {
+ return new ServletMapping() {
@Override
public String getMatchValue() {
Modified: tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java?rev=1784597&r1=1784596&r2=1784597&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java
(original)
+++ tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java Mon Feb
27 16:56:47 2017
@@ -119,8 +119,8 @@ public class HttpServletRequestWrapper e
* wrapped request object.
*/
@Override
- public Mapping getMapping() {
- return this._getHttpServletRequest().getMapping();
+ public ServletMapping getServletMapping() {
+ return this._getHttpServletRequest().getServletMapping();
}
/**
Copied: tomcat/trunk/java/javax/servlet/http/ServletMapping.java (from
r1784596, tomcat/trunk/java/javax/servlet/http/Mapping.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/ServletMapping.java?p2=tomcat/trunk/java/javax/servlet/http/ServletMapping.java&p1=tomcat/trunk/java/javax/servlet/http/Mapping.java&r1=1784596&r2=1784597&rev=1784597&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/http/Mapping.java (original)
+++ tomcat/trunk/java/javax/servlet/http/ServletMapping.java Mon Feb 27
16:56:47 2017
@@ -24,7 +24,7 @@ import javax.servlet.annotation.WebServl
*
* @since 4.0
*/
-public interface Mapping {
+public interface ServletMapping {
/**
* @return The value that was matched or the empty String if not known.
Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=1784597&r1=1784596&r2=1784597&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Mon Feb 27
16:56:47 2017
@@ -63,9 +63,9 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpUpgradeHandler;
-import javax.servlet.http.Mapping;
import javax.servlet.http.Part;
import javax.servlet.http.PushBuilder;
+import javax.servlet.http.ServletMapping;
import org.apache.catalina.Container;
import org.apache.catalina.Context;
@@ -2167,8 +2167,8 @@ public class Request implements HttpServ
@Override
- public Mapping getMapping() {
- return applicationMapping.getMapping();
+ public ServletMapping getServletMapping() {
+ return applicationMapping.getServletMapping();
}
Modified: tomcat/trunk/java/org/apache/catalina/connector/RequestFacade.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/RequestFacade.java?rev=1784597&r1=1784596&r2=1784597&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/RequestFacade.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/RequestFacade.java Mon Feb
27 16:56:47 2017
@@ -38,9 +38,9 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpUpgradeHandler;
-import javax.servlet.http.Mapping;
import javax.servlet.http.Part;
import javax.servlet.http.PushBuilder;
+import javax.servlet.http.ServletMapping;
import org.apache.catalina.Globals;
import org.apache.catalina.security.SecurityUtil;
@@ -738,14 +738,14 @@ public class RequestFacade implements Ht
@Override
- public Mapping getMapping() {
+ public ServletMapping getServletMapping() {
if (request == null) {
throw new IllegalStateException(
sm.getString("requestFacade.nullRequest"));
}
- return request.getMapping();
+ return request.getServletMapping();
}
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=1784597&r1=1784596&r2=1784597&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java Mon Feb
27 16:56:47 2017
@@ -54,7 +54,7 @@ import javax.servlet.descriptor.JspConfi
import javax.servlet.http.HttpSessionAttributeListener;
import javax.servlet.http.HttpSessionIdListener;
import javax.servlet.http.HttpSessionListener;
-import javax.servlet.http.Mapping;
+import javax.servlet.http.ServletMapping;
import org.apache.catalina.Container;
import org.apache.catalina.Context;
@@ -481,7 +481,7 @@ public class ApplicationContext implemen
Wrapper wrapper = mappingData.wrapper;
String wrapperPath = mappingData.wrapperPath.toString();
String pathInfo = mappingData.pathInfo.toString();
- Mapping mapping = (new ApplicationMapping(mappingData)).getMapping();
+ ServletMapping mapping = (new
ApplicationMapping(mappingData)).getServletMapping();
mappingData.recycle();
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java?rev=1784597&r1=1784596&r2=1784597&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java Mon
Feb 27 16:56:47 2017
@@ -34,7 +34,7 @@ import javax.servlet.ServletResponseWrap
import javax.servlet.UnavailableException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.Mapping;
+import javax.servlet.http.ServletMapping;
import org.apache.catalina.AsyncDispatcher;
import org.apache.catalina.Context;
@@ -206,7 +206,7 @@ final class ApplicationDispatcher implem
*/
public ApplicationDispatcher
(Wrapper wrapper, String requestURI, String servletPath,
- String pathInfo, String queryString, Mapping mapping, String name) {
+ String pathInfo, String queryString, ServletMapping mapping, String
name) {
super();
@@ -263,7 +263,7 @@ final class ApplicationDispatcher implem
/**
* The mapping for this RequestDispatcher.
*/
- private final Mapping mapping;
+ private final ServletMapping mapping;
/**
@@ -369,7 +369,7 @@ final class ApplicationDispatcher implem
hrequest.getPathInfo());
wrequest.setAttribute(RequestDispatcher.FORWARD_QUERY_STRING,
hrequest.getQueryString());
- wrequest.setAttribute(RequestDispatcher.FORWARD_MAPPING,
hrequest.getMapping());
+ wrequest.setAttribute(RequestDispatcher.FORWARD_MAPPING,
hrequest.getServletMapping());
}
wrequest.setContextPath(contextPath);
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java?rev=1784597&r1=1784596&r2=1784597&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java Mon
Feb 27 16:56:47 2017
@@ -33,8 +33,8 @@ import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequestWrapper;
import javax.servlet.http.HttpSession;
-import javax.servlet.http.Mapping;
import javax.servlet.http.PushBuilder;
+import javax.servlet.http.ServletMapping;
import org.apache.catalina.Context;
import org.apache.catalina.Globals;
@@ -190,7 +190,7 @@ class ApplicationHttpRequest extends Htt
/**
* The mapping for this request.
*/
- private Mapping mapping = null;
+ private ServletMapping mapping = null;
/**
@@ -506,7 +506,7 @@ class ApplicationHttpRequest extends Htt
@Override
- public Mapping getMapping() {
+ public ServletMapping getServletMapping() {
return mapping;
}
@@ -690,7 +690,7 @@ class ApplicationHttpRequest extends Htt
queryString = request.getQueryString();
requestURI = request.getRequestURI();
servletPath = request.getServletPath();
- mapping = request.getMapping();
+ mapping = request.getServletMapping();
}
@@ -749,7 +749,7 @@ class ApplicationHttpRequest extends Htt
}
- void setMapping(Mapping mapping) {
+ void setMapping(ServletMapping mapping) {
this.mapping = mapping;
}
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationMapping.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationMapping.java?rev=1784597&r1=1784596&r2=1784597&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationMapping.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationMapping.java Mon Feb
27 16:56:47 2017
@@ -16,8 +16,8 @@
*/
package org.apache.catalina.core;
-import javax.servlet.http.Mapping;
import javax.servlet.http.MappingMatch;
+import javax.servlet.http.ServletMapping;
import org.apache.catalina.mapper.MappingData;
@@ -25,13 +25,13 @@ public class ApplicationMapping {
private final MappingData mappingData;
- private volatile Mapping mapping = null;
+ private volatile ServletMapping mapping = null;
public ApplicationMapping(MappingData mappingData) {
this.mappingData = mappingData;
}
- public Mapping getMapping() {
+ public ServletMapping getServletMapping() {
if (mapping == null) {
String servletName;
if (mappingData.wrapper == null) {
@@ -74,7 +74,7 @@ public class ApplicationMapping {
mapping = null;
}
- private static class MappingImpl implements Mapping {
+ private static class MappingImpl implements ServletMapping {
private final String matchValue;
private final String pattern;
Modified: tomcat/trunk/test/org/apache/catalina/core/TestApplicationMapping.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestApplicationMapping.java?rev=1784597&r1=1784596&r2=1784597&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/core/TestApplicationMapping.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestApplicationMapping.java Mon
Feb 27 16:56:47 2017
@@ -24,7 +24,7 @@ import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.Mapping;
+import javax.servlet.http.ServletMapping;
import org.junit.Assert;
import org.junit.Test;
@@ -284,12 +284,12 @@ public class TestApplicationMapping exte
throws ServletException, IOException {
resp.setContentType("text/plain;charset=UTF-8");
PrintWriter pw = resp.getWriter();
- Mapping mapping = req.getMapping();
+ ServletMapping mapping = req.getServletMapping();
pw.println("MatchValue=[" + mapping.getMatchValue() + "]");
pw.println("Pattern=[" + mapping.getPattern() + "]");
pw.println("MatchType=[" + mapping.getMappingMatch() + "]");
pw.println("ServletName=[" + mapping.getServletName() + "]");
- Mapping includeMapping = (Mapping)
req.getAttribute(RequestDispatcher.INCLUDE_MAPPING);
+ ServletMapping includeMapping = (ServletMapping)
req.getAttribute(RequestDispatcher.INCLUDE_MAPPING);
if (includeMapping != null) {
pw.println("IncludeMatchValue=[" +
includeMapping.getMatchValue() + "]");
pw.println("IncludePattern=[" + includeMapping.getPattern() +
"]");
@@ -297,7 +297,7 @@ public class TestApplicationMapping exte
pw.println("IncludeServletName=[" +
includeMapping.getServletName() + "]");
}
- Mapping forwardMapping = (Mapping)
req.getAttribute(RequestDispatcher.FORWARD_MAPPING);
+ ServletMapping forwardMapping = (ServletMapping)
req.getAttribute(RequestDispatcher.FORWARD_MAPPING);
if (forwardMapping != null) {
pw.println("ForwardMatchValue=[" +
forwardMapping.getMatchValue() + "]");
pw.println("ForwardPattern=[" + forwardMapping.getPattern() +
"]");
Modified:
tomcat/trunk/test/org/apache/catalina/filters/TesterHttpServletRequest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/filters/TesterHttpServletRequest.java?rev=1784597&r1=1784596&r2=1784597&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/filters/TesterHttpServletRequest.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/filters/TesterHttpServletRequest.java
Mon Feb 27 16:56:47 2017
@@ -42,9 +42,9 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpUpgradeHandler;
-import javax.servlet.http.Mapping;
import javax.servlet.http.Part;
import javax.servlet.http.PushBuilder;
+import javax.servlet.http.ServletMapping;
public class TesterHttpServletRequest implements HttpServletRequest {
@@ -265,7 +265,7 @@ public class TesterHttpServletRequest im
}
@Override
- public Mapping getMapping() {
+ public ServletMapping getServletMapping() {
throw new RuntimeException("Not implemented");
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1784597&r1=1784596&r2=1784597&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Feb 27 16:56:47 2017
@@ -126,6 +126,11 @@
character in <code>jar:file:...</code> URLs. The default separator of
<code>*</code> remains unchanged. (markt)
</fix>
+ <update>
+ Update the Servlet 4.0 API implementation to align with the latest
+ proposals from the Servlet 4.0 expert group. Note that the Servlet 4.0
+ API is still a work in progress and further changes are likely. (markt)
+ </update>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
