User: starksm 
  Date: 01/07/17 20:24:42

  Modified:    src/build Tag: Branch_2_2 build.xml run_tests.xml
  Log:
  Merge some changes from main back to 2.2 to update the 2.2 branch testing
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.25.2.2  +152 -363  jbosstest/src/build/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jbosstest/src/build/build.xml,v
  retrieving revision 1.25.2.1
  retrieving revision 1.25.2.2
  diff -u -r1.25.2.1 -r1.25.2.2
  --- build.xml 2001/06/24 20:09:59     1.25.2.1
  +++ build.xml 2001/07/18 03:24:42     1.25.2.2
  @@ -5,7 +5,6 @@
   <!-- ======================================================================= -->
   
   <project name="jBossTest" default="main" basedir="../.." >
  -  <target name="init">
       <property name="Name" value="jBossTest"/>
       <property name="name" value="jbosstest"/>
       <property name="version" value="1.0"/>
  @@ -33,16 +32,16 @@
       <property name="packages" value="org.*"/>
   
       <property name="build.compiler" value="classic"/>
  -    
  -  </target>
   
  -  <!-- =================================================================== -->
  -  <!-- Prepares the build directory                                        -->
  -  <!-- =================================================================== -->
  -  <target name="prepare" depends="init">
  -    <mkdir dir="${build.dir}"/>
  -  </target>
  -  
  +   <!-- =================================================================== -->
  +   <!-- Prepares the build directory                                        -->
  +   <!-- =================================================================== -->
  +   <target name="prepare">
  +      <mkdir dir="${build.dir}"/>
  +      <mkdir dir="${build.lib.dir}"/>
  +      <mkdir dir="${build.deploy.dir}"/>
  +   </target>
  +
     <!-- =================================================================== -->
     <!-- Compiles the source code                                            -->
     <!-- =================================================================== -->
  @@ -57,352 +56,128 @@
       />
     </target>
   
  -  <!-- =================================================================== -->
  -  <!-- Creates the jar archives                                            -->
  -  <!-- =================================================================== -->
  +<!-- ===================================================================
  +### Begin testcase build targets
  +     =================================================================== -->
  +
  +  <!-- Creates the test jar archives. To add a new test suite add create a
  +    build file in the subprojects directory using one of the existing build-x.xml
  +    files as a template and then add a <antcall target="bank-x" /> statement
  +    to the following jar target.
  +    Also add a target like:
  +        <target name="x-subproject" depends="prepare">
  +            <ant antfile="src/build/subprojects/build-x.xml" />
  +        </target>
  +    after the existing targets below.
  +  -->
     <target name="jar" depends="compile">
  -    <mkdir dir="${build.lib.dir}"/>
  -    <mkdir dir="${build.deploy.dir}"/>
  -
  -      <!-- Bank test -->
  -    <delete dir="${build.classes.dir}/META-INF"/>
  -    <copy todir="${build.classes.dir}">
  -        <fileset dir="${src.resources}/bank"/>
  -    </copy>
  -    <jar jarfile="${build.lib.dir}/banktest.jar"
  -         basedir="${build.classes.dir}"
  -         manifest="${etc.dir}/manifest.mf"
  -         
includes="org/jboss/test/bank/interfaces/**,org/jboss/test/bank/test/**,*.*"
  -    />    
  -      
  -    <jar jarfile="${build.deploy.dir}/bank.jar"
  -         basedir="${build.classes.dir}"
  -         
includes="org/jboss/test/util/ejb/**,org/jboss/test/bank/interfaces/**,org/jboss/test/bank/ejb/**,**/*.xml"
  -    />    
  -      
  -      <!-- Hello test -->
  -    <delete dir="${build.classes.dir}/META-INF"/>
  -    <copy todir="${build.classes.dir}">
  -        <fileset dir="${src.resources}/hello"/>
  -    </copy>
  -    <jar jarfile="${build.lib.dir}/hellotest.jar"
  -         basedir="${build.classes.dir}"
  -         manifest="${etc.dir}/manifest.mf"
  -         
