[jBoss-Dev] CVS update: jboss/src/main/org/jboss/utilClassPathExtension.java ServiceMBean.java ServiceMBeanSupport.java

[jBoss CVS Development]

  User: oberg   
  Date: 00/06/16 06:10:33

  Modified:    src/main/org/jboss/util ClassPathExtension.java
                        ServiceMBean.java ServiceMBeanSupport.java
  Log:
  Added configuration service
  Changed interceptors to be messagebased
  Added mini webserver
  Changed server bootstrap process
  
  Revision  Changes    Path
  1.3       +2 -2      jboss/src/main/org/jboss/util/ClassPathExtension.java
  
  Index: ClassPathExtension.java
  ===================================================================
  RCS file: 
/products/cvs/ejboss/jboss/src/main/org/jboss/util/ClassPathExtension.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ClassPathExtension.java   2000/05/19 07:12:01     1.2
  +++ ClassPathExtension.java   2000/06/16 13:10:32     1.3
  @@ -19,7 +19,7 @@
    *      
    *   @see <related>
    *   @author Rickard �berg ([EMAIL PROTECTED])
  - *   @version $Revision: 1.2 $
  + *   @version $Revision: 1.3 $
    */
   public class ClassPathExtension
      implements ClassPathExtensionMBean, MBeanRegistration
  @@ -107,7 +107,7 @@
            }
         }
         
  -      return new ObjectName(OBJECT_NAME);
  +      return new ObjectName(OBJECT_NAME+",url="+url);
      }
      
      public void postRegister(java.lang.Boolean registrationDone)
  
  
  
  1.2       +2 -6      jboss/src/main/org/jboss/util/ServiceMBean.java
  
  Index: ServiceMBean.java
  ===================================================================
  RCS file: /products/cvs/ejboss/jboss/src/main/org/jboss/util/ServiceMBean.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ServiceMBean.java 2000/04/22 14:30:13     1.1
  +++ ServiceMBean.java 2000/06/16 13:10:32     1.2
  @@ -11,9 +11,10 @@
    *      
    *   @see <related>
    *   @author Rickard �berg ([EMAIL PROTECTED])
  - *   @version $Revision: 1.1 $
  + *   @version $Revision: 1.2 $
    */
   public interface ServiceMBean
  +     extends Service
   {
      // Constants -----------------------------------------------------
       
  @@ -25,9 +26,4 @@
      public int getState();
      
      public String getStateString();
  -   
  -   public void start()
  -      throws Exception;
  -   
  -   public void stop();
   }
  
  
  
  1.4       +11 -6     jboss/src/main/org/jboss/util/ServiceMBeanSupport.java
  
  Index: ServiceMBeanSupport.java
  ===================================================================
  RCS file: 
/products/cvs/ejboss/jboss/src/main/org/jboss/util/ServiceMBeanSupport.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ServiceMBeanSupport.java  2000/05/30 18:32:33     1.3
  +++ ServiceMBeanSupport.java  2000/06/16 13:10:32     1.4
  @@ -20,7 +20,7 @@
    *      
    *   @see <related>
    *   @author Rickard �berg ([EMAIL PROTECTED])
  - *   @version $Revision: 1.3 $
  + *   @version $Revision: 1.4 $
    */
   public abstract class ServiceMBeanSupport
      extends NotificationBroadcasterSupport
  @@ -77,6 +77,9 @@
      public void start()
         throws Exception
      {
  +      if (getState() != STOPPED)
  +             return;
  +                     
         state = STARTING;
         sendNotification(new 
AttributeChangeNotification(AttributeChangeNotification.ATTRIBUTE_CHANGE, this, id++, 
new Date(), getName()+" starting", "State", "java.lang.Integer", new Integer(STOPPED), 
new Integer(STARTING)));
         log.log("Starting");
  @@ -102,6 +105,9 @@
      
      public void stop()
      {
  +             if (getState() != STARTED)
  +                     return;
  +     
         state = STOPPING;
         sendNotification(new 
AttributeChangeNotification(AttributeChangeNotification.ATTRIBUTE_CHANGE, this, id++, 
new Date(), getName()+" stopping", "State", "java.lang.Integer", new Integer(STARTED), 
new Integer(STOPPING)));
         log.log("Stopping");
  @@ -123,6 +129,9 @@
      
      public void destroy()
      {
  +             if (getState() != STOPPED)
  +                     stop();
  +     
        log.log("Destroying");
        log.setLog(log);
        try
  @@ -144,14 +153,13 @@
   
                init();
                
  -      start();
         return name;
      }
      
      public void postRegister(java.lang.Boolean registrationDone)
      {
         if (!registrationDone.booleanValue())
  -         stop();
  +         destroy();
      }
      
      public void preDeregister()
  @@ -161,9 +169,6 @@
      
      public void postDeregister()
      {
  -             if (getState() == STARTED)
  -           stop();
  -             
           destroy();
      }