Author: markt Date: Thu Sep 28 19:38:27 2017 New Revision: 1810039 URL: http://svn.apache.org/viewvc?rev=1810039&view=rev Log: More deprecation
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationContext.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardContext.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/ServletContext.java Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationContext.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=1810039&r1=1810038&r2=1810039&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationContext.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationContext.java Thu Sep 28 19:38:27 2017 @@ -87,6 +87,7 @@ import org.apache.tomcat.util.res.String * @author Craig R. McClanahan * @author Remy Maucherat */ +@SuppressWarnings("deprecation") public class ApplicationContext implements org.apache.catalina.servlet4preview.ServletContext { protected static final boolean STRICT_SERVLET_COMPLIANCE; Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java?rev=1810039&r1=1810038&r2=1810039&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java Thu Sep 28 19:38:27 2017 @@ -57,6 +57,7 @@ import org.apache.tomcat.util.ExceptionU * * @author Remy Maucherat */ +@SuppressWarnings("deprecation") public class ApplicationContextFacade implements org.apache.catalina.servlet4preview.ServletContext { // ---------------------------------------------------------- Attributes Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardContext.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1810039&r1=1810038&r2=1810039&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardContext.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardContext.java Thu Sep 28 19:38:27 2017 @@ -6419,6 +6419,7 @@ public class StandardContext extends Con } + @SuppressWarnings("deprecation") private static class NoPluggabilityServletContext implements org.apache.catalina.servlet4preview.ServletContext { Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/ServletContext.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/ServletContext.java?rev=1810039&r1=1810038&r2=1810039&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/ServletContext.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlet4preview/ServletContext.java Thu Sep 28 19:38:27 2017 @@ -20,6 +20,17 @@ import javax.servlet.ServletContextEvent import javax.servlet.ServletContextListener; import javax.servlet.ServletRegistration; +/** + * Provides early access to some parts of the proposed Servlet 4.0 API. + * + * @deprecated This class is not included in Tomcat 9 onwards. Users of this + * class should normally upgrade to Tomcat 9 and switch to the + * Servlet 4.0 API. If the functionality is required in Tomcat 8.5, + * then the Tomcat implementation classes should be used directly. + * This class may be removed from Tomcat 8.5.x some time after 30 + * September 2018. + */ +@Deprecated public interface ServletContext extends javax.servlet.ServletContext { /** --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org