[jboss-cvs] JBoss Messaging SVN: r4631 - trunk/src/main/org/jboss/messaging/core/server/impl.

[jboss-cvs-commits at lists.jboss.org]

Author: ataylor
Date: 2008-07-04 06:02:50 -0400 (Fri, 04 Jul 2008)
New Revision: 4631

Modified:
   trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
Log:
created repository at instantiation time for injection dependency

Modified: trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java	2008-07-01 11:01:28 UTC (rev 4630)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java	2008-07-04 10:02:50 UTC (rev 4631)
@@ -22,14 +22,6 @@
 
 package org.jboss.messaging.core.server.impl;
 
-import java.util.HashSet;
-import java.util.Set;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledThreadPoolExecutor;
-import java.util.concurrent.ThreadFactory;
-
 import org.jboss.messaging.core.client.RemotingSessionListener;
 import org.jboss.messaging.core.config.Configuration;
 import org.jboss.messaging.core.exception.MessagingException;
@@ -39,11 +31,7 @@
 import org.jboss.messaging.core.persistence.StorageManager;
 import org.jboss.messaging.core.postoffice.PostOffice;
 import org.jboss.messaging.core.postoffice.impl.PostOfficeImpl;
-import org.jboss.messaging.core.remoting.ConnectorRegistryFactory;
-import org.jboss.messaging.core.remoting.Interceptor;
-import org.jboss.messaging.core.remoting.PacketDispatcher;
-import org.jboss.messaging.core.remoting.PacketReturner;
-import org.jboss.messaging.core.remoting.RemotingService;
+import org.jboss.messaging.core.remoting.*;
 import org.jboss.messaging.core.remoting.impl.wireformat.CreateConnectionResponse;
 import org.jboss.messaging.core.security.JBMSecurityManager;
 import org.jboss.messaging.core.security.Role;
@@ -63,7 +51,11 @@
 import org.jboss.messaging.util.OrderedExecutorFactory;
 import org.jboss.messaging.util.VersionLoader;
 
+import java.util.HashSet;
+import java.util.Set;
+import java.util.concurrent.*;
 
+
 /**
  * The messaging server implementation
  * 
@@ -92,7 +84,7 @@
    private SecurityStore securityStore;
    private ConnectionManager connectionManager;
    private RemotingSessionListener sessionListener; 
-   private HierarchicalRepository<QueueSettings> queueSettingsRepository;
+   private HierarchicalRepository<QueueSettings> queueSettingsRepository = new HierarchicalObjectRepository<QueueSettings>();;
    private ScheduledExecutorService scheduledExecutor;   
    private QueueFactory queueFactory;
    private PostOffice postOffice;
@@ -174,7 +166,6 @@
       ConnectionManagerImpl cm = new ConnectionManagerImpl();
       this.connectionManager = cm;
       this.sessionListener = cm;   
-      queueSettingsRepository = new HierarchicalObjectRepository<QueueSettings>();
       queueSettingsRepository.setDefault(new QueueSettings());
       scheduledExecutor = new ScheduledThreadPoolExecutor(configuration.getScheduledThreadPoolMaxSize(), new JBMThreadFactory("JBM-scheduled-threads"));                  
       queueFactory = new QueueFactoryImpl(scheduledExecutor, queueSettingsRepository);