[jboss-cvs] JBossAS SVN: r65400 - in branches/JBPAPP_4_2: testsuite and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: dbhole
Date: 2007-09-14 16:20:42 -0400 (Fri, 14 Sep 2007)
New Revision: 65400

Modified:
   branches/JBPAPP_4_2/build/build-thirdparty.xml
   branches/JBPAPP_4_2/build/build.xml
   branches/JBPAPP_4_2/testsuite/build.xml
Log:

Updated build files for conditional switching between MQ and JBM:

-Dbuild.soa=true passed to build/build.xml builds with JBM
-Djbosstest.useJBM=true passed to testsuite/build.xml tests with JBM

Not supplying -Dbuild.soa=true will build with MQ
Not supplying -Djbosstest.useJBM will run MQ tests



Modified: branches/JBPAPP_4_2/build/build-thirdparty.xml
===================================================================
--- branches/JBPAPP_4_2/build/build-thirdparty.xml	2007-09-14 18:59:37 UTC (rev 65399)
+++ branches/JBPAPP_4_2/build/build-thirdparty.xml	2007-09-14 20:20:42 UTC (rev 65400)
@@ -28,6 +28,11 @@
   <setproxy proxyhost="<your.proxy.host>" proxyport="<your.proxy.port>"/>
   -->
 
+  <!-- set jbossws version -->
+  <condition property="jbws.version" value="2.0.0.GA" else="1.2.1.GA_CP01">
+    <isset property="build.soa"/>
+  </condition>
+
   <!-- Main Definition of dependencies -->
   <build
     id="jbossas-thirdparty"
@@ -85,7 +90,7 @@
     <componentref name="jboss/dom4j-jarjar" version="1.6.1"/>
     <componentref name="jboss/jaxr" version="1.2.0.GA"/>
     <componentref name="jboss/jbossts14" version="4.2.3.SP5-brew"/>
-    <componentref name="jboss/jbossws-jboss42" version="1.2.1.GA_CP01"/>
+    <componentref name="jboss/jbossws-jboss42" version="${jbws.version}"/>
     <componentref name="jboss/jbossxb" version="1.0.0.GA_CP01-brew"/>
     <componentref name="jboss/microcontainer" version="1.0.2"/>
     <componentref name="jboss/profiler/jvmti" version="1.0.0.CR5-brew"/>

Modified: branches/JBPAPP_4_2/build/build.xml
===================================================================
--- branches/JBPAPP_4_2/build/build.xml	2007-09-14 18:59:37 UTC (rev 65399)
+++ branches/JBPAPP_4_2/build/build.xml	2007-09-14 20:20:42 UTC (rev 65400)
@@ -389,7 +389,7 @@
   </target>
 
   <!-- Parameter target - The target which will be replaced by jboss-messaging -->
-  <target name="replace-messaging" description = "Replace JBossMQ by JBoss Messaging on a given installation" depends="init">
+  <target name="replace-messaging" description = "Replace JBossMQ by JBoss Messaging on a given installation" depends="init" if="build.soa">
   	
   	 <ant antfile="build-distr.xml" target="replace-messaging">
  	 	 <property name="target" value="default" />
@@ -588,7 +588,9 @@
 
   <target name="install"
     description="Install the structure for a release."
-    depends="partition-build"/>
+    depends="partition-build">
+   	 <antcall target="replace-messaging"/>
+  </target>
 
   <target name="release"
     description="Builds the default release structure."
@@ -816,10 +818,6 @@
    <target name="main" depends="most"
      description="Executes the default target (most)."/>
 	
-   <target name="main-soa" depends="main">
-   	 <antcall target="replace-messaging"/>
-   </target>
-
    <target name="all" depends="createthirdparty, modules-all, install"
      description="Executes all modules and builds everything."/>
 

Modified: branches/JBPAPP_4_2/testsuite/build.xml
===================================================================
--- branches/JBPAPP_4_2/testsuite/build.xml	2007-09-14 18:59:37 UTC (rev 65399)
+++ branches/JBPAPP_4_2/testsuite/build.xml	2007-09-14 20:20:42 UTC (rev 65400)
@@ -717,8 +717,11 @@
      <exclude name="org/jboss/test/jbossmessaging/**/*TestCase.class"/>
      <exclude name="org/jboss/test/jms/integration/**/*Test.class"/>
   </patternset>
-	
 
+  <patternset id="jbossmq.excludes">
+     <exclude name="org/jboss/test/jbossmq/**/*TestCase.class"/>
+  </patternset>
+
   <!-- Tests that are currently broken -->
   <patternset id="badtest.excludes">
     <exclude name="org/jboss/test/aop/test/RemotingUnitTestCase"/>
@@ -1555,13 +1558,25 @@
        <sysproperty key="jboss-junit-configuration" value="tests-standard-stress"/>
        <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" usefile="${junit.formatter.usefile}" extension="-tests-standard-stress.xml"/>
 
-      <batchtest todir="${build.reports}" haltonerror="${junit.batchtest.haltonerror}" haltonfailure="${junit.batchtest.haltonfailure}" fork="${junit.batchtest.fork}">
+      <!-- Normal stress tests (including mq tests) -->
 
+      <batchtest todir="${build.reports}" haltonerror="${junit.batchtest.haltonerror}" haltonfailure="${junit.batchtest.haltonfailure}" fork="${junit.batchtest.fork}" unless="jbosstest.useJBM">
         <fileset dir="${build.classes}">
           <include name="**/*StressTestCase.class"/>
           <patternset refid="all.excludes"/>
         </fileset>
       </batchtest>
+
+      <!-- Normal stress tests (excluding mq tests) -->
+
+      <batchtest todir="${build.reports}" haltonerror="${junit.batchtest.haltonerror}" haltonfailure="${junit.batchtest.haltonfailure}" fork="${junit.batchtest.fork}" if="jbosstest.useJBM">
+        <fileset dir="${build.classes}">
+          <include name="**/*StressTestCase.class"/>
+          <patternset refid="all.excludes"/>
+          <patternset refid="jbossmq.excludes"/>
+        </fileset>
+      </batchtest>
+
     </junit>
   </target>