[jboss-cvs] JBoss Messaging SVN: r6475 - 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 09:53:52 -0400 (Fri, 17 Apr 2009)
New Revision: 6475

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 for security store and manager and injects them from 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 13:40:56 UTC (rev 6474)
+++ trunk/src/main/org/jboss/messaging/core/security/SecurityStore.java	2009-04-17 13:53:52 UTC (rev 6475)
@@ -22,11 +22,8 @@
 
 package org.jboss.messaging.core.security;
 
-import java.util.Set;
-
 import org.jboss.messaging.core.management.NotificationService;
 import org.jboss.messaging.core.server.ServerSession;
-import org.jboss.messaging.core.settings.HierarchicalRepository;
 import org.jboss.messaging.utils.SimpleString;
 
 
@@ -43,10 +40,6 @@
    
    void check(SimpleString address, CheckType checkType, ServerSession session) throws Exception;
 
-   void setSecurityRepository(HierarchicalRepository<Set<Role>> securityRepository);
-   
-   void setSecurityManager(JBMSecurityManager securityManager);
-
    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 13:40:56 UTC (rev 6474)
+++ trunk/src/main/org/jboss/messaging/core/security/impl/SecurityStoreImpl.java	2009-04-17 13:53:52 UTC (rev 6475)
@@ -22,14 +22,19 @@
 
 package org.jboss.messaging.core.security.impl;
 
-import org.jboss.messaging.core.client.management.impl.ManagementHelper;
 import static org.jboss.messaging.core.config.impl.ConfigurationImpl.DEFAULT_MANAGEMENT_CLUSTER_PASSWORD;
+import static org.jboss.messaging.core.management.NotificationType.SECURITY_AUTHENTICATION_VIOLATION;
+
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+import org.jboss.messaging.core.client.management.impl.ManagementHelper;
 import org.jboss.messaging.core.exception.MessagingException;
 import org.jboss.messaging.core.logging.Logger;
 import org.jboss.messaging.core.management.Notification;
 import org.jboss.messaging.core.management.NotificationService;
 import org.jboss.messaging.core.management.NotificationType;
-import static org.jboss.messaging.core.management.NotificationType.SECURITY_AUTHENTICATION_VIOLATION;
 import org.jboss.messaging.core.security.CheckType;
 import org.jboss.messaging.core.security.JBMSecurityManager;
 import org.jboss.messaging.core.security.Role;
@@ -41,10 +46,6 @@
 import org.jboss.messaging.utils.SimpleString;
 import org.jboss.messaging.utils.TypedProperties;
 
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
 /**
  * The JBM SecurityStore implementation
  *
@@ -75,9 +76,9 @@
 
    private boolean trace = log.isTraceEnabled();
 
-   private HierarchicalRepository<Set<Role>> securityRepository;
+   private final HierarchicalRepository<Set<Role>> securityRepository;
 
-   private JBMSecurityManager securityManager;
+   private final JBMSecurityManager securityManager;
 
    private final ConcurrentMap<CheckType, ConcurrentHashSet<SimpleString>> cache = new ConcurrentHashMap<CheckType, ConcurrentHashSet<SimpleString>>();
 
@@ -93,10 +94,14 @@
    
    // Constructors --------------------------------------------------
 
-   public SecurityStoreImpl(final long invalidationInterval, final boolean securityEnabled)
+   public SecurityStoreImpl(final HierarchicalRepository<Set<Role>> securityRepository,
+                            final JBMSecurityManager securityManager,
+                            final long invalidationInterval,
+                            final boolean securityEnabled)
    {
-   	this.invalidationInterval = invalidationInterval;
-   	
+      this.securityRepository = securityRepository;
+      this.securityManager = securityManager;
+   	this.invalidationInterval = invalidationInterval;   	
    	this.securityEnabled = securityEnabled;   	   
    }
 
@@ -199,22 +204,11 @@
 
    // Public --------------------------------------------------------
 
-   public void setSecurityRepository(HierarchicalRepository<Set<Role>> securityRepository)
-   {
-      this.securityRepository = securityRepository;
-      securityRepository.registerListener(this);
-   }
-
    public void setNotificationService(NotificationService notificationService)
    {
       this.notificationService = notificationService;
    }
    
-   public void setSecurityManager(JBMSecurityManager securityManager)
-   {
-      this.securityManager = securityManager;
-   }
-
    public void setManagementClusterPassword(String password)
    {           
       this.managementClusterPassword = password;

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 13:40:56 UTC (rev 6474)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java	2009-04-17 13:53:52 UTC (rev 6475)
@@ -248,7 +248,12 @@
 
       initialised = !configuration.isBackup();
 
-      securityStore = new SecurityStoreImpl(configuration.getSecurityInvalidationInterval(),
+      securityRepository = new HierarchicalObjectRepository<Set<Role>>();
+      securityRepository.setDefault(new HashSet<Role>());
+
+      securityStore = new SecurityStoreImpl(securityRepository,
+                                            securityManager,
+                                            configuration.getSecurityInvalidationInterval(),
                                             configuration.isSecurityEnabled());
       securityStore.setManagementClusterPassword(configuration.getManagementClusterPassword());
       securityStore.setNotificationService(managementService);
@@ -276,11 +281,6 @@
                                       executorFactory,
                                       addressSettingsRepository);
 
-      securityRepository = new HierarchicalObjectRepository<Set<Role>>();
-      securityRepository.setDefault(new HashSet<Role>());
-      securityStore.setSecurityRepository(securityRepository);
-      securityStore.setSecurityManager(securityManager);
-
       postOffice.start();
 
       pagingManager.start();