includes="org/jboss/test/hello/interfaces/**,org/jboss/test/hello/test/**,*.*"
  -    />    
  -      
  -    <jar jarfile="${build.deploy.dir}/hello.jar"
  -         basedir="${build.classes.dir}"
  -         
includes="org/jboss/test/util/ejb/**,org/jboss/test/hello/interfaces/**,org/jboss/test/hello/ejb/**,**/*.xml"
  -    />    
  -      
  -      <!-- IdGenerator test -->
  -    <delete dir="${build.classes.dir}/META-INF"/>
  -    <copy todir="${build.classes.dir}">
  -        <fileset dir="${src.resources}/idgen"/>
  -    </copy>
  -    <jar jarfile="${build.lib.dir}/idgentest.jar"
  -         basedir="${build.classes.dir}"
  -         manifest="${etc.dir}/manifest.mf"
  -         
includes="org/jboss/test/idgen/interfaces/**,org/jboss/test/idgen/test/**,*.*"
  -    />    
  -      
  -    <jar jarfile="${build.deploy.dir}/idgen.jar"
  -         basedir="${build.classes.dir}"
  -         
includes="org/jboss/test/util/ejb/**,org/jboss/test/idgen/interfaces/**,org/jboss/test/idgen/ejb/**,**/*.xml"
  -    />    
  -      
  -      <!-- CTS (Compatibility Test Suite) test -->
  -    <delete dir="${build.classes.dir}/META-INF"/>
  -    <copy todir="${build.classes.dir}">
  -        <fileset dir="${src.resources}/cts"/>
  -    </copy>
  -    <jar jarfile="${build.lib.dir}/ctstest.jar"
  -         basedir="${build.classes.dir}"
  -         manifest="${etc.dir}/manifest.mf"
  -         
includes="org/jboss/test/util/ejb/BeanContextInfo.class,org/jboss/test/cts/jms/**,org/jboss/test/cts/keys/**,org/jboss/test/cts/interfaces/**,org/jboss/test/cts/test/**,*.*"
  -    />    
  -      
  -    <jar jarfile="${build.deploy.dir}/cts.jar"
  -         basedir="${build.classes.dir}"
  -         
includes="org/jboss/test/util/**,org/jboss/test/cts/jms/**,org/jboss/test/cts/interfaces/**,org/jboss/test/cts/keys/**,org/jboss/test/cts/ejb/**,**/*.xml"
  -    />    
  -    
  -      <!-- Performance test -->
  -    <delete dir="${build.classes.dir}/META-INF"/>
  -    <copy todir="${build.classes.dir}">
  -        <fileset dir="${src.resources}/perf"/>
  -    </copy>
  -    <jar jarfile="${build.lib.dir}/perftest.jar"
  -         basedir="${build.classes.dir}"
  -         manifest="${etc.dir}/manifest.mf"
  -         
includes="org/jboss/test/perf/interfaces/**,org/jboss/test/perf/test/**,*.*"
  -    />    
  -      
  -    <jar jarfile="${build.deploy.dir}/perf.jar"
  -         basedir="${build.classes.dir}"
  -         
includes="org/jboss/test/perf/interfaces/**,org/jboss/test/perf/ejb/**,**/*.xml"
  -    />    
  -     
  -      <!-- TestBean test -->
  -    <delete dir="${build.classes.dir}/META-INF"/>
  -    <copy todir="${build.classes.dir}">
  -        <fileset dir="${src.resources}/testbean"/>
  -    </copy>
  -    <jar jarfile="${build.lib.dir}/testbeantest.jar"
  -         basedir="${build.classes.dir}"
  -         manifest="${etc.dir}/manifest.mf"
  -         
includes="org/jboss/test/testbean/interfaces/**,org/jboss/test/testbean/test/**,org/jboss/test/testbean2/interfaces/**,*.*,org/somepackage/**,org/jboss/test/bmp/interfaces/**"
  -    />    
  -      
  -    <jar jarfile="${build.deploy.dir}/testbean.jar"
  -         basedir="${build.classes.dir}"
  -         
