[jBoss-Dev] CVS update: jboss/src/main/org/jboss/loggingConsoleLoggingMBean.java ConsoleLogging.java

[jBoss CVS Development]

  User: oberg   
  Date: 00/11/07 04:27:45

  Modified:    src/main/org/jboss/logging ConsoleLoggingMBean.java
                        ConsoleLogging.java
  Log:
  Now uses ServiceMBeanSupport
  User can specify JMX ObjectName, but has decent default
  
  Revision  Changes    Path
  1.2       +2 -1      jboss/src/main/org/jboss/logging/ConsoleLoggingMBean.java
  
  Index: ConsoleLoggingMBean.java
  ===================================================================
  RCS file: 
/products/cvs/ejboss/jboss/src/main/org/jboss/logging/ConsoleLoggingMBean.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ConsoleLoggingMBean.java  2000/04/22 14:30:13     1.1
  +++ ConsoleLoggingMBean.java  2000/11/07 12:27:45     1.2
  @@ -10,11 +10,12 @@
    *      
    *   @see <related>
    *   @author Rickard �berg ([EMAIL PROTECTED])
  - *   @version $Revision: 1.1 $
  + *   @version $Revision: 1.2 $
    */
   public interface ConsoleLoggingMBean
   {
      // Constants -----------------------------------------------------
  +   public static final String OBJECT_NAME = ":service=Logging,type=Console";
       
      // Public --------------------------------------------------------
      public void setFormat(String format);
  
  
  
  1.4       +22 -19    jboss/src/main/org/jboss/logging/ConsoleLogging.java
  
  Index: ConsoleLogging.java
  ===================================================================
  RCS file: /products/cvs/ejboss/jboss/src/main/org/jboss/logging/ConsoleLogging.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ConsoleLogging.java       2000/10/03 12:13:13     1.3
  +++ ConsoleLogging.java       2000/11/07 12:27:45     1.4
  @@ -15,17 +15,19 @@
   import java.util.TreeSet;
   import javax.management.*;
   
  +import org.jboss.util.ServiceMBeanSupport;
  +
   /**
    *      
    *   @see <related>
    *   @author Rickard �berg ([EMAIL PROTECTED])
  - *   @version $Revision: 1.3 $
  + *   @version $Revision: 1.4 $
    */
   public class ConsoleLogging
  +   extends ServiceMBeanSupport
      implements ConsoleLoggingMBean, MBeanRegistration, NotificationListener
   {
      // Constants -----------------------------------------------------
  -   public static final String OBJECT_NAME = 
"DefaultDomain:service=Logging,type=Console";
       
      // Attributes ----------------------------------------------------
      PrintStream out, err;
  @@ -38,6 +40,9 @@
      
      String filter = "Information,Debug,Warning,Error";
      
  +   ObjectName name;
  +   MBeanServer server;
  +   
      // Static --------------------------------------------------------
   
      // Constructors --------------------------------------------------
  @@ -69,10 +74,22 @@
         else         
            out.println(msgFmt.format(args));
      }
  +   
  +   // Service implementation ------------------------------
  +   public ObjectName getObjectName(MBeanServer server, ObjectName name)
  +      throws javax.management.MalformedObjectNameException
  +   {
  +      this.server = server;
  +      return name == null ? new ObjectName(OBJECT_NAME) : name;
  +   }
  +   
  +   public String getName()
  +   {
  +      return "Console logging";
  +   }
      
  -   // MBeanRegistration implementation ------------------------------
  -   public ObjectName preRegister(MBeanServer server, ObjectName name)
  -      throws java.lang.Exception
  +   public void initService()
  +      throws Exception
      {
         out = System.out;
         err = System.err;
  @@ -88,20 +105,6 @@
         LogStream errLog = new LogStream("Error");
         System.setOut(outLog);
         System.setErr(errLog);
  -      
  -      log.log("Logging started");
  -      
  -      return new ObjectName(OBJECT_NAME);
      }
  -   
  -   public void postRegister(java.lang.Boolean registrationDone) 
  -   {
  -   }
  -   
  -   public void preDeregister()
  -      throws java.lang.Exception 
  -   {}
  -   
  -   public void postDeregister() {}
   }