User: d_jencks
  Date: 01/11/10 13:38:06

  Modified:    src/main/org/jboss/mq/server JBossMQService.java
                        JBossMQServiceMBean.java JMSDestination.java
                        JMSQueue.java JMSServer.java JMSTopic.java
                        MessageCache.java MessageCacheMBean.java
                        PersistentQueue.java QueueManager.java
                        QueueManagerMBean.java StateManager.java
                        StateManagerMBean.java TopicManager.java
                        TopicManagerMBean.java
  Log:
  Changed mbean dependencies to work directly by mbean-references: eliminated depends 
tag from *service.xml files
  
  Revision  Changes    Path
  1.8       +113 -273  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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- JBossMQService.java       2001/09/13 01:53:13     1.7
  +++ JBossMQService.java       2001/11/10 21:38:05     1.8
  @@ -22,15 +22,35 @@
    * @author     <a href="mailto:[EMAIL PROTECTED]";>Juha Lindfors</a>
    * @author     <a href="[EMAIL PROTECTED]">Hiram Chirino</a>
    * @see        JBossMQ subproject
  - * @version    $Revision: 1.7 $
  + * @version    $Revision: 1.8 $
    */
   public class JBossMQService extends ServiceMBeanSupport implements 
JBossMQServiceMBean
   {
      public static String jndiBindLocation = "java:/JBossMQServer";
  -   MBeanServer mBeanServer = null;
  -
      // Attributes ----------------------------------------------------
   
  +   private ObjectName mqService;
  +
  +   private JMSServer jmsServer;
  +
  +   private ObjectName persistenceManager;
  +
  +   private ObjectName stateManager;
  +
  +
  +   public JBossMQService() 
  +   {
  +      //jmsServer = new JMSServer();
  +   }
  +
  +   public ObjectName preRegister(MBeanServer server, ObjectName name)
  +      throws Exception
  +   {
  +      mqService = super.preRegister(server, name);
  +      return mqService;
  +   }
  +
  +
      /**
       *  Gets the Name attribute of the JBossMQService object
       *
  @@ -48,9 +68,47 @@
       */
      public JMSServer getJMSServer()
      {
  -      return JMSServer.getInstance();
  +      return jmsServer;//JMSServer.getInstance();
      }
   
  +   
  +   /**
  +    * Get the value of PersistenceManager.
  +    * @return value of PersistenceManager.
  +    */
  +   public ObjectName getPersistenceManager() 
  +   {
  +      return persistenceManager;
  +   }
  +   
  +   /**
  +    * Set the value of PersistenceManager.
  +    * @param v  Value to assign to PersistenceManager.
  +    */
  +   public void setPersistenceManager(ObjectName objectName) 
  +   {
  +      this.persistenceManager = objectName;
  +   }
  +   
  +   
  +   /**
  +    * Get the value of StateManager.
  +    * @return value of StateManager.
  +    */
  +   public ObjectName getStateManager() 
  +   {
  +      return stateManager;
  +   }
  +   
  +   /**
  +    * Set the value of StateManager.
  +    * @param v  Value to assign to StateManager.
  +    */
  +   public void setStateManager(ObjectName  objectName) 
  +   {
  +      this.stateManager = objectName;
  +   }
  +   
      /**
       *  #Description of the Method
       *
  @@ -63,14 +121,10 @@
         try
         {
   
  -         ObjectName objectName = new ObjectName("JBossMQ:serivce=Queue,name=" + 
name);
  -         getServer().createMBean("org.jboss.mq.server.QueueManager", objectName);
  -         getServer().invoke(objectName, "init", new Object[]{
  -               }, new String[]{
  -               });
  -         getServer().invoke(objectName, "start", new Object[]{
  -               }, new String[]{
  -               });
  +         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[]{});
   
         }
         catch (Exception e)
  @@ -79,55 +133,6 @@
            throw e;
         }
   
  -      /*
  -       * check to see if this queue already exists in the config structure
  -       * boolean queueExists = false;
  -       * XElement element = null;
  -       * try{
  -       *
  -       * Enumeration enum = serverConfig.getElementsNamed("Queue");
  -       *
  -       * while( enum.hasMoreElements() ) {
  -       * element = (XElement)enum.nextElement();
  -       * if(name.equals(element.getField("Name"))){
  -       * queueExists = true;
  -       * break;
  -       * }
  -       *
  -       * }
  -       *
  -       * if(!queueExists){
  -       * add this queue to the config structure
  -       * XElement newQueueEl = new XElement("Queue");
  -       * newQueueEl.addField("Name", name);
  -       * serverConfig.addElement(newQueueEl);
  -       *
  -       * save the new state in the config file
  -       * saveConfig();
  -       *
  -       * }
  -       *
  -       * }
  -       * catch(Exception ioe){
  -       * remove the queue from the destinations
  -       * synchronized (destinations) {
  -       * HashMap newMap=(HashMap)destinations.clone();
  -       * newMap.remove(newQueue);
  -       * destinations=newMap;
  -       * }
  -       * remove the queue from the jndi queue context
  -       * try{
  -       * subcontext.unbind(name);
  -       * }
  -       * catch(Exception e){ // Do we need to do anything else here? For now we'll 
just eat this exception  }
  -       *
  -       * ResourceAllocationException newE = new 
ResourceAllocationException("Exception saving updated configuration state");
  -       * newE.setLinkedException(ioe);
  -       * throw newE;
  -       * }
  -       */
  -
  -      //return newQueue;
      }
   
      // Administration calls
  @@ -142,14 +147,10 @@
         try
         {
   
  -         ObjectName objectName = new ObjectName("JBossMQ:serivce=Topic,name=" + 
name);
  -         getServer().createMBean("org.jboss.mq.server.TopicManager", objectName);
  -         getServer().invoke(objectName, "init", new Object[]{
  -               }, new String[]{
  -               });
  -         getServer().invoke(objectName, "start", new Object[]{
  -               }, new String[]{
  -               });
  +         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[]{});
   
         }
         catch (Exception e)
  @@ -158,54 +159,6 @@
            throw e;
         }
   
  -      /*
  -       *
  -       * check to see if this topic already exists in the config structure
  -       * boolean topicExists = false;
  -       * XElement element = null;
  -       *
  -       * try{
  -       * Enumeration enum = serverConfig.getElementsNamed("Topic");
  -       *
  -       * while( enum.hasMoreElements() ) {
  -       * element = (XElement)enum.nextElement();
  -       * if(name.equals(element.getField("Name"))){
  -       * topicExists = true;
  -       * break;
  -       * }
  -       *
  -       * }
  -       *
  -       * if it doesn't exist, add it
  -       * if(!topicExists){
  -       * XElement newTopicEl = new XElement("Topic");
  -       * newTopicEl.addField("Name", name);
  -       * serverConfig.addElement(newTopicEl);
  -       *
  -       * save the new state in the config file
  -       * saveConfig();
  -       * }
  -       *
  -       * }
  -       * catch(Exception ioe){
  -       * remove the topic from the destinations
  -       * synchronized (destinations) {
  -       * HashMap newMap=(HashMap)destinations.clone();
  -       * newMap.remove(newTopic);
  -       * destinations=newMap;
  -       * }
  -       * remove the topic from the jndi topic context
  -       * try{
  -       * subcontext.unbind(name);
  -       * }
  -       * catch(Exception e){ // Do we need to do anything else here? For now we'll 
just eat this exception  }
  -       *
  -       * ResourceAllocationException newE = new 
ResourceAllocationException("Exception saving updated configuration state");
  -       * newE.setLinkedException(ioe);
  -       * throw newE;
  -       * }
  -       * return newTopic;
  -       */
   
      }
   
  @@ -220,87 +173,17 @@
         try
         {
   
  -         ObjectName objectName = new ObjectName("JBossMQ:serivce=Queue,name=" + 
name);
  -         getServer().invoke(objectName, "stop", new Object[]{
  -               }, new String[]{
  -               });
  -         getServer().invoke(objectName, "destroy", new Object[]{
  -               }, new String[]{
  -               });
  -         getServer().unregisterMBean(objectName);
  +         ObjectName queue = getQueueObjectName(name);
  +         getServer().invoke(queue, "stop", new Object[]{}, new String[]{});
  +         getServer().unregisterMBean(queue);
   
         }
         catch (Exception e)
         {
  -         log.warn("Could not destory the destination: ", e);
  +         log.warn("Could not destroy the destination: ", e);
            throw e;
         }
   
  -      /*
  -       * cat.debug("destroy queue : "+name);
  -       *
  -       * SpyQueue destroyQueue=new SpyQueue(name);
  -       * if (!destinations.containsKey(destroyQueue)) throw new JMSException("This 
queue doesn't exist!");
  -       *
  -       * JMSDestination queue=new JMSDestination(destroyQueue,null,this);
  -       *
  -       * InitialContext ctx = null;
  -       * Context subcontext = null;
  -       *
  -       * try{
  -       * Get an InitialContext
  -       * ctx = new InitialContext();
  -       *
  -       * get the queues subcontext
  -       * subcontext = (Context)ctx.lookup("queue");
  -       *
  -       * remove this queue to the jndi queue context
  -       * subcontext.unbind(name);
  -       *
  -       * }
  -       * catch(Exception e){
  -       * JMSException newE = new JMSException("Exception unbinding Queue from the 
JNDI queue context");
  -       * newE.setLinkedException(e);
  -       * throw newE;
  -       * }
  -       *
  -       * remove this new JMSServerQueue from the list
  -       * synchronized (destinations) {
  -       * HashMap newMap=(HashMap)destinations.clone();
  -       * newMap.remove(destroyQueue);
  -       * destinations=newMap;
  -       * }
  -       */
  -
  -      /*
  -       * check to see if this queue already exists in the config structure
  -       * and remove it if it does
  -       * XElement element = null;
  -       *
  -       * try{
  -       * Enumeration enum = serverConfig.getElementsNamed("Queue");
  -       *
  -       * while( enum.hasMoreElements() ) {
  -       * element = (XElement)enum.nextElement();
  -       * if(name.equals(element.getField("Name"))){
  -       * remove this queue element from the config structure
  -       * element.removeFromParent();
  -       * break;
  -       * }
  -       *
  -       * }
  -       *
  -       * save the new state in the config file
  -       * saveConfig();
  -       *
  -       *
  -       * }
  -       * catch(Exception ioe){
  -       * ResourceAllocationException newE = new 
ResourceAllocationException("Exception saving updated configuration state");
  -       * newE.setLinkedException(ioe);
  -       * throw newE;
  -       * }
  -       */
   
      }
   
  @@ -315,107 +198,64 @@
         try
         {
   
  -         ObjectName objectName = new ObjectName("JBossMQ:serivce=Topic,name=" + 
name);
  -         getServer().invoke(objectName, "stop", new Object[]{
  -               }, new String[]{
  -               });
  -         getServer().invoke(objectName, "destroy", new Object[]{
  -               }, new String[]{
  -               });
  -         getServer().unregisterMBean(objectName);
  +         ObjectName topic = getTopicObjectName(name);
  +         getServer().invoke(topic, "stop", new Object[]{}, new String[]{});
  +         getServer().unregisterMBean(topic);
   
         }
         catch (Exception e)
         {
  -         log.warn("Could not destory the destination: ", e);
  +         log.warn("Could not destroy the destination: ", e);
            throw e;
         }
   
  -      /*
  -       * cat.debug("destroy queue : "+name);
  -       *
  -       * SpyQueue destroyQueue=new SpyQueue(name);
  -       * if (!destinations.containsKey(destroyQueue)) throw new JMSException("This 
queue doesn't exist!");
  -       *
  -       * JMSDestination queue=new JMSDestination(destroyQueue,null,this);
  -       *
  -       * InitialContext ctx = null;
  -       * Context subcontext = null;
  -       *
  -       * try{
  -       * Get an InitialContext
  -       * ctx = new InitialContext();
  -       *
  -       * get the queues subcontext
  -       * subcontext = (Context)ctx.lookup("queue");
  -       *
  -       * remove this queue to the jndi queue context
  -       * subcontext.unbind(name);
  -       *
  -       * }
  -       * catch(Exception e){
  -       * JMSException newE = new JMSException("Exception unbinding Queue from the 
JNDI queue context");
  -       * newE.setLinkedException(e);
  -       * throw newE;
  -       * }
  -       *
  -       * remove this new JMSServerQueue from the list
  -       * synchronized (destinations) {
  -       * HashMap newMap=(HashMap)destinations.clone();
  -       * newMap.remove(destroyQueue);
  -       * destinations=newMap;
  -       * }
  -       */
  -
  -      /*
  -       * check to see if this queue already exists in the config structure
  -       * and remove it if it does
  -       * XElement element = null;
  -       *
  -       * try{
  -       * Enumeration enum = serverConfig.getElementsNamed("Queue");
  -       *
  -       * while( enum.hasMoreElements() ) {
  -       * element = (XElement)enum.nextElement();
  -       * if(name.equals(element.getField("Name"))){
  -       * remove this queue element from the config structure
  -       * element.removeFromParent();
  -       * break;
  -       * }
  -       *
  -       * }
  -       *
  -       * save the new state in the config file
  -       * saveConfig();
  -       *
  -       *
  -       * }
  -       * catch(Exception ioe){
  -       * ResourceAllocationException newE = new 
ResourceAllocationException("Exception saving updated configuration state");
  -       * newE.setLinkedException(ioe);
  -       * throw newE;
  -       * }
  -       */
   
      }
   
  -   protected void initService() throws Exception
  -   {
  -      JMSServer.initServer();
  -   }
   
      protected void startService() throws Exception
      {
  -      JMSServer.getInstance().startServer();
  +      try 
  +      {
  +
  +         PersistenceManager pm = (PersistenceManager)
  +            getServer().invoke(persistenceManager, "getInstance", 
  +                               new Object[] {},
  +                               new String[] {});
  +         JMSServer.initServer();//yucky kludge!
  +         jmsServer = JMSServer.getInstance();
  +         jmsServer.setPersistenceManager(pm);
  +      } catch (Exception e) 
  +      {
  +         log.error("couldn't set persistence manager on jmsserver", e);
  +      } // end of try-catch
  +      try 
  +      {
  +         StateManager sm = (StateManager)
  +            getServer().invoke(stateManager, "getInstance", 
  +                               new Object[] {},
  +                               new String[] {});
  +         jmsServer.setStateManager(sm);
  +      } catch (Exception e) 
  +      {
  +         log.error("couldn't set state manager on jmsserver", e);
  +      } // end of try-catch
  +      jmsServer.startServer();
      }
   
      protected void stopService()
      {
  -      JMSServer.getInstance().stopServer();
  +      jmsServer.stopServer();
      }
   
  -   protected void destroyService()
  +   private ObjectName getTopicObjectName(String name) throws 
