Index: lams_tool_images/build.xml
===================================================================
diff -u -rba26f4ad68fd58cbf431a64bb597bf688221b1b9 -r09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a
--- lams_tool_images/build.xml	(.../build.xml)	(revision ba26f4ad68fd58cbf431a64bb597bf688221b1b9)
+++ lams_tool_images/build.xml	(.../build.xml)	(revision 09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a)
@@ -156,20 +156,20 @@
 	<!-- ImageGallery Database tasks                                       -->
 	<!-- =================================================================== -->
 	<target name="clean-db"	description="clean imageGallery database.">
-		<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}/cleanup_lams_tool_imageGallery.sql"/>
 		</sql>
 	</target>
 	
 	<target name="init-db"	description="drop and create forum database.">
-		<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_imageGallery.sql"/>
 			<transaction src="${db.scripts}/create_lams_tool_imageGallery.sql"/>
@@ -178,10 +178,10 @@
 	
 	<target name="build-db"	depends="init-db" 
 							description="build qa tool database.">
-		<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.name}"/>
+				<fileset dir="${db.driver.dir}" includes="*.jar"/> 
 			</classpath>
 			<transaction src="${db.scripts}/insert_lams_tool_imageGallery_data.sql"/>
 		</sql>
@@ -310,14 +310,17 @@
 		<echo>+------------------------------------------+</echo>
 		<echo>| Generate the deployment package.         |</echo>
 		<echo>+------------------------------------------+</echo>
-		<path id="deploy.lib.classpath">
-			<fileset dir="${deploy.tool.dir}">
-				<include name="lib/*.jar"/>
-			</fileset>
-		</path> 
+			<path id="deploy.lib.classpath">
+				<fileset dir="${deploy.tool.dir}">
+					<include name="lib/*.jar" />
+				</fileset>
+				<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"/> 
 		 
@@ -361,12 +364,6 @@
 			</fileset>
 		</copy>
 
-		<copy overwrite="yes" todir="${build.deploy}/lib">
-			<fileset dir="${deploy.tool.dir}/lib">
-				<include name="*.jar"/>
-			</fileset>
-		</copy>
-		
 		<copy overwrite="true" todir="${build.deploy}">
 				<fileset dir="${build.lib}">
 					<include name="*.jar"/>
@@ -391,7 +388,7 @@
 			generateForInstallers="${generate.for.installers}"
 			dbPassword="${db.password}"
 			dbUsername="${db.username}"
-			dbDriverUrl="${db.url}"
+			dbDriverUrl="${db.url.build}"
 			dbDriverClass="com.mysql.jdbc.Driver"
 			deployFiles="${build.deploy}/${product}.war,${build.deploy}/${product}.jar"
 			toolJarFileName="${product}.jar"
@@ -425,12 +422,14 @@
 	</target>
 
 	<target name="run-deploy-package" description="Run the deploy tool.">
-		<path id="deploy.classpath">
-			<fileset dir="${build.deploy}">
-				<include name="lib/*.jar"/>
-			</fileset>
-		</path> 
-
+				<path id="deploy.classpath">
+					<fileset dir="${deploy.tool.dir}/lib">
+						<include name="*.jar" />
+					</fileset>
+					<fileset dir="${sharedlib}">
+						<include name="**/*.jar" />
+					</fileset>
+				</path>
 		<echo>Deploying the ImageGallery tool</echo>
 	
 		<java