[jboss-cvs] JBossAS SVN: r62851 - branches/JBoss_4_0_2_CP/testsuite/src/resources/security/client-login.

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

Author: anil.saldhana at jboss.com
Date: 2007-05-07 20:32:01 -0400 (Mon, 07 May 2007)
New Revision: 62851

Added:
   branches/JBoss_4_0_2_CP/testsuite/src/resources/security/client-login/TestRoles.properties
   branches/JBoss_4_0_2_CP/testsuite/src/resources/security/client-login/TestUsers.properties
   branches/JBoss_4_0_2_CP/testsuite/src/resources/security/client-login/jaas-login.xml
Modified:
   branches/JBoss_4_0_2_CP/testsuite/src/resources/security/client-login/jaas-service.xml
Log:
ASPATCH-207: update the test resources such that there is no usage of PolicyConfig attribute of the DynamicLoginConfig Service

Added: branches/JBoss_4_0_2_CP/testsuite/src/resources/security/client-login/TestRoles.properties
===================================================================
--- branches/JBoss_4_0_2_CP/testsuite/src/resources/security/client-login/TestRoles.properties	                        (rev 0)
+++ branches/JBoss_4_0_2_CP/testsuite/src/resources/security/client-login/TestRoles.properties	2007-05-08 00:32:01 UTC (rev 62851)
@@ -0,0 +1,5 @@
+jduke=CanCallA
+clientLoginA1=CanCallB
+clientLoginA2=CanCallB
+clientLoginB1=CanCallC
+clientLoginB2=CanCallC

Added: branches/JBoss_4_0_2_CP/testsuite/src/resources/security/client-login/TestUsers.properties
===================================================================
--- branches/JBoss_4_0_2_CP/testsuite/src/resources/security/client-login/TestUsers.properties	                        (rev 0)
+++ branches/JBoss_4_0_2_CP/testsuite/src/resources/security/client-login/TestUsers.properties	2007-05-08 00:32:01 UTC (rev 62851)
@@ -0,0 +1,5 @@
+jduke=theduke
+clientLoginA1=A1
+clientLoginA2=A2
+clientLoginB1=B1
+clientLoginB2=B2

Added: branches/JBoss_4_0_2_CP/testsuite/src/resources/security/client-login/jaas-login.xml
===================================================================
--- branches/JBoss_4_0_2_CP/testsuite/src/resources/security/client-login/jaas-login.xml	                        (rev 0)
+++ branches/JBoss_4_0_2_CP/testsuite/src/resources/security/client-login/jaas-login.xml	2007-05-08 00:32:01 UTC (rev 62851)
@@ -0,0 +1,16 @@
+<policy
+  xsi:schemaLocation="urn:jboss:security-config:4.1 resource:security-config_4_1.xsd"
+  xmlns="urn:jboss:security-config:4.1"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  >
+  <application-policy name="client-login-tests">
+    <authentication>
+      <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
+                     flag="required">
+         <module-option name="usersProperties">META-INF/TestUsers.properties</module-option>
+         <module-option name="rolesProperties">META-INF/TestRoles.properties</module-option>
+         <module-option name="unauthenticatedIdentity">guest</module-option>
+      </login-module>
+    </authentication>
+  </application-policy>
+</policy>         

Modified: branches/JBoss_4_0_2_CP/testsuite/src/resources/security/client-login/jaas-service.xml
===================================================================
--- branches/JBoss_4_0_2_CP/testsuite/src/resources/security/client-login/jaas-service.xml	2007-05-07 21:42:32 UTC (rev 62850)
+++ branches/JBoss_4_0_2_CP/testsuite/src/resources/security/client-login/jaas-service.xml	2007-05-08 00:32:01 UTC (rev 62851)
@@ -7,43 +7,7 @@
    -->
    <mbean code="org.jboss.security.auth.login.DynamicLoginConfig"
       name="jboss.security.tests:service=LoginConfig,test=SubjectContext">
-      <attribute name="PolicyConfig" serialDataType="jbxb">
-         <policy
-            xsi:schemaLocation="urn:jboss:security-config:4.1 resource:security-config_4_1.xsd"
-            xmlns="urn:jboss:security-config:4.1"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            >
-            <application-policy name="client-login-tests">
-               <authentication>
-                  <login-module code="org.jboss.security.auth.spi.XMLLoginModule"
-                     flag="required">
-                     <module-option name="userInfo">
-                        <users
-                           xsi:schemaLocation="urn:jboss:user-roles:1.0 resource:user-roles_1_0.xsd"
-                           xmlns="urn:jboss:user-roles:1.0">
-                           <user name="jduke" password="theduke">
-                              <role name="CanCallA"/>
-                           </user>
-                           <user name="clientLoginA1" password="A1">
-                              <role name="CanCallB"/>
-                           </user>
-                           <user name="clientLoginA2" password="A2">
-                              <role name="CanCallB"/>
-                           </user>
-                           <user name="clientLoginB1" password="B1">
-                              <role name="CanCallC"/>
-                           </user>
-                           <user name="clientLoginB2" password="B2">
-                              <role name="CanCallC"/>
-                           </user>
-                        </users>
-                     </module-option>
-                     <module-option name="unauthenticatedIdentity">guest</module-option>
-                  </login-module>
-               </authentication>
-            </application-policy>
-         </policy>         
-      </attribute>
+      <attribute name="AuthConfig">META-INF/jaas-login.xml</attribute>
       <depends optional-attribute-name="LoginConfigService">
          jboss.security:service=XMLLoginConfig
       </depends>