Author: markt
Date: Mon Jan 4 19:19:29 2016
New Revision: 1722945
URL: http://svn.apache.org/viewvc?rev=1722945&view=rev
Log:
Deprecate InstanceListener, InstanceEvent and InstanceSupport prior to removal
Modified:
tomcat/trunk/java/org/apache/catalina/Context.java
tomcat/trunk/java/org/apache/catalina/InstanceEvent.java
tomcat/trunk/java/org/apache/catalina/InstanceListener.java
tomcat/trunk/java/org/apache/catalina/Wrapper.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
tomcat/trunk/java/org/apache/catalina/storeconfig/InstanceListenerSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StandardContextSF.java
tomcat/trunk/java/org/apache/catalina/util/InstanceSupport.java
Modified: tomcat/trunk/java/org/apache/catalina/Context.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Context.java?rev=1722945&r1=1722944&r2=1722945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/Context.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Context.java Mon Jan 4 19:19:29 2016
@@ -816,7 +816,10 @@ public interface Context extends Contain
* Wrapper appended to this Context.
*
* @param listener Java class name of an InstanceListener class
+ *
+ * @deprecated Will be removed in 9.0.x onwards
*/
+ @Deprecated
public void addInstanceListener(String listener);
@@ -1003,7 +1006,10 @@ public interface Context extends Contain
/**
* Return the set of InstanceListener classes that will be added to
* newly created Wrappers automatically.
+ *
+ * @deprecated Will be removed in 9.0.x onwards
*/
+ @Deprecated
public String[] findInstanceListeners();
@@ -1230,7 +1236,10 @@ public interface Context extends Contain
* will be added to newly created Wrappers.
*
* @param listener Class name of an InstanceListener class to be removed
+ *
+ * @deprecated Will be removed in 9.0.x onwards
*/
+ @Deprecated
public void removeInstanceListener(String listener);
Modified: tomcat/trunk/java/org/apache/catalina/InstanceEvent.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/InstanceEvent.java?rev=1722945&r1=1722944&r2=1722945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/InstanceEvent.java (original)
+++ tomcat/trunk/java/org/apache/catalina/InstanceEvent.java Mon Jan 4
19:19:29 2016
@@ -33,7 +33,10 @@ import javax.servlet.ServletResponse;
* as opposed to the Wrapper component that manages it.
*
* @author Craig R. McClanahan
+ *
+ * @deprecated Will be removed in 9.0.x onwards
*/
+@Deprecated
public final class InstanceEvent extends EventObject {
private static final long serialVersionUID = 1L;
Modified: tomcat/trunk/java/org/apache/catalina/InstanceListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/InstanceListener.java?rev=1722945&r1=1722944&r2=1722945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/InstanceListener.java (original)
+++ tomcat/trunk/java/org/apache/catalina/InstanceListener.java Mon Jan 4
19:19:29 2016
@@ -25,7 +25,10 @@ package org.apache.catalina;
* is managing that instance.
*
* @author Craig R. McClanahan
+ *
+ * @deprecated Will be removed in 9.0.x onwards
*/
+@Deprecated
public interface InstanceListener {
Modified: tomcat/trunk/java/org/apache/catalina/Wrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Wrapper.java?rev=1722945&r1=1722944&r2=1722945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/Wrapper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Wrapper.java Mon Jan 4 19:19:29 2016
@@ -174,7 +174,10 @@ public interface Wrapper extends Contain
* Add a new listener interested in InstanceEvents.
*
* @param listener The new listener
+ *
+ * @deprecated Will be removed in 9.0.x onwards
*/
+ @Deprecated
public void addInstanceListener(InstanceListener listener);
@@ -293,7 +296,10 @@ public interface Wrapper extends Contain
* Remove a listener no longer interested in InstanceEvents.
*
* @param listener The listener to remove
+ *
+ * @deprecated Will be removed in 9.0.x onwards
*/
+ @Deprecated
public void removeInstanceListener(InstanceListener listener);
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java?rev=1722945&r1=1722944&r2=1722945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java Mon
Jan 4 19:19:29 2016
@@ -61,6 +61,7 @@ import org.apache.tomcat.util.res.String
*
* @author Craig R. McClanahan
*/
+@SuppressWarnings("deprecation")
final class ApplicationDispatcher implements AsyncDispatcher,
RequestDispatcher {
static final boolean STRICT_SERVLET_COMPLIANCE;
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java?rev=1722945&r1=1722944&r2=1722945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java Mon
Jan 4 19:19:29 2016
@@ -45,6 +45,7 @@ import org.apache.tomcat.util.res.String
*
* @author Craig R. McClanahan
*/
+@SuppressWarnings("deprecation")
final class ApplicationFilterChain implements FilterChain {
// Used to enforce requirements of SRV.8.2 / SRV.14.2.5.1
@@ -389,7 +390,10 @@ final class ApplicationFilterChain imple
* for this filter chain.
*
* @param support The InstanceSupport object for our Wrapper
+ *
+ * @deprecated Will be removed in 9.0.x onwards
*/
+ @Deprecated
void setSupport(InstanceSupport support) {
this.support = support;
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java?rev=1722945&r1=1722944&r2=1722945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java
Mon Jan 4 19:19:29 2016
@@ -50,6 +50,7 @@ public final class ApplicationFilterFact
* @return The configured FilterChain instance or null if none is to be
* executed.
*/
+ @SuppressWarnings("deprecation")
public static ApplicationFilterChain createFilterChain
(ServletRequest request, Wrapper wrapper, Servlet servlet) {
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=1722945&r1=1722944&r2=1722945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Mon Jan 4
19:19:29 2016
@@ -145,6 +145,7 @@ import org.apache.tomcat.util.security.P
* @author Craig R. McClanahan
* @author Remy Maucherat
*/
+@SuppressWarnings("deprecation")
public class StandardContext extends ContainerBase
implements Context, NotificationEmitter {
@@ -2978,7 +2979,10 @@ public class StandardContext extends Con
* Wrapper appended to this Context.
*
* @param listener Java class name of an InstanceListener class
+ *
+ * @deprecated Will be removed in 9.0.x onwards
*/
+ @Deprecated
@Override
public void addInstanceListener(String listener) {
@@ -3467,7 +3471,10 @@ public class StandardContext extends Con
/**
* Return the set of InstanceListener classes that will be added to
* newly created Wrappers automatically.
+ *
+ * @deprecated Will be removed in 9.0.x onwards
*/
+ @Deprecated
@Override
public String[] findInstanceListeners() {
@@ -4042,7 +4049,10 @@ public class StandardContext extends Con
* will be added to newly created Wrappers.
*
* @param listener Class name of an InstanceListener class to be removed
+ *
+ * @deprecated Will be removed in 9.0.x onwards
*/
+ @Deprecated
@Override
public void removeInstanceListener(String listener) {
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=1722945&r1=1722944&r2=1722945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java Mon Jan 4
19:19:29 2016
@@ -143,7 +143,10 @@ public class StandardWrapper extends Con
/**
* The support object for our instance listeners.
+ *
+ * @deprecated Will be removed in 9.0.x onwards
*/
+ @Deprecated
protected final InstanceSupport instanceSupport = new
InstanceSupport(this);
@@ -349,7 +352,10 @@ public class StandardWrapper extends Con
/**
* Return the InstanceSupport object for this Wrapper instance.
+ *
+ * @deprecated Will be removed in 9.0.x onwards
*/
+ @Deprecated
public InstanceSupport getInstanceSupport() {
return (this.instanceSupport);
@@ -730,7 +736,10 @@ public class StandardWrapper extends Con
* Add a new listener interested in InstanceEvents.
*
* @param listener The new listener
+ *
+ * @deprecated Will be removed in 9.0.x onwards
*/
+ @Deprecated
@Override
public void addInstanceListener(InstanceListener listener) {
@@ -1274,7 +1283,10 @@ public class StandardWrapper extends Con
* Remove a listener no longer interested in InstanceEvents.
*
* @param listener The listener to remove
+ *
+ * @deprecated Will be removed in 9.0.x onwards
*/
+ @Deprecated
@Override
public void removeInstanceListener(InstanceListener listener) {
Modified:
tomcat/trunk/java/org/apache/catalina/storeconfig/InstanceListenerSF.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/InstanceListenerSF.java?rev=1722945&r1=1722944&r2=1722945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/InstanceListenerSF.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/InstanceListenerSF.java
Mon Jan 4 19:19:29 2016
@@ -41,6 +41,7 @@ public class InstanceListenerSF extends
if (aElement instanceof StandardContext) {
StoreDescription elementDesc = getRegistry().findDescription(
aElement.getClass().getName() + ".[InstanceListener]");
+ @SuppressWarnings("deprecation")
String[] listeners = ((StandardContext) aElement)
.findInstanceListeners();
if (elementDesc != null) {
Modified:
tomcat/trunk/java/org/apache/catalina/storeconfig/StandardContextSF.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/StandardContextSF.java?rev=1722945&r1=1722944&r2=1722945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/StandardContextSF.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/StandardContextSF.java
Mon Jan 4 19:19:29 2016
@@ -268,6 +268,7 @@ public class StandardContextSF extends S
storeElement(aWriter, indent, resources);
// Store nested <InstanceListener> elements
+ @SuppressWarnings("deprecation")
String iListeners[] = context.findInstanceListeners();
getStoreAppender().printTagArray(aWriter, "InstanceListener",
indent + 2, iListeners);
Modified: tomcat/trunk/java/org/apache/catalina/util/InstanceSupport.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/InstanceSupport.java?rev=1722945&r1=1722944&r2=1722945&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/InstanceSupport.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/InstanceSupport.java Mon Jan 4
19:19:29 2016
@@ -34,7 +34,10 @@ import org.apache.catalina.Wrapper;
* registered InstanceListeners.
*
* @author Craig R. McClanahan
+ *
+ * @deprecated Will be removed in 9.0.x onwards
*/
+@Deprecated
public final class InstanceSupport {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
