[jboss-cvs] JBossAS SVN: r70898 - in trunk/testsuite: src/resources/test-configs/jacc and 2 other directories.

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

Author: smcgowan at redhat.com
Date: 2008-03-16 21:13:50 -0400 (Sun, 16 Mar 2008)
New Revision: 70898

Added:
   trunk/testsuite/src/resources/test-configs/jacc/deploy/
   trunk/testsuite/src/resources/test-configs/jacc/deploy/security-policies-service.xml
Removed:
   trunk/testsuite/src/resources/test-configs/jacc/deployers/security-policies-service.xml
Modified:
   trunk/testsuite/build.xml
Log:
fix jacc config

Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml	2008-03-16 20:09:28 UTC (rev 70897)
+++ trunk/testsuite/build.xml	2008-03-17 01:13:50 UTC (rev 70898)
@@ -1461,6 +1461,7 @@
             <include name="deploy/mail-service.xml"/>
             <include name="deploy/messaging/**"/>
             <include name="deploy/ejb3-interceptors-aop.xml"/>
+            <include name="deploy/security-beans.xml"/>
          </patternset>
       </create-config>
       <!-- Copy the test-destinations-service.xml to the all config.

Copied: trunk/testsuite/src/resources/test-configs/jacc/deploy/security-policies-service.xml (from rev 70897, trunk/testsuite/src/resources/test-configs/jacc/deployers/security-policies-service.xml)
===================================================================
--- trunk/testsuite/src/resources/test-configs/jacc/deploy/security-policies-service.xml	                        (rev 0)
+++ trunk/testsuite/src/resources/test-configs/jacc/deploy/security-policies-service.xml	2008-03-17 01:13:50 UTC (rev 70898)
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<server>
+   <!-- The custom JAAS login configuration that installs 
+       a Configuration capable of dynamically updating the
+       config settings
+   -->
+   <mbean code="org.jboss.security.auth.login.DynamicLoginConfig"
+      name="jboss.security:service=StandardLoginConfig">
+      <attribute name="PolicyConfig" serialDataType="jbxb">
+         <jbsx:policy
+            xsi:schemaLocation="urn:jboss:security-config:5.0 resource:security-config_5_0.xsd"
+            xmlns:jbsx="urn:jboss:security-config:5.0"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            >
+            <jbsx:application-policy name="jboss-web-policy">
+              <jbsx:authentication>
+                <jbsx:login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule" flag="required"/>
+              </jbsx:authentication>
+              <jbsx:authorization>
+               <jbsx:policy-module code="org.jboss.security.authorization.modules.JACCAuthorizationModule" flag="required"/>
+              </jbsx:authorization>
+            </jbsx:application-policy>
+            <jbsx:application-policy name="jboss-ejb-policy">
+              <jbsx:authentication>
+                <jbsx:login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule" flag="required"/>
+              </jbsx:authentication>
+              <jbsx:authorization>
+               <jbsx:policy-module code="org.jboss.security.authorization.modules.JACCAuthorizationModule" flag="required"/>
+              </jbsx:authorization>
+            </jbsx:application-policy>
+            <jbsx:application-policy name="jaas-test">
+              <jbsx:authentication>
+                <jbsx:login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule" flag="required"/>
+              </jbsx:authentication>
+              <jbsx:authorization>
+               <jbsx:policy-module code="org.jboss.security.authorization.modules.JACCAuthorizationModule" flag="required"/>
+              </jbsx:authorization>
+            </jbsx:application-policy>
+         </jbsx:policy>         
+      </attribute>
+      <depends optional-attribute-name="LoginConfigService">
+         jboss.security:service=XMLLoginConfig
+      </depends>
+      <depends optional-attribute-name="SecurityManagerService">
+         jboss.security:service=JaasSecurityManager
+      </depends>
+   </mbean>
+</server>

Deleted: trunk/testsuite/src/resources/test-configs/jacc/deployers/security-policies-service.xml
===================================================================
--- trunk/testsuite/src/resources/test-configs/jacc/deployers/security-policies-service.xml	2008-03-16 20:09:28 UTC (rev 70897)
+++ trunk/testsuite/src/resources/test-configs/jacc/deployers/security-policies-service.xml	2008-03-17 01:13:50 UTC (rev 70898)
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<server>
-   <!-- The custom JAAS login configuration that installs 
-       a Configuration capable of dynamically updating the
-       config settings
-   -->
-   <mbean code="org.jboss.security.auth.login.DynamicLoginConfig"
-      name="jboss.security:service=StandardLoginConfig">
-      <attribute name="PolicyConfig" serialDataType="jbxb">
-         <jbsx:policy
-            xsi:schemaLocation="urn:jboss:security-config:5.0 resource:security-config_5_0.xsd"
-            xmlns:jbsx="urn:jboss:security-config:5.0"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            >
-            <jbsx:application-policy name="jboss-web-policy">
-              <jbsx:authentication>
-                <jbsx:login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule" flag="required"/>
-              </jbsx:authentication>
-              <jbsx:authorization>
-               <jbsx:policy-module code="org.jboss.security.authorization.modules.JACCAuthorizationModule" flag="required"/>
-              </jbsx:authorization>
-            </jbsx:application-policy>
-            <jbsx:application-policy name="jboss-ejb-policy">
-              <jbsx:authentication>
-                <jbsx:login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule" flag="required"/>
-              </jbsx:authentication>
-              <jbsx:authorization>
-               <jbsx:policy-module code="org.jboss.security.authorization.modules.JACCAuthorizationModule" flag="required"/>
-              </jbsx:authorization>
-            </jbsx:application-policy>
-            <jbsx:application-policy name="jaas-test">
-              <jbsx:authentication>
-                <jbsx:login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule" flag="required"/>
-              </jbsx:authentication>
-              <jbsx:authorization>
-               <jbsx:policy-module code="org.jboss.security.authorization.modules.JACCAuthorizationModule" flag="required"/>
-              </jbsx:authorization>
-            </jbsx:application-policy>
-         </jbsx:policy>         
-      </attribute>
-      <depends optional-attribute-name="LoginConfigService">
-         jboss.security:service=XMLLoginConfig
-      </depends>
-      <depends optional-attribute-name="SecurityManagerService">
-         jboss.security:service=JaasSecurityManager
-      </depends>
-   </mbean>
-</server>