[hornetq-commits] JBoss hornetq SVN: r8972 - in branches/Clebert_TMP/src/main/org/hornetq: jms/server/impl and 1 other directory.

[do-not-reply at jboss.org]

Author: clebert.suconic at jboss.com
Date: 2010-03-26 14:10:52 -0400 (Fri, 26 Mar 2010)
New Revision: 8972

Modified:
   branches/Clebert_TMP/src/main/org/hornetq/api/jms/management/JMSServerControl.java
   branches/Clebert_TMP/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java
Log:
tweaks before merge

Modified: branches/Clebert_TMP/src/main/org/hornetq/api/jms/management/JMSServerControl.java
===================================================================
--- branches/Clebert_TMP/src/main/org/hornetq/api/jms/management/JMSServerControl.java	2010-03-26 17:53:40 UTC (rev 8971)
+++ branches/Clebert_TMP/src/main/org/hornetq/api/jms/management/JMSServerControl.java	2010-03-26 18:10:52 UTC (rev 8972)
@@ -14,7 +14,6 @@
 package org.hornetq.api.jms.management;
 
 import java.util.Map;
-import java.util.Set;
 
 import javax.management.MBeanOperationInfo;
 
@@ -22,8 +21,6 @@
 import org.hornetq.api.core.client.ClientSessionFactory;
 import org.hornetq.api.core.management.Operation;
 import org.hornetq.api.core.management.Parameter;
-import org.hornetq.core.security.Role;
-import org.hornetq.core.settings.impl.AddressSettings;
 import org.hornetq.spi.core.remoting.ConnectorFactory;
 
 /**

Modified: branches/Clebert_TMP/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java
===================================================================
--- branches/Clebert_TMP/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java	2010-03-26 17:53:40 UTC (rev 8971)
+++ branches/Clebert_TMP/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java	2010-03-26 18:10:52 UTC (rev 8972)
@@ -154,6 +154,8 @@
       {
          jmsManagementService.registerJMSServer(this);
 
+         initJournal();
+
          // start the JMS deployer only if the configuration is not done using the JMSConfiguration object
          if (config == null)
          {
@@ -176,7 +178,6 @@
             deploy();
          }
 
-         initJournal();
       }
       catch (Exception e)
       {
@@ -324,7 +325,7 @@
       
       for (String jndiItem : jndi)
       {
-         addQueueToJndi(topicName, jndiItem);
+         addTopicToJndi(topicName, jndiItem);
       }
 
       return added;