[jboss-cvs] JBoss Messaging SVN: r3293 - branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server.

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

Author: ataylor
Date: 2007-11-06 12:09:40 -0500 (Tue, 06 Nov 2007)
New Revision: 3293

Modified:
   branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/Configuration.java
Log:
initial microcontainer integration, tidied up

Modified: branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/Configuration.java
===================================================================
--- branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/Configuration.java	2007-11-06 16:44:26 UTC (rev 3292)
+++ branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/Configuration.java	2007-11-06 17:09:40 UTC (rev 3293)
@@ -36,6 +36,10 @@
  */
 public class Configuration
 {
+   private static final String READ_ATTR = "read";
+   private static final String WRITE_ATTR = "write";
+   private static final String CREATE_ATTR = "create";
+   private static final String NAME_ATTR = "name";
    private static PropertyChangeSupport propertyChangeSupport;
    private static Integer _serverPeerID = -1;
    private static String _defaultQueueJNDIContext = "";
@@ -48,12 +52,12 @@
    private static Integer _defaultMaxDeliveryAttempts = 10;
    protected static String _defaultExpiryQueue;
 
-   private static Long _defaultRedeliveryDelay = (long)0;
+   private static Long _defaultRedeliveryDelay = (long) 0;
 
-   private static Long _messageCounterSamplePeriod = (long)10000;// Default is 1 minute
-   private static Long _failoverStartTimeout = (long)(60 * 1000);
+   private static Long _messageCounterSamplePeriod = (long) 10000;// Default is 1 minute
+   private static Long _failoverStartTimeout = (long) (60 * 1000);
    // Default is 5 minutes
-   private static Long _failoverCompleteTimeout = (long)(5 * 60 * 1000);
+   private static Long _failoverCompleteTimeout = (long) (5 * 60 * 1000);
 
    private static Integer _defaultMessageCounterHistoryDayLimit = 1;
 
@@ -64,12 +68,12 @@
 
    private static Boolean _defaultPreserveOrdering = false;
 
-   private static Long _recoverDeliveriesTimeout = (long)(5 * 60 * 1000);
+   private static Long _recoverDeliveriesTimeout = (long) (5 * 60 * 1000);
 
 
    private static String _suckerPassword;
 
-      //Global override for strict behaviour
+   //Global override for strict behaviour
    private static Boolean _strictTck = false;
 
    //From a system property - this overrides
@@ -81,7 +85,7 @@
 
    private static Long _stateTimeout = (long) 5000;
 
-   private static Long _castTimeout = (long)5000;
+   private static Long _castTimeout = (long) 5000;
 
    private static String _groupName;
 
@@ -110,7 +114,7 @@
       _securityDomain = getString(e, "security-domain", _securityDomain);
       _defaultDLQ = getString(e, "default-dlq", _defaultDLQ);
       _defaultMaxDeliveryAttempts = getInteger(e, "default-max-delivery-attempts", _defaultMaxDeliveryAttempts);
-      _defaultExpiryQueue = getString(e,"default-expiry-queue", _defaultExpiryQueue);
+      _defaultExpiryQueue = getString(e, "default-expiry-queue", _defaultExpiryQueue);
       _defaultRedeliveryDelay = getLong(e, "default-redelivery-delay", _defaultRedeliveryDelay);
       _messageCounterSamplePeriod = getLong(e, "message-counter-sample-period", _messageCounterSamplePeriod);
       _failoverStartTimeout = getLong(e, "failover-start-timeout", _failoverStartTimeout);
@@ -131,25 +135,46 @@
       _dataChannelName = getString(e, "data-channel-name", _dataChannelName);
       _channelPartitionName = getString(e, "channel-partition-name", _channelPartitionName);
       _maxConcurrentReplications = getInteger(e, "max-concurrent-replications", _maxConcurrentReplications);
-      
+      NodeList security = e.getElementsByTagName("default-security-config");
+      if (security.getLength() > 0)
+      {
+         HashSet<Role> securityConfig;
+         securityConfig = new HashSet<Role>();
+         NodeList roles = security.item(0).getChildNodes();
+         for (int k = 0; k < roles.getLength(); k++)
+         {
+            if ("role".equalsIgnoreCase(roles.item(k).getNodeName()))
+            {
+               Boolean read = roles.item(k).getAttributes().getNamedItem(READ_ATTR) != null && Boolean.valueOf(roles.item(k).getAttributes().getNamedItem(READ_ATTR).getNodeValue());
+               Boolean write = roles.item(k).getAttributes().getNamedItem(WRITE_ATTR) != null && Boolean.valueOf(roles.item(k).getAttributes().getNamedItem(WRITE_ATTR).getNodeValue());
+               Boolean create = roles.item(k).getAttributes().getNamedItem(CREATE_ATTR) != null && Boolean.valueOf(roles.item(k).getAttributes().getNamedItem(CREATE_ATTR).getNodeValue());
+               Role role = new Role(roles.item(k).getAttributes().getNamedItem(NAME_ATTR).getNodeValue(),
+                       read,
+                       write,
+                       create);
+               securityConfig.add(role);
+            }
+         }
+         _securityConfig = securityConfig;
+      }
 
    }
 
    private static Boolean getBoolean(Element e, String name, Boolean def)
+   {
+      NodeList nl = e.getElementsByTagName(name);
+      if (nl.getLength() > 0)
       {
-         NodeList nl = e.getElementsByTagName(name);
-         if(nl.getLength() > 0)
-         {
-            return Boolean.valueOf(nl.item(0).getTextContent().trim());
-         }
-         return def;
+         return Boolean.valueOf(nl.item(0).getTextContent().trim());
       }
+      return def;
+   }
 
 
    private static Integer getInteger(Element e, String name, Integer def)
    {
       NodeList nl = e.getElementsByTagName(name);
-      if(nl.getLength() > 0)
+      if (nl.getLength() > 0)
       {
          return Integer.valueOf(nl.item(0).getTextContent().trim());
       }
@@ -159,7 +184,7 @@
    private static Long getLong(Element e, String name, Long def)
    {
       NodeList nl = e.getElementsByTagName(name);
-      if(nl.getLength() > 0)
+      if (nl.getLength() > 0)
       {
          return Long.valueOf(nl.item(0).getTextContent().trim());
       }
@@ -168,8 +193,8 @@
 
    private static String getString(Element e, String name, String def)
    {
-       NodeList nl = e.getElementsByTagName(name);
-      if(nl.getLength() > 0)
+      NodeList nl = e.getElementsByTagName(name);
+      if (nl.getLength() > 0)
       {
          return nl.item(0).getTextContent().trim();
       }
@@ -340,7 +365,7 @@
 
    public static void setClusterPullConnectionFactoryName(String clusterPullConnectionFactoryName)
    {
-     _clusterPullConnectionFactoryName = clusterPullConnectionFactoryName;
+      _clusterPullConnectionFactoryName = clusterPullConnectionFactoryName;
    }