[jboss-cvs] JBossAS SVN: r102170 - in projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-mc-int/src: test/resources/org/jboss/test/security/microcontainer/metadata and 1 other directory.

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

Author: anil.saldhana at jboss.com
Date: 2010-03-09 16:06:03 -0500 (Tue, 09 Mar 2010)
New Revision: 102170

Modified:
   projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/FlaggedPolicyModule.java
   projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-mc-int/src/test/resources/org/jboss/test/security/microcontainer/metadata/BasicApplicationPolicyTestCase.xml
Log:
SECURITY-472: flag on the login module should be optional

Modified: projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/FlaggedPolicyModule.java
===================================================================
--- projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/FlaggedPolicyModule.java	2010-03-09 21:01:26 UTC (rev 102169)
+++ projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-mc-int/src/main/java/org/jboss/security/microcontainer/beans/FlaggedPolicyModule.java	2010-03-09 21:06:03 UTC (rev 102170)
@@ -66,7 +66,8 @@
    public void setFlag(String flag)
    {
       if (flag == null)
-         throw new IllegalArgumentException("Invalid null module flag");
+         flag = "required";
+      
       // set the control flag using the string representation specified.
       flag = flag.toLowerCase();
       if (AppConfigurationEntry.LoginModuleControlFlag.REQUIRED.toString().indexOf(flag) > 0)

Modified: projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-mc-int/src/test/resources/org/jboss/test/security/microcontainer/metadata/BasicApplicationPolicyTestCase.xml
===================================================================
--- projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-mc-int/src/test/resources/org/jboss/test/security/microcontainer/metadata/BasicApplicationPolicyTestCase.xml	2010-03-09 21:01:26 UTC (rev 102169)
+++ projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-mc-int/src/test/resources/org/jboss/test/security/microcontainer/metadata/BasicApplicationPolicyTestCase.xml	2010-03-09 21:06:03 UTC (rev 102170)
@@ -9,7 +9,7 @@
    <!-- an application policy that specifies an authentication configuration -->
    <application-policy xmlns="urn:jboss:security-beans:1.0" name="TestPolicy1">
       <authentication>
-         <login-module code="org.jboss.security.auth.AuthModule1" flag="required">
+         <login-module code="org.jboss.security.auth.AuthModule1">
             <module-option name="authOption1">value1</module-option>
             <module-option name="authOption2">value2</module-option>
          </login-module>