includes="org/jboss/test/testbean/interfaces/**,org/jboss/test/testbean2/interfaces/**,org/jboss/test/testbean/bean/**,**/*.xml,org/somepackage/**"
  -    />
  -     
  -      <!-- TestBean2 test -->
  -    <delete dir="${build.classes.dir}/META-INF"/>
  -    <copy todir="${build.classes.dir}">
  -        <fileset dir="${src.resources}/testbean2"/>
  -    </copy>
  -    <jar jarfile="${build.deploy.dir}/testbean2.jar"
  -         basedir="${build.classes.dir}"
  -         
includes="org/jboss/test/testbean2/interfaces/**,org/jboss/test/testbean/interfaces/**,org/jboss/test/testbean2/bean/**,**/*.xml"
  -    />
  -    
  -      <!-- dbtest -->
  -    <delete dir="${build.classes.dir}/META-INF"/>
  -    <copy todir="${build.classes.dir}">
  -        <fileset dir="${src.resources}/dbtest"/>
  -    </copy>
  -    <jar jarfile="${build.lib.dir}/dbtestclient.jar"
  -         basedir="${build.classes.dir}"
  -         manifest="${etc.dir}/manifest.mf"
  -         
includes="org/jboss/test/dbtest/interfaces/**,org/jboss/test/dbtest/test/**"
  -    />    
  -      
  -    <jar jarfile="${build.deploy.dir}/dbtest.jar"
  -         basedir="${build.classes.dir}"
  -         
includes="org/jboss/test/dbtest/interfaces/**,org/jboss/test/dbtest/bean/**,**/*.xml"
  -    />
  -     
  -     <!-- locktest -->
  -    <delete dir="${build.classes.dir}/META-INF"/>
  -    <copy todir="${build.classes.dir}">
  -        <fileset dir="${src.resources}/lock"/>
  -    </copy>
  -    <jar jarfile="${build.lib.dir}/locktestclient.jar"
  -         basedir="${build.classes.dir}"
  -         manifest="${etc.dir}/manifest.mf"
  -         includes="org/jboss/test/lock/interfaces/**,org/jboss/test/lock/test/**"
  -    />    
  -      
  -    <jar jarfile="${build.deploy.dir}/locktest.jar"
  -         basedir="${build.classes.dir}"
  -         
includes="org/jboss/test/lock/interfaces/**,org/jboss/test/lock/bean/**,**/*.xml"
  -    />
  -     
  -
  -    <!-- load test -->
  -    <delete dir="${build.classes.dir}/META-INF"/>
  -    <jar jarfile="${build.lib.dir}/load.jar"
  -         basedir="${build.classes.dir}"
  -         manifest="${etc.dir}/manifest.mf"
  -         
includes="org/jboss/test/load/test/**,org/jboss/test/testbean/interfaces/**,org/jboss/test/bmp/interfaces/**"
  -    />
  -
  -    <!-- xa test -->
  -    <delete dir="${build.classes.dir}/META-INF"/>
  -    <jar jarfile="${build.deploy.dir}/xatest.jar"
  -         basedir="${build.classes.dir}"
  -         manifest="${etc.dir}/manifest.mf"
  -         
includes="org/jboss/test/xa/test/**,org/jboss/xa/bean/**,org/jboss/test/xa/interfaces/**"
  -    />
  -
  -    <!-- bmp test -->
  -    <delete dir="${build.classes.dir}/META-INF"/>
  -    <copy todir="${build.classes.dir}">
  -        <fileset dir="${src.resources}/bmp"/>
  -    </copy>
  -    <jar jarfile="${build.lib.dir}/bmptest.jar"
  -         basedir="${build.classes.dir}"
  -         manifest="${etc.dir}/manifest.mf"
  -         includes="org/jboss/test/bmp/interfaces/**,org/jboss/test/bmp/test/**,*.*"
  -    />
  - 
  -    <jar jarfile="${build.deploy.dir}/bmp.jar"
  -         basedir="${build.classes.dir}"
  -         
