Author: markt
Date: Mon Jan 4 19:38:59 2016
New Revision: 1722946
URL: http://svn.apache.org/viewvc?rev=1722946&view=rev
Log:
Remove InstanceListener, InstanceEvent and InstanceSupport
Removed:
tomcat/trunk/java/org/apache/catalina/InstanceEvent.java
tomcat/trunk/java/org/apache/catalina/InstanceListener.java
tomcat/trunk/java/org/apache/catalina/storeconfig/InstanceListenerSF.java
tomcat/trunk/java/org/apache/catalina/util/InstanceSupport.java
Modified:
tomcat/trunk/java/org/apache/catalina/Context.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/core/mbeans-descriptors.xml
tomcat/trunk/java/org/apache/catalina/startup/ContextRuleSet.java
tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StandardContextSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/server-registry.xml
tomcat/trunk/test/org/apache/tomcat/unittest/TesterContext.java
tomcat/trunk/webapps/docs/funcspecs/mbean-names.xml
Modified: tomcat/trunk/java/org/apache/catalina/Context.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Context.java?rev=1722946&r1=1722945&r2=1722946&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/Context.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Context.java Mon Jan 4 19:38:59 2016
@@ -811,17 +811,6 @@ public interface Context extends Contain
*/
public void addFilterMapBefore(FilterMap filterMap);
- /**
- * Add the classname of an InstanceListener to be added to each
- * 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);
-
/**
* Add a Locale Encoding Mapping (see Sec 5.4 of Servlet spec 2.4)
@@ -1004,16 +993,6 @@ 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();
-
-
- /**
* Return the MIME type to which the specified extension is mapped,
* if any; otherwise return <code>null</code>.
*
@@ -1232,18 +1211,6 @@ public interface Context extends Contain
/**
- * Remove a class name from the set of InstanceListener classes that
- * 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);
-
-
- /**
* Remove the MIME mapping for the specified extension, if it exists;
* otherwise, no action is taken.
*
Modified: tomcat/trunk/java/org/apache/catalina/Wrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Wrapper.java?rev=1722946&r1=1722945&r2=1722946&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/Wrapper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Wrapper.java Mon Jan 4 19:38:59 2016
@@ -171,17 +171,6 @@ 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);
-
-
- /**
* Add a mapping associated with the Wrapper.
*
* @param mapping The new wrapper mapping
@@ -293,17 +282,6 @@ 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);
-
-
- /**
* Remove a mapping associated with the wrapper.
*
* @param mapping The pattern to remove
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=1722946&r1=1722945&r2=1722946&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:38:59 2016
@@ -38,14 +38,12 @@ import javax.servlet.http.HttpServletRes
import org.apache.catalina.AsyncDispatcher;
import org.apache.catalina.Context;
import org.apache.catalina.Globals;
-import org.apache.catalina.InstanceEvent;
import org.apache.catalina.Wrapper;
import org.apache.catalina.connector.ClientAbortException;
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.RequestFacade;
import org.apache.catalina.connector.Response;
import org.apache.catalina.connector.ResponseFacade;
-import org.apache.catalina.util.InstanceSupport;
import org.apache.tomcat.util.ExceptionUtils;
import org.apache.tomcat.util.res.StringManager;
@@ -61,7 +59,6 @@ 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;
@@ -219,11 +216,6 @@ final class ApplicationDispatcher implem
this.pathInfo = pathInfo;
this.queryString = queryString;
this.name = name;
- if (wrapper instanceof StandardWrapper)
- this.support = ((StandardWrapper) wrapper).getInstanceSupport();
- else
- this.support = new InstanceSupport(wrapper);
-
}
@@ -268,15 +260,7 @@ final class ApplicationDispatcher implem
/**
* The StringManager for this package.
*/
- private static final StringManager sm =
- StringManager.getManager(Constants.Package);
-
-
- /**
- * The InstanceSupport instance associated with our Wrapper (used to
- * send "before dispatch" and "after dispatch" events.
- */
- private final InstanceSupport support;
+ private static final StringManager sm =
StringManager.getManager(Constants.Package);
/**
@@ -713,35 +697,23 @@ final class ApplicationDispatcher implem
// Call the service() method for the allocated servlet instance
try {
- support.fireInstanceEvent(InstanceEvent.BEFORE_DISPATCH_EVENT,
- servlet, request, response);
// for includes/forwards
if ((servlet != null) && (filterChain != null)) {
filterChain.doFilter(request, response);
}
// Servlet Service Method is called by the FilterChain
- support.fireInstanceEvent(InstanceEvent.AFTER_DISPATCH_EVENT,
- servlet, request, response);
} catch (ClientAbortException e) {
- support.fireInstanceEvent(InstanceEvent.AFTER_DISPATCH_EVENT,
- servlet, request, response);
ioException = e;
} catch (IOException e) {
- support.fireInstanceEvent(InstanceEvent.AFTER_DISPATCH_EVENT,
- servlet, request, response);
wrapper.getLogger().error(sm.getString("applicationDispatcher.serviceException",
wrapper.getName()), e);
ioException = e;
} catch (UnavailableException e) {
- support.fireInstanceEvent(InstanceEvent.AFTER_DISPATCH_EVENT,
- servlet, request, response);
wrapper.getLogger().error(sm.getString("applicationDispatcher.serviceException",
wrapper.getName()), e);
servletException = e;
wrapper.unavailable(e);
} catch (ServletException e) {
- support.fireInstanceEvent(InstanceEvent.AFTER_DISPATCH_EVENT,
- servlet, request, response);
Throwable rootCause = StandardWrapper.getRootCause(e);
if (!(rootCause instanceof ClientAbortException)) {
wrapper.getLogger().error(sm.getString("applicationDispatcher.serviceException",
@@ -749,8 +721,6 @@ final class ApplicationDispatcher implem
}
servletException = e;
} catch (RuntimeException e) {
- support.fireInstanceEvent(InstanceEvent.AFTER_DISPATCH_EVENT,
- servlet, request, response);
wrapper.getLogger().error(sm.getString("applicationDispatcher.serviceException",
wrapper.getName()), e);
runtimeException = e;
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=1722946&r1=1722945&r2=1722946&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:38:59 2016
@@ -30,9 +30,7 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import org.apache.catalina.Globals;
-import org.apache.catalina.InstanceEvent;
import org.apache.catalina.security.SecurityUtil;
-import org.apache.catalina.util.InstanceSupport;
import org.apache.tomcat.util.ExceptionUtils;
import org.apache.tomcat.util.res.StringManager;
@@ -68,27 +66,12 @@ final class ApplicationFilterChain imple
public static final int INCREMENT = 10;
- // ----------------------------------------------------------- Constructors
-
-
- /**
- * Construct a new chain instance with no defined filters.
- */
- public ApplicationFilterChain() {
-
- super();
-
- }
-
-
// ----------------------------------------------------- Instance Variables
-
/**
* Filters.
*/
- private ApplicationFilterConfig[] filters =
- new ApplicationFilterConfig[0];
+ private ApplicationFilterConfig[] filters = new ApplicationFilterConfig[0];
/**
@@ -111,17 +94,15 @@ final class ApplicationFilterChain imple
/**
- * The string manager for our package.
+ * Does the associated servlet instance support async processing?
*/
- private static final StringManager sm =
- StringManager.getManager(Constants.Package);
-
+ private boolean servletSupportsAsync = false;
/**
- * The InstanceSupport instance associated with our Wrapper (used to
- * send "before filter" and "after filter" events.
+ * The string manager for our package.
*/
- private InstanceSupport support = null;
+ private static final StringManager sm =
+ StringManager.getManager(Constants.Package);
/**
@@ -196,13 +177,10 @@ final class ApplicationFilterChain imple
Filter filter = null;
try {
filter = filterConfig.getFilter();
- support.fireInstanceEvent(InstanceEvent.BEFORE_FILTER_EVENT,
- filter, request, response);
if (request.isAsyncSupported() && "false".equalsIgnoreCase(
filterConfig.getFilterDef().getAsyncSupported())) {
- request.setAttribute(Globals.ASYNC_SUPPORTED_ATTR,
- Boolean.FALSE);
+ request.setAttribute(Globals.ASYNC_SUPPORTED_ATTR,
Boolean.FALSE);
}
if( Globals.IS_SECURITY_ENABLED ) {
final ServletRequest req = request;
@@ -211,28 +189,16 @@ final class ApplicationFilterChain imple
((HttpServletRequest) req).getUserPrincipal();
Object[] args = new Object[]{req, res, this};
- SecurityUtil.doAsPrivilege
- ("doFilter", filter, classType, args, principal);
-
+ SecurityUtil.doAsPrivilege ("doFilter", filter, classType,
args, principal);
} else {
filter.doFilter(request, response, this);
}
-
- support.fireInstanceEvent(InstanceEvent.AFTER_FILTER_EVENT,
- filter, request, response);
} catch (IOException | ServletException | RuntimeException e) {
- if (filter != null)
- support.fireInstanceEvent(InstanceEvent.AFTER_FILTER_EVENT,
- filter, request, response, e);
throw e;
} catch (Throwable e) {
e = ExceptionUtils.unwrapInvocationTargetException(e);
ExceptionUtils.handleThrowable(e);
- if (filter != null)
- support.fireInstanceEvent(InstanceEvent.AFTER_FILTER_EVENT,
- filter, request, response, e);
- throw new ServletException
- (sm.getString("filterChain.filter"), e);
+ throw new ServletException(sm.getString("filterChain.filter"),
e);
}
return;
}
@@ -244,10 +210,7 @@ final class ApplicationFilterChain imple
lastServicedResponse.set(response);
}
- support.fireInstanceEvent(InstanceEvent.BEFORE_SERVICE_EVENT,
- servlet, request, response);
- if (request.isAsyncSupported()
- && !support.getWrapper().isAsyncSupported()) {
+ if (request.isAsyncSupported() && !servletSupportsAsync) {
request.setAttribute(Globals.ASYNC_SUPPORTED_ATTR,
Boolean.FALSE);
}
@@ -272,24 +235,14 @@ final class ApplicationFilterChain imple
} else {
servlet.service(request, response);
}
- support.fireInstanceEvent(InstanceEvent.AFTER_SERVICE_EVENT,
- servlet, request, response);
} catch (IOException e) {
- support.fireInstanceEvent(InstanceEvent.AFTER_SERVICE_EVENT,
- servlet, request, response, e);
throw e;
} catch (ServletException e) {
- support.fireInstanceEvent(InstanceEvent.AFTER_SERVICE_EVENT,
- servlet, request, response, e);
throw e;
} catch (RuntimeException e) {
- support.fireInstanceEvent(InstanceEvent.AFTER_SERVICE_EVENT,
- servlet, request, response, e);
throw e;
} catch (Throwable e) {
ExceptionUtils.handleThrowable(e);
- support.fireInstanceEvent(InstanceEvent.AFTER_SERVICE_EVENT,
- servlet, request, response, e);
throw new ServletException
(sm.getString("filterChain.servlet"), e);
} finally {
@@ -353,15 +306,13 @@ final class ApplicationFilterChain imple
* Release references to the filters and wrapper executed by this chain.
*/
void release() {
-
for (int i = 0; i < n; i++) {
filters[i] = null;
}
n = 0;
pos = 0;
servlet = null;
- support = null;
-
+ servletSupportsAsync = false;
}
@@ -379,24 +330,11 @@ final class ApplicationFilterChain imple
* @param servlet The Wrapper for the servlet to be executed
*/
void setServlet(Servlet servlet) {
-
this.servlet = servlet;
-
}
- /**
- * Set the InstanceSupport object used for event notifications
- * 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;
-
+ void setServletSupportsAsync(boolean servletSupportsAsync) {
+ this.servletSupportsAsync = servletSupportsAsync;
}
}
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=1722946&r1=1722945&r2=1722946&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:38:59 2016
@@ -50,7 +50,6 @@ 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) {
@@ -92,9 +91,7 @@ public final class ApplicationFilterFact
}
filterChain.setServlet(servlet);
-
- filterChain.setSupport
- (((StandardWrapper)wrapper).getInstanceSupport());
+ filterChain.setServletSupportsAsync(wrapper.isAsyncSupported());
// Acquire the filter mappings for this Context
StandardContext context = (StandardContext) wrapper.getParent();
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=1722946&r1=1722945&r2=1722946&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:38:59 2016
@@ -88,7 +88,6 @@ import org.apache.catalina.ContainerList
import org.apache.catalina.Context;
import org.apache.catalina.CredentialHandler;
import org.apache.catalina.Globals;
-import org.apache.catalina.InstanceListener;
import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.LifecycleListener;
@@ -145,7 +144,6 @@ import org.apache.tomcat.util.security.P
* @author Craig R. McClanahan
* @author Remy Maucherat
*/
-@SuppressWarnings("deprecation")
public class StandardContext extends ContainerBase
implements Context, NotificationEmitter {
@@ -407,15 +405,6 @@ public class StandardContext extends Con
/**
- * The set of classnames of InstanceListeners that will be added
- * to each newly created Wrapper by <code>createWrapper()</code>.
- */
- private String instanceListeners[] = new String[0];
-
- private final Object instanceListenersLock = new Object();
-
-
- /**
* The Loader implementation with which this Container is associated.
*/
private Loader loader = null;
@@ -2974,28 +2963,6 @@ public class StandardContext extends Con
}
}
- /**
- * Add the classname of an InstanceListener to be added to each
- * 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) {
-
- synchronized (instanceListenersLock) {
- String results[] =new String[instanceListeners.length + 1];
- for (int i = 0; i < instanceListeners.length; i++)
- results[i] = instanceListeners[i];
- results[instanceListeners.length] = listener;
- instanceListeners = results;
- }
- fireContainerEvent("addInstanceListener", listener);
-
- }
/**
* Add a Locale Encoding Mapping (see Sec 5.4 of Servlet spec 2.4)
@@ -3290,21 +3257,6 @@ public class StandardContext extends Con
wrapper = new StandardWrapper();
}
- synchronized (instanceListenersLock) {
- for (int i = 0; i < instanceListeners.length; i++) {
- try {
- Class<?> clazz = Class.forName(instanceListeners[i]);
- InstanceListener listener =
- (InstanceListener) clazz.newInstance();
- wrapper.addInstanceListener(listener);
- } catch (Throwable t) {
- ExceptionUtils.handleThrowable(t);
- log.error("createWrapper", t);
- return (null);
- }
- }
- }
-
synchronized (wrapperLifecyclesLock) {
for (int i = 0; i < wrapperLifecycles.length; i++) {
try {
@@ -3469,23 +3421,6 @@ 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() {
-
- synchronized (instanceListenersLock) {
- return (instanceListeners);
- }
-
- }
-
-
- /**
* Return the message destination with the specified name, if any;
* otherwise, return <code>null</code>.
*
@@ -4045,48 +3980,6 @@ public class StandardContext extends Con
/**
- * Remove a class name from the set of InstanceListener classes that
- * 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) {
-
- synchronized (instanceListenersLock) {
-
- // Make sure this listener is currently present
- int n = -1;
- for (int i = 0; i < instanceListeners.length; i++) {
- if (instanceListeners[i].equals(listener)) {
- n = i;
- break;
- }
- }
- if (n < 0)
- return;
-
- // Remove the specified listener
- int j = 0;
- String results[] = new String[instanceListeners.length - 1];
- for (int i = 0; i < instanceListeners.length; i++) {
- if (i != n)
- results[j++] = instanceListeners[i];
- }
- instanceListeners = results;
-
- }
-
- // Inform interested listeners
- fireContainerEvent("removeInstanceListener", listener);
-
- }
-
-
- /**
* Remove any message destination with the specified name.
*
* @param name Name of the message destination to remove
@@ -5616,10 +5509,6 @@ public class StandardContext extends Con
namingResources.destroy();
}
- synchronized (instanceListenersLock) {
- instanceListeners = new String[0];
- }
-
Loader loader = getLoader();
if (loader instanceof Lifecycle) {
((Lifecycle) loader).destroy();
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=1722946&r1=1722945&r2=1722946&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:38:59 2016
@@ -52,13 +52,10 @@ import org.apache.catalina.Container;
import org.apache.catalina.ContainerServlet;
import org.apache.catalina.Context;
import org.apache.catalina.Globals;
-import org.apache.catalina.InstanceEvent;
-import org.apache.catalina.InstanceListener;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.LifecycleState;
import org.apache.catalina.Wrapper;
import org.apache.catalina.security.SecurityUtil;
-import org.apache.catalina.util.InstanceSupport;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.InstanceManager;
@@ -141,14 +138,6 @@ public class StandardWrapper extends Con
*/
protected volatile boolean instanceInitialized = false;
- /**
- * The support object for our instance listeners.
- *
- * @deprecated Will be removed in 9.0.x onwards
- */
- @Deprecated
- protected final InstanceSupport instanceSupport = new
InstanceSupport(this);
-
/**
* The load-on-startup order value (negative value means load on
@@ -344,22 +333,7 @@ public class StandardWrapper extends Con
* not implement <code>SingleThreadModel</code>.
*/
public int getCountAllocated() {
-
- return (this.countAllocated.get());
-
- }
-
-
- /**
- * Return the InstanceSupport object for this Wrapper instance.
- *
- * @deprecated Will be removed in 9.0.x onwards
- */
- @Deprecated
- public InstanceSupport getInstanceSupport() {
-
- return (this.instanceSupport);
-
+ return this.countAllocated.get();
}
@@ -733,22 +707,6 @@ 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) {
-
- instanceSupport.addInstanceListener(listener);
-
- }
-
-
- /**
* Add a mapping associated with the Wrapper.
*
* @param mapping The new wrapper mapping
@@ -1211,9 +1169,6 @@ public class StandardWrapper extends Con
// Call the initialization method of this servlet
try {
- instanceSupport.fireInstanceEvent(InstanceEvent.BEFORE_INIT_EVENT,
- servlet);
-
if( Globals.IS_SECURITY_ENABLED) {
boolean success = false;
try {
@@ -1234,25 +1189,16 @@ public class StandardWrapper extends Con
}
instanceInitialized = true;
-
- instanceSupport.fireInstanceEvent(InstanceEvent.AFTER_INIT_EVENT,
- servlet);
} catch (UnavailableException f) {
- instanceSupport.fireInstanceEvent(InstanceEvent.AFTER_INIT_EVENT,
- servlet, f);
unavailable(f);
throw f;
} catch (ServletException f) {
- instanceSupport.fireInstanceEvent(InstanceEvent.AFTER_INIT_EVENT,
- servlet, f);
// If the servlet wanted to be unavailable it would have
// said so, so do not call unavailable(null).
throw f;
} catch (Throwable f) {
ExceptionUtils.handleThrowable(f);
getServletContext().log("StandardWrapper.Throwable", f );
- instanceSupport.fireInstanceEvent(InstanceEvent.AFTER_INIT_EVENT,
- servlet, f);
// If the servlet wanted to be unavailable it would have
// said so, so do not call unavailable(null).
throw new ServletException
@@ -1280,22 +1226,6 @@ 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) {
-
- instanceSupport.removeInstanceListener(listener);
-
- }
-
-
- /**
* Remove a mapping associated with the wrapper.
*
* @param mapping The pattern to remove
@@ -1424,13 +1354,9 @@ public class StandardWrapper extends Con
// Call the servlet destroy() method
try {
- instanceSupport.fireInstanceEvent
- (InstanceEvent.BEFORE_DESTROY_EVENT, instance);
-
if( Globals.IS_SECURITY_ENABLED) {
try {
- SecurityUtil.doAsPrivilege("destroy",
- instance);
+ SecurityUtil.doAsPrivilege("destroy", instance);
} finally {
SecurityUtil.remove(instance);
}
@@ -1438,19 +1364,13 @@ public class StandardWrapper extends Con
instance.destroy();
}
- instanceSupport.fireInstanceEvent
- (InstanceEvent.AFTER_DESTROY_EVENT, instance);
-
// Annotation processing
if (!((Context) getParent()).getIgnoreAnnotations()) {
((StandardContext)getParent()).getInstanceManager().destroyInstance(instance);
}
-
} catch (Throwable t) {
t = ExceptionUtils.unwrapInvocationTargetException(t);
ExceptionUtils.handleThrowable(t);
- instanceSupport.fireInstanceEvent
- (InstanceEvent.AFTER_DESTROY_EVENT, instance, t);
instance = null;
instancePool = null;
nInstances = 0;
Modified: tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml?rev=1722946&r1=1722945&r2=1722946&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml (original)
+++ tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml Mon Jan
4 19:38:59 2016
@@ -395,15 +395,6 @@
type="java.lang.String"/>
</operation>
- <operation name="addInstanceListener"
- description="Add the classname of an InstanceListener to be
added to each Wrapper appended to this Context."
- impact="ACTION"
- returnType="void">
- <parameter name="listener"
- description="Java class name of an InstanceListener class"
- type="java.lang.String"/>
- </operation>
-
<operation name="addLifecycleListener"
description="Add a lifecycle listener to this Context"
impact="ACTION"
@@ -617,12 +608,6 @@
returnType="[Ljava.lang.String;">
</operation>
- <operation name="findInstanceListeners"
- description="Return the set of InstanceListener classes that
will be added to newly created Wrappers automatically."
- impact="INFO"
- returnType="[Ljava.lang.String;">
- </operation>
-
<operation name="findLifecycleListenerNames"
description="Return the set of lifecycle listener class names
configured for this application."
impact="INFO"
@@ -797,15 +782,6 @@
type="java.lang.String"/>
</operation>
- <operation name="removeInstanceListener"
- description="Remove the application parameter with the
specified name from the set for this application."
- impact="ACTION"
- returnType="void">
- <parameter name="listener"
- description="Class name of an InstanceListener class to be
removed"
- type="java.lang.String"/>
- </operation>
-
<operation name="removeLifecycleListeners"
description="Removes lifecycle listeners of given class type
from this Context"
impact="ACTION"
Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextRuleSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextRuleSet.java?rev=1722946&r1=1722945&r2=1722946&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ContextRuleSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextRuleSet.java Mon Jan
4 19:38:59 2016
@@ -117,8 +117,6 @@ public class ContextRuleSet extends Rule
"addChild",
"org.apache.catalina.Container");
}
- digester.addCallMethod(prefix + "Context/InstanceListener",
- "addInstanceListener", 0);
digester.addObjectCreate(prefix + "Context/Listener",
null, // MUST be specified in the element
Modified: tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java?rev=1722946&r1=1722945&r2=1722946&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java Mon Jan 4
19:38:59 2016
@@ -530,13 +530,6 @@ public class FailedContext extends Lifec
public void removeFilterMap(FilterMap filterMap) { /* NO-OP */ }
@Override
- public void addInstanceListener(String listener) { /* NO-OP */ }
- @Override
- public String[] findInstanceListeners() { return null; }
- @Override
- public void removeInstanceListener(String listener) { /* NO-OP */ }
-
- @Override
public void addLocaleEncodingMappingParameter(String locale, String
encoding) { /* NO-OP */ }
@Override
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=1722946&r1=1722945&r2=1722946&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:38:59 2016
@@ -267,12 +267,6 @@ public class StandardContextSF extends S
WebResourceRoot resources = context.getResources();
storeElement(aWriter, indent, resources);
- // Store nested <InstanceListener> elements
- @SuppressWarnings("deprecation")
- String iListeners[] = context.findInstanceListeners();
- getStoreAppender().printTagArray(aWriter, "InstanceListener",
- indent + 2, iListeners);
-
// Store nested <WrapperListener> elements
String wLifecycles[] = context.findWrapperLifecycles();
getStoreAppender().printTagArray(aWriter, "WrapperListener",
Modified: tomcat/trunk/java/org/apache/catalina/storeconfig/server-registry.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/server-registry.xml?rev=1722946&r1=1722945&r2=1722946&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/server-registry.xml
(original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/server-registry.xml Mon
Jan 4 19:38:59 2016
@@ -342,14 +342,6 @@
storeFactoryClass="org.apache.catalina.storeconfig.StoreFactoryBase">
</Description>
<Description
- id="org.apache.catalina.core.StandardContext.[InstanceListener]"
- tag="InstanceListener"
- standard="true"
- default="false"
- attributes="false"
- storeFactoryClass="org.apache.catalina.storeconfig.InstanceListenerSF">
- </Description>
- <Description
id="org.apache.catalina.core.StandardContext.[WrapperLifecycle]"
tag="WrapperLifecycle"
standard="true"
Modified: tomcat/trunk/test/org/apache/tomcat/unittest/TesterContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/unittest/TesterContext.java?rev=1722946&r1=1722945&r2=1722946&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/unittest/TesterContext.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/unittest/TesterContext.java Mon Jan 4
19:38:59 2016
@@ -733,11 +733,6 @@ public class TesterContext implements Co
}
@Override
- public void addInstanceListener(String listener) {
- // NO-OP
- }
-
- @Override
public void addLocaleEncodingMappingParameter(String locale, String
encoding) {
// NO-OP
}
@@ -834,11 +829,6 @@ public class TesterContext implements Co
}
@Override
- public String[] findInstanceListeners() {
- return null;
- }
-
- @Override
public String findMimeMapping(String extension) {
return null;
}
@@ -948,11 +938,6 @@ public class TesterContext implements Co
// NO-OP
}
- @Override
- public void removeInstanceListener(String listener) {
- // NO-OP
- }
-
@Override
public void removeMimeMapping(String extension) {
// NO-OP
Modified: tomcat/trunk/webapps/docs/funcspecs/mbean-names.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/funcspecs/mbean-names.xml?rev=1722946&r1=1722945&r2=1722946&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/funcspecs/mbean-names.xml (original)
+++ tomcat/trunk/webapps/docs/funcspecs/mbean-names.xml Mon Jan 4 19:38:59 2016
@@ -173,15 +173,6 @@ corresponding values:</p>
</tr>
<tr>
- <td>Server / Service / Engine / Host / Context / InstanceListener</td>
- <td style="text-align: center;">0..n</td>
- <td style="text-align: center;">(none)</td>
- <td><code class="noHighlight">type=${INSTANCE-LISTENER}, sequence=${###},
- context=${context.name}, host=${host.name},
- service=${service.name}</code></td>
- </tr>
-
- <tr>
<td>Server / Service / Engine / Host / Context / Listener</td>
<td style="text-align: center;">0..n</td>
<td style="text-align: center;">(none)</td>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
