Index: lams_webct_integration/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_webct_integration/build.xml,v
diff -u -r1.3 -r1.4
--- lams_webct_integration/build.xml	27 Nov 2007 23:13:09 -0000	1.3
+++ lams_webct_integration/build.xml	5 Dec 2007 04:30:46 -0000	1.4
@@ -2,6 +2,7 @@
 <project default="deploy" name="LAMS/WebCt Integration" basedir="./">
 	
 	<property file="build.properties" />
+	<property file="db/conf/${dbType}.properties" />
 	<property name="project" value="BlackboardPlugin"/>
 	<property name="product" value="lams2-webct-integration"/>
 	<property name="version" value="1.0.0"/>
@@ -12,11 +13,13 @@
 	<property name="build.web" value="${build}/web"/>
 	<property name="build.lib" value="${build}/lib"/>
 	<property name="build.webinf" value="${build}/WEB-INF"/>
-
+	<property name="sqlDir" value="${basedir}/db/sql" />
+	
+	<!--
 	<property name="dbUrl" value="jdbc:sqlserver://${dbHost}:${dbPort}" />
 	<property name="dbDriver" value="com.microsoft.sqlserver.jdbc.SQLServerDriver" />
 	<property name="dbDriverClassPath" value="lib/sqljdbc.jar" />
-	<property name="sqlDir" value="${basedir}/db/sql" />
+	-->
 	
 	
 	<property name="lib" value="${basedir}/lib"/>
@@ -70,10 +73,12 @@
    			      <include name="DeployableComponentConfig.xml"/>
    			</fileset>
    			<filterset>
-   				<filter token="dbHost" value="${dbHost}" />
+   				<filter token="dbUrl" value="${dbUrl}" />
    				<filter token="dbPort" value="${dbPort}" />
    				<filter token="dbName" value="${dbName}" />
    				<filter token="dbUser" value="${dbUser}" />
+   				<filter token="dbDriver" value="${dbDriver}" />
+   				<filter token="dbTable" value="${dbTable}" />
    				<filter token="dbPass" value="${dbPass}" />
    				<filter token="lamsServerUrl" value="${lamsServerUrl}" />
    				<filter token="serverId" value="${serverId}" />
@@ -117,7 +122,8 @@
    			<fileset dir="${lib}">
    				<include name="commons-codec-1.3.jar" />
    				<include name="authmoduledata_ce_1.4.jar" />
-   				<include name="sqljdbc.jar" />
+   				<!-- include name="sqljdbc.jar" / -->
+   				<include name="mysql-connector-java-3.1.12-bin.jar" />
    			</fileset>
 		</copy>
 	
@@ -126,6 +132,8 @@
 		
 		
 	<target name="create-table">
+		<echo>${dbUrl}</echo>
+		
 		<sql 
 			driver="${dbDriver}"
 			classpath="${dbDriverClassPath}"
@@ -134,7 +142,7 @@
 			password="${dbPass}"
 			encoding="utf8"
 		>
-			<transaction src="${sqlDir}/createTable.sql" />
+			<transaction src="${sqlDir}/createTable_${dbType}.sql" />
 		</sql>	
 	</target>
 	
@@ -147,7 +155,7 @@
 				password="${dbPass}"
 				encoding="utf8"
 			>
-				<transaction src="${sqlDir}/deleteTable.sql" />
+				<transaction src="${sqlDir}/deleteTable_${dbType}.sql" />
 			</sql>	
 	</target>