Author: markt
Date: Mon Feb 27 17:05:17 2017
New Revision: 1784599
URL: http://svn.apache.org/viewvc?rev=1784599&view=rev
Log:
Rename Mapping to ServletMapping
Added:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/http/ServletMapping.java
- copied, changed from r1784598,
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/http/Mapping.java
Removed:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/http/Mapping.java
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Request.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/RequestFacade.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationMapping.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/http/HttpServletRequest.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/http/HttpServletRequestWrapper.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestApplicationMapping.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Request.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Request.java?rev=1784599&r1=1784598&r2=1784599&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Request.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Request.java Mon
Feb 27 17:05:17 2017
@@ -80,8 +80,8 @@ import org.apache.catalina.core.Applicat
import org.apache.catalina.core.ApplicationSessionCookieConfig;
import org.apache.catalina.core.AsyncContextImpl;
import org.apache.catalina.mapper.MappingData;
-import org.apache.catalina.servlet4preview.http.Mapping;
import org.apache.catalina.servlet4preview.http.PushBuilder;
+import org.apache.catalina.servlet4preview.http.ServletMapping;
import org.apache.catalina.util.ParameterMap;
import org.apache.catalina.util.URLEncoder;
import org.apache.coyote.ActionCode;
@@ -2195,8 +2195,8 @@ public class Request implements org.apac
@Override
- public Mapping getMapping() {
- return applicationMapping.getMapping();
+ public ServletMapping getServletMapping() {
+ return applicationMapping.getServletMapping();
}
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/RequestFacade.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/RequestFacade.java?rev=1784599&r1=1784598&r2=1784599&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/RequestFacade.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/RequestFacade.java
Mon Feb 27 17:05:17 2017
@@ -42,8 +42,8 @@ import javax.servlet.http.Part;
import org.apache.catalina.Globals;
import org.apache.catalina.security.SecurityUtil;
import org.apache.catalina.servlet4preview.http.HttpServletRequest;
-import org.apache.catalina.servlet4preview.http.Mapping;
import org.apache.catalina.servlet4preview.http.PushBuilder;
+import org.apache.catalina.servlet4preview.http.ServletMapping;
import org.apache.tomcat.util.res.StringManager;
/**
@@ -1123,8 +1123,8 @@ public class RequestFacade implements Ht
* removed or replaced at any time until Servlet 4.0 becomes final.
*/
@Override
- public Mapping getMapping() {
- return request.getMapping();
+ public ServletMapping getServletMapping() {
+ return request.getServletMapping();
}
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=1784599&r1=1784598&r2=1784599&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationContext.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationContext.java
Mon Feb 27 17:05:17 2017
@@ -66,7 +66,7 @@ import org.apache.catalina.WebResourceRo
import org.apache.catalina.Wrapper;
import org.apache.catalina.connector.Connector;
import org.apache.catalina.mapper.MappingData;
-import org.apache.catalina.servlet4preview.http.Mapping;
+import org.apache.catalina.servlet4preview.http.ServletMapping;
import org.apache.catalina.util.ServerInfo;
import org.apache.catalina.util.URLEncoder;
import org.apache.tomcat.util.ExceptionUtils;
@@ -482,7 +482,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/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java?rev=1784599&r1=1784598&r2=1784599&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
Mon Feb 27 17:05:17 2017
@@ -44,7 +44,7 @@ import org.apache.catalina.connector.Req
import org.apache.catalina.connector.RequestFacade;
import org.apache.catalina.connector.Response;
import org.apache.catalina.connector.ResponseFacade;
-import org.apache.catalina.servlet4preview.http.Mapping;
+import org.apache.catalina.servlet4preview.http.ServletMapping;
import org.apache.tomcat.util.ExceptionUtils;
import org.apache.tomcat.util.res.StringManager;
@@ -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,12 +369,12 @@ final class ApplicationDispatcher implem
hrequest.getPathInfo());
wrequest.setAttribute(RequestDispatcher.FORWARD_QUERY_STRING,
hrequest.getQueryString());
- Mapping mapping;
+ ServletMapping mapping;
if (hrequest instanceof
org.apache.catalina.servlet4preview.http.HttpServletRequest) {
mapping =
((org.apache.catalina.servlet4preview.http.HttpServletRequest)
- hrequest).getMapping();
+ hrequest).getServletMapping();
} else {
- mapping = (new ApplicationMapping(null)).getMapping();
+ mapping = (new
ApplicationMapping(null)).getServletMapping();
}
wrequest.setAttribute(
org.apache.catalina.servlet4preview.RequestDispatcher.FORWARD_MAPPING,
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java?rev=1784599&r1=1784598&r2=1784599&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
Mon Feb 27 17:05:17 2017
@@ -37,8 +37,8 @@ import org.apache.catalina.Context;
import org.apache.catalina.Globals;
import org.apache.catalina.Manager;
import org.apache.catalina.Session;
-import org.apache.catalina.servlet4preview.http.Mapping;
import org.apache.catalina.servlet4preview.http.PushBuilder;
+import org.apache.catalina.servlet4preview.http.ServletMapping;
import org.apache.catalina.util.ParameterMap;
import org.apache.tomcat.util.buf.B2CConverter;
import org.apache.tomcat.util.buf.MessageBytes;
@@ -189,7 +189,7 @@ class ApplicationHttpRequest
/**
* The mapping for this request.
*/
- private Mapping mapping = null;
+ private ServletMapping mapping = null;
/**
@@ -523,7 +523,7 @@ class ApplicationHttpRequest
@Override
- public Mapping getMapping() {
+ public ServletMapping getServletMapping() {
return mapping;
}
@@ -707,9 +707,9 @@ class ApplicationHttpRequest
requestURI = request.getRequestURI();
servletPath = request.getServletPath();
if (request instanceof
org.apache.catalina.servlet4preview.http.HttpServletRequest) {
- mapping =
((org.apache.catalina.servlet4preview.http.HttpServletRequest)
request).getMapping();
+ mapping =
((org.apache.catalina.servlet4preview.http.HttpServletRequest)
request).getServletMapping();
} else {
- mapping = (new ApplicationMapping(null)).getMapping();
+ mapping = (new ApplicationMapping(null)).getServletMapping();
}
}
@@ -769,7 +769,7 @@ class ApplicationHttpRequest
}
- void setMapping(Mapping mapping) {
+ void setMapping(ServletMapping mapping) {
this.mapping = mapping;
}
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationMapping.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationMapping.java?rev=1784599&r1=1784598&r2=1784599&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationMapping.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationMapping.java
Mon Feb 27 17:05:17 2017
@@ -17,20 +17,20 @@
package org.apache.catalina.core;
import org.apache.catalina.mapper.MappingData;
-import org.apache.catalina.servlet4preview.http.Mapping;
import org.apache.catalina.servlet4preview.http.MappingMatch;
+import org.apache.catalina.servlet4preview.http.ServletMapping;
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) {
if (mappingData == null) {
mapping = new MappingImpl("", "", MappingMatch.UNKNOWN, "");
@@ -77,7 +77,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/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/http/HttpServletRequest.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/http/HttpServletRequest.java?rev=1784599&r1=1784598&r2=1784599&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/http/HttpServletRequest.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/http/HttpServletRequest.java
Mon Feb 27 17:05:17 2017
@@ -21,7 +21,7 @@ package org.apache.catalina.servlet4prev
*/
public interface HttpServletRequest extends
javax.servlet.http.HttpServletRequest {
- public Mapping getMapping();
+ public ServletMapping getServletMapping();
/**
* Does the current request allow push requests. This will return {@code
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/http/HttpServletRequestWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/http/HttpServletRequestWrapper.java?rev=1784599&r1=1784598&r2=1784599&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/http/HttpServletRequestWrapper.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/http/HttpServletRequestWrapper.java
Mon Feb 27 17:05:17 2017
@@ -43,13 +43,13 @@ public class HttpServletRequestWrapper e
* {@inheritDoc}
* <p>
* The default behavior of this method is to return
- * {@link HttpServletRequest#getMapping()} on the wrapped request object.
+ * {@link HttpServletRequest#getServletMapping()} on the wrapped request
object.
*
* @since Servlet 4.0
*/
@Override
- public Mapping getMapping() {
- return this._getHttpServletRequest().getMapping();
+ public ServletMapping getServletMapping() {
+ return this._getHttpServletRequest().getServletMapping();
}
/**
Copied:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/http/ServletMapping.java
(from r1784598,
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/http/Mapping.java)
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/http/ServletMapping.java?p2=tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/http/ServletMapping.java&p1=tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/http/Mapping.java&r1=1784598&r2=1784599&rev=1784599&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/http/Mapping.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/http/ServletMapping.java
Mon Feb 27 17:05:17 2017
@@ -22,7 +22,7 @@ package org.apache.catalina.servlet4prev
*
* @since 4.0
*/
-public interface Mapping {
+public interface ServletMapping {
/**
* @return The value that was matched or the empty String if not known.
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestApplicationMapping.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestApplicationMapping.java?rev=1784599&r1=1784598&r2=1784599&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestApplicationMapping.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestApplicationMapping.java
Mon Feb 27 17:05:17 2017
@@ -29,7 +29,7 @@ import org.junit.Assert;
import org.junit.Test;
import org.apache.catalina.Context;
-import org.apache.catalina.servlet4preview.http.Mapping;
+import org.apache.catalina.servlet4preview.http.ServletMapping;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
import org.apache.tomcat.util.buf.ByteChunk;
@@ -284,13 +284,13 @@ public class TestApplicationMapping exte
throws ServletException, IOException {
resp.setContentType("text/plain;charset=UTF-8");
PrintWriter pw = resp.getWriter();
- Mapping mapping =
((org.apache.catalina.servlet4preview.http.HttpServletRequest)
- req).getMapping();
+ ServletMapping mapping =
((org.apache.catalina.servlet4preview.http.HttpServletRequest)
+ 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(
+ ServletMapping includeMapping = (ServletMapping) req.getAttribute(
org.apache.catalina.servlet4preview.RequestDispatcher.INCLUDE_MAPPING);
if (includeMapping != null) {
pw.println("IncludeMatchValue=[" +
includeMapping.getMatchValue() + "]");
@@ -299,7 +299,7 @@ public class TestApplicationMapping exte
pw.println("IncludeServletName=[" +
includeMapping.getServletName() + "]");
}
- Mapping forwardMapping = (Mapping) req.getAttribute(
+ ServletMapping forwardMapping = (ServletMapping) req.getAttribute(
org.apache.catalina.servlet4preview.RequestDispatcher.FORWARD_MAPPING);
if (forwardMapping != null) {
pw.println("ForwardMatchValue=[" +
forwardMapping.getMatchValue() + "]");
Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1784599&r1=1784598&r2=1784599&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Mon Feb 27 17:05:17 2017
@@ -126,6 +126,13 @@
character in <code>jar:file:...</code> URLs. The default separator of
<code>*</code> remains unchanged. (markt)
</fix>
+ <update>
+ Update the <code>org.apache.catalina.servlet4preview</code> package
that
+ can be used to gain early access to Servlet 4.0 features 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
