Author: markt
Date: Sun Aug 12 17:44:18 2012
New Revision: 1372158
URL: http://svn.apache.org/viewvc?rev=1372158&view=rev
Log:
Deprecate duplicated constants
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardHostValve.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardWrapperValve.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1372156
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java?rev=1372158&r1=1372157&r2=1372158&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
Sun Aug 12 17:44:18 2012
@@ -457,7 +457,7 @@ final class ApplicationDispatcher
State state)
throws IOException, ServletException {
- DispatcherType disInt = (DispatcherType)
request.getAttribute(ApplicationFilterFactory.DISPATCHER_TYPE_ATTR);
+ DispatcherType disInt = (DispatcherType)
request.getAttribute(Globals.DISPATCHER_TYPE_ATTR);
if (disInt != null) {
boolean doInvoke = true;
@@ -468,12 +468,12 @@ final class ApplicationDispatcher
if (doInvoke) {
if (disInt != DispatcherType.ERROR) {
- state.outerRequest.setAttribute
- (ApplicationFilterFactory.DISPATCHER_REQUEST_PATH_ATTR,
- getCombinedPath());
- state.outerRequest.setAttribute
- (ApplicationFilterFactory.DISPATCHER_TYPE_ATTR,
- DispatcherType.FORWARD);
+ state.outerRequest.setAttribute(
+ Globals.DISPATCHER_REQUEST_PATH_ATTR,
+ getCombinedPath());
+ state.outerRequest.setAttribute(
+ Globals.DISPATCHER_TYPE_ATTR,
+ DispatcherType.FORWARD);
invoke(state.outerRequest, response, state);
} else {
invoke(state.outerRequest, response, state);
@@ -559,10 +559,8 @@ final class ApplicationDispatcher
wrequest.setAttribute(Globals.NAMED_DISPATCHER_ATTR, name);
if (servletPath != null)
wrequest.setServletPath(servletPath);
-
wrequest.setAttribute(ApplicationFilterFactory.DISPATCHER_TYPE_ATTR,
- type);
- wrequest.setAttribute(
- ApplicationFilterFactory.DISPATCHER_REQUEST_PATH_ATTR,
+ wrequest.setAttribute(Globals.DISPATCHER_TYPE_ATTR, type);
+ wrequest.setAttribute(Globals.DISPATCHER_REQUEST_PATH_ATTR,
getCombinedPath());
invoke(state.outerRequest, state.outerResponse, state);
}
@@ -591,10 +589,8 @@ final class ApplicationDispatcher
wrequest.setQueryParams(queryString);
}
-
wrequest.setAttribute(ApplicationFilterFactory.DISPATCHER_TYPE_ATTR,
- type);
- wrequest.setAttribute(
- ApplicationFilterFactory.DISPATCHER_REQUEST_PATH_ATTR,
+ wrequest.setAttribute(Globals.DISPATCHER_TYPE_ATTR, type);
+ wrequest.setAttribute(Globals.DISPATCHER_REQUEST_PATH_ATTR,
getCombinedPath());
invoke(state.outerRequest, state.outerResponse, state);
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java?rev=1372158&r1=1372157&r2=1372158&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java
Sun Aug 12 17:44:18 2012
@@ -45,10 +45,18 @@ public final class ApplicationFilterFact
// -------------------------------------------------------------- Constants
- public static final String DISPATCHER_TYPE_ATTR =
- Globals.DISPATCHER_TYPE_ATTR;
+ /**
+ * @deprecated Use {@link Globals#DISPATCHER_TYPE_ATTR}
+ */
+ @Deprecated
+ public static final String DISPATCHER_TYPE_ATTR =
+ Globals.DISPATCHER_TYPE_ATTR;
+ /**
+ * @deprecated Use {@link Globals#DISPATCHER_REQUEST_PATH_ATTR}
+ */
+ @Deprecated
public static final String DISPATCHER_REQUEST_PATH_ATTR =
- Globals.DISPATCHER_REQUEST_PATH_ATTR;
+ Globals.DISPATCHER_REQUEST_PATH_ATTR;
private static ApplicationFilterFactory factory = null;
@@ -87,11 +95,13 @@ public final class ApplicationFilterFact
// get the dispatcher type
DispatcherType dispatcher = null;
- if (request.getAttribute(DISPATCHER_TYPE_ATTR) != null) {
- dispatcher = (DispatcherType)
request.getAttribute(DISPATCHER_TYPE_ATTR);
+ if (request.getAttribute(Globals.DISPATCHER_TYPE_ATTR) != null) {
+ dispatcher = (DispatcherType) request.getAttribute(
+ Globals.DISPATCHER_TYPE_ATTR);
}
String requestPath = null;
- Object attribute = request.getAttribute(DISPATCHER_REQUEST_PATH_ATTR);
+ Object attribute = request.getAttribute(
+ Globals.DISPATCHER_REQUEST_PATH_ATTR);
if (attribute != null){
requestPath = attribute.toString();
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardHostValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardHostValve.java?rev=1372158&r1=1372157&r2=1372158&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardHostValve.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardHostValve.java
Sun Aug 12 17:44:18 2012
@@ -312,11 +312,10 @@ final class StandardHostValve extends Va
if (message == null)
message = "";
request.setAttribute(RequestDispatcher.ERROR_MESSAGE, message);
- request.setAttribute
- (ApplicationFilterFactory.DISPATCHER_REQUEST_PATH_ATTR,
- errorPage.getLocation());
- request.setAttribute(ApplicationFilterFactory.DISPATCHER_TYPE_ATTR,
- DispatcherType.ERROR);
+ request.setAttribute(Globals.DISPATCHER_REQUEST_PATH_ATTR,
+ errorPage.getLocation());
+ request.setAttribute(Globals.DISPATCHER_TYPE_ATTR,
+ DispatcherType.ERROR);
Wrapper wrapper = request.getWrapper();
@@ -381,11 +380,10 @@ final class StandardHostValve extends Va
if (errorPage != null) {
response.setAppCommitted(false);
- request.setAttribute
- (ApplicationFilterFactory.DISPATCHER_REQUEST_PATH_ATTR,
- errorPage.getLocation());
- request.setAttribute(ApplicationFilterFactory.DISPATCHER_TYPE_ATTR,
- DispatcherType.ERROR);
+ request.setAttribute(Globals.DISPATCHER_REQUEST_PATH_ATTR,
+ errorPage.getLocation());
+ request.setAttribute(Globals.DISPATCHER_TYPE_ATTR,
+ DispatcherType.ERROR);
request.setAttribute(RequestDispatcher.ERROR_STATUS_CODE,
new Integer(HttpServletResponse.SC_INTERNAL_SERVER_ERROR));
request.setAttribute(RequestDispatcher.ERROR_MESSAGE,
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardWrapperValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardWrapperValve.java?rev=1372158&r1=1372157&r2=1372158&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardWrapperValve.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardWrapperValve.java
Sun Aug 12 17:44:18 2012
@@ -175,12 +175,9 @@ final class StandardWrapperValve
MessageBytes requestPathMB = request.getRequestPathMB();
DispatcherType dispatcherType = DispatcherType.REQUEST;
if (request.getDispatcherType()==DispatcherType.ASYNC) dispatcherType
= DispatcherType.ASYNC;
- request.setAttribute
- (ApplicationFilterFactory.DISPATCHER_TYPE_ATTR,
- dispatcherType);
- request.setAttribute
- (ApplicationFilterFactory.DISPATCHER_REQUEST_PATH_ATTR,
- requestPathMB);
+ request.setAttribute(Globals.DISPATCHER_TYPE_ATTR,dispatcherType);
+ request.setAttribute(Globals.DISPATCHER_REQUEST_PATH_ATTR,
+ requestPathMB);
// Create the filter chain for this request
ApplicationFilterFactory factory =
ApplicationFilterFactory.getInstance();
@@ -385,12 +382,10 @@ final class StandardWrapperValve
}
MessageBytes requestPathMB = request.getRequestPathMB();
- request.setAttribute
- (ApplicationFilterFactory.DISPATCHER_TYPE_ATTR,
- DispatcherType.REQUEST);
- request.setAttribute
- (ApplicationFilterFactory.DISPATCHER_REQUEST_PATH_ATTR,
- requestPathMB);
+ request.setAttribute(Globals.DISPATCHER_TYPE_ATTR,
+ DispatcherType.REQUEST);
+ request.setAttribute(Globals.DISPATCHER_REQUEST_PATH_ATTR,
+ requestPathMB);
// Get the current (unchanged) filter chain for this request
ApplicationFilterChain filterChain =
(ApplicationFilterChain) request.getFilterChain();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
