amyroh 02/05/05 22:56:03
Modified: catalina/src/share/org/apache/catalina/mbeans
NamingResourcesMBean.java
Log:
addEnvironment() and addResource() methods now return the object name
of the newly created mbean.
Revision Changes Path
1.4 +23 -9
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- NamingResourcesMBean.java 4 May 2002 16:10:34 -0000 1.3
+++ NamingResourcesMBean.java 6 May 2002 05:56:03 -0000 1.4
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/NamingResourcesMBean.java,v
1.3 2002/05/04 16:10:34 manveen Exp $
- * $Revision: 1.3 $
- * $Date: 2002/05/04 16:10:34 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/NamingResourcesMBean.java,v
1.4 2002/05/06 05:56:03 amyroh Exp $
+ * $Revision: 1.4 $
+ * $Date: 2002/05/06 05:56:03 $
*
* ====================================================================
*
@@ -83,7 +83,7 @@
* <code>org.apache.catalina.deploy.NamingResources</code> component.</p>
*
* @author Amy Roh
- * @version $Revision: 1.3 $ $Date: 2002/05/04 16:10:34 $
+ * @version $Revision: 1.4 $ $Date: 2002/05/06 05:56:03 $
*/
public class NamingResourcesMBean extends BaseModelMBean {
@@ -181,11 +181,12 @@
*
* @param envName New environment entry name
*/
- public void addEnvironment(String envName, String type) {
+ public String addEnvironment(String envName, String type)
+ throws MalformedObjectNameException {
NamingResources nresources = (NamingResources) this.resource;
if (nresources == null) {
- return;
+ return null;
}
ContextEnvironment env = nresources.findEnvironment(envName);
if (env != null) {
@@ -197,6 +198,13 @@
env.setType(type);
nresources.addEnvironment(env);
// FIXME add to the javax.naming.directory.DirContext
+
+ // Return the corresponding MBean name
+ ManagedBean managed = registry.findManagedBean("ContextEnvironment");
+ ObjectName oname =
+ MBeanUtils.createObjectName(managed.getDomain(), env);
+ return (oname.toString());
+
}
@@ -205,11 +213,12 @@
*
* @param resourceName New resource reference name
*/
- public void addResource(String resourceName, String type) {
+ public String addResource(String resourceName, String type)
+ throws MalformedObjectNameException {
NamingResources nresources = (NamingResources) this.resource;
if (nresources == null) {
- return;
+ return null;
}
ContextResource resource = nresources.findResource(resourceName);
if (resource != null) {
@@ -221,7 +230,12 @@
resource.setType(type);
nresources.addResource(resource);
// FIXME
-
+
+ // Return the corresponding MBean name
+ ManagedBean managed = registry.findManagedBean("ContextResource");
+ ObjectName oname =
+ MBeanUtils.createObjectName(managed.getDomain(), resource);
+ return (oname.toString());
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
