[jboss-cvs] JBossAS SVN: r106392 - in trunk: security/src/etc/deploy and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jul 1 17:24:51 EDT 2010
Author: ALRubinger
Date: 2010-07-01 17:24:51 -0400 (Thu, 01 Jul 2010)
New Revision: 106392
Removed:
trunk/server/src/etc/conf/all/bootstrap/security.xml
Modified:
trunk/build/build.xml
trunk/security/src/etc/deploy/security-jboss-beans.xml
trunk/security/src/main/java/org/jboss/security/auth/AuthenticationTimedCachePolicy.java
trunk/security/src/main/java/org/jboss/security/integration/SecurityConstantsBridge.java
trunk/security/src/main/java/org/jboss/security/integration/SecurityDomainObjectFactory.java
trunk/security/src/main/java/org/jboss/security/plugins/JaasSecurityDomain.java
trunk/server/src/etc/conf/all/bootstrap.xml
trunk/server/src/etc/conf/minimal/bootstrap.xml
Log:
[JBAS-8129] Temporarily reverting r106382 due to test failures in Embedded testuite org.jboss.jbossas.embedded.testsuite.ServerIntegrationTest: javax.jms.JMSSecurityException: Unable to validate user: null for check type SEND for address jms.queue.EmbeddedQueue. Once corrected please reapply by reverting this commit.
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2010-07-01 21:21:55 UTC (rev 106391)
+++ trunk/build/build.xml 2010-07-01 21:24:51 UTC (rev 106392)
@@ -271,7 +271,6 @@
<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"/>
@@ -1096,9 +1095,9 @@
<property name="security.module.output" value="${project.root}/${security.module.name}/target"/>
<!-- Copy the generated libraries -->
- <mkdir dir="${install.lib}"/>
+ <mkdir dir="${install.common.lib}"/>
<copy file="${security.module.output}/jboss-as-security.jar"
- tofile="${install.lib}/jbosssx-server.jar" filtering="no"/>
+ tofile="${install.common.lib}/jbosssx-server.jar" filtering="no"/>
<copy file="${security.module.output}/jboss-as-security-client.jar"
tofile="${install.client}/jbosssx-as-client.jar" filtering="no"/>
@@ -2037,6 +2036,8 @@
<fileset refid="antlr:antlr:jar"/>
<fileset refid="commons-collections:commons-collections:jar"/>
<fileset refid="org.jboss.security:jboss-negotiation:jar"/>
+ <fileset refid="org.jboss.security:jboss-security-spi:jar"/>
+ <fileset refid="org.jboss.security:jbosssx:jar"/>
<fileset refid="org.jboss.security:jbossxacml:jar"/>
<fileset refid="org.picketbox:picketbox-bare:jar"/>
<fileset refid="org.jboss.slf4j:slf4j-jboss-logmanager:jar"/>
@@ -2290,8 +2291,6 @@
<fileset refid="xml-resolver:xml-resolver:jar"/>
<fileset refid="org.jboss:jbossxb:jar"/>
<fileset refid="org.jboss.osgi.framework:jboss-osgi-framework-metadata:jar"/>
- <fileset refid="org.jboss.security:jboss-security-spi:jar"/>
- <fileset refid="org.jboss.security:jbosssx:jar"/>
<mapper refid="remove-versions" />
</copy>
Modified: trunk/security/src/etc/deploy/security-jboss-beans.xml
===================================================================
--- trunk/security/src/etc/deploy/security-jboss-beans.xml 2010-07-01 21:21:55 UTC (rev 106391)
+++ trunk/security/src/etc/deploy/security-jboss-beans.xml 2010-07-01 21:24:51 UTC (rev 106392)
@@ -51,6 +51,10 @@
<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: trunk/security/src/main/java/org/jboss/security/auth/AuthenticationTimedCachePolicy.java
===================================================================
--- trunk/security/src/main/java/org/jboss/security/auth/AuthenticationTimedCachePolicy.java 2010-07-01 21:21:55 UTC (rev 106391)
+++ trunk/security/src/main/java/org/jboss/security/auth/AuthenticationTimedCachePolicy.java 2010-07-01 21:24:51 UTC (rev 106392)
@@ -21,7 +21,6 @@
*/
package org.jboss.security.auth;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -35,7 +34,7 @@
* @author <a href="mmoyses at redhat.com">Marcus Moyses</a>
* @version $Revision: 1 $
*/
-public class AuthenticationTimedCachePolicy extends TimedCachePolicy implements Serializable
+public class AuthenticationTimedCachePolicy extends TimedCachePolicy
{
public AuthenticationTimedCachePolicy(int defaultCacheTimeout, boolean b, int defaultCacheResolution)
{
Modified: trunk/security/src/main/java/org/jboss/security/integration/SecurityConstantsBridge.java
===================================================================
--- trunk/security/src/main/java/org/jboss/security/integration/SecurityConstantsBridge.java 2010-07-01 21:21:55 UTC (rev 106391)
+++ trunk/security/src/main/java/org/jboss/security/integration/SecurityConstantsBridge.java 2010-07-01 21:24:51 UTC (rev 106392)
@@ -36,16 +36,4 @@
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: trunk/security/src/main/java/org/jboss/security/integration/SecurityDomainObjectFactory.java
===================================================================
--- trunk/security/src/main/java/org/jboss/security/integration/SecurityDomainObjectFactory.java 2010-07-01 21:21:55 UTC (rev 106391)
+++ trunk/security/src/main/java/org/jboss/security/integration/SecurityDomainObjectFactory.java 2010-07-01 21:24:51 UTC (rev 106392)
@@ -51,7 +51,7 @@
*/
public class SecurityDomainObjectFactory implements InvocationHandler, ObjectFactory
{
- private JNDIBasedSecurityManagement securityManagement = SecurityConstantsBridge.getSecurityManagement();
+ private JNDIBasedSecurityManagement securityManagement = new JNDIBasedSecurityManagement();
public void setSecurityManagement(JNDIBasedSecurityManagement sm)
{
Modified: trunk/security/src/main/java/org/jboss/security/plugins/JaasSecurityDomain.java
===================================================================
--- trunk/security/src/main/java/org/jboss/security/plugins/JaasSecurityDomain.java 2010-07-01 21:21:55 UTC (rev 106391)
+++ trunk/security/src/main/java/org/jboss/security/plugins/JaasSecurityDomain.java 2010-07-01 21:24:51 UTC (rev 106392)
@@ -60,7 +60,6 @@
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
@@ -178,7 +177,7 @@
private String trustStoreProviderArgument;
/** Specify the SecurityManagement instance */
- private ISecurityManagement securityManagement = SecurityConstantsBridge.getSecurityManagement();
+ private ISecurityManagement securityManagement = new JNDIBasedSecurityManagement();
/**
* Creates a default JaasSecurityDomain for with a securityDomain name of 'other'.
Deleted: trunk/server/src/etc/conf/all/bootstrap/security.xml
===================================================================
--- trunk/server/src/etc/conf/all/bootstrap/security.xml 2010-07-01 21:21:55 UTC (rev 106391)
+++ trunk/server/src/etc/conf/all/bootstrap/security.xml 2010-07-01 21:24:51 UTC (rev 106392)
@@ -1,23 +0,0 @@
-<?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>
- </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: trunk/server/src/etc/conf/all/bootstrap.xml
===================================================================
--- trunk/server/src/etc/conf/all/bootstrap.xml 2010-07-01 21:21:55 UTC (rev 106391)
+++ trunk/server/src/etc/conf/all/bootstrap.xml 2010-07-01 21:24:51 UTC (rev 106392)
@@ -12,5 +12,4 @@
<url>bootstrap/jmx.xml</url>
<url>bootstrap/deployers.xml</url>
<url>bootstrap/profile.xml</url>
- <url>bootstrap/security.xml</url>
</bootstrap>
Modified: trunk/server/src/etc/conf/minimal/bootstrap.xml
===================================================================
--- trunk/server/src/etc/conf/minimal/bootstrap.xml 2010-07-01 21:21:55 UTC (rev 106391)
+++ trunk/server/src/etc/conf/minimal/bootstrap.xml 2010-07-01 21:24:51 UTC (rev 106392)
@@ -11,6 +11,5 @@
<url>bootstrap/jmx.xml</url>
<url>bootstrap/deployers.xml</url>
<url>bootstrap/profile.xml</url>
- <url>bootstrap/security.xml</url>
</bootstrap>
More information about the jboss-cvs-commits
mailing list