[jboss-cvs] JBossAS SVN: r72599 - in trunk/testsuite: src/resources/security/deepcopy/META-INF and 1 other directory.

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

Author: anil.saldhana at jboss.com
Date: 2008-04-22 23:08:28 -0400 (Tue, 22 Apr 2008)
New Revision: 72599

Modified:
   trunk/testsuite/imports/sections/security.xml
   trunk/testsuite/src/resources/security/deepcopy/META-INF/jboss-app.xml
Log:
fix resources packing for deepcopy subject test

Modified: trunk/testsuite/imports/sections/security.xml
===================================================================
--- trunk/testsuite/imports/sections/security.xml	2008-04-23 02:49:51 UTC (rev 72598)
+++ trunk/testsuite/imports/sections/security.xml	2008-04-23 03:08:28 UTC (rev 72599)
@@ -310,19 +310,30 @@
             <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> 
+    
+     <!-- package the resources as a jar -->
+     <jar destfile="${build.lib}/deepcopy-resources.jar"> 
+       <fileset dir="${build.resources}/security/deepcopy/META-INF">
+         <include name="deepcopy-config.xml"/>
+       </fileset>
+     </jar>
 
       <!--deepcopy.ear--> 
       <ear destfile="${build.lib}/deepcopy.ear" 
          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="deepcopy-service.xml"/> 
+              <exclude name="deepcopy-config.xml"/> 
               <exclude name="application.xml"/> 
          </metainf> 
+         <zipfileset dir="${build.resources}/security/deepcopy/META-INF">  
+            <include name="deepcopy-service.xml" /> 
+         </zipfileset>  
+         <zipfileset dir="output/lib" prefix="lib">  
+            <include name="deepcopy-resources.jar" /> 
+         </zipfileset>  
          <fileset dir="output/lib">  
               <include name="deepcopy.war" /> 
          </fileset>  

Modified: trunk/testsuite/src/resources/security/deepcopy/META-INF/jboss-app.xml
===================================================================
--- trunk/testsuite/src/resources/security/deepcopy/META-INF/jboss-app.xml	2008-04-23 02:49:51 UTC (rev 72598)
+++ trunk/testsuite/src/resources/security/deepcopy/META-INF/jboss-app.xml	2008-04-23 03:08:28 UTC (rev 72599)
@@ -5,6 +5,6 @@
 
 <jboss-app>
    <module>
-      <service>META-INF/deepcopy-service.xml</service>
+      <service>deepcopy-service.xml</service>
    </module>
 </jboss-app>