amyroh 02/01/31 15:02:42
Modified: catalina/src/share/org/apache/catalina/core
StandardDefaultContext.java
catalina/src/share/org/apache/catalina/mbeans
ServerLifecycleListener.java mbeans-descriptors.xml
Log:
Add property change support for DefaultContext so that interested Listeners
can be notified of its property changes.
Add "defaultContext" property change handle to ServerLifecycleListener.
Revision Changes Path
1.3 +20 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardDefaultContext.java
Index: StandardDefaultContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardDefaultContext.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StandardDefaultContext.java 9 Nov 2001 19:35:46 -0000 1.2
+++ StandardDefaultContext.java 31 Jan 2002 23:02:41 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardDefaultContext.java,v
1.2 2001/11/09 19:35:46 remm Exp $
- * $Revision: 1.2 $
- * $Date: 2001/11/09 19:35:46 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardDefaultContext.java,v
1.3 2002/01/31 23:02:41 amyroh Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/01/31 23:02:41 $
*
* ====================================================================
*
@@ -64,7 +64,8 @@
package org.apache.catalina.core;
-
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyChangeSupport;
import java.util.HashMap;
import java.util.Iterator;
import javax.naming.directory.DirContext;
@@ -95,7 +96,7 @@
* <CODE>override="true"</CODE>.
*
* @author Glenn Nielsen
- * @version $Revision: 1.2 $ $Date: 2001/11/09 19:35:46 $
+ * @version $Revision: 1.3 $ $Date: 2002/01/31 23:02:41 $
*/
public class StandardDefaultContext implements DefaultContext {
@@ -244,6 +245,10 @@
protected static StringManager sm =
StringManager.getManager(Constants.Package);
+ /**
+ * The property change support for this component.
+ */
+ protected PropertyChangeSupport support = new PropertyChangeSupport(this);
// ----------------------------------------------------- Context Properties
@@ -408,7 +413,11 @@
* @param loader The newly associated loader
*/
public void setLoader(Loader loader) {
+ Loader oldLoader = this.loader;
this.loader = loader;
+
+ // Report this property change to interested listeners
+ support.firePropertyChange("loader", oldLoader, this.loader);
}
@@ -429,7 +438,11 @@
* @param manager The newly associated Manager
*/
public void setManager(Manager manager) {
+ Manager oldManager = this.manager;
this.manager = manager;
+
+ // Report this property change to interested listeners
+ support.firePropertyChange("manager", oldManager, this.manager);
}
@@ -471,7 +484,9 @@
* attached to the specified Container
*/
public void setParent(Container container) {
+ Container oldParent = this.parent;
this.parent = container;
+ support.firePropertyChange("parent", oldParent, this.parent);
}
1.18 +19 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ServerLifecycleListener.java
Index: ServerLifecycleListener.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ServerLifecycleListener.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ServerLifecycleListener.java 28 Jan 2002 12:08:35 -0000 1.17
+++ ServerLifecycleListener.java 31 Jan 2002 23:02:41 -0000 1.18
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ServerLifecycleListener.java,v
1.17 2002/01/28 12:08:35 remm Exp $
- * $Revision: 1.17 $
- * $Date: 2002/01/28 12:08:35 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ServerLifecycleListener.java,v
1.18 2002/01/31 23:02:41 amyroh Exp $
+ * $Revision: 1.18 $
+ * $Date: 2002/01/31 23:02:41 $
*
* ====================================================================
*
@@ -78,6 +78,7 @@
import org.apache.catalina.ContainerEvent;
import org.apache.catalina.ContainerListener;
import org.apache.catalina.Context;
+import org.apache.catalina.DefaultContext;
import org.apache.catalina.Engine;
import org.apache.catalina.Globals;
import org.apache.catalina.Host;
@@ -104,7 +105,7 @@
*
* @author Craig R. McClanahan
* @author Amy Roh
- * @version $Revision: 1.17 $ $Date: 2002/01/28 12:08:35 $
+ * @version $Revision: 1.18 $ $Date: 2002/01/31 23:02:41 $
*/
public class ServerLifecycleListener
@@ -705,7 +706,20 @@
",oldValue=" + oldValue +
",newValue=" + newValue + "]");
}
- if ("loader".equals(propertyName)) {
+ if ("defaultContext".equals(propertyName)) {
+ if (oldValue != null) {
+ if (debug >= 5) {
+ log("Removing MBean for DefaultContext " + oldValue);
+ }
+ MBeanUtils.destroyMBean((DefaultContext) oldValue);
+ }
+ if (newValue != null) {
+ if (debug >= 5) {
+ log("Creating MBean for DefaultContext " + newValue);
+ }
+ MBeanUtils.createMBean((DefaultContext) newValue);
+ }
+ } else if ("loader".equals(propertyName)) {
if (oldValue != null) {
if (debug >= 5) {
log("Removing MBean for Loader " + oldValue);
1.25 +3 -1
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/mbeans-descriptors.xml
Index: mbeans-descriptors.xml
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/mbeans-descriptors.xml,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- mbeans-descriptors.xml 29 Jan 2002 23:10:49 -0000 1.24
+++ mbeans-descriptors.xml 31 Jan 2002 23:02:41 -0000 1.25
@@ -6,7 +6,7 @@
<!--
Descriptions of JMX MBeans for Catalina
- $Id: mbeans-descriptors.xml,v 1.24 2002/01/29 23:10:49 amyroh Exp $
+ $Id: mbeans-descriptors.xml,v 1.25 2002/01/31 23:02:41 amyroh Exp $
-->
<mbeans-descriptors>
@@ -53,6 +53,7 @@
<mbean name="DefaultContext"
+ className="org.apache.catalina.mbeans.ClassNameMBean"
description="Used to store the default configuration a Host will use when
creating a Context"
domain="Catalina"
group="Default-Context"
@@ -1156,6 +1157,7 @@
<mbean name="StandardManager"
+ className="org.apache.catalina.mbeans.ClassNameMBean"
description="Standard implementation of the Manager interface"
domain="Catalina"
group="Manager"
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
