[jboss-cvs] jbosstest build.xml

[Scott M S. <st...@us...>]

  User: starksm 
  Date: 04/09/08 21:17:05

  Modified:    .        build.xml
  Log:
  Exclude the media ejb tests and fix the app-client/cts build order
  
  Revision  Changes    Path
  1.397     +3 -47     jbosstest/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jbosstest/build.xml,v
  retrieving revision 1.396
  retrieving revision 1.397
  diff -u -r1.396 -r1.397
  --- build.xml	8 Sep 2004 14:35:39 -0000	1.396
  +++ build.xml	9 Sep 2004 04:17:03 -0000	1.397
  @@ -15,7 +15,7 @@
   <!--                                                                        -->
   <!-- ====================================================================== -->
   
  -<!-- $Id: build.xml,v 1.396 2004/09/08 14:35:39 ejort Exp $ -->
  +<!-- $Id: build.xml,v 1.397 2004/09/09 04:17:03 starksm Exp $ -->
   
   <project default="main" name="JBoss/Testsuite">
   
  @@ -1168,29 +1168,6 @@
           destdir="${build.resources}/cache/META-INF"/>
       </ejbdoclet>
   
  -    <!-- JBoss Media -->
  -    <mkdir dir="${build.resources}/media/entity/META-INF"/>
  -    <ejbdoclet destdir="${build.gen-src}"
  -      ejbspec="2.0"
  -      excludedtags="@version,@author"
  -      mergedir="${source.resources}/media/entity">
  -      <fileset dir="${source.java}">
  -        <include name="org/jboss/test/media/entity/ejb/*Bean.java"/>
  -      </fileset>
  -      <remoteinterface/>
  -      <localinterface/>
  -      <homeinterface/>
  -      <localhomeinterface/>
  -      <!--session/>
  -      <deploymentdescriptor
  -         destdir="${build.resources}/media/entity/META-INF"
  -         validatexml="${validatexml}"/>
  -      <jboss
  -         version="3.2"
  -         xmlencoding="UTF-8"
  -         destdir="${build.resources}/media/entity/META-INF"
  -         validatexml="${validatexml}"/-->
  -    </ejbdoclet>
     </target>
   
     <target name="compile-mbean-sources" depends="init" unless="noxdoclet">
  @@ -1421,9 +1398,9 @@
         _jars-bmp,
         _jars-cache,
         _jars-classloader,
  -      _jars-client,
         _jars-cmp2,
         _jars-cts,
  +      _jars-client,
         _jars-dbtest,
         _jars-deadlock,
         _jars-ejbconf,
  @@ -1453,7 +1430,6 @@
         _jars-lock,
         _jars-marathon,
         _jars-mdb,
  -      _jars-media,
         _jars-messagedriven,
         _jars-naming,
         _jars-perf,
  @@ -4476,27 +4452,6 @@
       </jar>
     </target>
   
  -  <!-- JBoss Media tests -->
  -  <target name="_jars-media">
  -    <mkdir dir="${build.lib}"/>
  -
  -    <!-- build media-entity.jar -->
  -    <jar jarfile="${build.lib}/media-entity.jar"
  -      manifest="${build.etc}/manifest.mf">
  -      <fileset dir="${build.classes}">
  -        <patternset refid="common.test.client.classes"/>
  -        <include name="org/jboss/test/media/entity/**"/>
  -      </fileset>
  -      <fileset dir="${build.resources}/media/entity">
  -        <include name="**/*.*"/>
  -      </fileset>
  -      <zipfileset src="${junitejb.junitejb.lib}/junitejb.jar"
  -        includes="net/**/*.*"/>
  -      <zipfileset src="${junit.junit.lib}/junit.jar"
  -        includes="junit/**/*.*"/>
  -    </jar>
  -  </target>
  -
     <!-- naming test -->
     <target name="_jars-naming">
       <mkdir dir="${build.lib}"/>
  @@ -5904,6 +5859,7 @@
   
             <!-- Exclude iiop they run in their own target -->
             <exclude name="**/test/*iiop/test/*"/>
  +          <exclude name="org/jboss/test/media/**" />>
           </fileset>
         </batchtest>
       </junit>