You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by am...@apache.org on 2002/06/19 23:17:20 UTC
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans ServerLifecycleListener.java mbeans-descriptors.xml
amyroh 2002/06/19 14:17:20
Modified: catalina/src/share/org/apache/catalina/deploy
NamingResources.java
catalina/src/share/org/apache/catalina/mbeans
ServerLifecycleListener.java mbeans-descriptors.xml
Log:
When removing JNDI resources, setNamingResources(null) after triggering
PropertyChange event so that MBeans have the NamingResources info for
unregistering.
Add resourceLinks attribute to NamingResourcesMBean.
Revision Changes Path
1.10 +10 -10 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/deploy/NamingResources.java
Index: NamingResources.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/deploy/NamingResources.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- NamingResources.java 11 Jun 2002 19:40:34 -0000 1.9
+++ NamingResources.java 19 Jun 2002 21:17:19 -0000 1.10
@@ -581,8 +581,8 @@
ejb = (ContextEjb) ejbs.remove(name);
}
if (ejb != null) {
- ejb.setNamingResources(null);
support.firePropertyChange("ejb", ejb, null);
+ ejb.setNamingResources(null);
}
}
@@ -602,8 +602,8 @@
environment = (ContextEnvironment) envs.remove(name);
}
if (environment != null) {
- environment.setNamingResources(null);
support.firePropertyChange("environment", environment, null);
+ environment.setNamingResources(null);
}
}
@@ -623,8 +623,8 @@
localEjb = (ContextLocalEjb) ejbs.remove(name);
}
if (localEjb != null) {
- localEjb.setNamingResources(null);
support.firePropertyChange("localEjb", localEjb, null);
+ localEjb.setNamingResources(null);
}
}
@@ -656,8 +656,8 @@
resource = (ContextResource) resources.remove(name);
}
if (resource != null) {
- resource.setNamingResources(null);
support.firePropertyChange("resource", resource, null);
+ resource.setNamingResources(null);
}
}
@@ -698,8 +698,8 @@
resourceLink = (ContextResourceLink) resourceLinks.remove(name);
}
if (resourceLink != null) {
- resourceLink.setNamingResources(null);
support.firePropertyChange("resourceLink", resourceLink, null);
+ resourceLink.setNamingResources(null);
}
}
@@ -717,9 +717,9 @@
resourceParameters = (ResourceParams) resourceParams.remove(name);
}
if (resourceParameters != null) {
- resourceParameters.setNamingResources(null);
support.firePropertyChange("resourceParams", resourceParameters,
null);
+ resourceParameters.setNamingResources(null);
}
}
1.30 +11 -11 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.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ServerLifecycleListener.java 18 Jun 2002 03:19:12 -0000 1.29
+++ ServerLifecycleListener.java 19 Jun 2002 21:17:19 -0000 1.30
@@ -1049,7 +1049,13 @@
* @exception Exception if an exception is thrown during MBean destruction
*/
protected void destroyMBeans(Server server) throws Exception {
-
+
+ // Destroy the MBeans for the global NamingResources (if any)
+ NamingResources resources = server.getGlobalNamingResources();
+ if (resources != null) {
+ destroyMBeans(resources);
+ }
+
// Destroy the MBeans for each child Service
Service services[] = server.findServices();
for (int i = 0; i < services.length; i++) {
@@ -1062,12 +1068,6 @@
continue;
}
destroyMBeans(services[i]);
- }
-
- // Destroy the MBeans for the global NamingResources (if any)
- NamingResources resources = server.getGlobalNamingResources();
- if (resources != null) {
- destroyMBeans(resources);
}
// Destroy the MBean for the Server itself
1.62 +7 -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.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- mbeans-descriptors.xml 12 Jun 2002 07:39:23 -0000 1.61
+++ mbeans-descriptors.xml 19 Jun 2002 21:17:19 -0000 1.62
@@ -1606,6 +1606,12 @@
type="java.lang.String[]"
writeable="false"/>
+ <attribute name="resourceLinks"
+ description="MBean Names of all the defined resource link references
+ for this application."
+ type="java.lang.String[]"
+ writeable="false"/>
+
<operation name="addEnvironment"
description="Add an environment entry for this web application"
impact="ACTION"
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>