[jboss-svn-commits] JBoss Portal SVN: r5517 - in trunk: cms core identity tools/etc/buildfragments

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

Author: julien at jboss.com
Date: 2006-10-30 17:14:12 -0500 (Mon, 30 Oct 2006)
New Revision: 5517

Modified:
   trunk/cms/build.xml
   trunk/core/build.xml
   trunk/identity/build.xml
   trunk/tools/etc/buildfragments/buildmagic.ent
Log:
JBPORTAL-1090 : fix testsuite build to include db driver jars for portal testing

Modified: trunk/cms/build.xml
===================================================================
--- trunk/cms/build.xml	2006-10-30 18:23:06 UTC (rev 5516)
+++ trunk/cms/build.xml	2006-10-30 22:14:12 UTC (rev 5517)
@@ -341,7 +341,6 @@
 	            <path refid="antlr.antlr.classpath"/>
 	            <path refid="asm.asm.classpath"/>
 	            <path refid="cglib.cglib.classpath"/>
-	            <path refid="hsqldb.hsqldb.classpath"/>
 	            <path refid="jboss.portal-common.classpath"/>
 	            <path refid="jboss.portal-test.classpath"/>
 	            <path refid="jboss.portal-server.classpath"/>
@@ -418,7 +417,6 @@
             <path refid="antlr.antlr.classpath"/>
             <path refid="asm.asm.classpath"/>
             <path refid="cglib.cglib.classpath"/>
-            <path refid="hsqldb.hsqldb.classpath"/>
             <path refid="jboss.portal-common.classpath"/>
             <path refid="jboss.portal-test.classpath"/>
             <path refid="jboss.portal-server.classpath"/>

Modified: trunk/core/build.xml
===================================================================
--- trunk/core/build.xml	2006-10-30 18:23:06 UTC (rev 5516)
+++ trunk/core/build.xml	2006-10-30 22:14:12 UTC (rev 5517)
@@ -610,7 +610,6 @@
             <path refid="jboss.microcontainer.classpath"/>
             <path refid="aop.classpath"/>
             <path refid="dom4j.dom4j.classpath"/>
-            <path refid="hsqldb.hsqldb.classpath"/>
             <path refid="cglib.cglib.classpath"/>
             <path refid="antlr.antlr.classpath"/>
             <path refid="asm.asm.classpath"/>

Modified: trunk/identity/build.xml
===================================================================
--- trunk/identity/build.xml	2006-10-30 18:23:06 UTC (rev 5516)
+++ trunk/identity/build.xml	2006-10-30 22:14:12 UTC (rev 5517)
@@ -250,7 +250,6 @@
             <path refid="hibernate.hibernate.classpath"/>
             <path refid="antlr.antlr.classpath"/>
             <path refid="asm.asm.classpath"/>
-            <path refid="hsqldb.hsqldb.classpath"/>
             <path refid="apache.collections.classpath"/>
             <path refid="jbossas/core.libs.classpath"/>
             <path refid="junit.junit.classpath"/>

Modified: trunk/tools/etc/buildfragments/buildmagic.ent
===================================================================
--- trunk/tools/etc/buildfragments/buildmagic.ent	2006-10-30 18:23:06 UTC (rev 5516)
+++ trunk/tools/etc/buildfragments/buildmagic.ent	2006-10-30 22:14:12 UTC (rev 5517)
@@ -82,10 +82,11 @@
   <!-- Setup the JBoss environment -->
   <property environment="env"/>
 
+  <!-- Define jboss home -->
   <condition property="jboss.home" value="${env.JBOSS_HOME}">
-	  <not>
+	 <not>
 	  	<isset property="jboss.home"/>
-	  </not>
+	 </not>
   </condition>
 
   <!-- Setup the build.log -->
@@ -154,6 +155,13 @@
   <!-- Invoke the configure task -->
   <call target="configure" unless="configure.disable"/>
 
+  <!-- Set up default value of classpath for test drivers -->
+  <condition property="driver.path" value="${hsqldb.hsqldb.lib}/hsqldb.jar">
+	 <not>
+	  	<isset property="driver.path"/>
+	 </not>
+  </condition>
+
   <!-- Load common task properties -->
   <property file="${project.tools}/etc/buildfragments/task.properties"/>
 
@@ -635,6 +643,7 @@
          build.reports=${build.reports}
          test.reports=${test.reports}
          module.output=${module.output}
+         driver.path=${driver.path}
          junit.printsummary=${junit.printsummary}
          junit.batchtest.haltonerror=${junit.batchtest.haltonerror}
          junit.batchtest.haltonfailure=${junit.batchtest.haltonfailure}
@@ -668,6 +677,7 @@
             <x-test/>
             <classpath>
                <path refid="jboss.test.classpath"/>
+               <pathelement path="${driver.path}"/>
                <x-classpath/>
             </classpath>
          </junit_>