includes="org/jboss/test/bmp/interfaces/**,org/jboss/test/bmp/beans/**,**/*.xml"
  -    />    
  -    
  -    <!-- benchmark test -->
  -    <mkdir dir="${build.dir}/bench"/>
  -    <delete dir="${build.classes.dir}/META-INF"/>
  -    <copy todir="${build.classes.dir}">
  -        <fileset dir="${src.resources}/bench/ejb"/>
  -    </copy>
  -    <jar jarfile="${build.dir}/bench/bench.jar"
  -         basedir="${build.classes.dir}"
  -         
includes="org/jboss/test/bench/interfaces/**,org/jboss/test/bench/ejb/**,**/*.xml"
  -    />
  -    
  -    <delete dir="${build.classes.dir}/META-INF"/>
  -    <copy todir="${build.dir}/web">
  -        <fileset dir="${src.resources}/bench/web"/>
  -    </copy>
  -    <copy todir="${build.dir}/web/WEB-INF/classes/org/jboss/test/bench/servlet">
  -        <fileset dir="${build.classes.dir}/org/jboss/test/bench/servlet"/>
  -    </copy>
  -    <jar jarfile="${build.dir}/bench/bench.war"
  -         basedir="${build.dir}/web"
  -              manifest="${src.resources}/bench/web.mf"
  -         includes="**"
  -    />
  -    
  -    <delete dir="${build.classes.dir}/META-INF"/>
  -    <delete dir="${build.classes.dir}/WEB-INF"/>
  -    <copy todir="${build.dir}/bench">
  -        <fileset dir="${src.resources}/bench/ear"/>
  -    </copy>
  -    <jar jarfile="${build.deploy.dir}/bench.ear"
  -         basedir="${build.dir}/bench"
  -         includes="bench.jar,bench.war,META-INF/**"
  -    />
  -              
  -     <!-- MDB test -->
  -    <delete dir="${build.classes.dir}/META-INF"/>
  -    <copy todir="${build.classes.dir}">
  -        <fileset dir="${src.resources}/mdb"/>
  -    </copy>
  -    <jar jarfile="${build.lib.dir}/mdbtest.jar"
  -         basedir="${build.classes.dir}"
  -         manifest="${etc.dir}/manifest.mf"
  -         includes="org/jboss/test/mdb/**,*.*"
  -    />    
  -      
  -    <jar jarfile="${build.deploy.dir}/mdb.jar"
  -         basedir="${build.classes.dir}"
  -         includes="org/jboss/test/mdb/bean/**,**/*.xml"
  -    />  
  -
  -     <!-- spyderMQ test -->
  -    <jar jarfile="${build.lib.dir}/spydermqtest.jar"
  -         basedir="${build.classes.dir}"
  -         manifest="${etc.dir}/manifest.mf"
  -         includes="org/jboss/test/spydermq/**,*.*"
  -    />    
  -
  -    <!-- JRMP custom socket tests -->
  -    <delete dir="${build.classes.dir}/META-INF"/>
  -    <copy todir="${build.classes.dir}">
  -      <fileset dir="${src.resources}/jrmp" />
  -    </copy>
  -    <jar jarfile="${build.lib.dir}/jrmp-comp-client.jar"
  -         basedir="${build.classes.dir}"
  -         manifest="${etc.dir}/manifest.mf" >
  -      <include name="org/jboss/test/jrmp/interfaces/**" />
  -    </jar>
  -    <jar jarfile="${build.lib.dir}/comp-sockets.jar"
  -         basedir="${build.classes.dir}" >
  -      <include name="org/jboss/test/jrmp/ejb/Compression*.class" />
  -    </jar>
  -    <jar jarfile="${build.deploy.dir}/jrmp-comp.jar"
  -         basedir="${build.classes.dir}" >
  -      <include name="org/jboss/test/jrmp/ejb/**" />
  -      <include name="org/jboss/test/jrmp/interfaces/**" />
  -      <include name="**/ejb-jar.xml" />
  -      <include name="**/jboss.xml" />
  -      <exclude name="org/jboss/test/jrmp/ejb/Compression*.class" />
  -    </jar>
  -
  -    <!-- Naming ENC Tests -->
  -    <delete dir="${build.classes.dir}/META-INF"/>
  -    <mkdir dir="${build.classes.dir}/META-INF"/>
  -    <copy file="${src.resources}/naming/META-INF/ejb-jar.xml"
  -      todir="${build.classes.dir}/META-INF" />
  -    <copy file="${src.resources}/naming/META-INF/jboss.xml"
  -      todir="${build.classes.dir}/META-INF" />
  -    <jar jarfile="${build.deploy.dir}/naming.jar"
  -         basedir="${build.classes.dir}" >
  -      <include name="org/jboss/test/naming/ejb/**" />
  -      <include name="org/jboss/test/naming/interfaces/**" />
  -      <include name="**/ejb-jar.xml" />
  -      <include name="**/jboss.xml" />
  -    </jar>
  -    <copy file="${src.resources}/naming/META-INF/remote-ejb-jar.xml"
  -      tofile="${build.classes.dir}/META-INF/ejb-jar.xml" overwrite="yes" />
  -    <copy file="${src.resources}/naming/META-INF/remote-jboss.xml"
  -      tofile="${build.classes.dir}/META-INF/jboss.xml" overwrite="yes" />
  -    <jar jarfile="${build.deploy.dir}/remote-naming.jar"
  -         basedir="${build.classes.dir}" >
  -      <include name="org/jboss/test/naming/ejb/**" />
  -      <include name="org/jboss/test/naming/interfaces/**" />
  -      <include name="**/ejb-jar.xml" />
  -      <include name="**/jboss.xml" />
  -    </jar>
  -
  -    <!-- JBossSX/Security tests -->
  -    <delete dir="${build.classes.dir}/META-INF"/>
  -    <copy todir="${build.classes.dir}">
  -      <fileset dir="${src.resources}/security" />
  -    </copy>
  -    <jar jarfile="${build.lib.dir}/security-client.jar"
  -         basedir="${build.classes.dir}"
  -         manifest="${etc.dir}/manifest.mf" >
  -      <include name="org/jboss/test/security/interfaces/**" />
  -    </jar>
  -    <jar jarfile="${build.deploy.dir}/security.jar"
  -         basedir="${build.classes.dir}" >
  -      <include name="org/jboss/test/security/ejb/**" />
  -      <include name="org/jboss/test/security/interfaces/**" />
  -         <include name="org/jboss/test/security/proxy/*" />
  -         <include name="org/jboss/test/security/test/Namespace*" />
  -         <include name="org/jboss/test/security/test/PermissionName*.class" />
  -      <include name="**/ejb-jar.xml" />
  -      <include name="**/jboss.xml" />
  -      <include name="users.properties" />
  -      <include name="roles.properties" />
  -    </jar>
  -
  -    <move file="${build.classes.dir}/META-INF/jboss-spec.xml" 
