Author: markt
Date: Wed Jun 29 19:33:09 2016
New Revision: 1750703
URL: http://svn.apache.org/viewvc?rev=1750703&view=rev
Log:
Deprecate unused code
Modified:
tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
Modified: tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=1750703&r1=1750702&r2=1750703&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java Wed Jun
29 19:33:09 2016
@@ -148,7 +148,9 @@ public class DefaultServlet extends Http
/**
* JNDI resources name.
+ * @deprecated Unused. Will be removed in Tomcat 9.
*/
+ @Deprecated
protected static final String RESOURCES_JNDI_NAME = "java:/comp/Resources";
/**
@@ -1368,7 +1370,10 @@ public class DefaultServlet extends Http
* @return the input stream with the rendered output
* @throws IOException an IO error occurred
* @throws ServletException rendering error
+ *
+ * @deprecated Unused. Will be removed in Tomcat 9
*/
+ @Deprecated
protected InputStream render(String contextPath, WebResource resource)
throws IOException, ServletException {
return render(contextPath, resource, null);
@@ -1397,7 +1402,10 @@ public class DefaultServlet extends Http
* @return the XML data
* @throws IOException an IO error occurred
* @throws ServletException rendering error
+ *
+ * @deprecated Unused. Will be removed in Tomcat 9
*/
+ @Deprecated
protected InputStream renderXml(String contextPath, WebResource resource,
Source xsltSource)
throws IOException, ServletException {
return renderXml(contextPath, resource, xsltSource, null);
@@ -1530,7 +1538,10 @@ public class DefaultServlet extends Http
* @param resource The resource
* @return the HTML data
* @throws IOException an IO error occurred
+ *
+ * @deprecated Unused. Will be removed in Tomcat 9
*/
+ @Deprecated
protected InputStream renderHtml(String contextPath, WebResource resource)
throws IOException {
return renderHtml(contextPath, resource, null);
@@ -1699,7 +1710,10 @@ public class DefaultServlet extends Http
* Get the readme file as a string.
* @param directory The directory to search
* @return the readme for the specified directory
+ *
+ * @deprecated Unused. Will be removed in Tomcat 9
*/
+ @Deprecated
protected String getReadme(WebResource directory) {
return getReadme(directory, null);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
