Author: markt
Date: Wed Feb 17 09:38:07 2010
New Revision: 910883
URL: http://svn.apache.org/viewvc?rev=910883&view=rev
Log:
More lifecycle clean-up
Modified:
tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java
tomcat/trunk/java/org/apache/catalina/core/StandardServer.java
tomcat/trunk/java/org/apache/catalina/core/StandardService.java
tomcat/trunk/java/org/apache/catalina/mbeans/ServerLifecycleListener.java
Modified: tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java?rev=910883&r1=910882&r2=910883&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java Wed Feb 17
09:38:07 2010
@@ -123,7 +123,7 @@
*/
public abstract class ContainerBase
- implements Container, Lifecycle, MBeanRegistration {
+ implements Container, MBeanRegistration {
private static final org.apache.juli.logging.Log log=
org.apache.juli.logging.LogFactory.getLog( ContainerBase.class );
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardServer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardServer.java?rev=910883&r1=910882&r2=910883&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardServer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardServer.java Wed Feb 17
09:38:07 2010
@@ -34,7 +34,6 @@
import javax.management.ObjectName;
import org.apache.catalina.Context;
-import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.LifecycleListener;
import org.apache.catalina.Server;
@@ -57,9 +56,8 @@
* @author Craig R. McClanahan
* @version $Revision$ $Date$
*/
-public final class StandardServer
- implements Lifecycle, Server, MBeanRegistration
- {
+public final class StandardServer implements Server, MBeanRegistration {
+
private static final Log log = LogFactory.getLog(StandardServer.class);
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardService.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardService.java?rev=910883&r1=910882&r2=910883&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardService.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardService.java Wed Feb 17
09:38:07 2010
@@ -49,9 +49,8 @@
* @author Craig R. McClanahan
*/
-public class StandardService
- implements Lifecycle, Service, MBeanRegistration
- {
+public class StandardService implements Service, MBeanRegistration {
+
private static final Log log = LogFactory.getLog(StandardService.class);
Modified:
tomcat/trunk/java/org/apache/catalina/mbeans/ServerLifecycleListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/ServerLifecycleListener.java?rev=910883&r1=910882&r2=910883&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mbeans/ServerLifecycleListener.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/ServerLifecycleListener.java
Wed Feb 17 09:38:07 2010
@@ -302,7 +302,7 @@
context.addContainerListener(this);
if (context instanceof StandardContext) {
((StandardContext) context).addPropertyChangeListener(this);
- ((StandardContext) context).addLifecycleListener(this);
+ context.addLifecycleListener(this);
}
// If the context is privileged, give a reference to it
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
