[jboss-cvs] JBossAS SVN: r69666 - in trunk/testsuite: src/main/org/jboss/test/security/test and 1 other directories.

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

Author: anil.saldhana at jboss.com
Date: 2008-02-06 12:21:27 -0500 (Wed, 06 Feb 2008)
New Revision: 69666

Modified:
   trunk/testsuite/imports/sections/security.xml
   trunk/testsuite/src/main/org/jboss/test/security/test/DeepCopySubjectUnitTestCase.java
   trunk/testsuite/src/resources/security/deepcopy/META-INF/deepcopy-service.xml
Log:
JBAS-5219: get the test to atleast try to deploy the ear properly

Modified: trunk/testsuite/imports/sections/security.xml
===================================================================
--- trunk/testsuite/imports/sections/security.xml	2008-02-06 17:06:22 UTC (rev 69665)
+++ trunk/testsuite/imports/sections/security.xml	2008-02-06 17:21:27 UTC (rev 69666)
@@ -306,10 +306,13 @@
          <webinf dir="${build.resources}/security/deepcopy/WEB-INF"> 
             <include name="jboss-web.xml"/> 
          </webinf> 
-                 <classes dir="${build.classes}"> 
+         <classes dir="${build.classes}"> 
             <include 
                name="org/jboss/test/security/servlets/DeepCopy*.class"/> 
          </classes> 
+         <zipfileset dir="${build.resources}/security/deepcopy/META-INF" prefix="WEB-INF/classes">
+            <include name="deepcopy-config.xml"/>
+         </zipfileset>
       </war> 
 
       <!--deepcopy.ear--> 
@@ -317,6 +320,7 @@
          appxml="${build.resources}/security/deepcopy/META-INF/application.xml" > 
          <metainf dir="${build.resources}/security/deepcopy/META-INF"> 
               <include name="*.xml"/>  
+              <exclude name="deepcopy-config.xml"/> <!-- in the war -->
               <exclude name="application.xml"/> 
          </metainf> 
          <fileset dir="output/lib">  

Modified: trunk/testsuite/src/main/org/jboss/test/security/test/DeepCopySubjectUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/security/test/DeepCopySubjectUnitTestCase.java	2008-02-06 17:06:22 UTC (rev 69665)
+++ trunk/testsuite/src/main/org/jboss/test/security/test/DeepCopySubjectUnitTestCase.java	2008-02-06 17:21:27 UTC (rev 69666)
@@ -231,7 +231,7 @@
          protected void setUp() throws Exception
          {
             super.setUp();
-            deploy("deepcopy.ear");
+            redeploy("deepcopy.ear");
             // Make sure the security cache is clear
             flushAuthCache();
          }

Modified: trunk/testsuite/src/resources/security/deepcopy/META-INF/deepcopy-service.xml
===================================================================
--- trunk/testsuite/src/resources/security/deepcopy/META-INF/deepcopy-service.xml	2008-02-06 17:06:22 UTC (rev 69665)
+++ trunk/testsuite/src/resources/security/deepcopy/META-INF/deepcopy-service.xml	2008-02-06 17:21:27 UTC (rev 69666)
@@ -7,7 +7,7 @@
    -->
    <mbean code="org.jboss.security.auth.login.DynamicLoginConfig"
          name="jboss.security.tests:service=DynamicLoginConfigDeepCopyTest">
-      <attribute name="AuthConfig">META-INF/deepcopy-config.xml</attribute>
+      <attribute name="AuthConfig">deepcopy-config.xml</attribute>
       <depends optional-attribute-name="LoginConfigService">
          jboss.security:service=XMLLoginConfig
       </depends>