Author: markt
Date: Thu Sep 28 19:35:25 2017
New Revision: 1810038
URL: http://svn.apache.org/viewvc?rev=1810038&view=rev
Log:
Fix deprecation warnings
Modified:
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/test/org/apache/catalina/core/TestApplicationMapping.java
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=1810038&r1=1810037&r2=1810038&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
Thu Sep 28 19:35:25 2017
@@ -62,6 +62,11 @@ import org.apache.tomcat.util.res.String
*/
final class ApplicationDispatcher implements AsyncDispatcher,
RequestDispatcher {
+ /* Servlet 4.0 constants */
+ public static final String ASYNC_MAPPING = "javax.servlet.async.mapping";
+ public static final String FORWARD_MAPPING =
"javax.servlet.forward.mapping";
+ public static final String INCLUDE_MAPPING =
"javax.servlet.include.mapping";
+
static final boolean STRICT_SERVLET_COMPLIANCE;
static final boolean WRAP_SAME_OBJECT;
@@ -374,9 +379,7 @@ final class ApplicationDispatcher implem
} else {
mapping = (new
ApplicationMapping(null)).getServletMapping();
}
- wrequest.setAttribute(
-
org.apache.catalina.servlet4preview.RequestDispatcher.FORWARD_MAPPING,
- mapping);
+ wrequest.setAttribute(FORWARD_MAPPING, mapping);
}
wrequest.setContextPath(context.getPath());
@@ -578,9 +581,7 @@ final class ApplicationDispatcher implem
wrequest.setQueryParams(queryString);
}
if (mapping != null) {
- wrequest.setAttribute(
-
org.apache.catalina.servlet4preview.RequestDispatcher.INCLUDE_MAPPING,
- mapping);
+ wrequest.setAttribute(INCLUDE_MAPPING, mapping);
}
wrequest.setAttribute(Globals.DISPATCHER_TYPE_ATTR,
@@ -633,8 +634,7 @@ final class ApplicationDispatcher implem
} else {
mapping = (new ApplicationMapping(null)).getServletMapping();
}
- wrequest.setAttribute(
-
org.apache.catalina.servlet4preview.AsyncContext.ASYNC_MAPPING, mapping);
+ wrequest.setAttribute(ASYNC_MAPPING, mapping);
wrequest.setContextPath(context.getPath());
wrequest.setRequestURI(requestURI);
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=1810038&r1=1810037&r2=1810038&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
Thu Sep 28 19:35:25 2017
@@ -78,13 +78,13 @@ class ApplicationHttpRequest
RequestDispatcher.INCLUDE_SERVLET_PATH,
RequestDispatcher.INCLUDE_PATH_INFO,
RequestDispatcher.INCLUDE_QUERY_STRING,
- org.apache.catalina.servlet4preview.RequestDispatcher.INCLUDE_MAPPING,
+ ApplicationDispatcher.INCLUDE_MAPPING,
RequestDispatcher.FORWARD_REQUEST_URI,
RequestDispatcher.FORWARD_CONTEXT_PATH,
RequestDispatcher.FORWARD_SERVLET_PATH,
RequestDispatcher.FORWARD_PATH_INFO,
RequestDispatcher.FORWARD_QUERY_STRING,
- org.apache.catalina.servlet4preview.RequestDispatcher.FORWARD_MAPPING};
+ ApplicationDispatcher.FORWARD_MAPPING};
private static final int SPECIALS_FIRST_FORWARD_INDEX = 6;
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=1810038&r1=1810037&r2=1810038&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
Thu Sep 28 19:35:25 2017
@@ -347,7 +347,7 @@ public class TestApplicationMapping exte
pw.println("MatchType=[" + mapping.getMappingMatch() + "]");
pw.println("ServletName=[" + mapping.getServletName() + "]");
ServletMapping includeMapping = (ServletMapping) req.getAttribute(
-
org.apache.catalina.servlet4preview.RequestDispatcher.INCLUDE_MAPPING);
+ ApplicationDispatcher.INCLUDE_MAPPING);
if (includeMapping != null) {
pw.println("IncludeMatchValue=[" +
includeMapping.getMatchValue() + "]");
pw.println("IncludePattern=[" + includeMapping.getPattern() +
"]");
@@ -356,7 +356,7 @@ public class TestApplicationMapping exte
}
ServletMapping forwardMapping = (ServletMapping) req.getAttribute(
-
org.apache.catalina.servlet4preview.RequestDispatcher.FORWARD_MAPPING);
+ ApplicationDispatcher.FORWARD_MAPPING);
if (forwardMapping != null) {
pw.println("ForwardMatchValue=[" +
forwardMapping.getMatchValue() + "]");
pw.println("ForwardPattern=[" + forwardMapping.getPattern() +
"]");
@@ -364,7 +364,7 @@ public class TestApplicationMapping exte
pw.println("ForwardServletName=[" +
forwardMapping.getServletName() + "]");
}
ServletMapping asyncMapping = (ServletMapping) req.getAttribute(
-
org.apache.catalina.servlet4preview.AsyncContext.ASYNC_MAPPING);
+ ApplicationDispatcher.ASYNC_MAPPING);
if (asyncMapping != null) {
pw.println("AsyncMatchValue=[" + asyncMapping.getMatchValue()
+ "]");
pw.println("AsyncPattern=[" + asyncMapping.getPattern() + "]");
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
