[jboss-cvs] JBossAS SVN: r74313 - in trunk: testsuite and 1 other directories.

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

Author: sguilhen at redhat.com
Date: 2008-06-09 13:36:59 -0400 (Mon, 09 Jun 2008)
New Revision: 74313

Modified:
   trunk/security/src/main/org/jboss/security/plugins/JaasSecurityManagerService.java
   trunk/testsuite/build.xml
   trunk/testsuite/imports/sections/web.xml
Log:
JBAS-5585: Fixed the CustomHeaderAuthTestCase, enabled the GenericHeaderAuthTestCase and fixed a lookup issue in JaasSecurityManagerService.



Modified: trunk/security/src/main/org/jboss/security/plugins/JaasSecurityManagerService.java
===================================================================
--- trunk/security/src/main/org/jboss/security/plugins/JaasSecurityManagerService.java	2008-06-09 17:01:35 UTC (rev 74312)
+++ trunk/security/src/main/org/jboss/security/plugins/JaasSecurityManagerService.java	2008-06-09 17:36:59 UTC (rev 74313)
@@ -628,7 +628,8 @@
       SecurityDomainContext securityDomainCtx = (SecurityDomainContext) securityDomainCtxMap.get(securityDomain);
       if( securityDomainCtx == null )
       {
-         securityDomainCtx = newSecurityDomainCtx(securityDomain);
+         securityDomainCtx = (SecurityDomainContext) new InitialContext().lookup(
+                                 SecurityConstants.JAAS_CONTEXT_ROOT + "/" + securityDomain + "/domainContext");
          securityDomainCtxMap.put(securityDomain, securityDomainCtx);
          log.debug("Added "+securityDomain+", "+securityDomainCtx+" to map");
       }

Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml	2008-06-09 17:01:35 UTC (rev 74312)
+++ trunk/testsuite/build.xml	2008-06-09 17:36:59 UTC (rev 74313)
@@ -789,7 +789,6 @@
    <!-- Tests needing tomcat federation -->
    <patternset id="tc-federation.includes">
       <include name="org/jboss/test/web/security/*TestCase.class"/>
-      <exclude name="org/jboss/test/web/security/GenericHeaderAuthUnitTestCase.class"/>
       <include name="org/jboss/test/web/test/FormAuthUnitTestCase.class"/>
    </patternset>
    <!-- Tests needing tomcat SSL -->

Modified: trunk/testsuite/imports/sections/web.xml
===================================================================
--- trunk/testsuite/imports/sections/web.xml	2008-06-09 17:01:35 UTC (rev 74312)
+++ trunk/testsuite/imports/sections/web.xml	2008-06-09 17:36:59 UTC (rev 74313)
@@ -568,23 +568,23 @@
             <include name="**/*.jsp"/>
          </fileset>
       </war>
+      <jar destfile="${build.lib}/security_config.jar">
+         <zipfileset dir="${build.resources}/web" fullpath="form-auth-users.properties" includes="users.properties"/>
+         <zipfileset dir="${build.resources}/web" fullpath="form-auth-roles.properties" includes="roles.properties"/>
+         <zipfileset dir="${build.resources}/web/form-auth">
+            <include name="security-config.xml"/>
+         </zipfileset>
+      </jar>
       <zip destfile="${build.lib}/header-form-auth.ear">
          <zipfileset dir="${build.resources}/web/form-auth" prefix="META-INF">
             <include name="jboss-app.xml"/>
-            <include name="security-config.xml"/>
          </zipfileset>
          <zipfileset dir="${build.resources}/web/federation/customheader" prefix="META-INF">
             <include name="application.xml"/>
          </zipfileset>
-         <zipfileset dir="${build.resources}/web"
-            fullpath="form-auth-users.properties"
-            includes="users.properties"/>
-         <zipfileset dir="${build.resources}/web"
-            fullpath="form-auth-roles.properties"
-            includes="roles.properties"/>
          <zipfileset dir="${build.lib}" includes="header-form-auth.war"/>
-         <zipfileset dir="${build.resources}/web/form-auth"
-            includes="jboss-service.xml"/>
+         <zipfileset dir="${build.lib}" includes="security_config.jar" fullpath="lib/security_config.jar"/>
+         <zipfileset dir="${build.resources}/web/form-auth" includes="jboss-service.xml"/>
       </zip>
 
       <!--JBAS-4804: Generic Header Based Auth -->
@@ -605,18 +605,12 @@
       <zip destfile="${build.lib}/generic-header-auth.ear">
          <zipfileset dir="${build.resources}/web/form-auth" prefix="META-INF">
             <include name="jboss-app.xml"/>
-            <include name="security-config.xml"/>
          </zipfileset>
          <zipfileset dir="${build.resources}/web/federation/genericheader" prefix="META-INF">
             <include name="application.xml"/>
          </zipfileset>
-         <zipfileset dir="${build.resources}/web"
-            fullpath="form-auth-users.properties"
-            includes="users.properties"/>
-         <zipfileset dir="${build.resources}/web"
-            fullpath="form-auth-roles.properties"
-            includes="roles.properties"/>
          <zipfileset dir="${build.lib}" includes="generic-header-auth.war"/>
+         <zipfileset dir="${build.lib}" includes="security_config.jar" fullpath="lib/security_config.jar"/>
          <zipfileset dir="${build.resources}/web/form-auth"
             includes="jboss-service.xml"/>
       </zip>