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

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

Author: jmesnil
Date: 2009-04-17 10:46:20 -0400 (Fri, 17 Apr 2009)
New Revision: 6477

Modified:
   trunk/src/main/org/jboss/messaging/core/security/SecurityStore.java
   trunk/src/main/org/jboss/messaging/core/security/impl/SecurityStoreImpl.java
   trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
Log:
SecurityStore API refactoring

* removed setter methods and injects things in the constructor


Modified: trunk/src/main/org/jboss/messaging/core/security/SecurityStore.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/security/SecurityStore.java	2009-04-17 14:37:13 UTC (rev 6476)
+++ trunk/src/main/org/jboss/messaging/core/security/SecurityStore.java	2009-04-17 14:46:20 UTC (rev 6477)
@@ -22,7 +22,6 @@
 
 package org.jboss.messaging.core.security;
 
-import org.jboss.messaging.core.management.NotificationService;
 import org.jboss.messaging.core.server.ServerSession;
 import org.jboss.messaging.utils.SimpleString;
 
@@ -39,8 +38,4 @@
    void authenticate(String user, String password) throws Exception;
    
    void check(SimpleString address, CheckType checkType, ServerSession session) throws Exception;
-
-   void setManagementClusterPassword(String clusterAdminPassword);
-
-   void setNotificationService(NotificationService notificationService);
 }

Modified: trunk/src/main/org/jboss/messaging/core/security/impl/SecurityStoreImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/security/impl/SecurityStoreImpl.java	2009-04-17 14:37:13 UTC (rev 6476)
+++ trunk/src/main/org/jboss/messaging/core/security/impl/SecurityStoreImpl.java	2009-04-17 14:46:20 UTC (rev 6477)
@@ -88,21 +88,30 @@
    
    private final boolean securityEnabled;
    
-   private String managementClusterPassword;
+   private final String managementClusterPassword;
 
-   private NotificationService notificationService;
+   private final NotificationService notificationService;
    
    // Constructors --------------------------------------------------
 
+   /**
+    * @param notificationService can be <code>null</code>
+    */
    public SecurityStoreImpl(final HierarchicalRepository<Set<Role>> securityRepository,
                             final JBMSecurityManager securityManager,
                             final long invalidationInterval,
-                            final boolean securityEnabled)
+                            final boolean securityEnabled,
+                            final String managementClusterPassword,
+                            final NotificationService notificationService)
    {
       this.securityRepository = securityRepository;
       this.securityManager = securityManager;
    	this.invalidationInterval = invalidationInterval;   	
-   	this.securityEnabled = securityEnabled;   	   
+   	this.securityEnabled = securityEnabled;
+   	this.managementClusterPassword = managementClusterPassword;
+   	this.notificationService = notificationService;
+   	
+      checkDefaultManagementClusterPassword(managementClusterPassword);      
    }
 
    // SecurityManager implementation --------------------------------
@@ -204,18 +213,6 @@
 
    // Public --------------------------------------------------------
 
-   public void setNotificationService(NotificationService notificationService)
-   {
-      this.notificationService = notificationService;
-   }
-   
-   public void setManagementClusterPassword(String password)
-   {           
-      this.managementClusterPassword = password;
-      
-      checkDefaultManagementClusterPassword(password);      
-   }
-
    // Protected -----------------------------------------------------
 
    // Package Private -----------------------------------------------

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-17 14:37:13 UTC (rev 6476)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java	2009-04-17 14:46:20 UTC (rev 6477)
@@ -254,9 +254,9 @@
       securityStore = new SecurityStoreImpl(securityRepository,
                                             securityManager,
                                             configuration.getSecurityInvalidationInterval(),
-                                            configuration.isSecurityEnabled());
-      securityStore.setManagementClusterPassword(configuration.getManagementClusterPassword());
-      securityStore.setNotificationService(managementService);
+                                            configuration.isSecurityEnabled(),
+                                            configuration.getManagementClusterPassword(),
+                                            managementService);
 
       addressSettingsRepository.setDefault(new AddressSettings());
       scheduledExecutor = new ScheduledThreadPoolExecutor(configuration.getScheduledThreadPoolMaxSize(),