MalformedObjectNameException
      {
  -      JMSServer.destroyServer();
  +      return new ObjectName(mqService.getDomain() + ":service=Topic,name=" + name);
      }
  +
  +   private ObjectName getQueueObjectName(String name) throws 
MalformedObjectNameException
  +   {
  +      return new ObjectName(mqService.getDomain() + ":service=Queue,name=" + name);
  +   }
  +
   }
  
  
  
  1.5       +18 -1     jbossmq/src/main/org/jboss/mq/server/JBossMQServiceMBean.java
  
  Index: JBossMQServiceMBean.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/jbossmq/src/main/org/jboss/mq/server/JBossMQServiceMBean.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- JBossMQServiceMBean.java  2001/09/01 03:01:00     1.4
  +++ JBossMQServiceMBean.java  2001/11/10 21:38:05     1.5
  @@ -6,6 +6,7 @@
    */
   package org.jboss.mq.server;
   
  +import javax.management.ObjectName;
   import org.jboss.system.ServiceMBean;
   
   /**
  @@ -13,7 +14,7 @@
    *
    * @author     <a href="[EMAIL PROTECTED]">Hiram Chirino</a>
    * @see        <related>
  - * @version    $Revision: 1.4 $
  + * @version    $Revision: 1.5 $
    */
   public interface JBossMQServiceMBean
          extends ServiceMBean
  @@ -21,6 +22,22 @@
      public final static String OBJECT_NAME = "JBossMQ:service=Server";
   
      JMSServer getJMSServer();
  +
  +
  +   
  +   /**
  +    * <code>setPersistenceManager</code> sets the ObjectName
  +    * for the PersistenceManager used by this JMSServer.
  +    *
  +    * @param objectName an <code>ObjectName</code> value
  +    */
  +   void setPersistenceManager(ObjectName objectName);
  +
  +   ObjectName getPersistenceManager();
  +
  +   void setStateManager(ObjectName objectName);
  +
  +   ObjectName getStateManager();
   
      /**
       *  #Description of the Method
  
  
  
  1.5       +6 -1      jbossmq/src/main/org/jboss/mq/server/JMSDestination.java
  
  Index: JMSDestination.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/server/JMSDestination.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- JMSDestination.java       2001/10/28 01:27:01     1.4
  +++ JMSDestination.java       2001/11/10 21:38:05     1.5
  @@ -26,7 +26,7 @@
    * @author     Hiram Chirino ([EMAIL PROTECTED])
    * @author     David Maplesden ([EMAIL PROTECTED])
    * @created    August 16, 2001
  - * @version    $Revision: 1.4 $
  + * @version    $Revision: 1.5 $
    */
   public abstract class JMSDestination {
   
  @@ -49,6 +49,11 @@
         destination = dest;
         temporaryDestination = temporary;
         this.server = server;
  +   }
  +
  +   public SpyDestination getSpyDestination()
  +   {
  +      return destination;
      }
   
   
  
  
  
  1.7       +3 -1      jbossmq/src/main/org/jboss/mq/server/JMSQueue.java
  
  Index: JMSQueue.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/server/JMSQueue.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- JMSQueue.java     2001/10/28 04:07:36     1.6
  +++ JMSQueue.java     2001/11/10 21:38:05     1.7
  @@ -26,7 +26,7 @@
    * @author     Hiram Chirino ([EMAIL PROTECTED])
    * @author     David Maplesden ([EMAIL PROTECTED])
    * @created    August 16, 2001
  - * @version    $Revision: 1.6 $
  + * @version    $Revision: 1.7 $
    */
   public class JMSQueue extends JMSDestination {
   
  @@ -40,6 +40,7 @@
         // If this is a non-temp queue, then we should persist data
         if ( temporaryDestination == null ) {
            queue = new PersistentQueue( server, dest );
  +         server.getPersistenceManager().restoreQueue(this, dest);
         } else {
            queue = new BasicQueue( server );
         }
  @@ -112,3 +113,4 @@
         return queue.receive( sub, wait );
      }
   }
  +
  
  
  
  1.10      +4 -3      jbossmq/src/main/org/jboss/mq/server/JMSServer.java
  
  Index: JMSServer.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/server/JMSServer.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- JMSServer.java    2001/10/28 01:27:01     1.9
  +++ JMSServer.java    2001/11/10 21:38:05     1.10
  @@ -36,7 +36,7 @@
    * @author    Norbert Lataille ([EMAIL PROTECTED])
    * @author    Hiram Chirino ([EMAIL PROTECTED])
    * @author    David Maplesden ([EMAIL PROTECTED])
  - * @version   $Revision: 1.9 $
  + * @version   $Revision: 1.10 $
    */
   public class JMSServer
   {
  @@ -831,14 +831,15 @@
       * @return Returns a MessageCache
       */
      public MessageCache getMessageCache() {
  -      return messageCache;
  +      return getPersistenceManager().getMessageCacheInstance();
      }
      
      /**
       * Sets the messageCache
       * @param messageCache The messageCache to set
       */
  -   public void setMessageCache(MessageCache messageCache) {
  +   /*public void setMessageCache(MessageCache messageCache) {
         this.messageCache = messageCache;
      }
  +   */
   }
  
  
  
  1.8       +13 -6     jbossmq/src/main/org/jboss/mq/server/JMSTopic.java
  
  Index: JMSTopic.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/server/JMSTopic.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- JMSTopic.java     2001/10/28 04:07:36     1.7
  +++ JMSTopic.java     2001/11/10 21:38:05     1.8
  @@ -5,17 +5,18 @@
    * See terms of license at gnu.org.
    */
   package org.jboss.mq.server;
  +
  +
  +
  +import java.util.ArrayList;
   import java.util.HashMap;
   import java.util.Hashtable;
  -
   import java.util.Iterator;
   import java.util.LinkedList;
   import java.util.TreeSet;
   import javax.jms.DeliveryMode;
  -
   import javax.jms.Destination;
   import javax.jms.JMSException;
  -
   import org.jboss.mq.*;
   
   /**
  @@ -26,7 +27,7 @@
    * @author     Hiram Chirino ([EMAIL PROTECTED])
    * @author     David Maplesden ([EMAIL PROTECTED])
    * @created    August 16, 2001
  - * @version    $Revision: 1.7 $
  + * @version    $Revision: 1.8 $
    */
   public class JMSTopic extends JMSDestination {
   
  @@ -133,10 +134,11 @@
         synchronized (durQueues) {
            durQueues.put(id, queue);
         }
  +      server.getPersistenceManager().restoreQueue(this, dstopic);
      }
   
      //called by state manager when a durable sub is deleted
  -   public void destoryDurableSubscription(DurableSubcriptionID id) throws 
JMSException {
  +   public void destroyDurableSubscription(DurableSubcriptionID id) throws 
JMSException {
         BasicQueue queue;
         synchronized (durQueues) {
            queue = (BasicQueue) durQueues.remove(id);
  @@ -188,6 +190,11 @@
         }
      }
   
  +   public ArrayList getPersistentQueues()
  +   {
  +      return new ArrayList(durQueues.values());
  +   }
  +
      // Package protected ---------------------------------------------
      PersistentQueue getDurableSubscription(DurableSubcriptionID id) {
         synchronized (durQueues) {
  @@ -206,4 +213,4 @@
            }
         }
      }
  -}
  \ No newline at end of file
  +}
  
  
  
  1.4       +10 -3     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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- MessageCache.java 2001/10/31 01:51:10     1.3
  +++ MessageCache.java 2001/11/10 21:38:05     1.4
  @@ -23,7 +23,7 @@
    * later.
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>Hiram Chirino</a>
  - * @version    $Revision: 1.3 $
  + * @version    $Revision: 1.4 $
    */
   public class MessageCache extends ServiceMBeanSupport implements MessageCacheMBean, 
