Author: markt
Date: Thu Jun 14 14:03:19 2012
New Revision: 1350245
URL: http://svn.apache.org/viewvc?rev=1350245&view=rev
Log:
Remove deprecated code and o.a.c -> o.a.c.util dependency
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=1350245&r1=1350244&r2=1350245&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/Context.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Context.java Thu Jun 14 14:03:19 2012
@@ -34,7 +34,6 @@ import org.apache.catalina.deploy.Filter
import org.apache.catalina.deploy.LoginConfig;
import org.apache.catalina.deploy.NamingResources;
import org.apache.catalina.deploy.SecurityConstraint;
-import org.apache.catalina.util.CharsetMapper;
import org.apache.tomcat.JarScanner;
import org.apache.tomcat.util.http.mapper.Mapper;
@@ -157,25 +156,6 @@ public interface Context extends Contain
/**
- * Return the Locale to character set mapper for this Context.
- * @deprecated Use {@link #getCharset(Locale)}
- */
- @Deprecated
- public CharsetMapper getCharsetMapper();
-
-
- /**
- * Set the Locale to character set mapper for this Context.
- *
- * @param mapper The new mapper
- *
- * @deprecated
- */
- @Deprecated
- public void setCharsetMapper(CharsetMapper mapper);
-
-
- /**
* 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=1350245&r1=1350244&r2=1350245&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Thu Jun 14
14:03:19 2012
@@ -1410,7 +1410,6 @@ public class StandardContext extends Con
/**
* Return the Locale to character set mapper for this Context.
*/
- @Override
public CharsetMapper getCharsetMapper() {
// Create a mapper the first time it is requested
@@ -1434,7 +1433,6 @@ public class StandardContext extends Con
*
* @param mapper The new mapper
*/
- @Override
public void setCharsetMapper(CharsetMapper mapper) {
CharsetMapper oldCharsetMapper = this.charsetMapper;
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=1350245&r1=1350244&r2=1350245&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java Thu Jun 14
14:03:19 2012
@@ -54,7 +54,6 @@ import org.apache.catalina.deploy.Filter
import org.apache.catalina.deploy.LoginConfig;
import org.apache.catalina.deploy.NamingResources;
import org.apache.catalina.deploy.SecurityConstraint;
-import org.apache.catalina.util.CharsetMapper;
import org.apache.catalina.util.ContextName;
import org.apache.catalina.util.LifecycleMBeanBase;
import org.apache.juli.logging.Log;
@@ -316,13 +315,6 @@ public class FailedContext extends Lifec
@Override
public boolean getAvailable() { return false; }
- @Deprecated
- @Override
- public CharsetMapper getCharsetMapper() { return null; }
- @Deprecated
- @Override
- public void setCharsetMapper(CharsetMapper mapper) { /* NO-OP */ }
-
@Override
public String getCharset(Locale locale) { return null; }
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
