[jboss-cvs] JBossAS SVN: r60423 - in branches/Branch_4_2/ejb3: src/resources/test/ear and 1 other directory.

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

Author: wolfc
Date: 2007-02-08 09:11:34 -0500 (Thu, 08 Feb 2007)
New Revision: 60423

Added:
   branches/Branch_4_2/ejb3/src/resources/test/ear/application.xml
Modified:
   branches/Branch_4_2/ejb3/build-test.xml
Log:
Fixed ear and servlet deployment

Modified: branches/Branch_4_2/ejb3/build-test.xml
===================================================================
--- branches/Branch_4_2/ejb3/build-test.xml	2007-02-08 12:28:05 UTC (rev 60422)
+++ branches/Branch_4_2/ejb3/build-test.xml	2007-02-08 14:11:34 UTC (rev 60423)
@@ -622,7 +622,7 @@
             <include name="org/jboss/ejb3/test/ear/ReferencedEntity.class"/>
          </fileset>
       </jar>
-      <zip zipfile="${build.lib}/ear-test.ear">
+      <ear earfile="${build.lib}/ear-test.ear" appxml="${resources}/test/ear/application.xml">
          <zipfileset dir="${build.lib}">
             <include name="ear-session.jar"/>
          </zipfileset>
@@ -630,7 +630,7 @@
             <include name="ref.jar"/>
             <include name="earpu.jar"/>
          </zipfileset>
-      </zip>
+      </ear>
 
    </target>
 
@@ -1550,8 +1550,15 @@
          </fileset>
          <fileset dir="${resources}/test/servlet">
             <include name="META-INF/jboss-app.xml"/>
+            <include name="servlet-security-service.xml"/>
          </fileset>
       </ear>
+      
+      <copy todir="${build.lib}">
+         <fileset dir="${resources}/test/servlet">
+            <include name="servlet-security-service.xml"/>
+         </fileset>
+      </copy>
    </target>
 
    <target name="ejbthree440"
@@ -2835,7 +2842,7 @@
    </target>
    
    <target name="jars" depends="arjuna, mdbtransactions, unauthenticatedprincipal, clusteredservice, invoker, classloader, 
-      circulardependency, jsp, timerdependency, servicedependency, servlet, stateless14, webservices, ejbthree440, 
+      circulardependency, jsp, timerdependency, servicedependency, servlet, stateless14, webservices, ear, ejbthree440, 
       ejbthree454, ejbthree653, ejbthree670, ejbthree712, ejbthree751, aspectdomain, ejbcontext, schema, mail, scopedclassloader, dependency, 
       securitydomain, enventry, 
       jms/managed, naming, bmt, jca/inflowmdb, pool, jms, security, reference21_30, factory, dd/web, txexceptions, 

Added: branches/Branch_4_2/ejb3/src/resources/test/ear/application.xml
===================================================================
--- branches/Branch_4_2/ejb3/src/resources/test/ear/application.xml	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/resources/test/ear/application.xml	2007-02-08 14:11:34 UTC (rev 60423)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE application PUBLIC '-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN' 'http://java.sun.com/dtd/application_1_3.dtd'>
+
+<application>
+  <display-name>EAR test</display-name>
+  
+  <jar>lib/ref.jar</jar>
+
+  <module>
+    <ejb>lib/earpu.jar</ejb>
+  </module>
+    
+  <module>
+    <ejb>ear-session.jar</ejb>
+  </module>
+</application>
+
+