Index: lams_tool_sbmt/build.xml
===================================================================
diff -u -reab46de044a4c899fb8c8759c375402c6dba8783 -r09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a
--- lams_tool_sbmt/build.xml	(.../build.xml)	(revision eab46de044a4c899fb8c8759c375402c6dba8783)
+++ lams_tool_sbmt/build.xml	(.../build.xml)	(revision 09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a)
@@ -56,7 +56,7 @@
 		</target>
 
 		<target name="check-driver-present">
-			<available file="${db.driver.jar}" type="file" property="driver.present"/>
+			<available file="${db.driver.dir}" type="dir" property="driver.present"/>
 		</target>
 		<target name="panic-if-driver-not-present" unless="driver.present">
 			<fail>
@@ -76,7 +76,7 @@
 			<middlegen appname="lams_tool_sbmt" 
 					   prefsdir="${conf.middlegen.dir}"
 					   gui="${middlegen.gui}"
-					   databaseurl="${db.url}"
+					   databaseurl="${db.url.build}"
 					   driver="${db.driver}"
 					   username="${db.username}"
 					   password="${db.password}"
@@ -297,10 +297,10 @@
 		<!-- =================================================================== -->
 		<target name="rebuild-db"
 			description="rebuild Submit Files tables">
-			<sql driver="${db.driver}" url="${db.url}" userid="${db.username}"
+			<sql driver="${db.driver}" url="${db.url.build}" userid="${db.username}"
 					password="${db.password}"  encoding="${db.encoding}">
 				<classpath>
-					<pathelement location="${db.driver.jar}"/>
+					<fileset dir="${db.driver.dir}" includes="*.jar"/> 
 				</classpath>
 				<transaction src="${db.scripts}/drop_lams_tool_sbmt.sql"/>
 				<transaction src="${db.scripts}/create_lams_tool_sbmt.sql"/>
@@ -312,10 +312,10 @@
 	<!-- =================================================================== -->
 	<target name="insert-test-data" depends="rebuild-db"
 		description="Insert some dummy test data. Removes any data that was in the tables first.">
-		<sql driver="${db.driver}" url="${db.url}" userid="${db.username}"
+		<sql driver="${db.driver}" url="${db.url.build}" userid="${db.username}"
 				password="${db.password}"  encoding="${db.encoding}">
 			<classpath>
-				<pathelement location="${db.driver.jar}"/>
+				<fileset dir="${db.driver.dir}" includes="*.jar"/> 
 			</classpath>
 			<transaction src="${db.scripts}/insert_test_data.sql"/>
 		</sql>
@@ -329,12 +329,15 @@
 
 		<path id="deploy.lib.classpath">
 			<fileset dir="${deploy.tool.dir}">
-				<include name="lib/*.jar"/>
+				<include name="lib/*.jar" />
 			</fileset>
-		</path> 
+			<fileset dir="${sharedlib}">
+				<include name="**/*.jar" />
+			</fileset>
+		</path>
 			  
 		<mkdir dir="${build.deploy}"/>
-		<mkdir dir="${build.deploy}/lib"/> 
+		
 		<mkdir dir="${build.deploy}/sql"/> 
 		<mkdir dir="${build.deploy}/language"/>
 		 
@@ -378,12 +381,6 @@
 			</fileset>
 		</copy>
 
-		<copy overwrite="yes" todir="${build.deploy}/lib">
-			<fileset dir="${deploy.tool.dir}/lib">
-				<include name="*.jar"/>
-			</fileset>
-		</copy>
-
 		<copy overwrite="yes" todir="${build.deploy}/language">
 			<fileset dir="${conf.language.dir}">
 				<include name="*.properties"/>
@@ -408,7 +405,7 @@
 			generateForInstallers="${generate.for.installers}"
 			dbPassword="${db.password}"
 			dbUsername="${db.username}"
-			dbDriverUrl="${db.url}"
+			dbDriverUrl="${db.url.build}"
 			dbDriverClass="${db.driver}"
 			deployFiles="${build.deploy}/${product}.war,${build.deploy}/${product}.jar"
 			toolJarFileName="${product}.jar"
@@ -441,10 +438,13 @@
 
 	<target name="run-deploy-package" description="Run the deploy tool.">
 		<path id="deploy.classpath">
-			<fileset dir="${build.deploy}">
-				<include name="lib/*.jar"/>
+			<fileset dir="${deploy.tool.dir}/lib">
+				<include name="*.jar" />
 			</fileset>
-		</path> 
+			<fileset dir="${sharedlib}">
+				<include name="**/*.jar" />
+			</fileset>
+		</path>
 
 		<echo>Deploying the Submission tool</echo>