[jboss-cvs] JBossAS SVN: r58242 - trunk/tools/etc/cruisecontrol/scripts

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

Author: prabhat.jha at jboss.com
Date: 2006-11-09 17:51:01 -0500 (Thu, 09 Nov 2006)
New Revision: 58242

Modified:
   trunk/tools/etc/cruisecontrol/scripts/build-jboss-portal-db.xml
Log:
add driver.path parameter to portal tests

Modified: trunk/tools/etc/cruisecontrol/scripts/build-jboss-portal-db.xml
===================================================================
--- trunk/tools/etc/cruisecontrol/scripts/build-jboss-portal-db.xml	2006-11-09 22:35:52 UTC (rev 58241)
+++ trunk/tools/etc/cruisecontrol/scripts/build-jboss-portal-db.xml	2006-11-09 22:51:01 UTC (rev 58242)
@@ -5,9 +5,9 @@
     <property environment="env"/>
     <property name="jboss.host" value="localhost"/>
     <property name="jboss.port" value="8080"/>
-    <property name="jdbc.jar.path" value="/opt/jdbc-drivers/"/>
 
 
+
     <import file="build-common.xml"/>
 
     <target name="clean" depends="" description="Cleans checkout directory">
@@ -33,37 +33,32 @@
 
     <target name="runtestsuite" description="Deploys Portal on different JBoss homes and runs the testsuite against different database">
         <mkdir dir="${log.dir}/results"/>
-        <!--use sqlserver as test database -->
 	<antcall target="runtests-db">
             <param name="jboss.home.dir" value="../../jboss-4.0.4.GA"/>
-            <param name="jboss.version.info" value="4_0_4_GA-sqlserver"/>
+            <param name="jboss.version.info" value="404GA-database"/>
             <param name="java.home.dir" value="${java14}"/>
-            <param name="database.name" value="sqlserver"/>
-            <!-- this name is relative to jdbc.jar.path-->
-            <param name="jdbc.jar" value="jtds/jtds-1.2.jar"/>
        </antcall>
        <antcall target="copyresults"/>
     </target>
 
     <target name="runtests-db">
         <mkdir dir="${log.dir}/${jboss.version.info}-logs"/>
-        <!--deploy database specific ds.xml and jar -->
-        <copy file="../resources/portal-${database.name}-ds.xml" todir="${jboss.home.dir}/server/default/deploy" overwrite="true"/>
-        <copy file="${jdbc.jar.path}/${jdbc.jar}" todir="${jboss.home.dir}/server/default/lib"/>
-
+        <!--overwrite database configurations-->
+        <copy file="../resources/datasources.xml" todir="../checkout/${jboss.dir}/test/src/etc" overwrite="true"/>
         <antcall target="clean-portal">
             <param name="jboss.version" value="${jboss.version.info}"/>
         </antcall>
         <antcall target="build">
             <param name="jboss.version" value="${jboss.version.info}"/>
         </antcall>
-        <tests jboss.home="${jboss.home.dir}" jboss.version="${jboss.version.info}" java.home="${java.home.dir}"/>
+        <antcall target="tests">
+              <param name="jboss.home" value="${jboss.home.dir}"/>
+              <param name="jboss.version" value="${jboss.version.info}"/>
+              <param name="java.home" value="${java.home.dir}" />
+              <param name="driver.path" value="/opt/jdbc-drivers/jtds/jtds-1.2.jar:/opt/jdbc-drivers/hsqldb.jar"/>
+        </antcall>
         <copylogs jboss.home="${jboss.home.dir}" jboss.version="${jboss.version.info}"/>
-       <!--undeploy database specific descriptors-->
-       <echo> Going to undeploy database-ds.ml </echo>        
-       <delete file="${jboss.home.dir}/server/default/deploy/portal-${database.name}-ds.xml"/>
     </target>
-    
 
     <target name="clean-portal">
         <exec executable="ant"  failonerror="true" output="${log.dir}/${jboss.version}-logs/clean.log">
@@ -82,21 +77,16 @@
         </sequential>
     </target>
     
-    <macrodef name="tests">
-    <attribute name="jboss.home" default=""/>    
-    <attribute name="jboss.version" default=""/>
-    <attribute name="java.home" default=""/>
-        <sequential>
-        <exec executable="ant" output="${log.dir}/@{jboss.version}-logs/tests.log" append="true">
-            <arg line=" -buildfile ../checkout/${jboss.dir}/testsuite/build.xml -Djboss-junit-configuration=@{jboss.version} tests"/>
-            <env key="PATH" path="@{java.home}/bin:/home/cruisecontrol/apache-ant-1.6.5/bin:${env.PATH}"/>            
-            <env key="JBOSS_HOME" path="@{jboss.home}"/>   
-            <env key="JAVA_HOME" path="@{java.home}"/>
-            <env key="ANT_HOME" path="/home/cruisecontrol/apache-ant-1.6.5"/>              
-        </exec>        
-        </sequential>
-    </macrodef>    
-	
+    <target name="tests">
+      <exec executable="ant" output="${log.dir}/${jboss.version}-logs/tests.log" append="true">
+         <arg line=" -buildfile ../checkout/${jboss.dir}/testsuite/build.xml -Djboss-junit-configuration=${jboss.version} -Ddriver.path=${driver.path} tests"/>
+         <env key="PATH" path="${java.home}/bin:/home/cruisecontrol/apache-ant-1.6.5/bin:${env.PATH}"/>
+         <env key="JBOSS_HOME" path="${jboss.home}"/>
+         <env key="JAVA_HOME" path="${java.home}"/>
+         <env key="ANT_HOME" path="/home/cruisecontrol/apache-ant-1.6.5"/>
+     </exec>
+      </target>
+
     <target name="copyresults">
        <sequential>
        <mkdir dir="${log.dir}/results"/>