[jboss-cvs] jbosstest build.xml

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

  User: telrod  
  Date: 05/01/27 12:20:04

  Modified:    .        build.xml
  Log:
  JBREM-15 & JBREM-50 - Adding UnifiedInvoker to server module and testsuite.  Also some minor updates to socket invoker and marshaller code to support unified invoker.
  
  Revision  Changes    Path
  1.441     +92 -8     jbosstest/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jbosstest/build.xml,v
  retrieving revision 1.440
  retrieving revision 1.441
  diff -u -r1.440 -r1.441
  --- build.xml	26 Jan 2005 22:37:31 -0000	1.440
  +++ build.xml	27 Jan 2005 20:20:00 -0000	1.441
  @@ -6,7 +6,7 @@
   <!--  See terms of license at http://www.gnu.org.                 -->
   <!-- ============================================================ -->
   
  -<!-- $Id: build.xml,v 1.440 2005/01/26 22:37:31 clebert Exp $ -->
  +<!-- $Id: build.xml,v 1.441 2005/01/27 20:20:00 telrod Exp $ -->
   
   <project default="main" name="JBoss/Testsuite">
      <import file="../tools/etc/buildmagic/build-common.xml"/>
  @@ -42,7 +42,7 @@
      </condition>
   
      <!--We will use local.properties file to provide some configuration
  -       to the testsuite mainly for the Clustering framework. Please 
  +       to the testsuite mainly for the Clustering framework. Please
          do not checkin your local.properties file into CVS-->
      <property file="local.properties"/>
   
  @@ -94,8 +94,8 @@
         <!-- needed for proxy tests -->
         <path refid="apache.bcel.classpath"/>
         <!-- needed for security login module tests -->
  -      <path refid="hsqldb.hsqldb.classpath"/> 
  -    
  +      <path refid="hsqldb.hsqldb.classpath"/>
  +
         <!-- Need hibernate jar for hibernate-based tests -->
         <path refid="hibernate2.classpath"/>
         <path refid="odmg.classpath"/>
  @@ -342,7 +342,7 @@
   
   
      <!-- Import the test jars build targets -->
  -   <import file="imports/test-jars.xml"/> 
  +   <import file="imports/test-jars.xml"/>
   
      <!-- Import the jboss server run targets -->
      <import file="imports/server-config.xml"/>
  @@ -416,7 +416,7 @@
            </waitfor>
            <fail message="Timeout waiting for '@{conf}' server to shutdown." if="shutdown.timeout"/>
         </sequential>
  -   </macrodef> 
  +   </macrodef>
   
      <!-- patternsets for that require clustering to be enabled -->
      <patternset id="cluster.includes">
  @@ -493,6 +493,28 @@
      <patternset id="iiop.excludes">
         <exclude name="org/jboss/test/*iiop/test/*"/>
      </patternset>
  +   <!-- Tests needing unified invoker -->
  +   <patternset id="unified-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"/>
  +      <include name="org/jboss/test/cts/test/CtsCmp2UnitTestCase.class"/>
  +      <include name="org/jboss/test/cts/test/IndependentJarsUnitTestCase.class"/>
  +      <include name="org/jboss/test/cts/test/LocalEjbTestCase.class"/>
  +      <include name="org/jboss/test/cts/test/LongWaitStatefulSessionUnitTestCase.class"/>
  +      <include name="org/jboss/test/cts/test/MDBInvoker.class"/>
  +      <include name="org/jboss/test/cts/test/MDBUnitTestCase.class"/>
  +      <include name="org/jboss/test/cts/test/SessionInvoker.class"/>
  +      <include name="org/jboss/test/cts/test/StatefulSessionLocalUnitTestCase.class"/>
  +      <include name="org/jboss/test/cts/test/StatefulSessionUnitTestCase.class"/>
  +      <include name="org/jboss/test/cts/test/StatelessSessionStressTestCase.class"/>
  +      <include name="org/jboss/test/cts/test/StatelessSessionUnitTestCase.class"/>
  +      <include name="org/jboss/test/bank/test/BankEJB20StressTestCase.class"/>
  +      <include name="org/jboss/test/testbean/test/BeanUnitTestCase.class"/>
  +   </patternset>
  +   <patternset id="unified-invoker.excludes">
  +      <exclude name="org/jboss/test/bank/test/*"/>
  +   </patternset>
      <!-- Tests needing xml binding setup -->
      <patternset id="jbossxb.includes">
         <include name="org/jboss/test/xml/*TestCase.class"/>
  @@ -529,7 +551,7 @@
      </patternset>
   
      <!-- A target that allows for conditional dependency on the compilation and
  -   
  +
       -->
      <target name="maybejars"
         unless="nojars">
  @@ -552,6 +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="tests-report"/>
         <record name="${basedir}/build.log" action="stop"/>
      </target>
  @@ -828,7 +851,7 @@
               <include name="lib/**"/>
            </patternset>
         </create-config>
  -      <create-config baseconf="all" newconf="tomcat-sso-cluster1" 
  +      <create-config baseconf="all" newconf="tomcat-sso-cluster1"
            newconf-src="tomcat-sso-cluster">
            <patternset>
               <include name="conf/**"/>
  @@ -866,6 +889,67 @@
         <stop-jboss url="${node1.jndi.url}"/>
      </target>
   
  +
  +   <!--
  +     | Tests ejb calls using the unified 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">
  +         <patternset>
  +            <include name="conf/**"/>
  +            <include name="deploy/**"/>
  +            <include name="lib/**"/>
  +         </patternset>
  +      </create-config>
  +      <start-jboss-os conf="unified-invoker"/>
  +      <wait-on-host/>
  +
  +      <antcall target="unified-invoker-unit-tests">
  +         <param name="jboss-junit-configuration" value="UnifiedInvoker"/>
  +      </antcall>
  +
  +      <stop-jboss/>
  +   </target>
  +
  +   <target name="unified-invoker-unit-tests">
  +      <junit dir="${module.output}"
  +         printsummary="${junit.printsummary}"
  +         haltonerror="${junit.haltonerror}"
  +         haltonfailure="${junit.haltonfailure}"
  +         fork="${junit.fork}"
  +         timeout="${junit.timeout}"
  +         jvm="${junit.jvm}">
  +
  +         <jvmarg value="${junit.jvm.options}"/>
  +         <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
  +         <sysproperty key="build.testlog" value="${build.testlog}"/>
  +         <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
  +         <sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/>
  +
  +         <classpath>
  +            <pathelement location="${build.classes}"/>
  +            <pathelement location="${build.resources}"/>
  +            <path refid="tests.classpath"/>
  +         </classpath>
  +
  +         <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
  +            usefile="${junit.formatter.usefile}"
  +            extension="-${jboss-junit-configuration}.xml"/>
  +
  +         <batchtest todir="${build.reports}"
  +            haltonerror="${junit.batchtest.haltonerror}"
  +            haltonfailure="${junit.batchtest.haltonfailure}"
  +            fork="${junit.batchtest.fork}">
  +
  +            <fileset dir="${build.classes}">
  +               <patternset refid="unified-invoker.includes"/>
  +            </fileset>
  +         </batchtest>
  +      </junit>
  +
  +   </target>
      <!--
         | Standard tests that should run successfully against a default JBoss
         | server distribution build.