tofile="${build.classes.dir}/META-INF/jboss.xml" overwrite="true" />
  -    <jar jarfile="${build.deploy.dir}/security-spec.jar"
  -         basedir="${build.classes.dir}" >
  -      <include name="org/jboss/test/security/ejb/**" />
  -      <include name="org/jboss/test/security/interfaces/**" />
  -         <include name="org/jboss/test/security/proxy/*" />
  -         <include name="org/jboss/test/security/test/Namespace*" />
  -         <include name="org/jboss/test/security/test/PermissionName*.class" />
  -      <include name="**/ejb-jar.xml" />
  -      <include name="**/jboss.xml" />
  -      <include name="users.properties" />
  -      <include name="roles.properties" />
  -    </jar>
  -    <!-- Create a separate jar that contains the security proxy classes.
  -         These need to be segregated so that they can be assigned a minimal
  -         Java2 permission set.
  -    <jar jarfile="${build.lib.dir}/security-proxy.jar"
  -        basedir="${build.classes.dir}"
  -        includes="org/jboss/test/security/proxy/*"
  -    />
  -    -->
  +    <antcall target="bank-subproject" />
  +    <antcall target="hello-subproject" />
  +    <antcall target="idgen-subproject" />
  +    <antcall target="cts-subproject" />
  +    <antcall target="perf-subproject" />
  +    <antcall target="bench-subproject" />
  +    <antcall target="testbean-subproject" />
  +    <antcall target="dbtest-subproject" />
  +    <antcall target="lock-subproject" />
  +    <antcall target="load-subproject" />
  +    <antcall target="xa-subproject" />
  +    <antcall target="bmp-subproject" />
  +    <antcall target="mdb-subproject" />
  +    <antcall target="jbossmq-subproject" />
  +    <antcall target="jrmp-subproject" />
  +    <antcall target="naming-subproject" />
  +    <antcall target="security-subproject" />
  +    <antcall target="web-subproject" />
  +    <antcall target="threading-subproject" />
  +    <antcall target="readahead-subproject" />
  +  </target>
  +
  +    <target name="bank-subproject" depends="prepare">
  +        <!-- Bank EJB tests -->
  +        <ant antfile="src/build/subprojects/build-bank.xml" />
  +    </target>
  +    <target name="hello-subproject" depends="prepare">
  +        <!-- Hello EJB tests -->
  +        <ant antfile="src/build/subprojects/build-hello.xml" />
  +    </target>
  +    <target name="idgen-subproject" depends="prepare">
  +        <!-- IdGenerator EJB tests -->
  +        <ant antfile="src/build/subprojects/build-idgen.xml" />
  +    </target>
  +    <target name="cts-subproject" depends="prepare">
  +        <!-- CTS (Compatibility Test Suite) tests -->
  +        <ant antfile="src/build/subprojects/build-cts.xml" />
  +    </target>
  +    <target name="perf-subproject" depends="prepare">
  +        <!-- Performance tests -->
  +        <ant antfile="src/build/subprojects/build-perf.xml" />
  +    </target>
  +    <target name="bench-subproject" depends="prepare">
  +        <!-- benchmark tests -->
  +        <ant antfile="src/build/subprojects/build-bench.xml" />
  +    </target>
  +    <target name="testbean-subproject" depends="prepare">
  +        <!-- Testbean/testbean2 tests -->
  +        <ant antfile="src/build/subprojects/build-testbean.xml" />
  +    </target>
  +    <target name="dbtest-subproject" depends="prepare">
  +        <!-- DB tests -->
  +        <ant antfile="src/build/subprojects/build-dbtest.xml" />
  +    </target>
  +    <target name="lock-subproject" depends="prepare">
  +        <!-- Lock tests -->
  +        <ant antfile="src/build/subprojects/build-lock.xml" />
  +    </target>
  +    <target name="load-subproject" depends="prepare">
  +        <!-- Load tests -->
  +        <ant antfile="src/build/subprojects/build-load.xml" />
  +    </target>
  +    <target name="xa-subproject" depends="prepare">
  +        <ant antfile="src/build/subprojects/build-xa.xml" />
  +    </target>
  +    <target name="bmp-subproject" depends="prepare">
  +        <ant antfile="src/build/subprojects/build-bmp.xml" />
  +    </target>
  +    <target name="mdb-subproject" depends="prepare">
  +        <ant antfile="src/build/subprojects/build-mdb.xml" />
  +    </target>
  +    <target name="jbossmq-subproject" depends="prepare">
  +        <ant antfile="src/build/subprojects/build-jbossmq.xml" />
  +    </target>
  +    <target name="jrmp-subproject" depends="prepare">
  +        <!-- JRMP custom socket tests -->
  +        <ant antfile="src/build/subprojects/build-jrmp.xml" />
  +    </target>
  +    <target name="naming-subproject" depends="prepare">
  +        <!-- JNDI Naming/ENC tests -->
  +        <ant antfile="src/build/subprojects/build-naming.xml" />
  +    </target>
  +    <target name="security-subproject" depends="prepare">
  +        <!-- JBossSX/Security tests -->
  +        <ant antfile="src/build/subprojects/build-security.xml" />
  +    </target>
  +    <target name="web-subproject" depends="prepare">
  +        <!-- Build the web integration testsuite -->
  +        <ant antfile="src/build/subprojects/build-web.xml" />
  +    </target>
  +    <target name="jmsra-subproject" depends="prepare">
  +        <!-- JMS ra tests -->
  +        <ant antfile="src/build/subprojects/build-jmsra.xml" />
  +    </target>
  +    <target name="readahead-subproject" depends="prepare">
  +        <!-- CMP finder readahead tests -->
  +        <ant antfile="src/build/subprojects/build-readahead.xml" />
  +    </target>
  +    <target name="threading-subproject" depends="prepare">
  +        <!-- threading tests -->
  +        <ant antfile="src/build/subprojects/build-threading.xml" />
  +    </target>
  +
  +<!-- ===================================================================
  +### End testcase build targets
  +     =================================================================== -->
   
  -    <!-- JMS ra test -->
  -    <delete dir="${build.classes.dir}/META-INF"/>
  -    <copy todir="${build.classes.dir}">
  -        <fileset dir="${src.resources}/jmsra"/>
  -    </copy>
  -    <jar jarfile="${build.lib.dir}/jmsratest.jar"
  -         basedir="${build.classes.dir}"
  -         manifest="${etc.dir}/manifest.mf"
  -         includes="org/jboss/test/jmsra/**,*.*"
  -    />
  -      
  -    <jar jarfile="${build.deploy.dir}/jmsra.jar"
  -         basedir="${build.classes.dir}"
  -         includes="org/jboss/test/util/ejb/**,org/jboss/test/jmsra/bean/**,**/*.xml"
  -    /> 
  -  </target>
  -
     <!-- =================================================================== -->
     <!-- Creates the binary structure                                        -->
     <!-- =================================================================== -->
  @@ -412,10 +187,16 @@
        <mkdir dir="${dist.dir}/lib"/>
        <mkdir dir="${dist.dir}/deploy"/>
   
  -     <copydir src="${src.bin.dir}" dest="${dist.dir}/bin"/> 
  -     <copydir src="${src.lib.dir}" dest="${dist.dir}/lib"/>
  -       <copydir src="${build.deploy.dir}" dest="${dist.dir}/deploy"/>
  -       <copydir src="${build.lib.dir}" dest="${dist.dir}/lib"/>
  +     <copy todir="${dist.dir}/bin">
  +        <fileset dir="${src.bin.dir}" />
  +     </copy>
  +     <copy todir="${dist.dir}/lib">
  +        <fileset dir="${src.lib.dir}" />
  +        <fileset dir="${build.lib.dir}" />
  +     </copy>
  +     <copy todir="${dist.dir}/deploy">
  +        <fileset dir="${build.deploy.dir}" />
  +     </copy>
     </target>
   
     <!-- =================================================================== -->
  @@ -431,7 +212,7 @@
                windowtitle="${Name} API"
                doctitle="${Name}"
                extdirs="${src.lib.dir}"
  -             bottom="Copyright &#169; 2000 The jBoss Organization. All Rights 
