Author: markt
Date: Fri Nov 11 09:28:32 2016
New Revision: 1769264
URL: http://svn.apache.org/viewvc?rev=1769264&view=rev
Log:
Remove deprecated code
Modified:
tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java?rev=1769264&r1=1769263&r2=1769264&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java Fri Nov 11
09:28:32 2016
@@ -582,24 +582,6 @@ public class Tomcat {
* @param config Custom context configurator helper
* @return the deployed context
* @see #addWebapp(String, String)
- *
- * @deprecated Use {@link
- * #addWebapp(Host, String, String, LifecycleListener)} instead
- */
- @Deprecated
- public Context addWebapp(Host host, String contextPath, String docBase,
ContextConfig config) {
- return addWebapp(host, contextPath, docBase, (LifecycleListener)
config);
- }
-
-
- /**
- * @param host The host in which the context will be deployed
- * @param contextPath The context mapping to use, "" for root context.
- * @param docBase Base directory for the context, for static files.
- * Must exist, relative to the server home
- * @param config Custom context configurator helper
- * @return the deployed context
- * @see #addWebapp(String, String)
*/
public Context addWebapp(Host host, String contextPath, String docBase,
LifecycleListener config) {
Modified:
tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java?rev=1769264&r1=1769263&r2=1769264&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java
Fri Nov 11 09:28:32 2016
@@ -37,7 +37,6 @@ import static org.junit.Assert.assertTru
import org.junit.Test;
import org.apache.catalina.Context;
-import org.apache.catalina.LifecycleListener;
import org.apache.catalina.startup.Constants;
import org.apache.catalina.startup.ContextConfig;
import org.apache.catalina.startup.Tomcat;
@@ -136,7 +135,7 @@ public class TestStandardContextResource
// app dir is relative to server home
StandardContext ctx = (StandardContext) tomcat.addWebapp(null, "/test",
- appDir.getAbsolutePath(), (LifecycleListener)
absoluteOrderConfig);
+ appDir.getAbsolutePath(), absoluteOrderConfig);
Tomcat.addServlet(ctx, "getresource", new GetResourceServlet());
ctx.addServletMappingDecoded("/getresource", "getresource");
@@ -158,7 +157,7 @@ public class TestStandardContextResource
absoluteOrderConfig.swap();
ctx = (StandardContext) tomcat.addWebapp(null, "/test",
- appDir.getAbsolutePath(), (LifecycleListener)
absoluteOrderConfig);
+ appDir.getAbsolutePath(), absoluteOrderConfig);
Tomcat.addServlet(ctx, "getresource", new GetResourceServlet());
ctx.addServletMappingDecoded("/getresource", "getresource");
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
