Author: markt
Date: Thu Sep 27 08:20:12 2012
New Revision: 1390882
URL: http://svn.apache.org/viewvc?rev=1390882&view=rev
Log:
Deprecate unnecessary code
Modified:
tomcat/trunk/java/org/apache/catalina/Context.java
tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java
tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
Modified: tomcat/trunk/java/org/apache/catalina/Context.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Context.java?rev=1390882&r1=1390881&r2=1390882&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/Context.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Context.java Thu Sep 27 08:20:12 2012
@@ -151,7 +151,12 @@ public interface Context extends Contain
/**
* Return the application available flag for this Context.
+ *
+ * @deprecated This will be removed in Tomcat 8.0.x onwards. Use
+ * {@link #getState()}.{@link LifecycleState#isAvailable()
+ * isAvailable()} instead
*/
+ @Deprecated
public boolean getAvailable();
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java?rev=1390882&r1=1390881&r2=1390882&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java Thu
Sep 27 08:20:12 2012
@@ -107,7 +107,7 @@ final class StandardWrapperValve
Context context = (Context) wrapper.getParent();
// Check for the application being marked unavailable
- if (!context.getAvailable()) {
+ if (!context.getState().isAvailable()) {
response.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE,
sm.getString("standardContext.isUnavailable"));
unavailable = true;
@@ -359,7 +359,8 @@ final class StandardWrapperValve
Context context = (Context) wrapper.getParent();
// Check for the application being marked unavailable
- boolean unavailable = !context.getAvailable() ||
wrapper.isUnavailable();
+ boolean unavailable = !context.getState().isAvailable() ||
+ wrapper.isUnavailable();
// Allocate a servlet instance to process this request
try {
Modified: tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java?rev=1390882&r1=1390881&r2=1390882&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java Thu
Sep 27 08:20:12 2012
@@ -510,7 +510,7 @@ public final class HTMLManagerServlet ex
} else {
args[2] = RequestUtil.filter(ctxt.getDisplayName());
}
- args[3] = Boolean.valueOf(ctxt.getAvailable());
+ args[3] = Boolean.valueOf(ctxt.getState().isAvailable());
args[4] =
RequestUtil.filter(response.encodeURL(request.getContextPath() +
"/html/sessions?" + pathVersion));
Manager manager = ctxt.getManager();
@@ -559,13 +559,13 @@ public final class HTMLManagerServlet ex
if (ctxt.getName().equals(this.context.getName())) {
writer.print(MessageFormat.format(
MANAGER_APP_ROW_BUTTON_SECTION, args));
- } else if (ctxt.getAvailable() && isDeployed) {
+ } else if (ctxt.getState().isAvailable() && isDeployed) {
writer.print(MessageFormat.format(
STARTED_DEPLOYED_APPS_ROW_BUTTON_SECTION, args));
- } else if (ctxt.getAvailable() && !isDeployed) {
+ } else if (ctxt.getState().isAvailable() && !isDeployed) {
writer.print(MessageFormat.format(
STARTED_NONDEPLOYED_APPS_ROW_BUTTON_SECTION, args));
- } else if (!ctxt.getAvailable() && isDeployed) {
+ } else if (!ctxt.getState().isAvailable() && isDeployed) {
writer.print(MessageFormat.format(
STOPPED_DEPLOYED_APPS_ROW_BUTTON_SECTION, args));
} else {
Modified: tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java?rev=1390882&r1=1390881&r2=1390882&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java Thu Sep
27 08:20:12 2012
@@ -859,10 +859,11 @@ public class ManagerServlet extends Http
}
}
context = (Context) host.findChild(name);
- if (context != null && context.getConfigured() &&
context.getAvailable()) {
+ if (context != null && context.getConfigured() &&
+ context.getState().isAvailable()) {
writer.println(smClient.getString(
"managerServlet.deployed", displayPath));
- } else if (context!=null && !context.getAvailable()) {
+ } else if (context!=null && !context.getState().isAvailable()) {
writer.println(smClient.getString(
"managerServlet.deployedButNotStarted", displayPath));
} else {
@@ -900,7 +901,7 @@ public class ManagerServlet extends Http
String displayPath = context.getPath();
if( displayPath.equals("") )
displayPath = "/";
- if (context.getAvailable()) {
+ if (context.getState().isAvailable()) {
writer.println(smClient.getString("managerServlet.listitem",
displayPath,
"running",
@@ -1231,7 +1232,7 @@ public class ManagerServlet extends Http
return;
}
context.start();
- if (context.getAvailable())
+ if (context.getState().isAvailable())
writer.println(smClient.getString("managerServlet.started",
displayPath));
else
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