Reserved."
  +             bottom="Copyright &#169; 2001 The JBoss Organization. All Rights 
Reserved."
       />
     </target>
   
  @@ -441,11 +222,17 @@
     <target name="dist" depends="main,jar,javadocs">
        <mkdir dir="${dist.dir}/docs"/>
        <mkdir dir="${dist.dir}/docs/api"/>
  -     <copydir src="${docs.dir}" dest="${dist.dir}/docs"/>
  -     <copydir src="${build.javadocs.dir}" dest="${dist.dir}/docs/api"/>
  +     <copy todir="${dist.dir}/docs">
  +        <fileset dir="${docs.dir}"/>
  +     </copy>
  +     <copy todir="${dist.dir}/docs/api">
  +        <fileset dir="${build.javadocs.dir}"/>
  +     </copy>
        
        <mkdir dir="${dist.dir}/src"/>
  -     <copydir src="${src.dir}" dest="${dist.dir}/src"/>
  +     <copy todir="${dist.dir}/src">
  +        <fileset dir="${src.dir}"/>
  +     </copy>
     </target>
   
     <!-- =================================================================== -->
  @@ -466,7 +253,8 @@
     <!-- =================================================================== -->
     <!-- Cleans up generated stuff                                           -->
     <!-- =================================================================== -->
  -  <target name="clean" depends="init">
  +  <target name="clean">
  +<echo message="build.dir = ${build.dir}"/>
       <delete dir="${build.dir}"/>
       <delete dir="${dist.dir}"/>
     </target>
  @@ -479,4 +267,5 @@
       <delete file="${Name}-${version}.tar"/>
       <delete file="${Name}-${version}.tar.gz"/>
     </target>
  +
   </project>
  
  
  
  1.5.2.1   +30 -1     jbosstest/src/build/run_tests.xml
  
  Index: run_tests.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jbosstest/src/build/run_tests.xml,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -r1.5 -r1.5.2.1
  --- run_tests.xml     2001/04/18 18:22:25     1.5
  +++ run_tests.xml     2001/07/18 03:24:42     1.5.2.1
  @@ -37,6 +37,7 @@
       <property name="build.classes.dir" value="${build.dir}/classes"/>
       <property name="build.javadocs.dir" value="${build.dir}/docs/api"/>
       <property name="dist.dir" value="dist"/>
  +    <property name="test.results.dir" value="${basedir}/.."/>
   
       <!-- Compile and jar the tests -->
       <target name="build">
  @@ -161,6 +162,34 @@
           </junit>
       </target>
   
  +
  +  <!-- =================================================================== -->
  +    <!-- Run all tests in the 'testcase' package. For example to run all the tests
  +        in the org/jboss/test/cts/test package one would use:
  +        ant -buildfile run_tests.xml -Dtestcase=cts run-testcase
  +    -->
  +  <!-- =================================================================== -->
  +    <target name="run-testcase" if="testcase">
  +        <junit printsummary="true" haltonfailure="no" fork="true">
  +            <jvmarg value="-Djava.security.manager" />
  +            <jvmarg 
