User: d_jencks
  Date: 01/11/11 22:36:49

  Modified:    src/main/org/jboss/mq/server JBossMQService.java
                        MessageCache.java
  Log:
  Changes to move toward eliminating init and destroy from Service interface, and make 
J2eeDeployer use mbean-refs.
  
  Revision  Changes    Path
  1.9       +39 -13    jbossmq/src/main/org/jboss/mq/server/JBossMQService.java
  
  Index: JBossMQService.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/server/JBossMQService.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- JBossMQService.java       2001/11/10 21:38:05     1.8
  +++ JBossMQService.java       2001/11/12 06:36:49     1.9
  @@ -5,14 +5,17 @@
    * See terms of license at gnu.org.
    */
   package org.jboss.mq.server;
  -import javax.jms.JMSException;
  +
   
  -import javax.management.*;
  +import javax.jms.JMSException;
  +import javax.management.Attribute;
  +import javax.management.MBeanServer;
  +import javax.management.MalformedObjectNameException;
  +import javax.management.ObjectName;
   import javax.naming.InitialContext;
   import org.jboss.mq.SpyQueue;
   import org.jboss.mq.SpyTopic;
   import org.jboss.mq.pm.PersistenceManager;
  -
   import org.jboss.system.ServiceMBeanSupport;
   
   /**
  @@ -22,11 +25,12 @@
    * @author     <a href="mailto:[EMAIL PROTECTED]";>Juha Lindfors</a>
    * @author     <a href="[EMAIL PROTECTED]">Hiram Chirino</a>
    * @see        JBossMQ subproject
  - * @version    $Revision: 1.8 $
  + * @version    $Revision: 1.9 $
    */
   public class JBossMQService extends ServiceMBeanSupport implements 
JBossMQServiceMBean
   {
  -   public static String jndiBindLocation = "java:/JBossMQServer";
  +   private static final String SERVICE_CONTROLLER_NAME = 
"JBOSS-SYSTEM:spine=ServiceController";
  +   public String jndiBindLocation = "java:/JBossMQServer";
      // Attributes ----------------------------------------------------
   
      private ObjectName mqService;
  @@ -40,7 +44,6 @@
   
      public JBossMQService() 
      {
  -      //jmsServer = new JMSServer();
      }
   
      public ObjectName preRegister(MBeanServer server, ObjectName name)
  @@ -68,7 +71,7 @@
       */
      public JMSServer getJMSServer()
      {
  -      return jmsServer;//JMSServer.getInstance();
  +      return jmsServer;
      }
   
      
  @@ -124,7 +127,11 @@
            ObjectName queue = getQueueObjectName(name);
            getServer().createMBean("org.jboss.mq.server.QueueManager", queue);
            getServer().setAttribute(queue, new Attribute("JBossMQService", 
mqService));
  -         getServer().invoke(queue, "start", new Object[]{}, new String[]{});
  +         //getServer().invoke(queue, "start", new Object[]{}, new String[]{});
  +         getServer().invoke(getServiceControllerName(),
  +                            "registerAndStartService",
  +                            new Object[] {queue, null},
  +                            new String[] {"javax.management.ObjectName", 
"java.lang.String"});
   
         }
         catch (Exception e)
  @@ -150,7 +157,12 @@
            ObjectName topic= getTopicObjectName(name);
            getServer().createMBean("org.jboss.mq.server.TopicManager", topic);
            getServer().setAttribute(topic, new Attribute("JBossMQService", 
mqService));
  -         getServer().invoke(topic, "start", new Object[]{}, new String[]{});
  +         //getServer().invoke(topic, "start", new Object[]{}, new String[]{});
  +         getServer().invoke(getServiceControllerName(),
  +                            "registerAndStartService",
  +                            new Object[] {topic, null},
  +                            new String[] {"javax.management.ObjectName", 
"java.lang.String"});
  +
   
         }
         catch (Exception e)
  @@ -174,9 +186,14 @@
         {
   
            ObjectName queue = getQueueObjectName(name);
  -         getServer().invoke(queue, "stop", new Object[]{}, new String[]{});
  -         getServer().unregisterMBean(queue);
  +         getServer().invoke(getServiceControllerName(),
  +                            "undeploy",
  +                            new Object[] {queue},
  +                            new String[] {"javax.management.ObjectName"});
   
  +         //getServer().invoke(queue, "stop", new Object[]{}, new String[]{});
  +         //getServer().unregisterMBean(queue);
  +
         }
         catch (Exception e)
         {
  @@ -199,8 +216,12 @@
         {
   
            ObjectName topic = getTopicObjectName(name);
  -         getServer().invoke(topic, "stop", new Object[]{}, new String[]{});
  -         getServer().unregisterMBean(topic);
  +         //getServer().invoke(topic, "stop", new Object[]{}, new String[]{});
  +         //getServer().unregisterMBean(topic);
  +         getServer().invoke(getServiceControllerName(),
  +                            "undeploy",
  +                            new Object[] {topic},
  +                            new String[] {"javax.management.ObjectName"});
   
         }
         catch (Exception e)
  @@ -256,6 +277,11 @@
      private ObjectName getQueueObjectName(String name) throws 
MalformedObjectNameException
      {
         return new ObjectName(mqService.getDomain() + ":service=Queue,name=" + name);
  +   }
  +
  +   private ObjectName getServiceControllerName() throws Exception
  +   {
  +      return new ObjectName(SERVICE_CONTROLLER_NAME);
      }
   
   }
  
  
  
  1.5       +4 -17     jbossmq/src/main/org/jboss/mq/server/MessageCache.java
  
  Index: MessageCache.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/server/MessageCache.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- MessageCache.java 2001/11/10 21:38:05     1.4
  +++ MessageCache.java 2001/11/12 06:36:49     1.5
  @@ -23,7 +23,7 @@
    * later.
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>Hiram Chirino</a>
  - * @version    $Revision: 1.4 $
  + * @version    $Revision: 1.5 $
    */
   public class MessageCache extends ServiceMBeanSupport implements MessageCacheMBean, 
MBeanRegistration, Runnable
   {
  @@ -226,12 +226,12 @@
      //
      
//////////////////////////////////////////////////////////////////////////////////
      
  +   
      /**
  -    * This gets called after the MBean has been initialized.
  +    * This gets called to start the cache service. Synch. by start
       */
  -   synchronized public void initService() throws Exception
  +   protected void startService() throws Exception
      {
  -      
         File jbossHome = new File(System.getProperty("jboss.system.home"));
         dataFile = new File(jbossHome, dataDirectory);
         log.debug("Data directory set to: " + dataFile.getCanonicalPath());
  @@ -247,18 +247,6 @@
         {
            files[i].delete();
         }
  -      /*    
  -      JMSServer server = (JMSServer) getServer().invoke(new 
ObjectName(JBossMQServiceMBean.OBJECT_NAME),
  -         "getJMSServer", new Object[]{}, new String[]{});
  -      server.setMessageCache(this);
  -*/
  -   }
  -   
  -   /**
  -    * This gets called to start the cache service.
  -    */
  -   synchronized public void startService() throws Exception
  -   {
         
         if (getState() == ServiceMBeanSupport.STARTED)
            throw new Exception("Cannot be initialized from the current state");
  @@ -410,7 +398,6 @@
         cache.setDataDirectory(tempDir.getCanonicalPath());
         cache.setHighMemoryMark(40);
         cache.setMaxMemoryMark(60);
  -      cache.init();
         cache.start();
         
         LinkedList ll = new LinkedList();
  
  
  

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

Reply via email to