[jboss-cvs] JBoss Messaging SVN: r6393 - in trunk/src/main/org/jboss/messaging/core: remoting/server/impl and 1 other directories.

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

Author: jmesnil
Date: 2009-04-10 04:58:25 -0400 (Fri, 10 Apr 2009)
New Revision: 6393

Modified:
   trunk/src/main/org/jboss/messaging/core/remoting/server/RemotingService.java
   trunk/src/main/org/jboss/messaging/core/remoting/server/impl/RemotingServiceImpl.java
   trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
Log:
fixed RemotingServiceImpl

* refactored RemotingServiceImpl constructor to inject directly the MessagingServer and the ManagementService rather than using setters for them

Modified: trunk/src/main/org/jboss/messaging/core/remoting/server/RemotingService.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/server/RemotingService.java	2009-04-10 05:31:16 UTC (rev 6392)
+++ trunk/src/main/org/jboss/messaging/core/remoting/server/RemotingService.java	2009-04-10 08:58:25 UTC (rev 6393)
@@ -24,11 +24,9 @@
 
 import java.util.Set;
 
-import org.jboss.messaging.core.management.ManagementService;
 import org.jboss.messaging.core.remoting.Interceptor;
 import org.jboss.messaging.core.remoting.RemotingConnection;
 import org.jboss.messaging.core.server.MessagingComponent;
-import org.jboss.messaging.core.server.MessagingServer;
 
 /**
  * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
@@ -42,13 +40,9 @@
 
    Set<RemotingConnection> getConnections();
    
-   void setMessagingServer(MessagingServer server);
-   
    void addInterceptor(Interceptor interceptor);
    
    boolean removeInterceptor(Interceptor interceptor);
    
-   void setManagementService(ManagementService managementService);
-   
    void freeze();
 }

Modified: trunk/src/main/org/jboss/messaging/core/remoting/server/impl/RemotingServiceImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/server/impl/RemotingServiceImpl.java	2009-04-10 05:31:16 UTC (rev 6392)
+++ trunk/src/main/org/jboss/messaging/core/remoting/server/impl/RemotingServiceImpl.java	2009-04-10 08:58:25 UTC (rev 6393)
@@ -46,7 +46,6 @@
 import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
 import org.jboss.messaging.core.server.MessagingServer;
 import org.jboss.messaging.core.server.impl.MessagingServerPacketHandler;
-import org.jboss.messaging.utils.UUIDGenerator;
 
 /**
  * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
@@ -88,7 +87,7 @@
 
    // Constructors --------------------------------------------------
 
-   public RemotingServiceImpl(final Configuration config)
+   public RemotingServiceImpl(final Configuration config, final MessagingServer server, final ManagementService managementService)
    {
       transportConfigs = config.getAcceptorConfigurations();
 
@@ -107,15 +106,12 @@
       }
 
       this.config = config;
+      this.server = server;
+      this.managementService = managementService;
    }
 
    // RemotingService implementation -------------------------------
 
-   public void setManagementService(final ManagementService managementService)
-   {
-      this.managementService = managementService;
-   }
-
    public synchronized void start() throws Exception
    {
       if (started)
@@ -248,11 +244,6 @@
       return new HashSet<RemotingConnection>(connections.values());
    }
 
-   public void setMessagingServer(final MessagingServer server)
-   {
-      this.server = server;
-   }
-
    // ConnectionLifeCycleListener implementation -----------------------------------
 
    public void connectionCreated(final Connection connection)

Modified: trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java	2009-04-10 05:31:16 UTC (rev 6392)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java	2009-04-10 08:58:25 UTC (rev 6393)
@@ -496,12 +496,10 @@
          return;
       }
 
-      remotingService = new RemotingServiceImpl(configuration);
-
-      remotingService.setMessagingServer(this);
-
       managementService = new ManagementServiceImpl(mbeanServer, configuration.isJMXManagementEnabled());
-     
+
+      remotingService = new RemotingServiceImpl(configuration, this, managementService);
+      
       if (configuration.isEnableFileDeployment())
       {
          // We need to create it now but not start it