value="-Djava.security.policy=${src.resources}/security/tst.policy" />
  +            <jvmarg value="-Djbosstest.deploy.dir=${build.deploy.dir}" />
  +            <classpath>
  +                <path refid="test.classpath" />
  +                <pathelement path="${build.classes.dir}" />
  +                <pathelement path="${jboss.lib}/jboss-jaas.jar" />
  +            </classpath>
  +            <formatter type="xml" usefile="true" />
  +            <batchtest todir="${test.results.dir}">
  +                <fileset dir="${src.dir}">
  +                    <include name="org/jboss/test/${testcase}/test/Test*.java" />
  +                    <include name="org/jboss/test/${testcase}/test/Main.java" />
  +                    <include 
name="org/jboss/test/${testcase}/test/AllJUnitTests.java" />
  +                </fileset>
  +            </batchtest>
  +        </junit>
  +    </target>
  +
       <target name="test1">
           <junit printsummary="yes" haltonfailure="no" fork="true"
             dir="${build.classes.dir}" timeout="1200000"
  @@ -176,7 +205,7 @@
               </classpath>
               <formatter type="plain" usefile="false" />
   
  -            <test name="org.jboss.test.security.test.TestNamespacePermissions" />
  +            <test name="org.jboss.test.lock.test.TestSpin" />
           </junit>
       </target>
   
  
  
  

_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development

Reply via email to