This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new d019539 Delete methods scheduled for removal in Tomcat 10 (o.a.c.core)
d019539 is described below
commit d019539f96ebac30a4b7aa8b51cfce3c13235cf2
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Jan 14 20:59:43 2020 +0000
Delete methods scheduled for removal in Tomcat 10 (o.a.c.core)
---
.../catalina/core/NamingContextListener.java | 23 +--------
java/org/apache/catalina/core/StandardContext.java | 58 ----------------------
2 files changed, 1 insertion(+), 80 deletions(-)
diff --git a/java/org/apache/catalina/core/NamingContextListener.java
b/java/org/apache/catalina/core/NamingContextListener.java
index 0cacd3f..5c825bb 100644
--- a/java/org/apache/catalina/core/NamingContextListener.java
+++ b/java/org/apache/catalina/core/NamingContextListener.java
@@ -37,8 +37,6 @@ import javax.naming.NamingException;
import javax.naming.Reference;
import javax.naming.StringRefAddr;
-import org.apache.catalina.ContainerEvent;
-import org.apache.catalina.ContainerListener;
import org.apache.catalina.Context;
import org.apache.catalina.Engine;
import org.apache.catalina.Host;
@@ -83,8 +81,7 @@ import org.apache.tomcat.util.res.StringManager;
*
* @author Remy Maucherat
*/
-public class NamingContextListener
- implements LifecycleListener, ContainerListener,
PropertyChangeListener {
+public class NamingContextListener implements LifecycleListener,
PropertyChangeListener {
private static final Log log =
LogFactory.getLog(NamingContextListener.class);
@@ -342,24 +339,6 @@ public class NamingContextListener
}
- // ---------------------------------------------- ContainerListener Methods
-
- /**
- * NO-OP.
- *
- * @param event ContainerEvent that has occurred
- *
- * @deprecated The {@link ContainerListener} interface and implementing
- * methods will be removed from this class for Tomcat 10
- * onwards.
- */
- @Deprecated
- @Override
- public void containerEvent(ContainerEvent event) {
- // NO-OP
- }
-
-
// ----------------------------------------- PropertyChangeListener Methods
diff --git a/java/org/apache/catalina/core/StandardContext.java
b/java/org/apache/catalina/core/StandardContext.java
index cddf7eb..545aaf2 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -127,7 +127,6 @@ import org.apache.tomcat.util.descriptor.web.Injectable;
import org.apache.tomcat.util.descriptor.web.InjectionTarget;
import org.apache.tomcat.util.descriptor.web.LoginConfig;
import org.apache.tomcat.util.descriptor.web.MessageDestination;
-import org.apache.tomcat.util.descriptor.web.MessageDestinationRef;
import org.apache.tomcat.util.descriptor.web.SecurityCollection;
import org.apache.tomcat.util.descriptor.web.SecurityConstraint;
import org.apache.tomcat.util.http.CookieProcessor;
@@ -3058,20 +3057,6 @@ public class StandardContext extends ContainerBase
/**
- * Add a message destination reference for this web application.
- *
- * @param mdr New message destination reference
- *
- * @deprecated This will be removed in Tomcat 10.
- * Use {@link #getNamingResources()} instead
- */
- @Deprecated
- public void addMessageDestinationRef(MessageDestinationRef mdr) {
- getNamingResources().addMessageDestinationRef(mdr);
- }
-
-
- /**
* Add a new MIME mapping, replacing any existing mapping for
* the specified extension.
*
@@ -3462,35 +3447,6 @@ public class StandardContext extends ContainerBase
/**
- * @param name Name of the desired message destination ref
- *
- * @return the message destination ref with the specified name, if any;
- * otherwise, return <code>null</code>.
- *
- * @deprecated This will be removed in Tomcat 10.
- * Use {@link #getNamingResources()} instead
- */
- @Deprecated
- public MessageDestinationRef findMessageDestinationRef(String name) {
- return getNamingResources().findMessageDestinationRef(name);
- }
-
-
- /**
- * @return the set of defined message destination refs for this web
- * application. If none have been defined, a zero-length array
- * is returned.
- *
- * @deprecated This will be removed in Tomcat 10.
- * Use {@link #getNamingResources()} instead
- */
- @Deprecated
- public MessageDestinationRef[] findMessageDestinationRefs() {
- return getNamingResources().findMessageDestinationRefs();
- }
-
-
- /**
* @return the MIME type to which the specified extension is mapped,
* if any; otherwise return <code>null</code>.
*
@@ -3971,20 +3927,6 @@ public class StandardContext extends ContainerBase
/**
- * Remove any message destination ref with the specified name.
- *
- * @param name Name of the message destination ref to remove
- *
- * @deprecated This will be removed in Tomcat 10.
- * Use {@link #getNamingResources()} instead
- */
- @Deprecated
- public void removeMessageDestinationRef(String name) {
- getNamingResources().removeMessageDestinationRef(name);
- }
-
-
- /**
* Remove the MIME mapping for the specified extension, if it exists;
* otherwise, no action is taken.
*
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