MBeanRegistration, Runnable
   {
  @@ -49,6 +49,12 @@
      // Used to get notified when message are being deleted by GC
      ReferenceQueue referenceQueue = new ReferenceQueue();
      
  +
  +   public MessageCache getInstance()
  +   {
  +      return this;
  +   }
  +
      /**
       * Adds a message to the cache
       */
  @@ -241,10 +247,11 @@
         {
            files[i].delete();
         }
  -      
  +      /*    
         JMSServer server = (JMSServer) getServer().invoke(new 
ObjectName(JBossMQServiceMBean.OBJECT_NAME),
            "getJMSServer", new Object[]{}, new String[]{});
         server.setMessageCache(this);
  +*/
      }
      
      /**
  @@ -450,4 +457,4 @@
         log.info("Cache Misses=" + cache.getCacheMisses());
      }
      
  -}
  \ No newline at end of file
  +}
  
  
  
  1.2       +4 -2      jbossmq/src/main/org/jboss/mq/server/MessageCacheMBean.java
  
  Index: MessageCacheMBean.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/jbossmq/src/main/org/jboss/mq/server/MessageCacheMBean.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- MessageCacheMBean.java    2001/10/28 01:27:01     1.1
  +++ MessageCacheMBean.java    2001/11/10 21:38:05     1.2
  @@ -11,7 +11,7 @@
    * Defines the managment interface that is exposed to the MessageCache
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>Hiram Chirino</a>
  - * @version    $Revision: 1.1 $
  + * @version    $Revision: 1.2 $
    */
   public interface MessageCacheMBean extends ServiceMBean {
   
   /**
  @@ -83,4 +83,6 @@
   
   
      public long getCurrentMemoryUsage();
  -}
  \ No newline at end of file
  +
  +   public MessageCache getInstance();
  +}
  
  
  
  1.4       +6 -1      jbossmq/src/main/org/jboss/mq/server/PersistentQueue.java
  
  Index: PersistentQueue.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/server/PersistentQueue.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- PersistentQueue.java      2001/10/28 01:27:01     1.3
  +++ PersistentQueue.java      2001/11/10 21:38:05     1.4
  @@ -19,7 +19,12 @@
         throws JMSException {
         super( server );
         this.destination = destination;
  -      server.getPersistenceManager().initQueue( destination );
  +      //server.getPersistenceManager().restoreQueue(this, destination);
  +   }
  +
  +   public SpyDestination getSpyDestination()
  +   {
  +      return destination;
      }
   
   
  
  
  
  1.5       +30 -14    jbossmq/src/main/org/jboss/mq/server/QueueManager.java
  
  Index: QueueManager.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/server/QueueManager.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- QueueManager.java 2001/09/01 03:01:00     1.4
  +++ QueueManager.java 2001/11/10 21:38:05     1.5
  @@ -27,13 +27,14 @@
    *
    * @author     Norbert Lataille ([EMAIL PROTECTED])
    * @author     <a href="[EMAIL PROTECTED]">Hiram Chirino</a>
  - * @version    $Revision: 1.4 $
  + * @version    $Revision: 1.5 $
    */
   public class QueueManager extends ServiceMBeanSupport implements QueueManagerMBean
   {
      JMSQueue destination;
      SpyQueue queue;
      String queueName;
  +   private ObjectName jbossMQService;
   
      /**
       *  Gets the Name attribute of the QueueManager object
  @@ -66,13 +67,33 @@
      {
         return destination.queue.messages.size();
      }
  +   
  +   /**
  +    * Get the value of JBossMQService.
  +    * @return value of JBossMQService.
  +    */
  +   public ObjectName getJBossMQService() 
  +   {
  +      return jbossMQService;
  +   }
  +   
  +   /**
  +    * Set the value of JBossMQService.
  +    * @param v  Value to assign to JBossMQService.
  +    */
  +   public void setJBossMQService(ObjectName  jbossMQService) 
  +   {
  +      this.jbossMQService = jbossMQService;
  +   }
  +   
  +
   
      /**
       *  #Description of the Method
       *
       * @exception  Exception  Description of Exception
       */
  -   public void initService() throws Exception
  +   public void startService() throws Exception
      {
   
         if (queueName == null || queueName.length() == 0)
  @@ -80,24 +101,14 @@
            throw new Exception("QueueName was not set");
         }
   
  -      JMSServer server = (JMSServer)getServer().invoke(new 
ObjectName(org.jboss.mq.server.JBossMQServiceMBean.OBJECT_NAME), "getJMSServer", new 
Object[]{}, new String[]{});
  +      JMSServer server = (JMSServer)getServer().invoke(jbossMQService, 
"getJMSServer", new Object[]{}, new String[]{});
   
         queue = new SpyQueue(queueName);
         destination = new JMSQueue(queue, null, server);
   
         server.addDestination(queue, destination);
  -
  -   }
  -
  -
  -   /**
  -    *  #Description of the Method
  -    *
  -    * @exception  Exception  Description of Exception
  -    */
  -   public void startService() throws Exception
  -   {
  -
  +      //server.getPersistenceManager().initQueue(destination);
  +      server.getPersistenceManager().restoreQueue(destination, queue);
         //Get an InitialContext
         InitialContext ctx = new InitialContext();
         javax.naming.Context subctx;
  @@ -111,6 +122,11 @@
         }
         subctx.rebind(queueName, queue);
   
  +   }
  +
  +   protected void stopService()
  +   {
  +      log.error("queue stop not yet implemented");
      }
   
      protected ObjectName getObjectName(MBeanServer server, ObjectName name) throws 
