Author: markt
Date: Tue May 2 09:08:27 2017
New Revision: 1793445
URL: http://svn.apache.org/viewvc?rev=1793445&view=rev
Log:
Remove deprecated code
Modified:
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/XmlEncodingBase.java
tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
tomcat/trunk/java/org/apache/tomcat/util/digester/DocumentProperties.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties?rev=1793445&r1=1793444&r2=1793445&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LocalStrings.properties
Tue May 2 09:08:27 2017
@@ -62,5 +62,3 @@ webXml.wrongFragmentName=Used a wrong fr
webXmlParser.applicationParse=Parse error in application web.xml file at [{0}]
webXmlParser.applicationPosition=Occurred at line [{0}] column [{1}]
webXmlParser.applicationStart=Parsing application web.xml file at [{0}]
-
-xmlEncodingBase.encodingInvalid=The encoding [{0}] is not recognised by this
JRE. The existing value of [{1}] will be used
\ No newline at end of file
Modified: tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java?rev=1793445&r1=1793444&r2=1793445&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java Tue May
2 09:08:27 2017
@@ -55,9 +55,7 @@ import org.apache.tomcat.util.res.String
* This class checks for invalid duplicates (eg filter/servlet names)
* StandardContext will check validity of values (eg URL formats etc)
*/
-@SuppressWarnings("deprecation")
-public class WebXml extends XmlEncodingBase implements
DocumentProperties.Encoding,
- DocumentProperties.Charset {
+public class WebXml extends XmlEncodingBase implements
DocumentProperties.Charset {
protected static final String ORDER_OTHERS =
"org.apache.catalina.order.others";
Modified:
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/XmlEncodingBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/XmlEncodingBase.java?rev=1793445&r1=1793444&r2=1793445&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/XmlEncodingBase.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/XmlEncodingBase.java
Tue May 2 09:08:27 2017
@@ -16,55 +16,18 @@
*/
package org.apache.tomcat.util.descriptor.web;
-import java.io.UnsupportedEncodingException;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
-import org.apache.juli.logging.Log;
-import org.apache.juli.logging.LogFactory;
-import org.apache.tomcat.util.buf.B2CConverter;
-import org.apache.tomcat.util.res.StringManager;
-
/**
* Base class for those elements that need to track the encoding used in the
* source XML.
*/
public abstract class XmlEncodingBase {
- private static final Log log = LogFactory.getLog(XmlEncodingBase.class);
- private static final StringManager sm =
StringManager.getManager(XmlEncodingBase.class);
private Charset charset = StandardCharsets.UTF_8;
- /**
- * @param encoding The encoding of the XML source that was used to
- * populated this object.
- * @deprecated This method will be removed in Tomcat 9
- */
- @Deprecated
- public void setEncoding(String encoding) {
- try {
- charset = B2CConverter.getCharset(encoding);
- } catch (UnsupportedEncodingException e) {
- log.warn(sm.getString("xmlEncodingBase.encodingInvalid", encoding,
charset.name()), e);
- }
- }
-
-
- /**
- * Obtain the encoding of the XML source that was used to populated this
- * object.
- *
- * @return The encoding of the associated XML source or <code>UTF-8</code>
- * if the encoding could not be determined
- * @deprecated This method will be removed in Tomcat 9
- */
- @Deprecated
- public String getEncoding() {
- return charset.name();
- }
-
-
public void setCharset(Charset charset) {
this.charset = charset;
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java?rev=1793445&r1=1793444&r2=1793445&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java Tue May 2
09:08:27 2017
@@ -1114,7 +1114,6 @@ public class Digester extends DefaultHan
*
* @exception SAXException if a parsing error is to be reported
*/
- @SuppressWarnings("deprecation")
@Override
public void startDocument() throws SAXException {
@@ -1130,8 +1129,6 @@ public class Digester extends DefaultHan
} catch (UnsupportedEncodingException e) {
log.warn(sm.getString("disgester.encodingInvalid", enc),
e);
}
- } else if (root instanceof DocumentProperties.Encoding) {
- ((DocumentProperties.Encoding) root).setEncoding(((Locator2)
locator).getEncoding());
}
}
Modified:
tomcat/trunk/java/org/apache/tomcat/util/digester/DocumentProperties.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/DocumentProperties.java?rev=1793445&r1=1793444&r2=1793445&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/digester/DocumentProperties.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/DocumentProperties.java
Tue May 2 09:08:27 2017
@@ -26,16 +26,6 @@ package org.apache.tomcat.util.digester;
public interface DocumentProperties {
/**
- * The encoding used by the source XML document.
- *
- * @deprecated This method will be removed in Tomcat 9
- */
- @Deprecated
- public interface Encoding {
- public void setEncoding(String encoding);
- }
-
- /**
* The character encoding used by the source XML document.
*/
public interface Charset {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
