[jboss-cvs] jbosstest build.xml

[Tom E. <te...@us...>]

  User: telrod  
  Date: 05/02/01 00:24:56

  Modified:    .        build.xml
  Log:
  Changed to use unified invoker by default.  Also updated testsuite to run default tests using unified invoker.
  
  Revision  Changes    Path
  1.444     +16 -16    jbosstest/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jbosstest/build.xml,v
  retrieving revision 1.443
  retrieving revision 1.444
  diff -u -r1.443 -r1.444
  --- build.xml	31 Jan 2005 07:39:24 -0000	1.443
  +++ build.xml	1 Feb 2005 08:24:56 -0000	1.444
  @@ -6,7 +6,7 @@
   <!--  See terms of license at http://www.gnu.org.                 -->
   <!-- ============================================================ -->
   
  -<!-- $Id: build.xml,v 1.443 2005/01/31 07:39:24 bwang00 Exp $ -->
  +<!-- $Id: build.xml,v 1.444 2005/02/01 08:24:56 telrod Exp $ -->
   
   <project default="main" name="JBoss/Testsuite">
      <import file="../tools/etc/buildmagic/build-common.xml"/>
  @@ -493,8 +493,8 @@
      <patternset id="iiop.excludes">
         <exclude name="org/jboss/test/*iiop/test/*"/>
      </patternset>
  -   <!-- Tests needing unified invoker -->
  -   <patternset id="unified-invoker.includes">
  +   <!-- Tests needing jrmp invoker -->
  +   <patternset id="jrmp-invoker.includes">
         <include name="org/jboss/test/cts/test/BmpUnitTestCase.class"/>
         <include name="org/jboss/test/cts/test/ClientCallbackImpl.class"/>
         <include name="org/jboss/test/cts/test/CmpUnitTestCase.class"/>
  @@ -512,7 +512,7 @@
         <include name="org/jboss/test/bank/test/BankEJB20StressTestCase.class"/>
         <include name="org/jboss/test/testbean/test/BeanUnitTestCase.class"/>
      </patternset>
  -   <patternset id="unified-invoker.excludes">
  +   <patternset id="jrmp-invoker.excludes">
         <exclude name="org/jboss/test/bank/test/*"/>
      </patternset>
      <!-- Tests needing xml binding setup -->
  @@ -574,7 +574,7 @@
         <antcall target="tomcat-sso-tests"/>
         <antcall target="tomcat-sso-clustered-tests"/>
         <antcall target="tests-jacc-security"/>
  -      <antcall target="unified-invoker-tests"/>
  +      <antcall target="jrmp-invoker-tests"/>
         <antcall target="tests-report"/>
         <record name="${basedir}/build.log" action="stop"/>
      </target>
  @@ -891,30 +891,30 @@
   
   
      <!--
  -     | Tests ejb calls using the unified invoker
  +     | Tests ejb calls using the jrmp invoker
      -->
  -   <target name="unified-invoker-tests"
  -      description="EJB tests using the unified invoker">
  -      <!-- Create the unified invoker enabled config -->
  -      <create-config baseconf="default" newconf="unified-invoker">
  +   <target name="jrmp-invoker-tests"
  +      description="EJB tests using the jrmp invoker">
  +      <!-- Create the jrmp invoker enabled config -->
  +      <create-config baseconf="default" newconf="jrmp-invoker">
            <patternset>
               <include name="conf/**"/>
               <include name="deploy/**"/>
               <include name="lib/**"/>
            </patternset>
         </create-config>
  -<!--      <start-jboss-os conf="unified-invoker"/>-->
  -      <start-jboss conf="unified-invoker"/>
  +<!--      <start-jboss-os conf="jrmp-invoker"/>-->
  +      <start-jboss conf="jrmp-invoker"/>
         <wait-on-host/>
   
  -      <antcall target="unified-invoker-unit-tests">
  -         <param name="jboss-junit-configuration" value="UnifiedInvoker"/>
  +      <antcall target="jrmp-invoker-unit-tests">
  +         <param name="jboss-junit-configuration" value="JRMP-Invoker"/>
         </antcall>
   
         <stop-jboss/>
      </target>
   
  -   <target name="unified-invoker-unit-tests">
  +   <target name="jrmp-invoker-unit-tests">
         <junit dir="${module.output}"
            printsummary="${junit.printsummary}"
            haltonerror="${junit.haltonerror}"
  @@ -945,7 +945,7 @@
               fork="${junit.batchtest.fork}">
   
               <fileset dir="${build.classes}">
  -               <patternset refid="unified-invoker.includes"/>
  +               <patternset refid="jrmp-invoker.includes"/>
               </fileset>
            </batchtest>
         </junit>