javax.management.MalformedObjectNameException
  
  
  
  1.5       +17 -3     jbossmq/src/main/org/jboss/mq/server/QueueManagerMBean.java
  
  Index: QueueManagerMBean.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/jbossmq/src/main/org/jboss/mq/server/QueueManagerMBean.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- QueueManagerMBean.java    2001/09/01 03:01:00     1.4
  +++ QueueManagerMBean.java    2001/11/10 21:38:05     1.5
  @@ -6,14 +6,16 @@
    */
   package org.jboss.mq.server;
   
  +import javax.management.ObjectName;
   import org.jboss.system.ServiceMBean;
   
   /**
    *  <description>MBean interface for the JBossMQ JMX service.
    *
    * @author     <a href="[EMAIL PROTECTED]">Hiram Chirino</a>
  + * @author <a href="mailto:[EMAIL PROTECTED]";>david jencks</a>
    * @see        <related>
  - * @version    $Revision: 1.4 $
  + * @version    $Revision: 1.5 $
    */
   public interface QueueManagerMBean
          extends ServiceMBean
  @@ -23,7 +25,7 @@
       *
       * @return    The QueueName value
       */
  -   public java.lang.String getQueueName();
  +   java.lang.String getQueueName();
   
      /**
       *  Gets the QueueDepth attribute of the QueueManagerMBean object
  @@ -31,5 +33,17 @@
       * @return                The QueueDepth value
       * @exception  Exception  Description of Exception
       */
  -   public int getQueueDepth() throws Exception;
  +   int getQueueDepth() throws Exception;
  +
  +   /**
  +    * Get the value of JBossMQService.
  +    * @return value of JBossMQService.
  +    */
  +   ObjectName getJBossMQService(); 
  +   
  +   /**
  +    * Set the value of JBossMQService.
  +    * @param v  Value to assign to JBossMQService.
  +    */
  +   void setJBossMQService(ObjectName  jbossMQService); 
   }
  
  
  
  1.9       +53 -14    jbossmq/src/main/org/jboss/mq/server/StateManager.java
  
  Index: StateManager.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/server/StateManager.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- StateManager.java 2001/09/11 18:38:18     1.8
  +++ StateManager.java 2001/11/10 21:38:05     1.9
  @@ -5,16 +5,19 @@
    * See terms of license at gnu.org.
    */
   package org.jboss.mq.server;
  +
  +
  +
   import java.io.File;
   import java.net.URL;
  +import java.util.ArrayList;
   import java.util.Collection;
   import java.util.Enumeration;
   import java.util.HashSet;
  -
   import java.util.Hashtable;
   import java.util.Iterator;
  +import java.util.Set;
   import javax.jms.InvalidClientIDException;
  -
   import javax.jms.JMSException;
   import javax.jms.JMSSecurityException;
   import javax.management.*;
  @@ -24,7 +27,7 @@
   import org.jboss.mq.SpyTopic;
   import org.jboss.mq.server.JMSServer;
   import org.jboss.mq.xml.XElement;
  -
  +import org.jboss.mq.xml.XElementException;
   import org.jboss.system.ServiceMBeanSupport;
   
   /**
  @@ -32,16 +35,17 @@
    *
    * @author     Norbert Lataille ([EMAIL PROTECTED])
    * @author     <a href="[EMAIL PROTECTED]">Hiram Chirino</a>
  - * @version    $Revision: 1.8 $
  + * @version    $Revision: 1.9 $
    */
   public class StateManager extends ServiceMBeanSupport implements StateManagerMBean
   {
   
  -   org.jboss.mq.xml.XElement stateConfig;
  +   XElement stateConfig;
   
  -   private HashSet loggedOnClientIds;
  +   private final Set loggedOnClientIds = new HashSet();
      private String stateFile = "conf/default/jbossmq-state.xml";
   
  +
      /**
       *  Constructor for the StateManager object
       *
  @@ -49,7 +53,7 @@
       */
      public StateManager() throws org.jboss.mq.xml.XElementException
      {
  -      loggedOnClientIds = new HashSet();
  +      //loggedOnClientIds = new HashSet();
      }
   
      /**
  @@ -63,6 +67,11 @@
         stateFile = newStateFile.trim();
      }
   
  +   public StateManager getInstance()
  +   {
  +      return this;
  +   }
  +
      /**
       *  Sets the DurableSubscription attribute of the StateManager object
       *
  @@ -133,7 +142,7 @@
                     // we have to change the subscription...
                     SpyTopic prevTopic = new 
SpyTopic(subscription.getField("TopicName"));
                     JMSTopic dest = (JMSTopic)server.getJMSDestination(prevTopic);
  -                  dest.destoryDurableSubscription(sub);
  +                  dest.destroyDurableSubscription(sub);
   
                     //straight deletion, remove subscription
                     subscription.removeFromParent();
  @@ -146,7 +155,7 @@
                     // we have to change the subscription...
                     SpyTopic prevTopic = new 
SpyTopic(subscription.getField("TopicName"));
                     JMSTopic dest = (JMSTopic)server.getJMSDestination(prevTopic);
  -                  dest.destoryDurableSubscription(sub);
  +                  dest.destroyDurableSubscription(sub);
   
                     dest = (JMSTopic)server.getJMSDestination(topic);
                     dest.createDurableSubscription(sub);
  @@ -328,20 +337,50 @@
   
         loadConfig();
   
  -      JMSServer server = (JMSServer)getServer().invoke(new 
ObjectName(org.jboss.mq.server.JBossMQServiceMBean.OBJECT_NAME), "getJMSServer", new 
Object[]{
  +      /*JMSServer server = (JMSServer)getServer().invoke(new 
ObjectName(org.jboss.mq.server.JBossMQServiceMBean.OBJECT_NAME), "getJMSServer", new 
Object[]{
               }, new String[]{
  -            });
  -      server.setStateManager(this);
  -      initDurableSubscriptions(server);
  +            });*/
  +      //server.setStateManager(this);
  +      //initDurableSubscriptions(server);
   
      }
   
  +   public Collection getDurableSubscriptionIdsForTopic(SpyTopic topic)
  +      throws JMSException
  +   {
  +      Collection durableSubs = new ArrayList();
  +      try 
  +      {
  +         Enumeration enum = 
stateConfig.getElementsNamed("User/DurableSubscription");
  +         while (enum.hasMoreElements())
  +         {
  +            XElement element = (XElement)enum.nextElement();
  +
  +            String clientId = element.getField("../Id");
  +            String name = element.getField("Name");
  +            String topicName = element.getField("TopicName");
  +            if (topic.getName().equals(topicName)) 
  +            {
  +               durableSubs.add(new DurableSubcriptionID(clientId, name));
  +            } // end of if ()
  +            
  +         }
  +      } 
  +      catch (XElementException e) 
  +      {
  +         JMSException jmse = new JMSException("Error in statemanager xml");
  +         jmse.setLinkedException(e);
  +         throw jmse;
  +      } // end of try-catch
  +      return durableSubs;
  +   }
      /**
       *  #Description of the Method
       *
       * @param  server                                  Description of Parameter
       * @exception  org.jboss.mq.xml.XElementException  Description of Exception
       */
  +   /*
      public void initDurableSubscriptions(JMSServer server) throws 
org.jboss.mq.xml.XElementException
      {
   
  @@ -380,7 +419,7 @@
         }
   
      }
  -
  +   */
      /**
       *  #Description of the Method
       *
  
  
  
  1.5       +3 -0      jbossmq/src/main/org/jboss/mq/server/StateManagerMBean.java
  
  Index: StateManagerMBean.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/jbossmq/src/main/org/jboss/mq/server/StateManagerMBean.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- StateManagerMBean.java    2001/09/01 03:01:00     1.4
  +++ StateManagerMBean.java    2001/11/10 21:38:05     1.5
  @@ -13,7 +13,7 @@
    *
    * @author     <a href="[EMAIL PROTECTED]">Hiram Chirino</a>
    * @see        <related>
  - * @version    $Revision: 1.4 $
  + * @version    $Revision: 1.5 $
    */
   public interface StateManagerMBean
          extends ServiceMBean
  @@ -31,6 +31,9 @@
       * @param  newStateFile  The new StateFile value
       */
      public void setStateFile(java.lang.String newStateFile);
  +
  +
  +   public StateManager getInstance();
   
      /**
       *  #Description of the Method
  
  
  
  1.5       +44 -17    jbossmq/src/main/org/jboss/mq/server/TopicManager.java
  
  Index: TopicManager.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/server/TopicManager.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- TopicManager.java 2001/09/01 03:01:00     1.4
  +++ TopicManager.java 2001/11/10 21:38:05     1.5
  @@ -5,21 +5,23 @@
    * See terms of license at gnu.org.
    */
   package org.jboss.mq.server;
  +
  +
  +
  +import java.util.Collection;
   import java.util.HashMap;
   import java.util.Hashtable;
  -
   import java.util.Iterator;
   import java.util.LinkedList;
   import java.util.TreeSet;
   import javax.jms.DeliveryMode;
  -
   import javax.jms.Destination;
   import javax.jms.JMSException;
   import javax.management.*;
   import javax.naming.InitialContext;
   import org.jboss.mq.*;
  -
   import org.jboss.system.ServiceMBeanSupport;
  +import org.jboss.mq.DurableSubcriptionID;//Typo!!!
   
   /**
    *  This class is a message queue which is stored (hashed by Destination) on the
  @@ -27,7 +29,7 @@
    *
    * @author     Norbert Lataille ([EMAIL PROTECTED])
    * @author     <a href="[EMAIL PROTECTED]">Hiram Chirino</a>
  - * @version    $Revision: 1.4 $
  + * @version    $Revision: 1.5 $
    */
   public class TopicManager
          extends ServiceMBeanSupport
  @@ -37,6 +39,7 @@
      JMSTopic destination;
      SpyTopic topic;
      String topicName;
  +   private ObjectName jbossMQService;
   
      /**
       *  Gets the Name attribute of the TopicManager object
  @@ -60,11 +63,31 @@
      }
   
      /**
  +    * Get the value of JBossMQService.
  +    * @return value of JBossMQService.
  +    */
  +   public ObjectName getJBossMQService() 
  +   {
  +      return jbossMQService;
  +   }
  +   
  +   /**
  +    * Set the value of JBossMQService.
  +    * @param v  Value to assign to JBossMQService.
  +    */
  +   public void setJBossMQService(ObjectName  jbossMQService) 
  +   {
  +      this.jbossMQService = jbossMQService;
  +   }
  +   
  +
  +
  +   /**
       *  #Description of the Method
       *
       * @exception  Exception  Description of Exception
       */
  -   public void initService() throws Exception
  +   public void startService() throws Exception
      {
   
         if (topicName == null || topicName.length() == 0)
  @@ -72,7 +95,7 @@
            throw new Exception("TopicName was not set");
         }
   
  -      JMSServer server = (JMSServer)getServer().invoke(new 
ObjectName(JBossMQServiceMBean.OBJECT_NAME), "getJMSServer", new Object[]{
  +      JMSServer server = (JMSServer)getServer().invoke(jbossMQService, 
"getJMSServer", new Object[]{
               }, new String[]{
               });
   
  @@ -80,17 +103,16 @@
         destination = new JMSTopic(topic, null, server);
   
         server.addDestination(topic, destination);
  -
  -   }
  -
  -   /**
  -    *  #Description of the Method
  -    *
  -    * @exception  Exception  Description of Exception
  -    */
  -   public void startService() throws Exception
  -   {
  -
  +      //Is this right? 
  +      StateManager sm = server.getStateManager();
  +      Collection durableSubs = sm.getDurableSubscriptionIdsForTopic(topic);
  +      for (Iterator i = durableSubs.iterator(); i.hasNext();) 
  +      {
  +         destination.createDurableSubscription((DurableSubcriptionID)i.next());     
    
  +      } // end of for ()
  +      
  +      //server.getPersistenceManager().restoreQueue(destination, topic);
  +      //server.getPersistenceManager().initQueue(destination);
         //Get an InitialContext
         InitialContext ctx = new InitialContext();
         javax.naming.Context subctx;
  @@ -104,6 +126,11 @@
         }
         subctx.rebind(topicName, topic);
   
  +   }
  +
  +   protected void stopService()
  +   {
  +      log.error("queue stop not yet implemented");
      }
   
      protected ObjectName getObjectName(MBeanServer server, ObjectName name) throws 
