[jboss-cvs] JBossAS SVN: r66723 - branches/JBPAPP_4_2/ejb3.

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

Author: wolfc
Date: 2007-11-05 03:06:19 -0500 (Mon, 05 Nov 2007)
New Revision: 66723

Modified:
   branches/JBPAPP_4_2/ejb3/build-test.xml
Log:
JBPAPP-347: Fixed jca/inflowmdb, modified service for build-jms-dd

Modified: branches/JBPAPP_4_2/ejb3/build-test.xml
===================================================================
--- branches/JBPAPP_4_2/ejb3/build-test.xml	2007-11-05 08:05:35 UTC (rev 66722)
+++ branches/JBPAPP_4_2/ejb3/build-test.xml	2007-11-05 08:06:19 UTC (rev 66723)
@@ -474,13 +474,15 @@
          </fileset>
       </jar>
 
+      <build-jms-dd name="jca/inflow" descriptor="jmsmdbtest-service.xml"/>
+      
       <jar jarfile="${build.lib}/jmsinflowmdb.jar">
          <fileset dir="${build.classes}">
             <include name="org/jboss/ejb3/test/jca/inflowmdb/JMS*.class"/>
             <include name="org/jboss/ejb3/test/jca/inflowmdb/Stateless*.class"/>
             <include name="org/jboss/ejb3/test/jca/inflowmdb/unit/*.class"/>
          </fileset>
-         <fileset dir="${build.resources}/test/jca/inflow">
+         <fileset dir="${target.resources}/test/jca/inflow">
             <include name="jmsmdbtest-service.xml"/>
          </fileset>
       </jar>
@@ -3063,21 +3065,9 @@
    </target>
 -->
 
-   <target name="_service_jbm" if="build.soa">
-      <mkdir dir="${target.resources}/test/service"/>
-      <xslt style="${resources}/test/mq2jbm.xsl" 
-      	in="${resources}/test/service/test-destination-service.xml" 
-      	out="${target.resources}/test/service/test-destination-service.xml"/>
-   </target>
-   
-   <target name="_service_mq" unless="build.soa">
-      <mkdir dir="${target.resources}/test/service"/>
-      <copy todir="${target.resources}/test/service" file="${resources}/test/service/test-destination-service.xml"/>
-   </target>
-   
    <target name="service"
       description="Builds all jar files."
-      depends="compile-classes,_service_jbm,_service_mq">
+      depends="compile-classes">
 
       <mkdir dir="${build.lib}"/>
 
@@ -3089,6 +3079,9 @@
             <include name="META-INF/jboss-service.xml"/>
          </fileset>
       </jar>
+      
+      <build-jms-dd name="service" descriptor="test-destination-service.xml"/>
+      
       <jar jarfile="${build.lib}/service-test.jar">
          <fileset dir="${build.classes}">
             <include name="org/jboss/ejb3/test/service/*.class"/>