[jboss-cvs] jbosstest build.xml

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

  User: starksm 
  Date: 02/05/20 20:00:11

  Modified:    .        Tag: Branch_3_0 build.xml
  Log:
  Add tests of resource loading from an mbean service
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.106.2.12 +48 -3     jbosstest/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jbosstest/build.xml,v
  retrieving revision 1.106.2.11
  retrieving revision 1.106.2.12
  diff -u -r1.106.2.11 -r1.106.2.12
  --- build.xml	18 May 2002 21:23:28 -0000	1.106.2.11
  +++ build.xml	21 May 2002 03:00:11 -0000	1.106.2.12
  @@ -13,7 +13,7 @@
   <!--                                                                        -->
   <!-- ====================================================================== -->
   
  -<!-- $Id: build.xml,v 1.106.2.11 2002/05/18 21:23:28 starksm Exp $ -->
  +<!-- $Id: build.xml,v 1.106.2.12 2002/05/21 03:00:11 starksm Exp $ -->
   
   <project default="main" name="JBoss/Testsuite">
   
  @@ -467,7 +467,7 @@
   	     excludedtags="@version,@author"
           mergedir="${source.resources}/eardeployment/a">
         <fileset dir="${source.java}">
  -        <include name="org/jboss/test/jmx/eardeployment/a/ejb/*Bean.java"/>
  +        <include name="org/jboss/test/jmx/eardeployment/a/ejb/SessionABean.java"/>
         </fileset>
         <packageSubstitution packages="ejb" substituteWith="interfaces"/>
         <remoteinterface/>
  @@ -1319,6 +1319,45 @@
         </fileset>
       </jar>
   
  +    <!-- ResourceTsts case#1, a sar with the classes and resources -->
  +    <jar jarfile="${build.lib}/rsrc1.sar">
  +      <metainf dir="${build.resources}/jmx/loading/rsrc1" />
  +      <fileset dir="${build.classes}">
  +        <include name="org/jboss/test/jmx/loading/ResourceTsts*"/>
  +      </fileset>
  +    </jar>
  +    <!-- ResourceTsts case#2, a sar with the resources and the
  +      service in a nested jar
  +    -->
  +    <jar jarfile="${build.lib}/rsrcsvc.jar">
  +      <fileset dir="${build.classes}">
  +        <include name="org/jboss/test/jmx/loading/ResourceTsts*"/>
  +      </fileset>
  +    </jar>
  +    <jar jarfile="${build.lib}/rsrc2.sar">
  +      <metainf dir="${build.resources}/jmx/loading/rsrc2" />
  +      <fileset dir="${build.lib}">
  +        <include name="rsrcsvc.jar"/>
  +      </fileset>
  +    </jar>
  +    <!-- ResourceTsts case#3, a jar with two sars with only
  +      the service descriptor metadata and a jar containing the
  +      service code.
  +    -->
  +    <jar jarfile="${build.lib}/rsrc31.sar">
  +      <metainf dir="${build.resources}/jmx/loading/rsrc1" />
  +    </jar>
  +    <jar jarfile="${build.lib}/rsrc32.sar">
  +      <metainf dir="${build.resources}/jmx/loading/rsrc2" />
  +    </jar>
  +    <jar jarfile="${build.lib}/rsrc3.jar">
  +       <fileset dir="${build.lib}">
  +         <include name="rsrcsvc.jar"/>
  +         <include name="rsrc31.sar" />
  +         <include name="rsrc32.sar" />
  +       </fileset>
  +    </jar>
  +
       <!--build test sar for testing local directory copy deployment -->
       <jar jarfile="${build.lib}/testcopylocaldir.sar">
         <fileset dir="${build.classes}">
  @@ -1895,6 +1934,9 @@
       <!-- build jbosstest-web.ear -->
       <ear earfile="${build.lib}/jbosstest-web.ear"
   	 appxml="${build.resources}/web/META-INF/application.xml">
  +      <metainf dir="${build.resources}/web/META-INF">
  +        <include name="jboss-app.xml" />
  +      </metainf>
         <fileset dir="${build.lib}">
           <include name="jbosstest-web-ejbs.jar"/>
           <include name="root-web.war"/>
  @@ -3097,11 +3139,14 @@
         <sysproperty key="jbosstest.threadcount" value="${jbosstest.threadcount}"/>
         <sysproperty key="jbosstest.iterationcount" value="${jbosstest.iterationcount}"/>
         <sysproperty key="jbosstest.beancount" value="${jbosstest.beancount}"/>
  -
  +      <sysproperty key="java.security.auth.login.config"
  +                   value="${build.resources}/security/auth.conf"/>
   
         <classpath>
           <pathelement location="${build.classes}"/>
           <pathelement location="${build.resources}"/>
  +        <!-- Include for those tests that need common security resources -->
  +        <pathelement location="${build.resources}/security"/>
           <path refid="tests.classpath"/>
         </classpath>