User: user57  
  Date: 02/02/12 20:22:31

  Modified:    src/main/org/jboss/system ServerMBean.java InfoMBean.java
                        ServiceControllerMBean.java
                        ServiceLibrariesMBean.java ServerConfigMBean.java
  Log:
   o renamed SafeObjectNameFactory -> ObjectNameFactory
   o updated existing users of SafeObjectNameFactory to use new name
   o converted a few more
  
  Revision  Changes    Path
  1.7       +9 -2      jboss/src/main/org/jboss/system/ServerMBean.java
  
  Index: ServerMBean.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/system/ServerMBean.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ServerMBean.java  11 Feb 2002 23:01:37 -0000      1.6
  +++ ServerMBean.java  13 Feb 2002 04:22:31 -0000      1.7
  @@ -7,17 +7,24 @@
   
   package org.jboss.system;
   
  -import java.util.Map;
   import java.util.Date;
   
  +import javax.management.ObjectName;
  +
  +import org.jboss.util.ObjectNameFactory;
  +
   /**
    * The JMX MBean interface for the <tt>Server</tt> component.
    *      
    * @author <a href="mailto:[EMAIL PROTECTED]";>Jason Dillon</a>
  - * @version $Revision: 1.6 $
  + * @version $Revision: 1.7 $
    */
   public interface ServerMBean
   {
  +   /** The default JMX object name for this MBean. */
  +   ObjectName OBJECT_NAME =
  +      ObjectNameFactory.create("jboss.system", "service", "Server");
  +   
      //
      // Should eventually expose init, start & stop to allow admin clients
      // to manage the state of the server dynamically.
  
  
  
  1.6       +27 -9     jboss/src/main/org/jboss/system/InfoMBean.java
  
  Index: InfoMBean.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/system/InfoMBean.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- InfoMBean.java    10 Feb 2002 02:50:00 -0000      1.5
  +++ InfoMBean.java    13 Feb 2002 04:22:31 -0000      1.6
  @@ -9,6 +9,10 @@
   
   import java.util.Map;
   
  +import javax.management.ObjectName;
  +
  +import org.jboss.util.ObjectNameFactory;
  +
   /**
    * The management interface for the Info bean.
    *      
  @@ -16,28 +20,42 @@
    * @author <a href="mailto:[EMAIL PROTECTED]";>Hiram Chirino</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Jason Dillon</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Marc Fleury</a>
  - * @version $Revision: 1.5 $
  + * @version $Revision: 1.6 $
    */
   public interface InfoMBean
   {
  -   String OBJECT_NAME = ":service=Info";
  +   /** The default JMX object name for this MBean. */
  +   ObjectName OBJECT_NAME =
  +      ObjectNameFactory.create("jboss.system", "service", "Info");
   
  -   /** InetAddress.getLocalHost().getHostName();
  +   /**
  +    * InetAddress.getLocalHost().getHostName();
       */
      String getHostName();
  -   /** Returns InetAddress.getLocalHost().getHostAddress();
  +   
  +   /**
  +    * Returns InetAddress.getLocalHost().getHostAddress();
       */
      String getHostAddress();
  -   /** Return the total memory and free memory from Runtime
  +   
  +   /**
  +    * Return the total memory and free memory from Runtime
       */
      String listMemoryUsage();
  -   /** Return a listing of the active threads and thread groups.
  +   
  +   /**
  +    * Return a listing of the active threads and thread groups.
       */
      String listThreadDump();
  -   /** Display the java.lang.Package info for the pkgName */
  +   
  +   /**
  +    * Display the java.lang.Package info for the pkgName
  +    */
      String displayPackageInfo(String pkgName);
  -   /** Return a Map of System.getProperties() with a toString implementation
  -    *that provides an html table of the key/value pairs
  +   
  +   /**
  +    * Return a Map of System.getProperties() with a toString implementation
  +    * that provides an html table of the key/value pairs
       */
      Map showProperties();   
   }
  
  
  
  1.10      +6 -5      jboss/src/main/org/jboss/system/ServiceControllerMBean.java
  
  Index: ServiceControllerMBean.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/jboss/src/main/org/jboss/system/ServiceControllerMBean.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ServiceControllerMBean.java       12 Feb 2002 06:59:23 -0000      1.9
  +++ ServiceControllerMBean.java       13 Feb 2002 04:22:31 -0000      1.10
  @@ -12,7 +12,7 @@
   import org.w3c.dom.Element;
   import org.w3c.dom.NodeList;
   
  -import org.jboss.util.SafeObjectNameFactory;
  +import org.jboss.util.ObjectNameFactory;
   
   /** 
    * This is the main Service Controller API.
  @@ -23,7 +23,7 @@
    * @see Service
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>Marc Fleury</a>
  - * @version $Revision: 1.9 $
  + * @version $Revision: 1.10 $
    *
    * <p><b>20010830 marc fleury:</b>
    * <ul>
  @@ -39,9 +39,10 @@
   public interface ServiceControllerMBean
   {
      /** The default object name. */
  -   ObjectName OBJECT_NAME = SafeObjectNameFactory.create("jboss.system", 
  -                                                         "service", 
  -                                                         "ServiceController");
  +   ObjectName OBJECT_NAME =
  +      ObjectNameFactory.create("jboss.system", 
  +                               "service", 
  +                               "ServiceController");
   
      /** Install a service, create the MBean and configure it**/
      ObjectName install(Element mbean) throws Exception;
  
  
  
  1.5       +11 -5     jboss/src/main/org/jboss/system/ServiceLibrariesMBean.java
  
  Index: ServiceLibrariesMBean.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/system/ServiceLibrariesMBean.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ServiceLibrariesMBean.java        11 Feb 2002 22:44:03 -0000      1.4
  +++ ServiceLibrariesMBean.java        13 Feb 2002 04:22:31 -0000      1.5
  @@ -8,13 +8,17 @@
   
   import java.net.URL;
   
  +import javax.management.ObjectName;
  +
  +import org.jboss.util.ObjectNameFactory;
  +
   /**
    * The management interface for the {@link ServiceLibraries} MBean.
    *
    * @see ServiceLibraries
    * 
    * @author  <a href="mailto:[EMAIL PROTECTED]";>Marc Fleury</a>
  - * @version $Revision: 1.4 $
  + * @version $Revision: 1.5 $
    *
    * <p><b>Revisions:</b>
    * <p><b>2001/06/22 , marcf</b>:
  @@ -24,15 +28,17 @@
    */
   public interface ServiceLibrariesMBean
   {
  -   String OBJECT_NAME = "jboss.system:service=Libraries";
  +   ObjectName OBJECT_NAME =
  +      ObjectNameFactory.create("jboss.system", "service", "Libraries");
   
      // The ServicesLibraries MBean should expose "soft" information like
      // the dependencies graph
      // for example give a URL and find out what MBean need to be restarted
      // in case you cycle that URL
   
  -   /** Obtain a listing of the URL for all UnifiedClassLoaders associated with
  -    *the ServiceLibraries
  +   /**
  +    * Obtain a listing of the URL for all UnifiedClassLoaders associated with
  +    * the ServiceLibraries
       */
  -   public URL[] getURLs();
  +   URL[] getURLs();
   }
  
  
  
  1.4       +9 -14     jboss/src/main/org/jboss/system/ServerConfigMBean.java
  
  Index: ServerConfigMBean.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/system/ServerConfigMBean.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ServerConfigMBean.java    12 Feb 2002 06:59:23 -0000      1.3
  +++ ServerConfigMBean.java    13 Feb 2002 04:22:31 -0000      1.4
  @@ -13,26 +13,21 @@
   
   import javax.management.ObjectName;
   
  -import org.jboss.util.SafeObjectNameFactory;
  +import org.jboss.util.ObjectNameFactory;
   
   /**
    * The JMX MBean interface for the <tt>ServerConfig</tt> component.
    *      
    * @author <a href="mailto:[EMAIL PROTECTED]";>Jason Dillon</a>
  - * @version $Revision: 1.3 $
  + * @version $Revision: 1.4 $
    */
   public interface ServerConfigMBean
   {
      /** The default object name. */
  -   ObjectName OBJECT_NAME = SafeObjectNameFactory.create("jboss.system", 
  -                                                         "service", 
  -                                                         "ServerConfig");
  -   /**
  -    * Get the JMX domain for which the system is bound under.
  -    *
  -    * @return    JMX domain name.
  -    */
  -   String getDomain();
  +   ObjectName OBJECT_NAME =
  +      ObjectNameFactory.create("jboss.system", 
  +                               "service", 
  +                               "ServerConfig");
   
      /**
       * Get the configuration name of the server.
  @@ -56,11 +51,11 @@
      File getTempDir();
   
      /**
  -    * Get the directory where local state data will be stored.
  +    * Get the directory where local data will be stored.
       *
  -    * @return    The directory where the server stores local state data.
  +    * @return    The directory where the server stores local data.
       */
  -   File getStateDataDir();
  +   File getDataDir();
      
      /**
       * Get the installation URL for the server.
  
  
  

_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development

Reply via email to