[teiid-commits] teiid SVN: r1742 - in trunk/test-integration/db: src/main/resources/ctc_tests and 1 other directory.

[teiid-commits at lists.jboss.org]

Author: vhalbert at redhat.com
Date: 2010-01-13 13:55:39 -0500 (Wed, 13 Jan 2010)
New Revision: 1742

Modified:
   trunk/test-integration/db/pom.xml
   trunk/test-integration/db/src/main/resources/ctc_tests/ctc.xml
Log:
Teiid 781 - added optionto pass in where the additional 3rd party jars are located

Modified: trunk/test-integration/db/pom.xml
===================================================================
--- trunk/test-integration/db/pom.xml	2010-01-13 18:21:09 UTC (rev 1741)
+++ trunk/test-integration/db/pom.xml	2010-01-13 18:55:39 UTC (rev 1742)
@@ -505,6 +505,7 @@
 								<property name="scenario.dir"  value="${scenario.dir}"></property>
 								<property name="queryset.artifacts.dir"  value="${queryset.artifacts.dir}"></property>
 								<property name="vdb.artifacts.dir"  value="${vdb.artifacts.dir}"></property>
+								<property name="third.party.jars.dir"  value="${third.party.jars.dir}"></property>
 								<property name="proj.dir" value="${project.basedir}" />
 								<ant antfile="src/main/resources/ctc_tests/ctc.xml" />
 							</tasks>

Modified: trunk/test-integration/db/src/main/resources/ctc_tests/ctc.xml
===================================================================
--- trunk/test-integration/db/src/main/resources/ctc_tests/ctc.xml	2010-01-13 18:21:09 UTC (rev 1741)
+++ trunk/test-integration/db/src/main/resources/ctc_tests/ctc.xml	2010-01-13 18:55:39 UTC (rev 1742)
@@ -35,10 +35,23 @@
 			</not>
 		</condition>
 		
-		<delete file="${ERROR_FILE}"/>
+		<delete file="${ERROR_FILE}"/>
+
+		
+		  <copy todir="${proj_dir}/lib" failonerror="false">
+		    <fileset dir="${third.party.jars.dir}"/>
+		  </copy>
 
+
 	</target>
 	
+
+	
+	<target name="copy.third.party.jars">
+	
+	
+	</target>
+	
 	<target name="set.win"
 		if="WinOS">
 		
@@ -55,6 +68,7 @@
 	<target name="set.linux"
 		if="UnixOS">
 		<property name="root_output" value="${proj.dir}/target/bulk-query-tests" />
+		<property name="proj_dir" value="${proj.dir}" />
 
 	</target>
 
@@ -125,7 +139,7 @@
 			  <java classname="org.teiid.test.client.TestClient" fork="true" >
 			  	<classpath>
 					<pathelement path="${maven.runtime.classpath}" />
-			        <fileset dir="${proj.dir}/lib">
+			        <fileset dir="${proj_dir}/lib">
 			          <include name="**/*.jar"/>
 			        </fileset>
 			    </classpath>
@@ -149,7 +163,7 @@
           <java classname="org.teiid.test.client.TestClient" fork="true" >
           	<classpath>
         		<pathelement path="${maven.runtime.classpath}" />
-                <fileset dir="${proj.dir}/lib">
+                <fileset dir="${proj_dir}/lib">
                   <include name="**/*.jar"/>
                 </fileset>
             </classpath>