Author: markt
Date: Tue Feb 6 14:43:17 2018
New Revision: 1823346
URL: http://svn.apache.org/viewvc?rev=1823346&view=rev
Log:
Remove deprecated code
Modified:
tomcat/trunk/java/org/apache/catalina/Wrapper.java
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
Modified: tomcat/trunk/java/org/apache/catalina/Wrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Wrapper.java?rev=1823346&r1=1823345&r2=1823346&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/Wrapper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Wrapper.java Tue Feb 6 14:43:17 2018
@@ -368,26 +368,6 @@ public interface Wrapper extends Contain
public void setEnabled(boolean enabled);
/**
- * This method is no longer used. All implementations should be NO-OPs.
- *
- * @param b Unused.
- *
- * @deprecated This will be removed in Tomcat 9.
- */
- @Deprecated
- public void setServletSecurityAnnotationScanRequired(boolean b);
-
- /**
- * This method is no longer used. All implementations should be NO-OPs.
- *
- * @throws ServletException Never thrown
- *
- * @deprecated This will be removed in Tomcat 9.
- */
- @Deprecated
- public void servletSecurityAnnotationScan() throws ServletException;
-
- /**
* Is the Servlet overridable by a ServletContainerInitializer?
*
* @return <code>true</code> if the Servlet can be overridden in a
ServletContainerInitializer
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=1823346&r1=1823345&r2=1823346&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Tue Feb 6
14:43:17 2018
@@ -4342,20 +4342,6 @@ public class StandardContext extends Con
return null;
}
- /**
- * Create a servlet registration.
- *
- * @param wrapper The wrapper for which the registration should be created.
- *
- * @return An appropriate registration
- *
- * @deprecated This will be removed in Tomcat 9. The registration should be
- * created directly.
- */
- @Deprecated
- public ServletRegistration.Dynamic dynamicServletAdded(Wrapper wrapper) {
- return new ApplicationServletRegistration(wrapper, this);
- }
/**
* Hook to track which Servlets were created via
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java?rev=1823346&r1=1823345&r2=1823346&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java Tue Feb 6
14:43:17 2018
@@ -605,17 +605,8 @@ public class StandardWrapper extends Con
}
- /**
- * {@inheritDoc}
- */
- @Override
- public void setServletSecurityAnnotationScanRequired(boolean b) {
- // NO-OP
- }
-
// --------------------------------------------------------- Public Methods
-
/**
* Execute a periodic task, such as reloading, etc. This method will be
* invoked inside the classloading context of this container. Unexpected
@@ -1106,14 +1097,6 @@ public class StandardWrapper extends Con
}
- /**
- * {@inheritDoc}
- */
- @Override
- public void servletSecurityAnnotationScan() throws ServletException {
- // NO-OP
- }
-
private synchronized void initServlet(Servlet servlet)
throws ServletException {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
