Author: markt
Date: Thu Sep 27 08:22:56 2012
New Revision: 1390884
URL: http://svn.apache.org/viewvc?rev=1390884&view=rev
Log:
Remove deprecated code
Modified:
tomcat/trunk/java/org/apache/catalina/Context.java
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/catalina/startup/FailedContext.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=1390884&r1=1390883&r2=1390884&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/Context.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Context.java Thu Sep 27 08:22:56 2012
@@ -150,17 +150,6 @@ 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();
-
-
- /**
* Obtain the character set name to use with the given Locale. Note that
* different Contexts may have different mappings of Locale to character
* set.
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1390884&r1=1390883&r2=1390884&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Thu Sep 27
08:22:56 2012
@@ -1398,18 +1398,6 @@ public class StandardContext extends Con
/**
- * Return the application available flag for this Context.
- */
- @Override
- public boolean getAvailable() {
-
- // TODO Remove this method entirely
- return getState().isAvailable();
-
- }
-
-
- /**
* Return the Locale to character set mapper for this Context.
*/
public CharsetMapper getCharsetMapper() {
Modified: tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java?rev=1390884&r1=1390883&r2=1390884&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java Thu Sep 27
08:22:56 2012
@@ -312,9 +312,6 @@ public class FailedContext extends Lifec
public void setApplicationLifecycleListeners(Object[] listeners) { /*
NO-OP */ }
@Override
- public boolean getAvailable() { return false; }
-
- @Override
public String getCharset(Locale locale) { return null; }
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
