[jboss-cvs] JBossAS SVN: r75461 - in projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src: test/java/org/jboss/test/security/microcontainer/metadata and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Jul 7 22:03:16 EDT 2008
Author: sguilhen at redhat.com
Date: 2008-07-07 22:03:16 -0400 (Mon, 07 Jul 2008)
New Revision: 75461
Modified:
projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/JASPIAuthenticationPolicyBean.java
projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/ApplicationPolicyExtendsTestCase.java
projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/BeanValidator.java
projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/PolicyValidator.java
projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/resources/org/jboss/test/security/microcontainer/metadata/ACLPolicyTestCase.xml
projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/resources/org/jboss/test/security/microcontainer/metadata/ApplicationPolicyExtendsTestCase.xml
projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/resources/org/jboss/test/security/microcontainer/metadata/ApplicationPolicyMixedTestCase.xml
projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/resources/org/jboss/test/security/microcontainer/metadata/AuditPolicyTestCase.xml
projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/resources/org/jboss/test/security/microcontainer/metadata/AuthorizationPolicyTestCase.xml
projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/resources/org/jboss/test/security/microcontainer/metadata/BasicApplicationPolicyTestCase.xml
projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/resources/org/jboss/test/security/microcontainer/metadata/IdentityTrustPolicyTestCase.xml
projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/resources/org/jboss/test/security/microcontainer/metadata/RoleMappingPolicyTestCase.xml
Log:
SECURITY-262: Expanded the ApplicationPolicyExtendsTestCase to validate the extension of policies that use a jaspi configuration.
Modified: projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/JASPIAuthenticationPolicyBean.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/JASPIAuthenticationPolicyBean.java 2008-07-08 01:17:51 UTC (rev 75460)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/JASPIAuthenticationPolicyBean.java 2008-07-08 02:03:16 UTC (rev 75461)
@@ -22,11 +22,14 @@
package org.jboss.security.microcontainer.beans;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import org.jboss.security.auth.container.config.AuthModuleEntry;
import org.jboss.security.auth.login.BaseAuthenticationInfo;
import org.jboss.security.auth.login.JASPIAuthenticationInfo;
+import org.jboss.security.auth.login.LoginModuleStackHolder;
/**
* <p>
@@ -86,14 +89,24 @@
public BaseAuthenticationInfo getPolicyInfo(String domainName)
{
JASPIAuthenticationInfo info = new JASPIAuthenticationInfo(domainName);
- // add the auth modules to the authentication info.
- for (StackRefPolicyModule module : super.modules)
- info.add(new AuthModuleEntry(module.getCode(), module.getOptions(), module.getStackRef()));
+ Map<String, LoginModuleStackHolder> stackMap = new HashMap<String, LoginModuleStackHolder>();
// add the stack modules to the authentication info.
for (LoginModuleStackBean stackBean : this.moduleStacks)
- info.add(stackBean.getLoginModuleStackHolder());
+ {
+ LoginModuleStackHolder holder = stackBean.getLoginModuleStackHolder();
+ info.add(holder);
+ stackMap.put(stackBean.getName(), holder);
+ }
+ // add the auth modules to the authentication info.
+ for (StackRefPolicyModule module : super.modules)
+ {
+ AuthModuleEntry entry = new AuthModuleEntry(module.getCode(), module.getOptions(), module.getStackRef());
+ entry.setLoginModuleStackHolder(stackMap.get(module.getStackRef()));
+ info.add(entry);
+ }
+
return info;
}
Modified: projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/ApplicationPolicyExtendsTestCase.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/ApplicationPolicyExtendsTestCase.java 2008-07-08 01:17:51 UTC (rev 75460)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/ApplicationPolicyExtendsTestCase.java 2008-07-08 02:03:16 UTC (rev 75461)
@@ -22,6 +22,7 @@
package org.jboss.test.security.microcontainer.metadata;
import org.jboss.security.auth.login.AuthenticationInfo;
+import org.jboss.security.auth.login.JASPIAuthenticationInfo;
import org.jboss.security.auth.login.XMLLoginConfigImpl;
import org.jboss.security.config.ApplicationPolicy;
import org.jboss.security.config.RoleMappingInfo;
@@ -106,7 +107,44 @@
* </pre>
*
* </p>
+ * <p>
+ * The configuration file also specifies two policies that use the jaspi configuration and one of the policies extends
+ * the other:
*
+ * <pre>
+ * <!-- an application policy using a jaspi configuration -->
+ * <application-policy xmlns="urn:jboss:security-beans:1.0" name="TestPolicy3">
+ * <authentication-jaspi>
+ * <login-module-stack name="ModuleStack1">
+ * <login-module code="org.jboss.security.auth.AuthModule3" flag="required">
+ * <module-option name="authOption5">value5</module-option>
+ * </login-module>
+ * <login-module code="org.jboss.security.auth.AuthModule4" flag="optional"/>
+ * </login-module-stack>
+ * <auth-module code="org.jboss.security.auth.AuthModule1" login-module-stack-ref="ModuleStack1"/>
+ * </authentication-jaspi>
+ * </application-policy>
+ *
+ * <!-- an application policy that extends the TestPolicy3 to specify new jaspi configurations -->
+ * <application-policy xmlns="urn:jboss:security-beans:1.0" name="TestPolicy4" extends="TestPolicy3">
+ * <authentication-jaspi>
+ * <login-module-stack name="ModuleStack2">
+ * <login-module code="org.jboss.security.auth.AuthModule5" flag="required">
+ * <module-option name="authOption6">value6</module-option>
+ * <module-option name="authOption7">value7</module-option>
+ * </login-module>
+ * </login-module-stack>
+ * <auth-module code="org.jboss.security.auth.AuthModule2" login-module-stack-ref="ModuleStack2">
+ * <module-option name="authOption1">value1</module-option>
+ * <module-option name="authOption2">value2</module-option>
+ * </auth-module>
+ * </authentication-jaspi>
+ * </application-policy>
+ *
+ * </pre>
+ *
+ * </p>
+ *
* @author <a href="mailto:sguilhen at redhat.com">Stefan Guilhen</a>
*/
public class ApplicationPolicyExtendsTestCase extends MicrocontainerTest
@@ -164,5 +202,17 @@
PolicyValidator.validateAuditPolicy("TestPolicy2", policy.getAuditInfo());
// validate the constructed identity-trust policy.
PolicyValidator.validateIdentityTrustPolicy("TestPolicy2", policy.getIdentityTrustInfo());
+
+ // now validate the jaspi authentication extension.
+ bean = (ApplicationPolicyBean) super.getBean("TestPolicy4");
+ assertNotNull("ApplicationPolicyBean not found", bean);
+ assertNotNull("Parent policy name has not been set", bean.getParentPolicy());
+ assertEquals("Unexpected parent policy name", "TestPolicy3", bean.getParentPolicy());
+ // validate the real application policy has been created with the expected contents.
+ policy = XMLLoginConfigImpl.getInstance().getApplicationPolicy("TestPolicy4");
+ assertNotNull("Application policy not found", policy);
+ // validate the constructed jaspi authentication policy.
+ PolicyValidator.validateJaspiAuthenticationPolicy("TestPolicy4", (JASPIAuthenticationInfo) policy
+ .getAuthenticationInfo());
}
}
Modified: projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/BeanValidator.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/BeanValidator.java 2008-07-08 01:17:51 UTC (rev 75460)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/BeanValidator.java 2008-07-08 02:03:16 UTC (rev 75461)
@@ -121,7 +121,8 @@
* <module-option name="authOption7">value7</module-option>
* </login-module>
* </login-module-stack>
- * <auth-module code="org.jboss.security.auth.AuthModule1" login-module-stack-ref="ModuleStack2">
+ * <auth-module code="org.jboss.security.auth.AuthModule1" login-module-stack-ref="ModuleStack1"/>
+ * <auth-module code="org.jboss.security.auth.AuthModule2" login-module-stack-ref="ModuleStack2">
* <module-option name="authOption1">value1</module-option>
* <module-option name="authOption2">value2</module-option>
* </auth-module>
@@ -179,12 +180,20 @@
// check the auth-modules that have been specified in the authentication-jaspi configuration.
List<StackRefPolicyModule> authModules = bean.getModules();
Assert.assertNotNull("Invalid null list of auth-modules found", authModules);
- Assert.assertEquals("Invalid number of modules", 1, authModules.size());
+ Assert.assertEquals("Invalid number of modules", 2, authModules.size());
+ // first module should be org.jboss.security.auth.AuthModule1.
Assert.assertEquals("org.jboss.security.auth.AuthModule1", authModules.get(0).getCode());
- Assert.assertEquals("ModuleStack2", authModules.get(0).getStackRef());
+ Assert.assertEquals("ModuleStack1", authModules.get(0).getStackRef());
options = authModules.get(0).getOptions();
Assert.assertNotNull("Unexpected null options map", options);
+ Assert.assertEquals("Unexpected number of module options", 0, options.size());
+
+ // second module should be org.jboss.security.auth.AuthModule2.
+ Assert.assertEquals("org.jboss.security.auth.AuthModule2", authModules.get(1).getCode());
+ Assert.assertEquals("ModuleStack2", authModules.get(1).getStackRef());
+ options = authModules.get(1).getOptions();
+ Assert.assertNotNull("Unexpected null options map", options);
Assert.assertTrue("Option authOption1 was not found", options.containsKey("authOption1"));
Assert.assertEquals("value1", options.get("authOption1"));
Assert.assertTrue("Option authOption2 was not found", options.containsKey("authOption2"));
Modified: projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/PolicyValidator.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/PolicyValidator.java 2008-07-08 01:17:51 UTC (rev 75460)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/java/org/jboss/test/security/microcontainer/metadata/PolicyValidator.java 2008-07-08 02:03:16 UTC (rev 75461)
@@ -128,6 +128,7 @@
* <module-option name="authOption7">value7</module-option>
* </login-module>
* </login-module-stack>
+ * <auth-module code="org.jboss.security.auth.AuthModule1" login-module-stack-ref="ModuleStack1"/>
* <auth-module code="org.jboss.security.auth.AuthModule1" login-module-stack-ref="ModuleStack2">
* <module-option name="authOption1">value1</module-option>
* <module-option name="authOption2">value2</module-option>
@@ -153,12 +154,12 @@
Assert.assertNotNull("Unexpected null stack of login modules");
Assert.assertEquals("Invalid number of stacks", 2, stacks.length);
- // first stack defined should be the ModuleStack1.
- Assert.assertEquals("ModuleStack1", stacks[0].getName());
- Assert.assertEquals("Invalid number of login modules for the ModuleStack1", 2, stacks[0]
- .getAppConfigurationEntry().length);
+ // check the contents of the ModuleStack1.
+ LoginModuleStackHolder holder1 = stacks[0].getName().equals("ModuleStack1") ? stacks[0] : stacks[1];
+ Assert.assertEquals("Invalid number of login modules for the ModuleStack1", 2,
+ holder1.getAppConfigurationEntry().length);
- AppConfigurationEntry[] entries = stacks[0].getAppConfigurationEntry();
+ AppConfigurationEntry[] entries = holder1.getAppConfigurationEntry();
Assert.assertEquals("org.jboss.security.auth.AuthModule3", entries[0].getLoginModuleName());
Assert.assertEquals(LoginModuleControlFlag.REQUIRED, entries[0].getControlFlag());
Map<String, ?> options = entries[0].getOptions();
@@ -170,12 +171,12 @@
Assert.assertEquals(LoginModuleControlFlag.OPTIONAL, entries[1].getControlFlag());
Assert.assertEquals(0, entries[1].getOptions().size());
- // second stack defined should be the ModuleStack2.
- Assert.assertEquals("ModuleStack2", stacks[1].getName());
- Assert.assertEquals("Invalid number of login modules for the ModuleStack2", 1, stacks[1]
- .getAppConfigurationEntry().length);
+ // check the contents of the ModuleStack2.
+ LoginModuleStackHolder holder2 = stacks[0].getName().equals("ModuleStack2") ? stacks[0] : stacks[1];
+ Assert.assertEquals("Invalid number of login modules for the ModuleStack2", 1,
+ holder2.getAppConfigurationEntry().length);
- entries = stacks[1].getAppConfigurationEntry();
+ entries = holder2.getAppConfigurationEntry();
Assert.assertEquals("org.jboss.security.auth.AuthModule5", entries[0].getLoginModuleName());
Assert.assertEquals(LoginModuleControlFlag.REQUIRED, entries[0].getControlFlag());
options = entries[0].getOptions();
@@ -188,16 +189,30 @@
// validate the auth-modules defined by the authentication-jaspi configuration.
AuthModuleEntry[] authEntries = authInfo.getAuthModuleEntry();
Assert.assertNotNull(authEntries);
- Assert.assertEquals("Invalid number of auth-modules", 1, authEntries.length);
+ Assert.assertEquals("Invalid number of auth-modules", 2, authEntries.length);
+ // first module should be org.jboss.security.auth.AuthModule1.
Assert.assertEquals("org.jboss.security.auth.AuthModule1", authEntries[0].getAuthModuleName());
- Assert.assertEquals("ModuleStack2", authEntries[0].getLoginModuleStackHolderName());
+ Assert.assertEquals("ModuleStack1", authEntries[0].getLoginModuleStackHolderName());
options = authEntries[0].getOptions();
Assert.assertNotNull("Unexpected null options map", options);
+ Assert.assertEquals("Unexpected number of module options", 0, options.size());
+ LoginModuleStackHolder stackHolder = authEntries[0].getLoginModuleStackHolder();
+ Assert.assertNotNull("Associated LoginModuleStackHolder is null", stackHolder);
+ Assert.assertEquals("Invalid LoginModuleStackHolder", holder1, stackHolder);
+
+ // second module should be org.jboss.security.auth.AuthModule2.
+ Assert.assertEquals("org.jboss.security.auth.AuthModule2", authEntries[1].getAuthModuleName());
+ Assert.assertEquals("ModuleStack2", authEntries[1].getLoginModuleStackHolderName());
+ options = authEntries[1].getOptions();
+ Assert.assertNotNull("Unexpected null options map", options);
Assert.assertTrue("Option authOption1 was not found", options.containsKey("authOption1"));
Assert.assertEquals("value1", options.get("authOption1"));
Assert.assertTrue("Option authOption2 was not found", options.containsKey("authOption2"));
Assert.assertEquals("value2", options.get("authOption2"));
+ stackHolder = authEntries[1].getLoginModuleStackHolder();
+ Assert.assertNotNull("Associated LoginModuleStackHolder is null", stackHolder);
+ Assert.assertEquals("Invalid LoginModuleStackHolder", holder2, stackHolder);
}
/**
Modified: projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/resources/org/jboss/test/security/microcontainer/metadata/ACLPolicyTestCase.xml
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/resources/org/jboss/test/security/microcontainer/metadata/ACLPolicyTestCase.xml 2008-07-08 01:17:51 UTC (rev 75460)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/resources/org/jboss/test/security/microcontainer/metadata/ACLPolicyTestCase.xml 2008-07-08 02:03:16 UTC (rev 75461)
@@ -45,7 +45,8 @@
<module-option name="authOption7">value7</module-option>
</login-module>
</login-module-stack>
- <auth-module code="org.jboss.security.auth.AuthModule1" login-module-stack-ref="ModuleStack2">
+ <auth-module code="org.jboss.security.auth.AuthModule1" login-module-stack-ref="ModuleStack1"/>
+ <auth-module code="org.jboss.security.auth.AuthModule2" login-module-stack-ref="ModuleStack2">
<module-option name="authOption1">value1</module-option>
<module-option name="authOption2">value2</module-option>
</auth-module>
Modified: projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/resources/org/jboss/test/security/microcontainer/metadata/ApplicationPolicyExtendsTestCase.xml
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/resources/org/jboss/test/security/microcontainer/metadata/ApplicationPolicyExtendsTestCase.xml 2008-07-08 01:17:51 UTC (rev 75460)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/resources/org/jboss/test/security/microcontainer/metadata/ApplicationPolicyExtendsTestCase.xml 2008-07-08 02:03:16 UTC (rev 75461)
@@ -74,7 +74,35 @@
<module-option name="trustOption2">value2</module-option>
</trust-module>
</identity-trust>
-
</application-policy>
+ <!-- an application policy using a jaspi configuration -->
+ <application-policy xmlns="urn:jboss:security-beans:1.0" name="TestPolicy3">
+ <authentication-jaspi>
+ <login-module-stack name="ModuleStack1">
+ <login-module code="org.jboss.security.auth.AuthModule3" flag="required">
+ <module-option name="authOption5">value5</module-option>
+ </login-module>
+ <login-module code="org.jboss.security.auth.AuthModule4" flag="optional"/>
+ </login-module-stack>
+ <auth-module code="org.jboss.security.auth.AuthModule1" login-module-stack-ref="ModuleStack1"/>
+ </authentication-jaspi>
+ </application-policy>
+
+ <!-- an application policy that extends the TestPolicy3 to specify new jaspi configurations -->
+ <application-policy xmlns="urn:jboss:security-beans:1.0" name="TestPolicy4" extends="TestPolicy3">
+ <authentication-jaspi>
+ <login-module-stack name="ModuleStack2">
+ <login-module code="org.jboss.security.auth.AuthModule5" flag="required">
+ <module-option name="authOption6">value6</module-option>
+ <module-option name="authOption7">value7</module-option>
+ </login-module>
+ </login-module-stack>
+ <auth-module code="org.jboss.security.auth.AuthModule2" login-module-stack-ref="ModuleStack2">
+ <module-option name="authOption1">value1</module-option>
+ <module-option name="authOption2">value2</module-option>
+ </auth-module>
+ </authentication-jaspi>
+ </application-policy>
+
</deployment>
\ No newline at end of file
Modified: projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/resources/org/jboss/test/security/microcontainer/metadata/ApplicationPolicyMixedTestCase.xml
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/resources/org/jboss/test/security/microcontainer/metadata/ApplicationPolicyMixedTestCase.xml 2008-07-08 01:17:51 UTC (rev 75460)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/resources/org/jboss/test/security/microcontainer/metadata/ApplicationPolicyMixedTestCase.xml 2008-07-08 02:03:16 UTC (rev 75461)
@@ -43,7 +43,8 @@
<module-option name="authOption7">value7</module-option>
</login-module>
</login-module-stack>
- <auth-module code="org.jboss.security.auth.AuthModule1" login-module-stack-ref="ModuleStack2">
+ <auth-module code="org.jboss.security.auth.AuthModule1" login-module-stack-ref="ModuleStack1"/>
+ <auth-module code="org.jboss.security.auth.AuthModule2" login-module-stack-ref="ModuleStack2">
<module-option name="authOption1">value1</module-option>
<module-option name="authOption2">value2</module-option>
</auth-module>
Modified: projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/resources/org/jboss/test/security/microcontainer/metadata/AuditPolicyTestCase.xml
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/resources/org/jboss/test/security/microcontainer/metadata/AuditPolicyTestCase.xml 2008-07-08 01:17:51 UTC (rev 75460)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/resources/org/jboss/test/security/microcontainer/metadata/AuditPolicyTestCase.xml 2008-07-08 02:03:16 UTC (rev 75461)
@@ -43,7 +43,8 @@
<module-option name="authOption7">value7</module-option>
</login-module>
</login-module-stack>
- <auth-module code="org.jboss.security.auth.AuthModule1" login-module-stack-ref="ModuleStack2">
+ <auth-module code="org.jboss.security.auth.AuthModule1" login-module-stack-ref="ModuleStack1"/>
+ <auth-module code="org.jboss.security.auth.AuthModule2" login-module-stack-ref="ModuleStack2">
<module-option name="authOption1">value1</module-option>
<module-option name="authOption2">value2</module-option>
</auth-module>
Modified: projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/resources/org/jboss/test/security/microcontainer/metadata/AuthorizationPolicyTestCase.xml
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/resources/org/jboss/test/security/microcontainer/metadata/AuthorizationPolicyTestCase.xml 2008-07-08 01:17:51 UTC (rev 75460)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/resources/org/jboss/test/security/microcontainer/metadata/AuthorizationPolicyTestCase.xml 2008-07-08 02:03:16 UTC (rev 75461)
@@ -45,7 +45,8 @@
<module-option name="authOption7">value7</module-option>
</login-module>
</login-module-stack>
- <auth-module code="org.jboss.security.auth.AuthModule1" login-module-stack-ref="ModuleStack2">
+ <auth-module code="org.jboss.security.auth.AuthModule1" login-module-stack-ref="ModuleStack1"/>
+ <auth-module code="org.jboss.security.auth.AuthModule2" login-module-stack-ref="ModuleStack2">
<module-option name="authOption1">value1</module-option>
<module-option name="authOption2">value2</module-option>
</auth-module>
Modified: projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/resources/org/jboss/test/security/microcontainer/metadata/BasicApplicationPolicyTestCase.xml
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/resources/org/jboss/test/security/microcontainer/metadata/BasicApplicationPolicyTestCase.xml 2008-07-08 01:17:51 UTC (rev 75460)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/resources/org/jboss/test/security/microcontainer/metadata/BasicApplicationPolicyTestCase.xml 2008-07-08 02:03:16 UTC (rev 75461)
@@ -35,7 +35,8 @@
<module-option name="authOption7">value7</module-option>
</login-module>
</login-module-stack>
- <auth-module code="org.jboss.security.auth.AuthModule1" login-module-stack-ref="ModuleStack2">
+ <auth-module code="org.jboss.security.auth.AuthModule1" login-module-stack-ref="ModuleStack1"/>
+ <auth-module code="org.jboss.security.auth.AuthModule2" login-module-stack-ref="ModuleStack2">
<module-option name="authOption1">value1</module-option>
<module-option name="authOption2">value2</module-option>
</auth-module>
Modified: projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/resources/org/jboss/test/security/microcontainer/metadata/IdentityTrustPolicyTestCase.xml
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/resources/org/jboss/test/security/microcontainer/metadata/IdentityTrustPolicyTestCase.xml 2008-07-08 01:17:51 UTC (rev 75460)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/resources/org/jboss/test/security/microcontainer/metadata/IdentityTrustPolicyTestCase.xml 2008-07-08 02:03:16 UTC (rev 75461)
@@ -41,7 +41,8 @@
<module-option name="authOption7">value7</module-option>
</login-module>
</login-module-stack>
- <auth-module code="org.jboss.security.auth.AuthModule1" login-module-stack-ref="ModuleStack2">
+ <auth-module code="org.jboss.security.auth.AuthModule1" login-module-stack-ref="ModuleStack1"/>
+ <auth-module code="org.jboss.security.auth.AuthModule2" login-module-stack-ref="ModuleStack2">
<module-option name="authOption1">value1</module-option>
<module-option name="authOption2">value2</module-option>
</auth-module>
Modified: projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/resources/org/jboss/test/security/microcontainer/metadata/RoleMappingPolicyTestCase.xml
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/resources/org/jboss/test/security/microcontainer/metadata/RoleMappingPolicyTestCase.xml 2008-07-08 01:17:51 UTC (rev 75460)
+++ projects/security/security-jboss-sx/trunk/jbosssx-mc-int/src/test/resources/org/jboss/test/security/microcontainer/metadata/RoleMappingPolicyTestCase.xml 2008-07-08 02:03:16 UTC (rev 75461)
@@ -45,7 +45,8 @@
<module-option name="authOption7">value7</module-option>
</login-module>
</login-module-stack>
- <auth-module code="org.jboss.security.auth.AuthModule1" login-module-stack-ref="ModuleStack2">
+ <auth-module code="org.jboss.security.auth.AuthModule1" login-module-stack-ref="ModuleStack1"/>
+ <auth-module code="org.jboss.security.auth.AuthModule2" login-module-stack-ref="ModuleStack2">
<module-option name="authOption1">value1</module-option>
<module-option name="authOption2">value2</module-option>
</auth-module>
More information about the jboss-cvs-commits
mailing list