|
From: Scott M S. <st...@us...> - 2002-04-26 17:33:39
|
User: starksm
Date: 02/04/26 10:30:36
Modified: . Tag: Branch_3_0 build.xml
Log:
Fix the screwed up jrmp-dl.jar construction
Revision Changes Path
No revision
No revision
1.106.2.4 +8 -10 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.106.2.3
retrieving revision 1.106.2.4
diff -u -r1.106.2.3 -r1.106.2.4
--- build.xml 18 Apr 2002 23:16:56 -0000 1.106.2.3
+++ build.xml 26 Apr 2002 17:30:35 -0000 1.106.2.4
@@ -13,7 +13,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.106.2.3 2002/04/18 23:16:56 starksm Exp $ -->
+<!-- $Id: build.xml,v 1.106.2.4 2002/04/26 17:30:35 starksm Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -1559,16 +1559,14 @@
</jar>
<!-- build jrmp-dl.jar -->
- <jar jarfile="${build.lib}/jrmp-dl.jar"
- manifest="${build.etc}/manifest.mf">
+ <jar jarfile="${build.lib}/jrmp-dl.jar">
+ <metainf dir="${build.resources}/jrmp/META-INF">
+ <exclude name="jboss.xml" />
+ </metainf>
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
<include name="org/jboss/test/jrmp/interfaces/**"/>
<include name="org/jboss/test/jrmp/ejb/**"/>
</fileset>
- <fileset dir="${build.resources}/jrmp">
- <include name="**/*.xml"/>
- </fileset>
</jar>
</target>
@@ -1591,7 +1589,6 @@
<!-- build threadingBean.jar -->
<jar jarfile="${build.lib}/threadingBean.jar">
<fileset dir="${build.classes}">
- <patternset refid="common.test.application.classes"/>
<include name="org/jboss/test/threading/interfaces/**"/>
<include name="org/jboss/test/threading/ejb/**"/>
</fileset>
@@ -1793,11 +1790,12 @@
<jar jarfile="${build.lib}/jbosstest-web-ejbs.jar">
<fileset dir="${build.classes}">
<patternset refid="common.test.application.classes"/>
- <include name="org/jboss/test/web/interfaces/**"/>
<include name="org/jboss/test/web/ejb/**"/>
+ <include name="org/jboss/test/web/interfaces/**"/>
</fileset>
<fileset dir="${build.resources}/web">
- <include name="**/*.xml"/>
+ <include name="META-INF/ejb-jar.xml"/>
+ <include name="META-INF/jboss.xml"/>
<include name="users.properties"/>
<include name="roles.properties"/>
</fileset>
|