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/18 05:19:12 UTC
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans ContextResourceMBean.java NamingResourcesMBean.java ServerLifecycleListener.java
amyroh 2002/06/17 20:19:12
Modified: catalina/src/share/org/apache/catalina/mbeans
ContextResourceMBean.java NamingResourcesMBean.java
ServerLifecycleListener.java
Log:
Add to handle Resource Link property change.
Revision Changes Path
1.7 +5 -5 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ContextResourceMBean.java
Index: ContextResourceMBean.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ContextResourceMBean.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ContextResourceMBean.java 8 Jun 2002 07:25:10 -0000 1.6
+++ ContextResourceMBean.java 18 Jun 2002 03:19:12 -0000 1.7
@@ -174,7 +174,7 @@
value = (String) rp.getParameters().get(name);
if (value == null) {
throw new AttributeNotFoundException
- ("Cannot find attribute "+cr.getName());
+ ("Cannot find attribute "+name+rp);
}
}
1.8 +8 -6 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/NamingResourcesMBean.java
Index: NamingResourcesMBean.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/NamingResourcesMBean.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- NamingResourcesMBean.java 12 Jun 2002 07:39:23 -0000 1.7
+++ NamingResourcesMBean.java 18 Jun 2002 03:19:12 -0000 1.8
@@ -266,8 +266,8 @@
*
* @param resourceLinkName New resource link reference name
*/
- public String addResourceLink(String resourceLinkName, String type)
- throws MalformedObjectNameException {
+ public String addResourceLink(String resourceLinkName, String type,
+ String global) throws MalformedObjectNameException {
NamingResources nresources = (NamingResources) this.resource;
if (nresources == null) {
@@ -283,6 +283,7 @@
resourceLink = new ContextResourceLink();
resourceLink.setName(resourceLinkName);
resourceLink.setType(type);
+ resourceLink.setGlobal(global);
nresources.addResourceLink(resourceLink);
// Return the corresponding MBean name
@@ -291,6 +292,7 @@
MBeanUtils.createObjectName(managed.getDomain(), resourceLink);
return (oname.toString());
}
+
/**
* Remove any environment entry with the specified name.
1.29 +11 -4 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.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ServerLifecycleListener.java 14 Jun 2002 13:29:49 -0000 1.28
+++ ServerLifecycleListener.java 18 Jun 2002 03:19:12 -0000 1.29
@@ -1411,6 +1411,13 @@
if (newValue != null) {
createMBeans((ContextResource) newValue);
}
+ } else if ("resourceLink".equals(propertyName)) {
+ if (oldValue != null) {
+ destroyMBeans((ContextResourceLink) oldValue);
+ }
+ if (newValue != null) {
+ createMBeans((ContextResourceLink) newValue);
+ }
}
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>