[jboss-cvs] JBossAS SVN: r81790 - in trunk: security/src/main/org/jboss/security/integration and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Nov 28 15:58:46 EST 2008
Author: anil.saldhana at jboss.com
Date: 2008-11-28 15:58:46 -0500 (Fri, 28 Nov 2008)
New Revision: 81790
Modified:
trunk/component-matrix/pom.xml
trunk/security/src/main/org/jboss/security/integration/JNDIBasedSecurityManagement.java
trunk/security/src/main/org/jboss/security/plugins/JaasSecurityDomain.java
trunk/security/src/main/org/jboss/security/plugins/JaasSecurityManager.java
trunk/security/src/main/org/jboss/security/plugins/JaasSecurityManagerService.java
Log:
JBAS-6021: upgrade to security 2.0.2.SP3
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2008-11-28 20:41:40 UTC (rev 81789)
+++ trunk/component-matrix/pom.xml 2008-11-28 20:58:46 UTC (rev 81790)
@@ -75,7 +75,7 @@
<version.org.jboss.metadata>1.0.0.CR7</version.org.jboss.metadata>
<version.org.jboss.naming>5.0.0.SP1</version.org.jboss.naming>
<version.org.jboss.remoting>2.5.0.SP2</version.org.jboss.remoting>
- <version.org.jboss.security>2.0.2.SP2</version.org.jboss.security>
+ <version.org.jboss.security>2.0.2.SP3</version.org.jboss.security>
<version.oswego-concurrent.concurrent>1.3.4-jboss-update1</version.oswego-concurrent.concurrent>
<version.suffix.org.jboss.javaee>.GA</version.suffix.org.jboss.javaee>
<version.org.springframework>2.5.5</version.org.springframework>
Modified: trunk/security/src/main/org/jboss/security/integration/JNDIBasedSecurityManagement.java
===================================================================
--- trunk/security/src/main/org/jboss/security/integration/JNDIBasedSecurityManagement.java 2008-11-28 20:41:40 UTC (rev 81789)
+++ trunk/security/src/main/org/jboss/security/integration/JNDIBasedSecurityManagement.java 2008-11-28 20:58:46 UTC (rev 81790)
@@ -43,7 +43,7 @@
import org.jboss.security.ISecurityManagement;
import org.jboss.security.SecurityConstants;
import org.jboss.security.audit.AuditManager;
-import org.jboss.security.auth.callback.SecurityAssociationHandler;
+import org.jboss.security.auth.callback.JBossCallbackHandler;
import org.jboss.security.config.SecurityConfiguration;
import org.jboss.security.identitytrust.IdentityTrustManager;
import org.jboss.security.mapping.MappingManager;
@@ -80,7 +80,7 @@
protected String mappingMgrClass = "org.jboss.security.plugins.mapping.JBossMappingManager";
- protected CallbackHandler callBackHandler = new SecurityAssociationHandler();
+ protected transient CallbackHandler callBackHandler = new JBossCallbackHandler();
/** Enable the IdentityTrust feature */
protected boolean enableIdentity = false;
@@ -98,14 +98,14 @@
public JNDIBasedSecurityManagement()
{
- initializeMaps();
+ initialize();
}
@ManagementOperation(description = "Get the audit manager for the specified security domain",
params = {@ManagementParameter(name = "securityDomain", description = "The security domain name")})
public AuditManager getAuditManager(String securityDomain)
{
- initializeMaps();
+ initialize();
AuditManager auditManager = null;
try
{
@@ -130,7 +130,7 @@
params = {@ManagementParameter(name = "securityDomain", description = "The security domain name")})
public AuthenticationManager getAuthenticationManager(String securityDomain)
{
- initializeMaps();
+ initialize();
AuthenticationManager am = null;
try
{
@@ -153,7 +153,7 @@
params = {@ManagementParameter(name = "securityDomain", description = "The security domain name")})
public AuthorizationManager getAuthorizationManager(String securityDomain)
{
- initializeMaps();
+ initialize();
AuthorizationManager am = null;
try
{
@@ -175,7 +175,7 @@
params = {@ManagementParameter(name = "securityDomain", description = "The security domain name")})
public IdentityTrustManager getIdentityTrustManager(String securityDomain)
{
- initializeMaps();
+ initialize();
IdentityTrustManager am = null;
try
{
@@ -200,7 +200,7 @@
params = {@ManagementParameter(name = "securityDomain", description = "The security domain name")})
public MappingManager getMappingManager(String securityDomain)
{
- initializeMaps();
+ initialize();
MappingManager am = null;
try
{
@@ -519,7 +519,7 @@
/**
* Since the maps are transient, initialize them
*/
- private void initializeMaps()
+ private void initialize()
{
if(authMgrMap == null)
authMgrMap = new ConcurrentHashMap<String,AuthenticationManager>();
@@ -530,6 +530,9 @@
if(auditMgrMap == null)
auditMgrMap = new ConcurrentHashMap<String,AuditManager>();
if(idmMgrMap == null)
- idmMgrMap = new ConcurrentHashMap<String,IdentityTrustManager>();
+ idmMgrMap = new ConcurrentHashMap<String,IdentityTrustManager>();
+
+ if(callBackHandler == null)
+ callBackHandler = new JBossCallbackHandler();
}
}
\ No newline at end of file
Modified: trunk/security/src/main/org/jboss/security/plugins/JaasSecurityDomain.java
===================================================================
--- trunk/security/src/main/org/jboss/security/plugins/JaasSecurityDomain.java 2008-11-28 20:41:40 UTC (rev 81789)
+++ trunk/security/src/main/org/jboss/security/plugins/JaasSecurityDomain.java 2008-11-28 20:58:46 UTC (rev 81790)
@@ -54,7 +54,7 @@
import org.jboss.security.ISecurityManagement;
import org.jboss.security.SecurityDomain;
import org.jboss.security.Util;
-import org.jboss.security.auth.callback.SecurityAssociationHandler;
+import org.jboss.security.auth.callback.JBossCallbackHandler;
import org.jboss.security.integration.JNDIBasedSecurityManagement;
/**
@@ -171,7 +171,7 @@
*/
public JaasSecurityDomain(String securityDomain)
{
- this(securityDomain, new SecurityAssociationHandler());
+ this(securityDomain, new JBossCallbackHandler());
}
/**
Modified: trunk/security/src/main/org/jboss/security/plugins/JaasSecurityManager.java
===================================================================
--- trunk/security/src/main/org/jboss/security/plugins/JaasSecurityManager.java 2008-11-28 20:41:40 UTC (rev 81789)
+++ trunk/security/src/main/org/jboss/security/plugins/JaasSecurityManager.java 2008-11-28 20:58:46 UTC (rev 81790)
@@ -34,7 +34,7 @@
import org.jboss.security.AuthenticationManager;
import org.jboss.security.RealmMapping;
import org.jboss.security.SubjectSecurityManager;
-import org.jboss.security.auth.callback.SecurityAssociationHandler;
+import org.jboss.security.auth.callback.JBossCallbackHandler;
import org.jboss.security.plugins.auth.JaasSecurityManagerBase;
import org.jboss.system.ServiceMBeanSupport;
import org.jboss.util.CachePolicy;
@@ -64,7 +64,7 @@
*/
public JaasSecurityManager()
{
- this("other", new SecurityAssociationHandler());
+ this("other", new JBossCallbackHandler());
}
/** Creates a JaasSecurityManager for with a securityDomain
name of that given by the 'securityDomain' argument.
Modified: trunk/security/src/main/org/jboss/security/plugins/JaasSecurityManagerService.java
===================================================================
--- trunk/security/src/main/org/jboss/security/plugins/JaasSecurityManagerService.java 2008-11-28 20:41:40 UTC (rev 81789)
+++ trunk/security/src/main/org/jboss/security/plugins/JaasSecurityManagerService.java 2008-11-28 20:58:46 UTC (rev 81790)
@@ -97,8 +97,8 @@
/** The loaded securityMgrClassName */
private static Class securityMgrClass = JaasSecurityManager.class;
/** The JAAS CallbackHandler interface implementation to use */
- private static String callbackHandlerClassName = "org.jboss.security.auth.callback.SecurityAssociationHandler";
- private static Class callbackHandlerClass = org.jboss.security.auth.callback.SecurityAssociationHandler.class;
+ private static String callbackHandlerClassName = "org.jboss.security.auth.callback.JBossCallbackHandler";
+ private static Class callbackHandlerClass = org.jboss.security.auth.callback.JBossCallbackHandler.class;
/** The location of the security credential cache policy. This is first treated
as a ObjectFactory location that is capable of returning CachePolicy instances
More information about the jboss-cvs-commits
mailing list