[Jboss-cvs] JBossAS SVN: r55219 - branches/MC_VDF_WORK/system/src/main/org/jboss/system/server

[jboss-cvs-commits at lists.jboss.org]

Author: scott.stark at jboss.org
Date: 2006-08-04 13:29:21 -0400 (Fri, 04 Aug 2006)
New Revision: 55219

Modified:
   branches/MC_VDF_WORK/system/src/main/org/jboss/system/server/ServerConfigImplMBean.java
   branches/MC_VDF_WORK/system/src/main/org/jboss/system/server/ServerInfo.java
   branches/MC_VDF_WORK/system/src/main/org/jboss/system/server/ServerInfoMBean.java
Log:
Cleanup the jmx util usage

Modified: branches/MC_VDF_WORK/system/src/main/org/jboss/system/server/ServerConfigImplMBean.java
===================================================================
--- branches/MC_VDF_WORK/system/src/main/org/jboss/system/server/ServerConfigImplMBean.java	2006-08-04 17:24:23 UTC (rev 55218)
+++ branches/MC_VDF_WORK/system/src/main/org/jboss/system/server/ServerConfigImplMBean.java	2006-08-04 17:29:21 UTC (rev 55219)
@@ -26,16 +26,13 @@
 
 import javax.management.ObjectName;
 
-import org.jboss.mx.util.ObjectNameFactory;
-
 /**
  * MBean interface.
  */
 public interface ServerConfigImplMBean
 {
    /** Default ObjectName */
-   static final ObjectName OBJECT_NAME =
-      ObjectNameFactory.create("jboss.system:type=ServerConfig");
+   static final String OBJECT_NAME_STR = "jboss.system:type=ServerConfig";
 
    /**
     * Get the local home directory which the server is running from.

Modified: branches/MC_VDF_WORK/system/src/main/org/jboss/system/server/ServerInfo.java
===================================================================
--- branches/MC_VDF_WORK/system/src/main/org/jboss/system/server/ServerInfo.java	2006-08-04 17:24:23 UTC (rev 55218)
+++ branches/MC_VDF_WORK/system/src/main/org/jboss/system/server/ServerInfo.java	2006-08-04 17:29:21 UTC (rev 55219)
@@ -183,7 +183,7 @@
          }
       }
       
-      return name == null ? OBJECT_NAME : name;
+      return name == null ? new ObjectName(OBJECT_NAME_STR) : name;
    }
    
    public void postRegister(Boolean registrationDone)

Modified: branches/MC_VDF_WORK/system/src/main/org/jboss/system/server/ServerInfoMBean.java
===================================================================
--- branches/MC_VDF_WORK/system/src/main/org/jboss/system/server/ServerInfoMBean.java	2006-08-04 17:24:23 UTC (rev 55218)
+++ branches/MC_VDF_WORK/system/src/main/org/jboss/system/server/ServerInfoMBean.java	2006-08-04 17:29:21 UTC (rev 55219)
@@ -23,8 +23,6 @@
 
 import javax.management.ObjectName;
 
-import org.jboss.mx.util.ObjectNameFactory;
-
 /**
  * ServerInfo MBean interface.
  * 
@@ -33,7 +31,7 @@
 public interface ServerInfoMBean
 {
    /** The default ObjectName */
-   ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.system:type=ServerInfo");
+   final String OBJECT_NAME_STR = "jboss.system:type=ServerInfo";
 
    // Attributes ----------------------------------------------------