[jboss-cvs] JBossAS SVN: r109827 - branches/JBPAPP_5_1/security/src/main/org/jboss/security/plugins.

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

Author: mmoyses
Date: 2010-12-10 11:08:01 -0500 (Fri, 10 Dec 2010)
New Revision: 109827

Modified:
   branches/JBPAPP_5_1/security/src/main/org/jboss/security/plugins/JaasSecurityDomain.java
   branches/JBPAPP_5_1/security/src/main/org/jboss/security/plugins/JaasSecurityDomainMBean.java
Log:
JBPAPP-5567: adding properties map option additionalOptions

Modified: branches/JBPAPP_5_1/security/src/main/org/jboss/security/plugins/JaasSecurityDomain.java
===================================================================
--- branches/JBPAPP_5_1/security/src/main/org/jboss/security/plugins/JaasSecurityDomain.java	2010-12-10 14:53:44 UTC (rev 109826)
+++ branches/JBPAPP_5_1/security/src/main/org/jboss/security/plugins/JaasSecurityDomain.java	2010-12-10 16:08:01 UTC (rev 109827)
@@ -30,6 +30,8 @@
 import java.security.KeyStore;
 import java.security.Provider;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.Properties;
 
 import javax.crypto.Cipher;
 import javax.crypto.SecretKey;
@@ -178,6 +180,8 @@
    private String trustStoreProviderArgument;
    
    private String clientAlias;
+   
+   private Properties additionalOptions;
 
    /** Specify the SecurityManagement instance */
    private ISecurityManagement securityManagement = SecurityConstantsBridge.getSecurityManagement();
@@ -796,6 +800,27 @@
    {
       this.keyStoreAlias = serverAlias;
    }
+   
+   /*
+    *  (non-Javadoc)
+    *  
+    *  @see org.jboss.security.plugins.JaasSecurityDomainMBean#getAdditionalOptions
+    */
+   @ManagementProperty(use = {ViewUse.CONFIGURATION}, description = "A map for additional options required by external components")
+   public Properties getAdditionalOptions()
+   {
+      return additionalOptions;
+   }
+   
+   /*
+    *  (non-Javadoc)
+    *  
+    *  @see org.jboss.security.plugins.JaasSecurityDomainMBean#setAdditionalOptions(java.lang.String)
+    */
+   public void setAdditionalOptions(Properties additionalOptions)
+   {
+      this.additionalOptions = additionalOptions;
+   }
 
    /*
     * (non-Javadoc)

Modified: branches/JBPAPP_5_1/security/src/main/org/jboss/security/plugins/JaasSecurityDomainMBean.java
===================================================================
--- branches/JBPAPP_5_1/security/src/main/org/jboss/security/plugins/JaasSecurityDomainMBean.java	2010-12-10 14:53:44 UTC (rev 109826)
+++ branches/JBPAPP_5_1/security/src/main/org/jboss/security/plugins/JaasSecurityDomainMBean.java	2010-12-10 16:08:01 UTC (rev 109827)
@@ -22,6 +22,7 @@
 package org.jboss.security.plugins;
 
 import java.io.IOException;
+import java.util.Properties;
 
 import javax.management.ObjectName;
 
@@ -253,4 +254,18 @@
     * @param clientAlias client alias name
     */
    public void setServerAlias(String serverAlias);
+   
+   /**
+    * Gets the additionalOptions map
+    * 
+    * @return the map
+    */
+   public Properties getAdditionalOptions();
+   
+   /**
+    * Sets the additionalOptions map
+    * 
+    * @param additionalOptions the map
+    */
+   public void setAdditionalOptions(Properties additionalOptions);
 }