[jboss-cvs] JBossAS SVN: r69212 - trunk/testsuite/src/resources/jca/securedejb.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Tue Jan 22 15:39:20 EST 2008


Author: anil.saldhana at jboss.com
Date: 2008-01-22 15:39:20 -0500 (Tue, 22 Jan 2008)
New Revision: 69212

Added:
   trunk/testsuite/src/resources/jca/securedejb/jca-login-config.xml
Removed:
   trunk/testsuite/src/resources/jca/securedejb/login-config.xml
Modified:
   trunk/testsuite/src/resources/jca/securedejb/calleridentity-ds.xml
Log:
fix descriptors

Modified: trunk/testsuite/src/resources/jca/securedejb/calleridentity-ds.xml
===================================================================
--- trunk/testsuite/src/resources/jca/securedejb/calleridentity-ds.xml	2008-01-22 20:10:06 UTC (rev 69211)
+++ trunk/testsuite/src/resources/jca/securedejb/calleridentity-ds.xml	2008-01-22 20:39:20 UTC (rev 69212)
@@ -13,6 +13,7 @@
       <metadata>
          <type-mapping>Hypersonic SQL</type-mapping>
       </metadata>
+      <depends>jboss.security.tests:service=SecuritySpecLoginConfig</depends>
    </local-tx-datasource>
 
    <local-tx-datasource>
@@ -24,6 +25,7 @@
       <metadata>
          <type-mapping>Hypersonic SQL</type-mapping>
       </metadata>
+      <depends>jboss.security.tests:service=SecuritySpecLoginConfig</depends>
    </local-tx-datasource>
 
    <local-tx-datasource>
@@ -37,11 +39,12 @@
       <metadata>
          <type-mapping>Hypersonic SQL</type-mapping>
       </metadata>
+      <depends>jboss.security.tests:service=SecuritySpecLoginConfig</depends>
    </local-tx-datasource>
 
    <mbean code="org.jboss.security.auth.login.DynamicLoginConfig"
          name="jboss.security.tests:service=SecuritySpecLoginConfig">
-      <attribute name="AuthConfig">login-config.xml</attribute>
+      <attribute name="AuthConfig">jca-login-config.xml</attribute>
       <depends optional-attribute-name="LoginConfigService">
          jboss.security:service=XMLLoginConfig
       </depends>

Copied: trunk/testsuite/src/resources/jca/securedejb/jca-login-config.xml (from rev 69177, trunk/testsuite/src/resources/jca/securedejb/login-config.xml)
===================================================================
--- trunk/testsuite/src/resources/jca/securedejb/jca-login-config.xml	                        (rev 0)
+++ trunk/testsuite/src/resources/jca/securedejb/jca-login-config.xml	2008-01-22 20:39:20 UTC (rev 69212)
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- A login-config.xml example that uses the extended schema and jbossxb
+to marshall non-trival module-options.
+-->
+<policy xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xmlns="http://www.jboss.org/j2ee/schema/jaas"
+   targetNamespace="http://www.jboss.org/j2ee/schema/jaas"
+   >
+
+   <application-policy name="ConfiguredIdentityDSRealm">
+      <authentication>
+         <login-module code="org.jboss.resource.security.ConfiguredIdentityLoginModule"
+            flag="required">
+            <module-option name="principal">fixedcaller</module-option>
+            <module-option name="userName">sa</module-option>
+            <module-option name="password"></module-option>
+            <module-option name="managedConnectionFactoryName">jboss.jca:service=LocalTxCM,name=ConfiguredIdentityDS</module-option>
+         </login-module>
+      </authentication>
+   </application-policy>
+
+   <application-policy name="CallerIdentityDSRealm">
+      <authentication>
+         <login-module code="org.jboss.resource.security.CallerIdentityLoginModule" flag="required">
+            <module-option name="userName">sa</module-option>
+            <module-option name="password"></module-option>
+            <module-option name="managedConnectionFactoryName">jboss.jca:service=LocalTxCM,name=CallerIdentityDS</module-option>
+         </login-module>
+
+         <login-module code="org.jboss.security.auth.spi.XMLLoginModule" flag="required">
+            <module-option name="userInfo">
+               <lm:users xmlns:lm="http://www.jboss.org/j2ee/schemas/XMLLoginModule">
+                  <lm:user name="ejbcaller" password="ejbcallerpw">
+                     <lm:role name="UseCallerForAuth"/>
+                     <lm:role name="UseConfiguredForAuth"/>
+                     <lm:role name="CallerIdentityUser"/>
+                  </lm:user>
+                  <lm:user name="scott" password="echoman">
+                     <lm:role name="Echo"/>
+                     <lm:role name="ProjectUser"/>
+                     <lm:role name="callerScott" group="CallerPrincipal"/>
+                  </lm:user>
+                  <lm:user name="invoker" password="invoker">
+                     <lm:role name="HttpInvoker"/>
+                  </lm:user>
+               </lm:users>
+            </module-option>
+            <module-option name="unauthenticatedIdentity">guest</module-option>
+         </login-module>
+
+      </authentication>
+   </application-policy>
+
+   <application-policy name="RunAsIdentityDSRealm">
+      <authentication>
+         <login-module code="org.jboss.resource.security.ConfiguredIdentityLoginModule"
+            flag="required">
+            <module-option name="principal">runascaller</module-option>
+            <module-option name="userName">sa</module-option>
+            <module-option name="password"></module-option>
+            <module-option name="managedConnectionFactoryName">jboss.jca:service=LocalTxCM,name=RunAsIdentityDS</module-option>
+         </login-module>
+      </authentication>
+   </application-policy>
+
+   <application-policy name="RunAsIdentityFSRealm">
+      <authentication>
+         <login-module code="org.jboss.resource.security.CallerIdentityLoginModule" flag="required">
+            <module-option name="userName">sa</module-option>
+            <module-option name="password"></module-option>
+            <module-option name="addRunAsRoles">true</module-option>
+            <module-option name="managedConnectionFactoryName">jboss.jca:service=NoTxCM,name=RunAsIdentityFS</module-option>
+         </login-module>
+      </authentication>
+   </application-policy>
+</policy>

