Author: markt
Date: Wed Aug 8 21:15:40 2012
New Revision: 1370971
URL: http://svn.apache.org/viewvc?rev=1370971&view=rev
Log:
Deprecate code that will be removed in 8.0.x
Modified:
tomcat/trunk/java/org/apache/catalina/util/ManifestResource.java
tomcat/trunk/java/org/apache/catalina/util/RequestUtil.java
tomcat/trunk/java/org/apache/catalina/util/Strftime.java
tomcat/trunk/java/org/apache/catalina/util/StringParser.java
tomcat/trunk/java/org/apache/catalina/util/XMLWriter.java
Modified: tomcat/trunk/java/org/apache/catalina/util/ManifestResource.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/ManifestResource.java?rev=1370971&r1=1370970&r2=1370971&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/ManifestResource.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/ManifestResource.java Wed Aug 8
21:15:40 2012
@@ -104,7 +104,10 @@ public class ManifestResource {
* has an requires extensions.
*
* @return true if required extensions are present
+ *
+ * @deprecated Unused - will be removed in 8.0.x
*/
+ @Deprecated
public boolean requiresExtensions() {
return (requiredExtensions != null) ? true : false;
}
Modified: tomcat/trunk/java/org/apache/catalina/util/RequestUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/RequestUtil.java?rev=1370971&r1=1370970&r2=1370971&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/RequestUtil.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/RequestUtil.java Wed Aug 8
21:15:40 2012
@@ -195,7 +195,10 @@ public final class RequestUtil {
* @param bytes The url-encoded byte array
* @exception IllegalArgumentException if a '%' character is not followed
* by a valid 2-digit hexadecimal number
+ *
+ * @deprecated Unused - will be removed in 8.0.x
*/
+ @Deprecated
public static String URLDecode(byte[] bytes) {
return URLDecode(bytes, null);
}
Modified: tomcat/trunk/java/org/apache/catalina/util/Strftime.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/Strftime.java?rev=1370971&r1=1370970&r2=1370971&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/Strftime.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/Strftime.java Wed Aug 8
21:15:40 2012
@@ -111,7 +111,10 @@ public class Strftime {
* Create an instance of this date formatting class
*
* @see #Strftime( String, Locale )
+ *
+ * @deprecated Unused - will be removed in 8.0.x
*/
+ @Deprecated
public Strftime( String origFormat ) {
String convertedFormat = convertDateFormat( origFormat );
simpleDateFormat = new SimpleDateFormat( convertedFormat );
Modified: tomcat/trunk/java/org/apache/catalina/util/StringParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/StringParser.java?rev=1370971&r1=1370970&r2=1370971&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/StringParser.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/StringParser.java Wed Aug 8
21:15:40 2012
@@ -122,7 +122,10 @@ public final class StringParser {
/**
* Return the String we are currently parsing.
+ *
+ * @deprecated Unused - will be removed in 8.0.x
*/
+ @Deprecated
public String getString() {
return (this.string);
@@ -172,7 +175,10 @@ public final class StringParser {
* possible, a zero-length string is returned.
*
* @param start Starting index, zero relative, inclusive
+ *
+ * @deprecated Unused - will be removed in 8.0.x
*/
+ @Deprecated
public String extract(int start) {
if ((start < 0) || (start >= length))
@@ -223,7 +229,10 @@ public final class StringParser {
* or the index of the character after the last position of the string
* if no more non-whitespace characters are found. The current
* parsing position is updated to the returned value.
+ *
+ * @deprecated Unused - will be removed in 8.0.x
*/
+ @Deprecated
public int findText() {
while ((index < length) && isWhite(chars[index]))
@@ -238,7 +247,10 @@ public final class StringParser {
* or the index of the character after the last position of the string
* if no more whitespace characters are found. The current parsing
* position is updated to the returned value.
+ *
+ * @deprecated Unused - will be removed in 8.0.x
*/
+ @Deprecated
public int findWhite() {
while ((index < length) && !isWhite(chars[index]))
@@ -265,7 +277,10 @@ public final class StringParser {
* Return the final value.
*
* @param ch Character to be skipped
+ *
+ * @deprecated Unused - will be removed in 8.0.x
*/
+ @Deprecated
public int skipChar(char ch) {
while ((index < length) && (ch == chars[index]))
@@ -279,7 +294,10 @@ public final class StringParser {
* Advance the current parsing position while it is pointing at a
* non-whitespace character, or until it moves past the end of the string.
* Return the final value.
+ *
+ * @deprecated Unused - will be removed in 8.0.x
*/
+ @Deprecated
public int skipText() {
while ((index < length) && !isWhite(chars[index]))
@@ -293,7 +311,10 @@ public final class StringParser {
* Advance the current parsing position while it is pointing at a
* whitespace character, or until it moves past the end of the string.
* Return the final value.
+ *
+ * @deprecated Unused - will be removed in 8.0.x
*/
+ @Deprecated
public int skipWhite() {
while ((index < length) && isWhite(chars[index]))
@@ -310,7 +331,10 @@ public final class StringParser {
* Is the specified character considered to be whitespace?
*
* @param ch Character to be checked
+ *
+ * @deprecated Unused - will be removed in 8.0.x
*/
+ @Deprecated
protected boolean isWhite(char ch) {
if ((ch == ' ') || (ch == '\t') || (ch == '\r') || (ch == '\n'))
Modified: tomcat/trunk/java/org/apache/catalina/util/XMLWriter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/XMLWriter.java?rev=1370971&r1=1370970&r2=1370971&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/XMLWriter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/XMLWriter.java Wed Aug 8
21:15:40 2012
@@ -104,7 +104,10 @@ public class XMLWriter {
* @param namespaceInfo Namespace info
* @param name Property name
* @param value Property value
+ *
+ * @deprecated Unused - will be removed in 8.0.x
*/
+ @Deprecated
public void writeProperty(String namespace, String namespaceInfo,
String name, String value) {
writeElement(namespace, namespaceInfo, name, OPENING);
@@ -133,7 +136,10 @@ public class XMLWriter {
*
* @param namespace Namespace
* @param name Property name
+ *
+ * @deprecated Unused - will be removed in 8.0.x
*/
+ @Deprecated
public void writeProperty(String namespace, String name) {
writeElement(namespace, name, NO_CONTENT);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
