[hibernate-commits] Hibernate SVN: r10982 - trunk/Hibernate3

[hibernate-commits at lists.jboss.org]

Author: steve.ebersole at jboss.com
Date: 2006-12-13 09:51:54 -0500 (Wed, 13 Dec 2006)
New Revision: 10982

Modified:
   trunk/Hibernate3/build.xml
Log:
allow externalized definition of where to find JDBC drivers

Modified: trunk/Hibernate3/build.xml
===================================================================
--- trunk/Hibernate3/build.xml	2006-12-13 00:14:17 UTC (rev 10981)
+++ trunk/Hibernate3/build.xml	2006-12-13 14:51:54 UTC (rev 10982)
@@ -79,11 +79,19 @@
         <fileset refid="fs.lib" />
 	</path>
 
-    <!-- fileset definition for the jdbc directory -->
-    <fileset id="fs.jdbc" dir="${dir.jdbc}">
-        <include name="**/*.jar" />
-        <include name="**/*.zip" />
-    </fileset>
+    <!-- path definition for the JDBC driver(s) -->
+    <path id="path.jdbc">
+        <!-- By default include everything in the ${dir.jdbc} directory -->
+        <fileset dir="${dir.jdbc}">
+            <include name="**/*.jar" />
+            <include name="**/*.zip" />
+        </fileset>
+        <!-- And the explicitly defined jar.driver property (used by the CC scripts) -->
+        <pathelement path="${jar.driver}"/>
+    </path>
+    <!-- allows external definition of the JDBC classpath fragment -->
+    <property name="hibernate.test.jdbc.fs.importFile" value="doNotImport" />
+    <import file="${hibernate.test.jdbc.fs.importFile}" optional="true" />
 
     <!-- patternset for insturmentation-eligible resources -->
 	<patternset id="ps.instrument.domain">
@@ -269,21 +277,20 @@
                 from AllTests and then performs the filtering based on that
             -->
             <fileset refid="fs.lib" />
-            <fileset refid="fs.jdbc" />
+            <path refid="path.jdbc" />
             <pathelement path="${dir.out.classes}"/>
             <pathelement path="${dir.out.test-classes}"/>
             <pathelement path="${dir.props}"/>
         </path>
 
         <junit printsummary="yes" dir="${basedir}" maxmemory="256M" fork="yes" forkmode="perBatch">
-			<jvmarg value="-Dhibernate.test.validatefailureexpected=${hibernate.test.validatefailureexpected}"/>
+            <jvmarg value="-Dhibernate.test.validatefailureexpected=${hibernate.test.validatefailureexpected}"/>
 			<classpath>
                 <fileset refid="fs.lib" />
-                <fileset refid="fs.jdbc" />
+                <path refid="path.jdbc" />
+                <pathelement path="${dir.props}"/>
                 <pathelement path="${dir.out.classes}"/>
                 <pathelement path="${dir.out.test-classes}"/>
-                <pathelement path="${dir.props}"/>
-				<pathelement path="${jar.driver}"/>
 				<pathelement path="${jar.clover}"/>
 			</classpath>
 			<formatter type="plain"/>
@@ -308,11 +315,10 @@
 			<jvmarg value="-Dhibernate.test.validatefailureexpected=${hibernate.test.validatefailureexpected}"/>
 			<classpath>
                 <fileset refid="fs.lib" />
-                <fileset refid="fs.jdbc" />
+                <path refid="path.jdbc" />
                 <pathelement path="${dir.out.classes}"/>
                 <pathelement path="${dir.out.test-classes}"/>
                 <pathelement path="${dir.props}"/>
-				<pathelement path="${jar.driver}"/>
 				<pathelement path="${jar.clover}"/>
 			</classpath>
 			<formatter type="plain"/>
@@ -331,11 +337,10 @@
 			<jvmarg value="-Dhibernate.test.validatefailureexpected=${hibernate.test.validatefailureexpected}"/>
 			<classpath>
                 <fileset refid="fs.lib" />
-                <fileset refid="fs.jdbc" />
+                <path refid="path.jdbc" />
                 <pathelement path="${dir.out.classes}"/>
                 <pathelement path="${dir.out.test-classes}"/>
                 <pathelement path="${dir.props}"/>
-				<pathelement path="${jar.driver}"/>
 				<pathelement path="${jar.clover}"/>
 			</classpath>
 			<formatter type="plain"/>
@@ -355,11 +360,10 @@
         <junit printsummary="yes" fork="yes" haltonfailure="yes" dir="${basedir}">
 			<classpath>
                 <fileset refid="fs.lib" />
-                <fileset refid="fs.jdbc" />
+                <path refid="path.jdbc" />
                 <pathelement path="${dir.out.classes}"/>
                 <pathelement path="${dir.out.test-classes}"/>
                 <pathelement path="${dir.props}"/>
-				<pathelement path="${jar.driver}"/>
                 <pathelement path="${jar.clover}"/>
             </classpath>
             <!-- support for JDWP debug 
@@ -381,11 +385,10 @@
 			<jvmarg value="-Dhibernate.test.validatefailureexpected=${hibernate.test.validatefailureexpected}"/>
 			<classpath>
                 <fileset refid="fs.lib" />
-                <fileset refid="fs.jdbc" />
+                <path refid="path.jdbc" />
                 <pathelement path="${dir.out.classes}"/>
                 <pathelement path="${dir.out.test-classes}"/>
                 <pathelement path="${dir.props}"/>
-				<pathelement path="${jar.driver}"/>
 				<pathelement path="${jar.clover}"/>
 			</classpath>
 			<formatter type="plain"/>
@@ -464,7 +467,7 @@
 		<java classname="org.hibernate.auction.Main" fork="true" failonerror="true">
 			<classpath>
                 <fileset refid="fs.lib" />
-                <fileset refid="fs.jdbc" />
+                <path refid="path.jdbc" />
 				<pathelement path="${dir.out.eg}" />
 				<pathelement path="${dir.build}/${jar.name}.jar"/>
 				<pathelement path="${dir.props}" />