Deleted: trunk/testsuite/src/resources/jca/securedejb/login-config.xml
===================================================================
--- trunk/testsuite/src/resources/jca/securedejb/login-config.xml	2008-01-22 20:10:06 UTC (rev 69211)
+++ trunk/testsuite/src/resources/jca/securedejb/login-config.xml	2008-01-22 20:39:20 UTC (rev 69212)
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- A login-config.xml example that uses the extended schema and jbossxb
-to marshall non-trival module-options.
--->
-<policy xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xmlns="http://www.jboss.org/j2ee/schema/jaas"
-   targetNamespace="http://www.jboss.org/j2ee/schema/jaas"
-   >
-
-   <application-policy name="ConfiguredIdentityDSRealm">
-      <authentication>
-         <login-module code="org.jboss.resource.security.ConfiguredIdentityLoginModule"
-            flag="required">
-            <module-option name="principal">fixedcaller</module-option>
-            <module-option name="userName">sa</module-option>
-            <module-option name="password"></module-option>
-            <module-option name="managedConnectionFactoryName">jboss.jca:service=LocalTxCM,name=ConfiguredIdentityDS</module-option>
-         </login-module>
-      </authentication>
-   </application-policy>
-
-   <application-policy name="CallerIdentityDSRealm">
-      <authentication>
-         <login-module code="org.jboss.resource.security.CallerIdentityLoginModule" flag="required">
-            <module-option name="userName">sa</module-option>
-            <module-option name="password"></module-option>
-            <module-option name="managedConnectionFactoryName">jboss.jca:service=LocalTxCM,name=CallerIdentityDS</module-option>
-         </login-module>
-
-         <login-module code="org.jboss.security.auth.spi.XMLLoginModule" flag="required">
-            <module-option name="userInfo">
-               <lm:users xmlns:lm="http://www.jboss.org/j2ee/schemas/XMLLoginModule">
-                  <lm:user name="ejbcaller" password="ejbcallerpw">
-                     <lm:role name="UseCallerForAuth"/>
-                     <lm:role name="UseConfiguredForAuth"/>
-                     <lm:role name="CallerIdentityUser"/>
-                  </lm:user>
-                  <lm:user name="scott" password="echoman">
-                     <lm:role name="Echo"/>
-                     <lm:role name="ProjectUser"/>
-                     <lm:role name="callerScott" group="CallerPrincipal"/>
-                  </lm:user>
-                  <lm:user name="invoker" password="invoker">
-                     <lm:role name="HttpInvoker"/>
-                  </lm:user>
-               </lm:users>
-            </module-option>
-            <module-option name="unauthenticatedIdentity">guest</module-option>
-         </login-module>
-
-      </authentication>
-   </application-policy>
-
-   <application-policy name="RunAsIdentityDSRealm">
-      <authentication>
-         <login-module code="org.jboss.resource.security.ConfiguredIdentityLoginModule"
-            flag="required">
-            <module-option name="principal">runascaller</module-option>
-            <module-option name="userName">sa</module-option>
-            <module-option name="password"></module-option>
-            <module-option name="managedConnectionFactoryName">jboss.jca:service=LocalTxCM,name=RunAsIdentityDS</module-option>
-         </login-module>
-      </authentication>
-   </application-policy>
-
-   <application-policy name="RunAsIdentityFSRealm">
-      <authentication>
-         <login-module code="org.jboss.resource.security.CallerIdentityLoginModule" flag="required">
-            <module-option name="userName">sa</module-option>
-            <module-option name="password"></module-option>
-            <module-option name="addRunAsRoles">true</module-option>
-            <module-option name="managedConnectionFactoryName">jboss.jca:service=NoTxCM,name=RunAsIdentityFS</module-option>
-         </login-module>
-      </authentication>
-   </application-policy>
-</policy>




More information about the jboss-cvs-commits mailing list