[jboss-cvs] JBossAS SVN: r106477 - in branches/JBPAPP_5_1: security/src/etc/deploy and 7 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jul 6 17:17:57 EDT 2010
Author: mmoyses
Date: 2010-07-06 17:17:57 -0400 (Tue, 06 Jul 2010)
New Revision: 106477
Added:
branches/JBPAPP_5_1/server/src/etc/conf/all/bootstrap/security.xml
Modified:
branches/JBPAPP_5_1/build/build-distr.xml
branches/JBPAPP_5_1/build/build.xml
branches/JBPAPP_5_1/security/src/etc/deploy/security-jboss-beans.xml
branches/JBPAPP_5_1/security/src/main/org/jboss/security/auth/AuthenticationTimedCachePolicy.java
branches/JBPAPP_5_1/security/src/main/org/jboss/security/integration/JNDIBasedSecurityManagement.java
branches/JBPAPP_5_1/security/src/main/org/jboss/security/integration/SecurityConstantsBridge.java
branches/JBPAPP_5_1/security/src/main/org/jboss/security/integration/SecurityDomainObjectFactory.java
branches/JBPAPP_5_1/security/src/main/org/jboss/security/plugins/JaasSecurityDomain.java
branches/JBPAPP_5_1/server/src/etc/conf/all/bootstrap.xml
branches/JBPAPP_5_1/server/src/etc/conf/minimal/bootstrap.xml
branches/JBPAPP_5_1/testsuite/build.xml
Log:
JBPAPP-4542: moving JNDIBasedSecurityManagement to bootstrap
Modified: branches/JBPAPP_5_1/build/build-distr.xml
===================================================================
--- branches/JBPAPP_5_1/build/build-distr.xml 2010-07-06 20:52:27 UTC (rev 106476)
+++ branches/JBPAPP_5_1/build/build-distr.xml 2010-07-06 21:17:57 UTC (rev 106477)
@@ -981,8 +981,8 @@
<property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
<!-- Copy the generated libraries -->
- <mkdir dir="${install.all.lib}"/>
- <copy todir="${install.all.lib}" filtering="no">
+ <mkdir dir="${install.lib}"/>
+ <copy todir="${install.lib}" filtering="no">
<fileset dir="${_module.output}/lib">
<include name="jbosssx-server.jar"/>
</fileset>
@@ -2008,12 +2008,6 @@
<fileset dir="${jboss.jboss.negotiation.lib}">
<include name="jboss-negotiation.jar"/>
</fileset>
- <fileset dir="${jboss.jboss.security.spi.lib}">
- <include name="jboss-security-spi.jar"/>
- </fileset>
- <fileset dir="${jboss.jbosssx.lib}">
- <include name="jbosssx.jar"/>
- </fileset>
<fileset dir="${jboss.security.lib}">
<include name="jbossxacml.jar"/>
</fileset>
@@ -2107,6 +2101,15 @@
<fileset dir="${woodstox.woodstox.lib}">
<include name="wstx.jar"/>
</fileset>
+ <fileset dir="${jboss.jboss.security.spi.lib}">
+ <include name="jboss-security-spi.jar"/>
+ </fileset>
+ <fileset dir="${jboss.jbosssx.lib}">
+ <include name="jbosssx.jar"/>
+ </fileset>
+ <fileset dir="${jboss.jboss.javaee.lib}">
+ <include name="jboss-javaee.jar"/>
+ </fileset>
</copy>
<!-- Copy the generated client libraries -->
@@ -2263,9 +2266,6 @@
<fileset dir="${jboss.jboss.jaspi.api.lib}">
<include name="jboss-jaspi-api.jar"/>
</fileset>
- <fileset dir="${jboss.jboss.javaee.lib}">
- <include name="jboss-javaee.jar"/>
- </fileset>
<fileset dir="${jboss.jnpserver.lib}">
<include name="jnpserver.jar"/>
</fileset>
Modified: branches/JBPAPP_5_1/build/build.xml
===================================================================
--- branches/JBPAPP_5_1/build/build.xml 2010-07-06 20:52:27 UTC (rev 106476)
+++ branches/JBPAPP_5_1/build/build.xml 2010-07-06 21:17:57 UTC (rev 106477)
@@ -997,6 +997,7 @@
<include name="bootstrap/jmx.xml"/>
<include name="bootstrap/deployers.xml"/>
<include name="bootstrap/profile.xml"/>
+ <include name="bootstrap/security.xml"/>
<include name="xmdesc/NamingBean-xmbean.xml"/>
<include name="xmdesc/NamingService-xmbean.xml"/>
<include name="xmdesc/NamingProviderURLWriter-xmbean.xml"/>
Modified: branches/JBPAPP_5_1/security/src/etc/deploy/security-jboss-beans.xml
===================================================================
--- branches/JBPAPP_5_1/security/src/etc/deploy/security-jboss-beans.xml 2010-07-06 20:52:27 UTC (rev 106476)
+++ branches/JBPAPP_5_1/security/src/etc/deploy/security-jboss-beans.xml 2010-07-06 21:17:57 UTC (rev 106477)
@@ -57,10 +57,6 @@
<bean name="JBossSecurityJNDIContextEstablishment"
class="org.jboss.security.integration.JNDIContextEstablishment"/>
- <!-- JNDI Based Security Management -->
- <bean name="JNDIBasedSecurityManagement"
- class="org.jboss.security.integration.JNDIBasedSecurityManagement"/>
-
<!-- Instance of JBoss Security Subject Factory -->
<bean name="JBossSecuritySubjectFactory"
class="org.jboss.security.integration.JBossSecuritySubjectFactory">
Modified: branches/JBPAPP_5_1/security/src/main/org/jboss/security/auth/AuthenticationTimedCachePolicy.java
===================================================================
--- branches/JBPAPP_5_1/security/src/main/org/jboss/security/auth/AuthenticationTimedCachePolicy.java 2010-07-06 20:52:27 UTC (rev 106476)
+++ branches/JBPAPP_5_1/security/src/main/org/jboss/security/auth/AuthenticationTimedCachePolicy.java 2010-07-06 21:17:57 UTC (rev 106477)
@@ -21,6 +21,7 @@
*/
package org.jboss.security.auth;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -34,7 +35,7 @@
* @author <a href="mmoyses at redhat.com">Marcus Moyses</a>
* @version $Revision: 1 $
*/
-public class AuthenticationTimedCachePolicy extends TimedCachePolicy
+public class AuthenticationTimedCachePolicy extends TimedCachePolicy implements Serializable
{
public AuthenticationTimedCachePolicy(int defaultCacheTimeout, boolean b, int defaultCacheResolution)
{
Modified: branches/JBPAPP_5_1/security/src/main/org/jboss/security/integration/JNDIBasedSecurityManagement.java
===================================================================
--- branches/JBPAPP_5_1/security/src/main/org/jboss/security/integration/JNDIBasedSecurityManagement.java 2010-07-06 20:52:27 UTC (rev 106476)
+++ branches/JBPAPP_5_1/security/src/main/org/jboss/security/integration/JNDIBasedSecurityManagement.java 2010-07-06 21:17:57 UTC (rev 106477)
@@ -364,19 +364,16 @@
{
log.debug("Creating SDC for domain="+securityDomain);
AuthenticationManager am = createAuthenticationManager(securityDomain);
- if(cachePolicy == null)
- {
- cachePolicy = createDefaultCachePolicy();
- }
+ CachePolicy cache = createDefaultCachePolicy();
//Set security cache if the auth manager implementation supports it
- setSecurityDomainCache(am, cachePolicy);
+ setSecurityDomainCache(am, cache);
//Set DeepCopySubject option if supported
if(SecurityConfiguration.isDeepCopySubjectMode())
{
setDeepCopySubjectMode(am);
}
- SecurityDomainContext securityDomainContext = new SecurityDomainContext(am, cachePolicy);
+ SecurityDomainContext securityDomainContext = new SecurityDomainContext(am, cache);
securityDomainContext.setAuthorizationManager(createAuthorizationManager(securityDomain));
securityDomainContext.setAuditMgr(createAuditManager(securityDomain));
Modified: branches/JBPAPP_5_1/security/src/main/org/jboss/security/integration/SecurityConstantsBridge.java
===================================================================
--- branches/JBPAPP_5_1/security/src/main/org/jboss/security/integration/SecurityConstantsBridge.java 2010-07-06 20:52:27 UTC (rev 106476)
+++ branches/JBPAPP_5_1/security/src/main/org/jboss/security/integration/SecurityConstantsBridge.java 2010-07-06 21:17:57 UTC (rev 106477)
@@ -36,4 +36,16 @@
public static int defaultCacheResolution = 60;
/** Frequency of the thread cleaning the authentication cache of expired entries */
public static int defaultCacheFlushPeriod = 60*60;
+
+ private static JNDIBasedSecurityManagement securityManagement;
+
+ public static JNDIBasedSecurityManagement getSecurityManagement()
+ {
+ return securityManagement;
+ }
+
+ public void setSecurityManagement(JNDIBasedSecurityManagement securityManagement)
+ {
+ this.securityManagement = securityManagement;
+ }
}
Modified: branches/JBPAPP_5_1/security/src/main/org/jboss/security/integration/SecurityDomainObjectFactory.java
===================================================================
--- branches/JBPAPP_5_1/security/src/main/org/jboss/security/integration/SecurityDomainObjectFactory.java 2010-07-06 20:52:27 UTC (rev 106476)
+++ branches/JBPAPP_5_1/security/src/main/org/jboss/security/integration/SecurityDomainObjectFactory.java 2010-07-06 21:17:57 UTC (rev 106477)
@@ -51,7 +51,7 @@
*/
public class SecurityDomainObjectFactory implements InvocationHandler, ObjectFactory
{
- private JNDIBasedSecurityManagement securityManagement = new JNDIBasedSecurityManagement();
+ private JNDIBasedSecurityManagement securityManagement = SecurityConstantsBridge.getSecurityManagement();
public void setSecurityManagement(JNDIBasedSecurityManagement sm)
{
@@ -170,4 +170,4 @@
//return domains.nextElement();
}
}
-}
\ No newline at end of file
+}
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-07-06 20:52:27 UTC (rev 106476)
+++ branches/JBPAPP_5_1/security/src/main/org/jboss/security/plugins/JaasSecurityDomain.java 2010-07-06 21:17:57 UTC (rev 106477)
@@ -60,6 +60,7 @@
import org.jboss.security.Util;
import org.jboss.security.auth.callback.JBossCallbackHandler;
import org.jboss.security.integration.JNDIBasedSecurityManagement;
+import org.jboss.security.integration.SecurityConstantsBridge;
/**
* The JaasSecurityDomain is an extension of JaasSecurityManager that addes the notion of a KeyStore, and JSSE
@@ -177,7 +178,7 @@
private String trustStoreProviderArgument;
/** Specify the SecurityManagement instance */
- private ISecurityManagement securityManagement = new JNDIBasedSecurityManagement();
+ private ISecurityManagement securityManagement = SecurityConstantsBridge.getSecurityManagement();
/**
* Creates a default JaasSecurityDomain for with a securityDomain name of 'other'.
Added: branches/JBPAPP_5_1/server/src/etc/conf/all/bootstrap/security.xml
===================================================================
--- branches/JBPAPP_5_1/server/src/etc/conf/all/bootstrap/security.xml (rev 0)
+++ branches/JBPAPP_5_1/server/src/etc/conf/all/bootstrap/security.xml 2010-07-06 21:17:57 UTC (rev 106477)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Security bootstrap configuration
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <classloader><inject bean="security-classloader:0.0.0"/></classloader>
+
+ <classloader name="security-classloader" xmlns="urn:jboss:classloader:1.0" export-all="NON_EMPTY" import-all="true">
+ <root>${jboss.lib.url}jbosssx-server.jar</root>
+ <root>${jboss.lib.url}jboss-security-spi.jar</root>
+ <root>${jboss.lib.url}jbosssx.jar</root>
+ <root>${jboss.lib.url}jboss-javaee.jar</root>
+ </classloader>
+
+ <!-- JNDI Based Security Management -->
+ <bean name="JNDIBasedSecurityManagement"
+ class="org.jboss.security.integration.JNDIBasedSecurityManagement"/>
+
+ <bean name="SecurityConstantsBridge" class="org.jboss.security.integration.SecurityConstantsBridge">
+ <property name="securityManagement"><inject bean="JNDIBasedSecurityManagement"/></property>
+ </bean>
+
+ </deployment>
Modified: branches/JBPAPP_5_1/server/src/etc/conf/all/bootstrap.xml
===================================================================
--- branches/JBPAPP_5_1/server/src/etc/conf/all/bootstrap.xml 2010-07-06 20:52:27 UTC (rev 106476)
+++ branches/JBPAPP_5_1/server/src/etc/conf/all/bootstrap.xml 2010-07-06 21:17:57 UTC (rev 106477)
@@ -12,5 +12,6 @@
<url>bootstrap/jmx.xml</url>
<url>bootstrap/deployers.xml</url>
<url>bootstrap/profile.xml</url>
+ <url>bootstrap/security.xml</url>
</bootstrap>
Modified: branches/JBPAPP_5_1/server/src/etc/conf/minimal/bootstrap.xml
===================================================================
--- branches/JBPAPP_5_1/server/src/etc/conf/minimal/bootstrap.xml 2010-07-06 20:52:27 UTC (rev 106476)
+++ branches/JBPAPP_5_1/server/src/etc/conf/minimal/bootstrap.xml 2010-07-06 21:17:57 UTC (rev 106477)
@@ -10,5 +10,6 @@
<url>bootstrap/jmx.xml</url>
<url>bootstrap/deployers.xml</url>
<url>bootstrap/profile.xml</url>
+ <url>bootstrap/security.xml</url>
</bootstrap>
Modified: branches/JBPAPP_5_1/testsuite/build.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/build.xml 2010-07-06 20:52:27 UTC (rev 106476)
+++ branches/JBPAPP_5_1/testsuite/build.xml 2010-07-06 21:17:57 UTC (rev 106477)
@@ -579,12 +579,12 @@
<!-- path refid="jboss.profileservice.classpath"/ -->
<pathelement path="${jboss.dist.common.lib}/jboss-profileservice.jar" />
<!-- path refid="jboss.jboss.security.spi.classpath"/ -->
- <pathelement path="${jboss.dist.client}/jboss-security-spi.jar" />
+ <pathelement path="${jboss.dist.lib}/jboss-security-spi.jar" />
<!-- jbosssx.jar -->
<!-- path refid="jboss.jbosssx.classpath"/ -->
- <pathelement path="${jboss.dist.common.lib}/jbosssx.jar" />
+ <pathelement path="${jboss.dist.lib}/jbosssx.jar" />
<!-- path refid="jboss.security.int.classpath"/ -->
- <pathelement path="${jboss.dist.common.lib}/jbosssx-server.jar" />
+ <pathelement path="${jboss.dist.lib}/jbosssx-server.jar" />
<!-- path refid="jboss.server.classpath"/ -->
<pathelement path="${jboss.dist.common.lib}/jboss.jar" />
<pathelement path="${jboss.dist.common.lib}/jmx-adaptor-plugin.jar" />
More information about the jboss-cvs-commits
mailing list