javax.management.MalformedObjectNameException
  
  
  
  1.5       +14 -2     jbossmq/src/main/org/jboss/mq/server/TopicManagerMBean.java
  
  Index: TopicManagerMBean.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/jbossmq/src/main/org/jboss/mq/server/TopicManagerMBean.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- TopicManagerMBean.java    2001/09/01 03:01:00     1.4
  +++ TopicManagerMBean.java    2001/11/10 21:38:05     1.5
  @@ -6,6 +6,7 @@
    */
   package org.jboss.mq.server;
   
  +import javax.management.ObjectName;
   import org.jboss.system.ServiceMBean;
   
   /**
  @@ -13,7 +14,7 @@
    *
    * @author     <a href="[EMAIL PROTECTED]">Hiram Chirino</a>
    * @see        <related>
  - * @version    $Revision: 1.4 $
  + * @version    $Revision: 1.5 $
    */
   public interface TopicManagerMBean
          extends ServiceMBean
  @@ -24,6 +25,17 @@
       *
       * @return    The TopicName value
       */
  -   public java.lang.String getTopicName();
  +   java.lang.String getTopicName();
   
  +   /**
  +    * Get the value of JBossMQService.
  +    * @return value of JBossMQService.
  +    */
  +   ObjectName getJBossMQService(); 
  +   
  +   /**
  +    * Set the value of JBossMQService.
  +    * @param v  Value to assign to JBossMQService.
  +    */
  +   void setJBossMQService(ObjectName  jbossMQService); 
   }
  
  
  

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

Reply via email to