Downgrade to DynamicMBeans in method signatures - there is no need to use Model here,

the mbean server doesn't care.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@407672 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/mbeans/MBeanUtils.java b/java/org/apache/catalina/mbeans/MBeanUtils.java
index 3f142f0..62db997 100644 (file)
--- a/java/org/apache/catalina/mbeans/MBeanUtils.java
+++ b/java/org/apache/catalina/mbeans/MBeanUtils.java
@@ -19,6 +19,7 @@ package org.apache.catalina.mbeans;
 \r
 import java.util.Hashtable;\r
 \r
+import javax.management.DynamicMBean;\r
 import javax.management.MBeanException;\r
 import javax.management.MBeanServer;\r
 import javax.management.MalformedObjectNameException;\r
@@ -139,7 +140,7 @@ public class MBeanUtils {
      *\r
      * @exception Exception if an MBean cannot be created or registered\r
      */\r
-    static ModelMBean createMBean(Connector connector)\r
+    static DynamicMBean createMBean(Connector connector)\r
         throws Exception {\r
 \r
         String mname = createManagedName(connector);\r
@@ -151,7 +152,7 @@ public class MBeanUtils {
         String domain = managed.getDomain();\r
         if (domain == null)\r
             domain = mserver.getDefaultDomain();\r
-        ModelMBean mbean = managed.createMBean(connector);\r
+        DynamicMBean mbean = managed.createMBean(connector);\r
         ObjectName oname = createObjectName(domain, connector);\r
         if( mserver.isRegistered( oname ))  {\r
             mserver.unregisterMBean(oname);\r
@@ -170,7 +171,7 @@ public class MBeanUtils {
      *\r
      * @exception Exception if an MBean cannot be created or registered\r
      */\r
-    static ModelMBean createMBean(Context context)\r
+    static DynamicMBean createMBean(Context context)\r
         throws Exception {\r
 \r
         String mname = createManagedName(context);\r
@@ -182,7 +183,7 @@ public class MBeanUtils {
         String domain = managed.getDomain();\r
         if (domain == null)\r
             domain = mserver.getDefaultDomain();\r
-        ModelMBean mbean = managed.createMBean(context);\r
+        DynamicMBean mbean = managed.createMBean(context);\r
         ObjectName oname = createObjectName(domain, context);\r
         if( mserver.isRegistered(oname)) {\r
             log.debug("Already registered " + oname);\r
@@ -202,7 +203,7 @@ public class MBeanUtils {
      *\r
      * @exception Exception if an MBean cannot be created or registered\r
      */\r
-    static ModelMBean createMBean(ContextEnvironment environment)\r
+    static DynamicMBean createMBean(ContextEnvironment environment)\r
         throws Exception {\r
 \r
         String mname = createManagedName(environment);\r
@@ -214,7 +215,7 @@ public class MBeanUtils {
         String domain = managed.getDomain();\r
         if (domain == null)\r
             domain = mserver.getDefaultDomain();\r
-        ModelMBean mbean = managed.createMBean(environment);\r
+        DynamicMBean mbean = managed.createMBean(environment);\r
         ObjectName oname = createObjectName(domain, environment);\r
         if( mserver.isRegistered( oname ))  {\r
             mserver.unregisterMBean(oname);\r
@@ -233,7 +234,7 @@ public class MBeanUtils {
      *\r
      * @exception Exception if an MBean cannot be created or registered\r
      */\r
-    static ModelMBean createMBean(ContextResource resource)\r
+    static DynamicMBean createMBean(ContextResource resource)\r
         throws Exception {\r
 \r
         String mname = createManagedName(resource);\r
@@ -245,7 +246,7 @@ public class MBeanUtils {
         String domain = managed.getDomain();\r
         if (domain == null)\r
             domain = mserver.getDefaultDomain();\r
-        ModelMBean mbean = managed.createMBean(resource);\r
+        DynamicMBean mbean = managed.createMBean(resource);\r
         ObjectName oname = createObjectName(domain, resource);\r
         if( mserver.isRegistered( oname ))  {\r
             mserver.unregisterMBean(oname);\r
@@ -264,7 +265,7 @@ public class MBeanUtils {
      *\r
      * @exception Exception if an MBean cannot be created or registered\r
      */\r
-    static ModelMBean createMBean(ContextResourceLink resourceLink)\r
+    static DynamicMBean createMBean(ContextResourceLink resourceLink)\r
         throws Exception {\r
 \r
         String mname = createManagedName(resourceLink);\r
@@ -276,7 +277,7 @@ public class MBeanUtils {
         String domain = managed.getDomain();\r
         if (domain == null)\r
             domain = mserver.getDefaultDomain();\r
-        ModelMBean mbean = managed.createMBean(resourceLink);\r
+        DynamicMBean mbean = managed.createMBean(resourceLink);\r
         ObjectName oname = createObjectName(domain, resourceLink);\r
         if( mserver.isRegistered( oname ))  {\r
             mserver.unregisterMBean(oname);\r
@@ -294,7 +295,7 @@ public class MBeanUtils {
      *\r
      * @exception Exception if an MBean cannot be created or registered\r
      */\r
-    static ModelMBean createMBean(Engine engine)\r
+    static DynamicMBean createMBean(Engine engine)\r
         throws Exception {\r
 \r
         String mname = createManagedName(engine);\r
@@ -306,7 +307,7 @@ public class MBeanUtils {
         String domain = managed.getDomain();\r
         if (domain == null)\r
             domain = mserver.getDefaultDomain();\r
-        ModelMBean mbean = managed.createMBean(engine);\r
+        DynamicMBean mbean = managed.createMBean(engine);\r
         ObjectName oname = createObjectName(domain, engine);\r
         if( mserver.isRegistered( oname ))  {\r
             mserver.unregisterMBean(oname);\r
@@ -325,7 +326,7 @@ public class MBeanUtils {
      *\r
      * @exception Exception if an MBean cannot be created or registered\r
      */\r
-    static ModelMBean createMBean(Group group)\r
+    static DynamicMBean createMBean(Group group)\r
         throws Exception {\r
 \r
         String mname = createManagedName(group);\r
@@ -337,7 +338,7 @@ public class MBeanUtils {
         String domain = managed.getDomain();\r
         if (domain == null)\r
             domain = mserver.getDefaultDomain();\r
-        ModelMBean mbean = managed.createMBean(group);\r
+        DynamicMBean mbean = managed.createMBean(group);\r
         ObjectName oname = createObjectName(domain, group);\r
         if( mserver.isRegistered( oname ))  {\r
             mserver.unregisterMBean(oname);\r
@@ -356,7 +357,7 @@ public class MBeanUtils {
      *\r
      * @exception Exception if an MBean cannot be created or registered\r
      */\r
-    static ModelMBean createMBean(Host host)\r
+    static DynamicMBean createMBean(Host host)\r
         throws Exception {\r
 \r
         String mname = createManagedName(host);\r
@@ -368,7 +369,7 @@ public class MBeanUtils {
         String domain = managed.getDomain();\r
         if (domain == null)\r
             domain = mserver.getDefaultDomain();\r
-        ModelMBean mbean = managed.createMBean(host);\r
+        DynamicMBean mbean = managed.createMBean(host);\r
         ObjectName oname = createObjectName(domain, host);\r
         if( mserver.isRegistered( oname ))  {\r
             mserver.unregisterMBean(oname);\r
@@ -387,7 +388,7 @@ public class MBeanUtils {
      *\r
      * @exception Exception if an MBean cannot be created or registered\r
      */\r
-    static ModelMBean createMBean(Loader loader)\r
+    static DynamicMBean createMBean(Loader loader)\r
         throws Exception {\r
 \r
         String mname = createManagedName(loader);\r
@@ -399,7 +400,7 @@ public class MBeanUtils {
         String domain = managed.getDomain();\r
         if (domain == null)\r
             domain = mserver.getDefaultDomain();\r
-        ModelMBean mbean = managed.createMBean(loader);\r
+        DynamicMBean mbean = managed.createMBean(loader);\r
         ObjectName oname = createObjectName(domain, loader);\r
         if( mserver.isRegistered( oname ))  {\r
             // side effect: stop it\r
@@ -418,7 +419,7 @@ public class MBeanUtils {
      *\r
      * @exception Exception if an MBean cannot be created or registered\r
      */\r
-    static ModelMBean createMBean(Manager manager)\r
+    static DynamicMBean createMBean(Manager manager)\r
         throws Exception {\r
 \r
         String mname = createManagedName(manager);\r
@@ -430,7 +431,7 @@ public class MBeanUtils {
         String domain = managed.getDomain();\r
         if (domain == null)\r
             domain = mserver.getDefaultDomain();\r
-        ModelMBean mbean = managed.createMBean(manager);\r
+        DynamicMBean mbean = managed.createMBean(manager);\r
         ObjectName oname = createObjectName(domain, manager);\r
         if( mserver.isRegistered( oname ))  {\r
             mserver.unregisterMBean(oname);\r
@@ -449,7 +450,7 @@ public class MBeanUtils {
      *\r
      * @exception Exception if an MBean cannot be created or registered\r
      */\r
-    static ModelMBean createMBean(MBeanFactory factory)\r
+    static DynamicMBean createMBean(MBeanFactory factory)\r
         throws Exception {\r
 \r
         String mname = createManagedName(factory);\r
@@ -461,7 +462,7 @@ public class MBeanUtils {
         String domain = managed.getDomain();\r
         if (domain == null)\r
             domain = mserver.getDefaultDomain();\r
-        ModelMBean mbean = managed.createMBean(factory);\r
+        DynamicMBean mbean = managed.createMBean(factory);\r
         ObjectName oname = createObjectName(domain, factory);\r
         if( mserver.isRegistered(oname )) {\r
             mserver.unregisterMBean(oname);\r
@@ -480,7 +481,7 @@ public class MBeanUtils {
      *\r
      * @exception Exception if an MBean cannot be created or registered\r
      */\r
-    static ModelMBean createMBean(NamingResources resource)\r
+    static DynamicMBean createMBean(NamingResources resource)\r
         throws Exception {\r
 \r
         String mname = createManagedName(resource);\r
@@ -492,7 +493,7 @@ public class MBeanUtils {
         String domain = managed.getDomain();\r
         if (domain == null)\r
             domain = mserver.getDefaultDomain();\r
-        ModelMBean mbean = managed.createMBean(resource);\r
+        DynamicMBean mbean = managed.createMBean(resource);\r
         ObjectName oname = createObjectName(domain, resource);\r
         if( mserver.isRegistered( oname ))  {\r
             mserver.unregisterMBean(oname);\r
@@ -511,7 +512,7 @@ public class MBeanUtils {
      *\r
      * @exception Exception if an MBean cannot be created or registered\r
      */\r
-    static ModelMBean createMBean(Realm realm)\r
+    static DynamicMBean createMBean(Realm realm)\r
         throws Exception {\r
 \r
         String mname = createManagedName(realm);\r
@@ -523,7 +524,7 @@ public class MBeanUtils {
         String domain = managed.getDomain();\r
         if (domain == null)\r
             domain = mserver.getDefaultDomain();\r
-        ModelMBean mbean = managed.createMBean(realm);\r
+        DynamicMBean mbean = managed.createMBean(realm);\r
         ObjectName oname = createObjectName(domain, realm);\r
         if( mserver.isRegistered( oname ))  {\r
             mserver.unregisterMBean(oname);\r
@@ -542,7 +543,7 @@ public class MBeanUtils {
      *\r
      * @exception Exception if an MBean cannot be created or registered\r
      */\r
-    static ModelMBean createMBean(Role role)\r
+    static DynamicMBean createMBean(Role role)\r
         throws Exception {\r
 \r
         String mname = createManagedName(role);\r
@@ -554,7 +555,7 @@ public class MBeanUtils {
         String domain = managed.getDomain();\r
         if (domain == null)\r
             domain = mserver.getDefaultDomain();\r
-        ModelMBean mbean = managed.createMBean(role);\r
+        DynamicMBean mbean = managed.createMBean(role);\r
         ObjectName oname = createObjectName(domain, role);\r
         if( mserver.isRegistered( oname ))  {\r
             mserver.unregisterMBean(oname);\r
@@ -573,7 +574,7 @@ public class MBeanUtils {
      *\r
      * @exception Exception if an MBean cannot be created or registered\r
      */\r
-    static ModelMBean createMBean(Server server)\r
+    static DynamicMBean createMBean(Server server)\r
         throws Exception {\r
 \r
         String mname = createManagedName(server);\r
@@ -585,7 +586,7 @@ public class MBeanUtils {
         String domain = managed.getDomain();\r
         if (domain == null)\r
             domain = mserver.getDefaultDomain();\r
-        ModelMBean mbean = managed.createMBean(server);\r
+        DynamicMBean mbean = managed.createMBean(server);\r
         ObjectName oname = createObjectName(domain, server);\r
         if( mserver.isRegistered( oname ))  {\r
             mserver.unregisterMBean(oname);\r
@@ -604,7 +605,7 @@ public class MBeanUtils {
      *\r
      * @exception Exception if an MBean cannot be created or registered\r
      */\r
-    static ModelMBean createMBean(Service service)\r
+    static DynamicMBean createMBean(Service service)\r
         throws Exception {\r
 \r
         String mname = createManagedName(service);\r
@@ -616,7 +617,7 @@ public class MBeanUtils {
         String domain = managed.getDomain();\r
         if (domain == null)\r
             domain = mserver.getDefaultDomain();\r
-        ModelMBean mbean = managed.createMBean(service);\r
+        DynamicMBean mbean = managed.createMBean(service);\r
         ObjectName oname = createObjectName(domain, service);\r
         if( mserver.isRegistered( oname ))  {\r
             mserver.unregisterMBean(oname);\r
@@ -635,7 +636,7 @@ public class MBeanUtils {
      *\r
      * @exception Exception if an MBean cannot be created or registered\r
      */\r
-    static ModelMBean createMBean(User user)\r
+    static DynamicMBean createMBean(User user)\r
         throws Exception {\r
 \r
         String mname = createManagedName(user);\r
@@ -647,7 +648,7 @@ public class MBeanUtils {
         String domain = managed.getDomain();\r
         if (domain == null)\r
             domain = mserver.getDefaultDomain();\r
-        ModelMBean mbean = managed.createMBean(user);\r
+        DynamicMBean mbean = managed.createMBean(user);\r
         ObjectName oname = createObjectName(domain, user);\r
         if( mserver.isRegistered( oname ))  {\r
             mserver.unregisterMBean(oname);\r
@@ -666,7 +667,7 @@ public class MBeanUtils {
      *\r
      * @exception Exception if an MBean cannot be created or registered\r
      */\r
-    static ModelMBean createMBean(UserDatabase userDatabase)\r
+    static DynamicMBean createMBean(UserDatabase userDatabase)\r
         throws Exception {\r
 \r
         String mname = createManagedName(userDatabase);\r
@@ -678,7 +679,7 @@ public class MBeanUtils {
         String domain = managed.getDomain();\r
         if (domain == null)\r
             domain = mserver.getDefaultDomain();\r
-        ModelMBean mbean = managed.createMBean(userDatabase);\r
+        DynamicMBean mbean = managed.createMBean(userDatabase);\r
         ObjectName oname = createObjectName(domain, userDatabase);\r
         if( mserver.isRegistered( oname ))  {\r
             mserver.unregisterMBean(oname);\r
@@ -697,7 +698,7 @@ public class MBeanUtils {
      *\r
      * @exception Exception if an MBean cannot be created or registered\r
      */\r
-    static ModelMBean createMBean(Valve valve)\r
+    static DynamicMBean createMBean(Valve valve)\r
         throws Exception {\r
 \r
         String mname = createManagedName(valve);\r
@@ -709,7 +710,7 @@ public class MBeanUtils {
         String domain = managed.getDomain();\r
         if (domain == null)\r
             domain = mserver.getDefaultDomain();\r
-        ModelMBean mbean = managed.createMBean(valve);\r
+        DynamicMBean mbean = managed.createMBean(valve);\r
         ObjectName oname = createObjectName(domain, valve);\r
         if( mserver.isRegistered( oname ))  {\r
             mserver.unregisterMBean(oname);\r
@@ -1377,7 +1378,7 @@ public class MBeanUtils {
     /**\r
      * Create and configure (if necessary) and return the\r
      * <code>MBeanServer</code> with which we will be\r
-     * registering our <code>ModelMBean</code> implementations.\r
+     * registering our <code>DynamicMBean</code> implementations.\r
      */\r
     public synchronized static MBeanServer createServer() {\r
 \r