[teiid-commits] teiid SVN: r1376 - trunk/test-integration/db/src/main/resources/ddl.

[teiid-commits at lists.jboss.org]

Author: vhalbert at redhat.com
Date: 2009-09-18 13:45:50 -0400 (Fri, 18 Sep 2009)
New Revision: 1376

Modified:
   trunk/test-integration/db/src/main/resources/ddl/exec_parms.properties_template
   trunk/test-integration/db/src/main/resources/ddl/manage_schemas.xml
   trunk/test-integration/db/src/main/resources/ddl/run_ddl.xml
Log:
Teiid 773 - organize integration test

Modified: trunk/test-integration/db/src/main/resources/ddl/exec_parms.properties_template
===================================================================
--- trunk/test-integration/db/src/main/resources/ddl/exec_parms.properties_template	2009-09-18 17:42:56 UTC (rev 1375)
+++ trunk/test-integration/db/src/main/resources/ddl/exec_parms.properties_template	2009-09-18 17:45:50 UTC (rev 1376)
@@ -3,7 +3,7 @@
 
 #   Each database type in the "ddl" directory must have an exec_parms.properties file.  
 
-#	For property setting options, see the Sql ant task page at @  http://ant.apache.org/manual/index.html
+#	For property setting options, see the SQL ant task page at @  http://ant.apache.org/manual/index.html
 
 delim=;
 delimtype=normal

Modified: trunk/test-integration/db/src/main/resources/ddl/manage_schemas.xml
===================================================================
--- trunk/test-integration/db/src/main/resources/ddl/manage_schemas.xml	2009-09-18 17:42:56 UTC (rev 1375)
+++ trunk/test-integration/db/src/main/resources/ddl/manage_schemas.xml	2009-09-18 17:45:50 UTC (rev 1376)
@@ -16,7 +16,7 @@
 	
 	
 	<target name="check">
-		<echo>Running for USERNAME = ${User}</echo>
+		
 		<echo>Perform check</echo>
 		<condition property="all">
 				<not>
@@ -41,6 +41,7 @@
  		<subant genericantfile="${resources.dir}/ddl/run_ddl.xml" inheritall="true"  >
  			<dirset dir="${resources.dir}/datasources/" />
  			<property name="sql.ddl.dir" value="${resources.dir}/ddl"/>
+			<property name="lib.dir" value="${basedir}/lib"/>
 
 		</subant>
 		
@@ -58,7 +59,9 @@
 		<ant inheritAll="true" antfile="${resources.dir}/ddl/run_ddl.xml">
 			<property name="basedir" value="${resources.dir}/datasources/${single}"/>
 			<property name="sql.ddl.dir" value="${resources.dir}/ddl"/>
+			<property name="lib.dir" value="${basedir}/lib"/>
 
+
 		</ant>
 
 		<echo>Completed creating single schema ${single}</echo>

Modified: trunk/test-integration/db/src/main/resources/ddl/run_ddl.xml
===================================================================
--- trunk/test-integration/db/src/main/resources/ddl/run_ddl.xml	2009-09-18 17:42:56 UTC (rev 1375)
+++ trunk/test-integration/db/src/main/resources/ddl/run_ddl.xml	2009-09-18 17:45:50 UTC (rev 1376)
@@ -212,7 +212,7 @@
 		<echo>Admin account:  ${adminuser} url: ${adminurl}</echo>
 
 	   	<available file="${script.file}" property="script.file.exist"/>
-
+	   	
 		<fail unless="script.file.exist" message="${script.file} does not exist" />
 
 			 <sql     driver="${driver}"
@@ -224,11 +224,16 @@
 			    delimiter="${delim}"
 			    delimitertype="${delimtype}"
 			    autocommit="${autocommit}"
-			    onerror="${onerror}"  
-			 	classpath="${maven.runtime.classpath}"
-			 /> 
-	    	
-		
+			    onerror="${onerror}" >
+			 	<classpath>
+			   		<fileset dir="${lib.dir}">
+			   			<include name="*.jar" />
+			   			<include name="jbedsp-datadirect-0.0.1-SNAPSHOT.jar" />
+			   		</fileset>
+			   		<pathelement path="${maven.runtime.classpath}"/>
+			 	</classpath>
+			 
+			</sql>
 	    </target>
 	
 	<!--
@@ -238,13 +243,11 @@
 	   <target name="execute.tables.sql"  > 
 	   	<echo>Executing table script file ${script.file}</echo>
 		<echo>User account:  ${User} url: ${URL}</echo>
-		<echo>Classpath: ${maven.runtime.classpath}</echo>
 
 		<available file="${script.file}" property="script.file.exist"/>
 
 		<fail unless="script.file.exist" message="DDL ${script.file} does not exist" />
 
-
 			 <sql     driver="${driver}"
 		                    url="${URL}"
 		                    userid="${User}"
@@ -254,9 +257,16 @@
 			    delimiter="${delim}"
 			    delimitertype="${delimtype}"
 			    autocommit="${autocommit}"
-			    onerror="${onerror}"  
-			 	classpath="${maven.runtime.classpath}"
-			 /> 
+			    onerror="${onerror}" >
+			 	<classpath>
+			   		<fileset dir="${lib.dir}">
+			   			<include name="*.jar" />
+			   		</fileset>
+			   		<pathelement path="${maven.runtime.classpath}"/>
+			 	</classpath>
+			 
+
+			 </sql> 
 	    	
 	    </target>
 	
@@ -278,9 +288,17 @@
 				    delimiter="${delim}"
 				    delimitertype="${delimtype}"
 				    autocommit="${autocommit}"
-				    onerror="${onerror}"  
-				 	classpath="${maven.runtime.classpath}"
-				 /> 
+				    onerror="${onerror}"  >
+				 	<classpath>
+				   		<fileset dir="${lib.dir}">
+				   			<include name="*.jar" />
+				   		</fileset>
+				   		<pathelement path="${maven.runtime.classpath}"/>
+				 	</classpath>
+				 
+
+				 </sql> 
+		    	
 		    				
 		    </target>