Index: lams_build/build.xml
===================================================================
diff -u -rc63a99d66e9ebb605672aeab4d591e72e0d962a4 -r09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a
--- lams_build/build.xml	(.../build.xml)	(revision c63a99d66e9ebb605672aeab4d591e72e0d962a4)
+++ lams_build/build.xml	(.../build.xml)	(revision 09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a)
@@ -121,8 +121,6 @@
 		<copy todir="${deploy.tool}/lib" overwrite="yes" flatten="true">
 			<fileset dir="../${lams_tool_deploy}/lib">
 				<include name="jakarta-commmons/*.jar" />
-				<include name="mysql/*.jar" />
-				<include name="xstream/*.jar" />
 			</fileset>
 		</copy>
 		
@@ -169,7 +167,7 @@
 					<include name="jakarta-taglibs/*.jar" />
 					<include name="jdom/*.jar" />
 					<include name="jfreechart/*.jar" />
-					<include name="mysql/*.jar" />
+					<include name="mysql/mysql-connector-java-*.jar" />
 					<include name="odmg/*.jar" />
 					<include name="smack/smack.jar"/>
 					<include name="smack/smackx.jar"/>
@@ -201,7 +199,16 @@
 				<include name="${lams_gradebook}/${sub.build.lib}/*.jar"/>
 				<include name="${lams_gradebook}/${sub.build.lib}/*.war"/>
 			</fileset>
-		</copy> 
+		</copy>
+		
+		<!-- Copy connectors for embedded MySQL, if they are available -->
+		<copy todir="${assembly}/temp" verbose="true" overwrite="true" failonerror="false">
+			<fileset dir="../mysql_embedded/connectors">
+				<include name="*-driver.jar" />
+				<include name="*-db-files-${osPropertiesName}.jar" />
+			</fileset>
+		</copy>
+
 		<!-- lams-central.war is already expanded -->
 		<copy todir="${assembly}/temp/" failonerror="true">
 			<fileset dir="../${lams_central}/${sub.build.lib}/">
@@ -491,7 +498,9 @@
 				<include name="mysql*.xml" />
 			</fileset>
 	        <filterset>
-	            <filter token="db.name" value="${db.name}"/>
+	        	<filter token="db.driver" value="${db.driver}"/>
+	        	<filter token="db.url.run" value="${db.url.run}"/>
+	        	<filter token="db.location" value="${db.location}"/>
                 <filter token="db.username" value="${db.username}"/>
                 <filter token="db.password" value="${db.password}"/>
 	        </filterset>
Index: lams_build/buildcombinedtasks.xml
===================================================================
diff -u -rea2fc9d773d5151414fea0a71dba64ba36880cd0 -r09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a
--- lams_build/buildcombinedtasks.xml	(.../buildcombinedtasks.xml)	(revision ea2fc9d773d5151414fea0a71dba64ba36880cd0)
+++ lams_build/buildcombinedtasks.xml	(.../buildcombinedtasks.xml)	(revision 09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a)
@@ -16,13 +16,14 @@
 		
 			<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="${assembly.activity}/"/>
-			<mkdir dir="${assembly.activity}/lib"/> 
-			<mkdir dir="${assembly.activity}/sql"/> 
 			<mkdir dir="${assembly.activity}/language"/> 
 			<mkdir dir="${dest.language.file.folder}" />
 		
@@ -60,11 +61,6 @@
 		        </filterchain>
 		    </copy>
 
-			<copy overwrite="yes" todir="${assembly.activity}/lib">
-				<fileset dir="${deploy.tool.dir}/lib">
-					<include name="*.jar"/>
-				</fileset>
-			</copy>
 
 			<taskdef name="generateDeployLibraryProperties" 
 				classname="org.lamsfoundation.lams.tool.deploy.libraryActivity.CreateLibraryPackageTask">
@@ -77,17 +73,10 @@
 				configFile="${assembly.activity}/deploy.xml"
 				dbPassword="${db.password}"
 				dbUsername="${db.username}"
-				dbDriverUrl="${db.url}"
+				dbDriverUrl="${db.url.build}"
 				dbDriverClass="com.mysql.jdbc.Driver"	
 				/>
 		
-			<!-- Do the actual deployment -->
-			<path id="deploy.classpath">
-				<fileset dir="${assembly.activity}">
-					<include name="lib/*.jar"/>
-				</fileset>
-			</path> 
-		
 			<!-- copy the language files to the assembly folder -->
 			<echo>Copying language files</echo>
 			<copy overwrite="yes" todir="${dest.language.file.folder}">
@@ -98,7 +87,7 @@
 	
 			<java
 				classname="org.lamsfoundation.lams.tool.deploy.libraryActivity.DeployLibrary"
-				classpathref="deploy.classpath"
+				classpathref="deploy.lib.classpath"
 				fork="true">
 					<arg file="${assembly.activity}/deploy.xml"/>
 					<arg file="${assembly.activity}/language"/>
Index: lams_build/common.properties
===================================================================
diff -u -r958ff334a0e0eefe817c84e80d6d87551ab43243 -r09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a
--- lams_build/common.properties	(.../common.properties)	(revision 958ff334a0e0eefe817c84e80d6d87551ab43243)
+++ lams_build/common.properties	(.../common.properties)	(revision 09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a)
@@ -42,21 +42,44 @@
 #deploy tool directory
 tag.web.dir=../lams_central/web/WEB-INF
 
-#database access
-db.name=${conf.application}
+
+#=========DATABASE PROPERTIES==========
+db.driver.dir=${sharedlib}/mysql/
 db.driver=com.mysql.jdbc.Driver
-db.url=jdbc:mysql://localhost/${db.name}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useUnicode=true
+db.name=${conf.application}
 db.encoding=utf8
 db.username=lams
 db.password=lamsdemo
-db.driver.jar=${sharedlib}/mysql/mysql-connector-java-5.0.8-bin.jar
 db.scripts=${basedir}/db/sql
 db.schema=
 db.catalog=
-
 # db scripts
 lamsconf.table.sql=insert_${conf.application}_${osPropertiesName}_config_data.sql
 
+
+# Basedir of embedded MySQL server. This is also the place where data is stored.
+# Set it if you use MXJ for running and/or building LAMS.
+db.location=C:/${conf.application}/database
+
+# To build LAMS using standalone MySQL server, use properties below
+db.url.build=jdbc:mysql://localhost:3306/${db.name}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useUnicode=true
+db.url.init.build=${db.url.build}
+
+# To build LAMS using embedded MySQL server, use properties below
+# If you build LAMS this way, you will also need to run it using the embedded server.
+# db.config.build configuration is a replacement for my.ini and it's optional. If left blank, server defaults will be used.
+#db.config.build=&server.skip-external-locking&server.key_buffer_size=16K&server.max_allowed_packet=1M&server.table_open_cache=4&server.sort_buffer_size=64K&server.read_buffer_size=256K&server.read_rnd_buffer_size=257K&server.net_buffer_length=2K&server.thread_stack=128K
+#db.url.build=jdbc:mysql:mxj://localhost:13306/${db.name}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useUnicode=true&server.basedir=${db.location}${db.config.build}
+#db.url.init.build=${db.url.build}&server.initialize-user=true&createDatabaseIfNotExist=true
+
+# To run LAMS using standalone MySQL server, use properties below
+db.url.run=jdbc:mysql://localhost:3306/${db.name}
+
+# To run LAMS using embedded MySQL server, use properties below
+#db.url.run=jdbc:mysql:mxj://localhost:13306/${db.name}
+
+#======END OF DATABASE PROPERTIES=======
+
 #xdoclet version number
 xdoclet.version=1.2.3
 
Index: lams_build/conf/unix/jboss/service/mysql-ds.xml
===================================================================
diff -u -r2f21856ec2ab85b47c93cfcc3fa2c8769be65077 -r09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a
--- lams_build/conf/unix/jboss/service/mysql-ds.xml	(.../mysql-ds.xml)	(revision 2f21856ec2ab85b47c93cfcc3fa2c8769be65077)
+++ lams_build/conf/unix/jboss/service/mysql-ds.xml	(.../mysql-ds.xml)	(revision 09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a)
@@ -9,12 +9,26 @@
   <!-- lams-ds datasource for use by LAMS Core and Services -->
   <local-tx-datasource>
     <jndi-name>jdbc/lams-ds</jndi-name>
-    <connection-url>jdbc:mysql://localhost:3306/@db.name@</connection-url>
-    <driver-class>com.mysql.jdbc.Driver</driver-class>
+    <connection-url>@db.url.run@</connection-url>
+    <driver-class>@db.driver@</driver-class>
     <!-- Tell MySQL Connector to use UTF-8 character encoding, -->
     <!-- and convert MySQL zero times to null -->
     <connection-property name="characterEncoding">utf8</connection-property>
     <connection-property name="zeroDateTimeBehavior">convertToNull</connection-property>
+
+    <!-- Properties below are used only for embedded MySQL server -->
+    <connection-property name="server.basedir">@db.location@</connection-property>
+    <connection-property name="createDatabaseIfNotExist">false</connection-property>
+    <connection-property name="server.initialize-user">false</connection-property>
+	<connection-property name="server.key_buffer">16K</connection-property>
+    <connection-property name="server.max_allowed_packet">1M</connection-property>
+    <connection-property name="server.table_cache">4</connection-property>
+    <connection-property name="server.sort_buffer_size">64K</connection-property>
+    <connection-property name="server.read_buffer_size">256K</connection-property>
+    <connection-property name="server.read_rnd_buffer_size">256K</connection-property>
+    <connection-property name="server.net_buffer_length">2K</connection-property>
+    <connection-property name="server.thread_stack">128K</connection-property>
+
     <!-- Set transaction isolation level to match db -->
     <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation>	
     <user-name>@db.username@</user-name>
Index: lams_build/conf/windows/jboss/service/mysql-ds.xml
===================================================================
diff -u -r126d84999e520648cb187e465cb4aaa3baad222e -r09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a
--- lams_build/conf/windows/jboss/service/mysql-ds.xml	(.../mysql-ds.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
+++ lams_build/conf/windows/jboss/service/mysql-ds.xml	(.../mysql-ds.xml)	(revision 09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a)
@@ -9,12 +9,26 @@
   <!-- lams-ds datasource for use by LAMS Core and Services -->
   <local-tx-datasource>
     <jndi-name>jdbc/lams-ds</jndi-name>
-    <connection-url>jdbc:mysql://localhost:3306/@db.name@</connection-url>
-    <driver-class>com.mysql.jdbc.Driver</driver-class>
+    <connection-url>@db.url.run@</connection-url>
+    <driver-class>@db.driver@</driver-class>
     <!-- Tell MySQL Connector to use UTF-8 character encoding, -->
     <!-- and convert MySQL zero times to null -->
     <connection-property name="characterEncoding">utf8</connection-property>
     <connection-property name="zeroDateTimeBehavior">convertToNull</connection-property>
+
+    <!-- Properties below are used only for embedded MySQL server -->
+    <connection-property name="server.basedir">@db.location@</connection-property>
+    <connection-property name="createDatabaseIfNotExist">false</connection-property>
+    <connection-property name="server.initialize-user">false</connection-property>
+	<connection-property name="server.key_buffer">16K</connection-property>
+    <connection-property name="server.max_allowed_packet">1M</connection-property>
+    <connection-property name="server.table_cache">4</connection-property>
+    <connection-property name="server.sort_buffer_size">64K</connection-property>
+    <connection-property name="server.read_buffer_size">256K</connection-property>
+    <connection-property name="server.read_rnd_buffer_size">256K</connection-property>
+    <connection-property name="server.net_buffer_length">2K</connection-property>
+    <connection-property name="server.thread_stack">128K</connection-property>
+
     <!-- Set transaction isolation level to match db -->
     <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation>	
     <user-name>@db.username@</user-name>
Index: lams_build/deploy-tool/lib/commons-collections.jar
===================================================================
diff -u -rbc4c13e34d34c094ad4ef1d23d3c8d630d6b5609 -r09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a
Binary files differ
Index: lams_build/deploy-tool/lib/commons-io-1.0.jar
===================================================================
diff -u -rbc4c13e34d34c094ad4ef1d23d3c8d630d6b5609 -r09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a
Binary files differ
Index: lams_build/deploy-tool/lib/commons-lang-2.0.jar
===================================================================
diff -u -rbc4c13e34d34c094ad4ef1d23d3c8d630d6b5609 -r09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a
Binary files differ
Index: lams_build/deploy-tool/lib/commons-logging.jar
===================================================================
diff -u -rbc4c13e34d34c094ad4ef1d23d3c8d630d6b5609 -r09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a
Binary files differ
Index: lams_build/deploy-tool/lib/lams-tool-deploy.jar
===================================================================
diff -u -rd2588e0437fdc1206a3a52a02a93c84e582dff44 -r09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a
Binary files differ
Index: lams_build/deploy-tool/lib/mysql-connector-java-5.0.8-bin.jar
===================================================================
diff -u -r3cae36fc3c73c4ce595adc48b7ef2f8ac166daaf -r09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a
Binary files differ
Index: lams_build/deploy-tool/lib/xstream-1.1.2.jar
===================================================================
diff -u -rf697f404cc7d769569ca0a457f4e2ed28f47830e -r09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a
Binary files differ
Index: lams_build/lib/mysql/.cvsignore
===================================================================
diff -u
--- lams_build/lib/mysql/.cvsignore	(revision 0)
+++ lams_build/lib/mysql/.cvsignore	(revision 09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a)
@@ -0,0 +1 @@
+mysql-connector-mxj-*.jar
Index: lams_common/build.xml
===================================================================
diff -u -r6d0e19e0d48a4950c9afbb40823a2bc49c2bb5a5 -r09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a
--- lams_common/build.xml	(.../build.xml)	(revision 6d0e19e0d48a4950c9afbb40823a2bc49c2bb5a5)
+++ lams_common/build.xml	(.../build.xml)	(revision 09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a)
@@ -10,6 +10,7 @@
 	<property file="build.properties"/>
 	<property file="../lams_build/common.properties"/>
 	<property file="../lams_build/${osPropertiesName}.properties" />
+
 	
 	<path id="all-libs">
 		<fileset dir="${sharedlib}">
@@ -65,12 +66,12 @@
 	</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>
 	      The JDBC driver you have specified by including one of the files in ${basedir}/config/database
-	      doesn't exist. You have to download this driver separately and put it in ${db.driver.jar}
+	      doesn't exist. You have to download this driver separately and put it in ${db.driver.dir}
 	      Please make sure you're using a version that is equal or superior to the one we looked for.
 	      If you name the driver jar file differently, please update the database.driver.jar property
 	      in the ${basedir}/config/database/xxx.xml file accordingly.
@@ -97,7 +98,7 @@
          appname="learningdesign"
          prefsdir="${middlegen}"
          gui="${middlegen.gui}"
-         databaseurl="${db.url}"
+         databaseurl="${db.url.build}"
          driver="${db.driver}"
          username="${db.username}"
          password="${db.password}"
@@ -297,11 +298,19 @@
                     <filter token="dbname" value="${db.name}"/>
 	        </filterset>
 		</copy>
-
-		<sql driver="${db.driver}" url="${db.url}" userid="${db.username}"
-				password="${db.password}" encoding="${db.encoding}">
+		
+		<!-- Copy connectors for embedded MySQL, if they are available -->
+		<copy todir="${db.driver.dir}" verbose="true" overwrite="true" failonerror="false">
+			<fileset dir="../mysql_embedded/connectors">
+				<include name="*-driver.jar" />
+				<include name="*-db-files-${osPropertiesName}.jar" />
+			</fileset>
+		</copy>
+		
+		<sql driver="${db.driver}" url="${db.url.init.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="${build}/create_lams_11_db.sql"/>
 			<transaction src="${db.scripts}/drop_lams_11_tables.sql"/>
@@ -333,10 +342,10 @@
 	<!-- =================================================================== -->
 	<target name="insert-test-data" depends="rebuild-db"
 		description="insert test data to lams 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}/insert_test_data.sql"/>
 		</sql>
Index: lams_learning/build.xml
===================================================================
diff -u -rb5f1c6147aeaaec0f5084813209fe0cf59a1c386 -r09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a
--- lams_learning/build.xml	(.../build.xml)	(revision b5f1c6147aeaaec0f5084813209fe0cf59a1c386)
+++ lams_learning/build.xml	(.../build.xml)	(revision 09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a)
@@ -147,7 +147,7 @@
 		</fail>
 	</target>
 	<!-- target name="check-driver-present">
-		<available file="${database.driver.file}" type="file" property="driver.present"/>
+		<available file="${database.driver.file}" type="dir" property="driver.present"/>
 		</target>
 		<target name="panic-if-driver-not-present" unless="driver.present">
 		<fail>
Index: lams_monitoring/build.xml
===================================================================
diff -u -rcb6d628cd53fe3d51e4f67cbaff7390651a048da -r09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a
--- lams_monitoring/build.xml	(.../build.xml)	(revision cb6d628cd53fe3d51e4f67cbaff7390651a048da)
+++ lams_monitoring/build.xml	(.../build.xml)	(revision 09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a)
@@ -168,7 +168,7 @@
    </target>
 
    <target name="check-driver-present">
-      <available file="${database.driver.file}" type="file" property="driver.present"/>
+      <available file="${database.driver.file}" type="dir" property="driver.present"/>
    </target>
    <target name="panic-if-driver-not-present" unless="driver.present">
       <fail>
Index: lams_tool_assessment/build.xml
===================================================================
diff -u -raa32fcfe917e7db472c59c08513fcab221e14ae6 -r09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a
--- lams_tool_assessment/build.xml	(.../build.xml)	(revision aa32fcfe917e7db472c59c08513fcab221e14ae6)
+++ lams_tool_assessment/build.xml	(.../build.xml)	(revision 09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a)
@@ -154,20 +154,20 @@
 	<!-- Assessment Database tasks                                       -->
 	<!-- =================================================================== -->
 	<target name="clean-db"	description="clean assessment 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_assessment.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_assessment.sql"/>
 			<transaction src="${db.scripts}/create_lams_tool_assessment.sql"/>
@@ -176,10 +176,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_assessment_data.sql"/>
 		</sql>
@@ -360,12 +360,14 @@
 		<echo>+------------------------------------------+</echo>
 		<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"/> 
 		 
@@ -408,12 +410,6 @@
 				<include name="*.*"/>
 			</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}">
@@ -439,7 +435,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"
@@ -474,11 +470,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 Assessment tool</echo>
 	
 		<java
Index: lams_tool_chat/build.xml
===================================================================
diff -u -rd2057fdd8708c4c7e5665bdc3ee25b72212aaecb -r09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a
--- lams_tool_chat/build.xml	(.../build.xml)	(revision d2057fdd8708c4c7e5665bdc3ee25b72212aaecb)
+++ lams_tool_chat/build.xml	(.../build.xml)	(revision 09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a)
@@ -135,18 +135,18 @@
 	<!-- Database Tasks                                             -->
 	<!-- =================================================================== -->
 	<target name="clean-db" description="Deletes the Tool Tables">
-		<sql driver="${db.driver}" url="${db.url}" userid="${db.username}" password="${db.password}" encoding="${db.encoding}">
+		<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_chat.sql" />
 		</sql>
 	</target>
 
 	<target name="build-db" depends="" description="Deletes and Creates the Tool tables and inserts default content">
-		<sql driver="${db.driver}" url="${db.url}" userid="${db.username}" password="${db.password}"  encoding="${db.encoding}">
+		<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}/create_lams_tool_chat.sql" />
 		</sql>
@@ -339,10 +339,13 @@
 			<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" />
 
@@ -386,12 +389,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" />
@@ -416,7 +413,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"
@@ -449,9 +446,12 @@
 	<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>
+			<fileset dir="${sharedlib}">
+				<include name="**/*.jar" />
+			</fileset>
 		</path>
 
 		<echo>Deploying the Chat Tool</echo>
Index: lams_tool_daco/build.xml
===================================================================
diff -u -rd2057fdd8708c4c7e5665bdc3ee25b72212aaecb -r09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a
--- lams_tool_daco/build.xml	(.../build.xml)	(revision d2057fdd8708c4c7e5665bdc3ee25b72212aaecb)
+++ lams_tool_daco/build.xml	(.../build.xml)	(revision 09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a)
@@ -150,20 +150,20 @@
 	<!-- Daco Database tasks                                       -->
 	<!-- =================================================================== -->
 	<target name="clean-db"	description="clean daco 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_daco.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_daco.sql"/>
 			<transaction src="${db.scripts}/create_lams_tool_daco.sql"/>
@@ -172,10 +172,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_daco_data.sql"/>
 		</sql>
@@ -306,12 +306,15 @@
 		<echo>+------------------------------------------+</echo>
 		<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"/> 
 		 
@@ -354,12 +357,6 @@
 				<include name="*.*"/>
 			</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}">
@@ -385,7 +382,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"
@@ -419,11 +416,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 Daco tool</echo>
 	
Index: lams_tool_deploy/.classpath
===================================================================
diff -u -r3cae36fc3c73c4ce595adc48b7ef2f8ac166daaf -r09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a
--- lams_tool_deploy/.classpath	(.../.classpath)	(revision 3cae36fc3c73c4ce595adc48b7ef2f8ac166daaf)
+++ lams_tool_deploy/.classpath	(.../.classpath)	(revision 09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a)
@@ -3,17 +3,21 @@
 	<classpathentry kind="src" path="src/java"/>
 	<classpathentry kind="src" path="test/java"/>
 	<classpathentry kind="lib" path="lib/ant/ant.jar"/>
-	<classpathentry kind="lib" path="lib/jakarta-commmons/commons-configuration-1.1.jar"/>
-	<classpathentry kind="lib" path="lib/jakarta-commmons/commons-dbutils-1.0.jar"/>
-	<classpathentry kind="lib" path="lib/jakarta-commmons/commons-io-1.0.jar"/>
-	<classpathentry kind="lib" path="lib/jakarta-commmons/commons-lang-2.0.jar"/>
-	<classpathentry kind="lib" path="lib/jakarta-commmons/commons-logging.jar"/>
-	<classpathentry kind="lib" path="lib/junit/junit.jar"/>
-	<classpathentry kind="lib" path="lib/mysql/mysql-connector-java-5.0.8-bin.jar"/>
 	<classpathentry kind="lib" path="test/file/test-dummy.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="lib/jakarta-commmons/commons-collections.jar"/>
-	<classpathentry kind="lib" path="lib/xstream/xstream-1.1.2.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_common"/>
+	<classpathentry kind="lib" path="/lams_build/lib/mysql/mysql-connector-mxj-gpl-5-0-12.jar"/>
+	<classpathentry kind="lib" path="/lams_build/lib/jakarta-commons/commons-collections.jar"/>
+	<classpathentry kind="lib" path="/lams_build/lib/jakarta-commons/commons-io-1.4.jar"/>
+	<classpathentry kind="lib" path="/lams_build/lib/jakarta-commons/commons-lang-2.0.jar"/>
+	<classpathentry kind="lib" path="/lams_build/lib/jakarta-commons/commons-logging.jar"/>
+	<classpathentry kind="lib" path="/lams_build/lib/mysql/mysql-connector-java-5.0.8-bin.jar"/>
+	<classpathentry kind="lib" path="/lams_build/lib/junit/junit.jar"/>
+	<classpathentry kind="lib" path="/lams_build/lib/xstream/xstream-1.1.3.jar"/>
+	<classpathentry kind="lib" path="lib/jakarta-commmons/commons-configuration-1.1.jar"/>
+	<classpathentry kind="lib" path="lib/jakarta-commmons/commons-dbutils-1.0.jar"/>
+	<classpathentry kind="lib" path="/lams_build/lib/mysql/mysql-connector-mxj-gpl-5-0-12-db-files-linux.jar"/>
+	<classpathentry kind="lib" path="/lams_build/lib/mysql/mysql-connector-mxj-gpl-5-0-12-db-files-mac.jar"/>
+	<classpathentry kind="lib" path="/lams_build/lib/mysql/mysql-connector-mxj-gpl-5-0-12-db-files-win.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
Index: lams_tool_deploy/build.xml
===================================================================
diff -u -r3a8216a0f97d66b941870386f80f9288f2a4c4dc -r09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a
--- lams_tool_deploy/build.xml	(.../build.xml)	(revision 3a8216a0f97d66b941870386f80f9288f2a4c4dc)
+++ lams_tool_deploy/build.xml	(.../build.xml)	(revision 09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a)
@@ -7,6 +7,7 @@
         <property name="build.dir" value="build/lib"/>
     	<property name="build.report.dir" value="build/report"/>
         <property name="lib.dir" value="lib"/>
+		<property name="sharedlib" value="../lams_build/lib"/>
         <property name="src.dir" value="src/java"/>
         <property name="test.src.dir" value="test/java"/>
         <property name="jar.file" value="${build.dir}/lams-tool-deploy.jar"/>
@@ -19,6 +20,12 @@
             <fileset dir="${lib.dir}">
                 <include name="**/*.jar"/>
             </fileset>
+    		<fileset dir="${sharedlib}">
+    			<include name="**/*.jar" />
+    		</fileset>
+    		<fileset dir="${deploy.tool.dir}">
+    			<include name="commons-*.jar" />
+    		</fileset>
         </path>
         
         <path id="test.class.path">
Index: lams_tool_deploy/lib/jakarta-commmons/commons-collections.jar
===================================================================
diff -u -r60f8ad90ac03834ede1c4a45585f7f117d5844de -r09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a
Binary files differ
Index: lams_tool_deploy/lib/jakarta-commmons/commons-io-1.0.jar
===================================================================
diff -u -r5a1e4424a7fee54a37abf1504b699077bd9f41fa -r09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a
Binary files differ
Index: lams_tool_deploy/lib/jakarta-commmons/commons-lang-2.0.jar
===================================================================
diff -u -r5a1e4424a7fee54a37abf1504b699077bd9f41fa -r09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a
Binary files differ
Index: lams_tool_deploy/lib/jakarta-commmons/commons-logging.jar
===================================================================
diff -u -r5a1e4424a7fee54a37abf1504b699077bd9f41fa -r09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a
Binary files differ
Index: lams_tool_deploy/lib/junit/junit.jar
===================================================================
diff -u -ra174a94fcb9db22380a89926f460afbef0216c91 -r09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a
Binary files differ
Index: lams_tool_deploy/lib/mysql/mysql-connector-java-5.0.8-bin.jar
===================================================================
diff -u -r3cae36fc3c73c4ce595adc48b7ef2f8ac166daaf -r09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a
Binary files differ
Index: lams_tool_deploy/lib/xstream/xstream-1.1.2.jar
===================================================================
diff -u -r491c46761832079b55758b07e6fb31e8ed70c4db -r09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a
Binary files differ
Index: lams_tool_dimdim/build.xml
===================================================================
diff -u -rd2057fdd8708c4c7e5665bdc3ee25b72212aaecb -r09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a
--- lams_tool_dimdim/build.xml	(.../build.xml)	(revision d2057fdd8708c4c7e5665bdc3ee25b72212aaecb)
+++ lams_tool_dimdim/build.xml	(.../build.xml)	(revision 09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a)
@@ -135,18 +135,18 @@
 	<!-- Database Tasks                                             -->
 	<!-- =================================================================== -->
 	<target name="clean-db" description="Deletes the Tool Tables">
-		<sql driver="${db.driver}" url="${db.url}" userid="${db.username}" password="${db.password}"  encoding="${db.encoding}">
+		<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_dimdim.sql" />
 		</sql>
 	</target>
 
 	<target name="build-db" depends="" description="Deletes and Creates the Tool tables and inserts default content">
-		<sql driver="${db.driver}" url="${db.url}" userid="${db.username}" password="${db.password}"  encoding="${db.encoding}">
+		<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}/create_lams_tool_dimdim.sql" />
 		</sql>
@@ -339,10 +339,13 @@
 			<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}/lang" />
 
@@ -386,12 +389,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" />
@@ -416,7 +413,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"
@@ -449,9 +446,12 @@
 	<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>
+			<fileset dir="${sharedlib}">
+				<include name="**/*.jar" />
+			</fileset>
 		</path>
 
 		<echo>Deploying the Dimdim Tool</echo>
Index: lams_tool_eadventure/build.xml
===================================================================
diff -u -r6ea6b66ee54c1f8523ca68af071fcf82caeb5e98 -r09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a
--- lams_tool_eadventure/build.xml	(.../build.xml)	(revision 6ea6b66ee54c1f8523ca68af071fcf82caeb5e98)
+++ lams_tool_eadventure/build.xml	(.../build.xml)	(revision 09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a)
@@ -154,20 +154,20 @@
 	<!-- Eadventure Database tasks                                       -->
 	<!-- =================================================================== -->
 	<target name="clean-db"	description="clean eadventure 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_eadventure.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_eadventure.sql"/>
 			<transaction src="${db.scripts}/create_lams_tool_eadventure.sql"/>
@@ -176,10 +176,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_eadventure_data.sql"/>
 		</sql>
@@ -311,14 +311,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"/> 
 		 
@@ -362,12 +365,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"/>
@@ -392,7 +389,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"
@@ -427,10 +424,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 Eadventure tool</echo>
 	
Index: lams_tool_example/build.xml
===================================================================
diff -u -rf124bb5b1ed07b1d5dca8e235453d8d1035a6215 -r09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a
--- lams_tool_example/build.xml	(.../build.xml)	(revision f124bb5b1ed07b1d5dca8e235453d8d1035a6215)
+++ lams_tool_example/build.xml	(.../build.xml)	(revision 09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a)
@@ -118,20 +118,20 @@
 	<!-- Database Tasks                                             -->
 	<!-- =================================================================== -->
 		<target name="clean-db"	description="Deletes the Tool 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_example.sql"/>
 			</sql>
 		</target>
 		
 		<target name="build-db" depends="" description="Deletes and Creates the Tool tables and inserts default content">
-			<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}/create_lams_tool_example.sql"/>
 			</sql>
@@ -285,14 +285,17 @@
 		<target name="create-deploy-package" depends="build-war" 
 				description="Generate the deployment package.">
 
-				<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"/>
 				 
@@ -326,12 +329,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"/>
@@ -355,7 +352,7 @@
 					outputPath="${build.deploy}"
 					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"
@@ -387,10 +384,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 Example Tool</echo>
 		
Index: lams_tool_forum/build.xml
===================================================================
diff -u -r8179037dc958585c054547eb7de9be14c6aed233 -r09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a
--- lams_tool_forum/build.xml	(.../build.xml)	(revision 8179037dc958585c054547eb7de9be14c6aed233)
+++ lams_tool_forum/build.xml	(.../build.xml)	(revision 09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a)
@@ -154,20 +154,20 @@
 	<!-- Forum Database tasks                                               -->
 	<!-- =================================================================== -->
 	<target name="clean-db"	description="clean 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}/cleanup_lams_tool_forum.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_forum.sql"/>
 			<transaction src="${db.scripts}/create_lams_tool_forum.sql"/>
@@ -176,10 +176,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_forum_data.sql"/>
 		</sql>
@@ -339,12 +339,15 @@
 		<echo>+------------------------------------------+</echo>
 		<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"/>
 		 
@@ -389,12 +392,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"/>
@@ -420,7 +417,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"
@@ -453,10 +450,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 Forum tool</echo>
 	
Index: lams_tool_gmap/build.xml
===================================================================
diff -u -rd2057fdd8708c4c7e5665bdc3ee25b72212aaecb -r09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a
--- lams_tool_gmap/build.xml	(.../build.xml)	(revision d2057fdd8708c4c7e5665bdc3ee25b72212aaecb)
+++ lams_tool_gmap/build.xml	(.../build.xml)	(revision 09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a)
@@ -135,18 +135,18 @@
 	<!-- Database Tasks                                             -->
 	<!-- =================================================================== -->
 	<target name="clean-db" description="Deletes the Tool Tables">
-		<sql driver="${db.driver}" url="${db.url}" userid="${db.username}" password="${db.password}"  encoding="${db.encoding}">
+		<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_gmap.sql" />
 		</sql>
 	</target>
 
 	<target name="build-db" depends="" description="Deletes and Creates the Tool tables and inserts default content">
-		<sql driver="${db.driver}" url="${db.url}" userid="${db.username}" password="${db.password}"  encoding="${db.encoding}">
+		<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}/create_lams_tool_gmap.sql" />
 		</sql>
@@ -358,10 +358,13 @@
 			<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}/lang" />
 
@@ -405,12 +408,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" />
@@ -435,7 +432,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"
@@ -467,11 +464,14 @@
 
 	<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 Gmap Tool</echo>
 
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
Index: lams_tool_imscc/build.xml
===================================================================
diff -u -r3469ac37f4f0094274d92c25b84886995305d3df -r09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a
--- lams_tool_imscc/build.xml	(.../build.xml)	(revision 3469ac37f4f0094274d92c25b84886995305d3df)
+++ lams_tool_imscc/build.xml	(.../build.xml)	(revision 09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a)
@@ -154,20 +154,20 @@
 	<!-- CommonCartridge Database tasks                                       -->
 	<!-- =================================================================== -->
 	<target name="clean-db"	description="clean commonCartridge 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_commonCartridge.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_commonCartridge.sql"/>
 			<transaction src="${db.scripts}/create_lams_tool_commonCartridge.sql"/>
@@ -176,10 +176,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_commonCartridge_data.sql"/>
 		</sql>
@@ -311,14 +311,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"/> 
 		 
@@ -362,12 +365,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"/>
@@ -392,7 +389,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"
@@ -426,12 +423,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 CommonCartridge tool</echo>
 	
 		<java
Index: lams_tool_lamc/build.xml
===================================================================
diff -u -r7e5ab4332d4d2fd98387717258e12a7eeebb3013 -r09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a
--- lams_tool_lamc/build.xml	(.../build.xml)	(revision 7e5ab4332d4d2fd98387717258e12a7eeebb3013)
+++ lams_tool_lamc/build.xml	(.../build.xml)	(revision 09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a)
@@ -53,14 +53,14 @@
 		</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>
 		      The JDBC driver you have specified by including one of the files in ${basedir}/config/database
-		      doesn't exist. You have to download this driver separately and put it in ${db.driver.jar}
+		      doesn't exist. You have to download this driver separately and put it in ${db.driver.dir}
 		      Please make sure you're using a version that is equal or superior to the one we looked for.
-		      If you name the driver jar file differently, please update the db.driver.jar property
+		      If you name the driver jar file differently, please update the db.driver.dir property
 		      in the ${basedir}/config/database/xxx.xml file accordingly.
 		     </fail>
 	   </target>
@@ -73,7 +73,7 @@
 			<middlegen appname="lams_tool_lamc11" 
 					   prefsdir="${conf.middlegen.dir}"
 					   gui="${middlegen.gui}"
-					   databaseurl="${db.url}"
+					   databaseurl="${db.url.build}"
 					   driver="${db.driver}"
 					   username="${db.username}"
 					   password="${db.password}"
@@ -286,10 +286,10 @@
 		<!-- =================================================================== -->
 		<target name="rebuild-db"
 			description="rebuild MCQ 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_mc.sql"/>
 				<transaction src="${db.scripts}/create_lams_tool_mc.sql"/>
@@ -302,10 +302,10 @@
 		<!-- =================================================================== -->
 		<target name="clean-tool-db"
 			description="rebuild Mc 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_mc.sql"/>
 			</sql>
@@ -320,12 +320,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"/>
 			 
@@ -369,12 +372,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"/>
@@ -399,7 +396,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"
@@ -430,11 +427,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 MCQ tool</echo>
 	
Index: lams_tool_laqa/build.xml
===================================================================
diff -u -r2a3012f2276337d5f3b2e7eb2a30acc2d4af4176 -r09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a
--- lams_tool_laqa/build.xml	(.../build.xml)	(revision 2a3012f2276337d5f3b2e7eb2a30acc2d4af4176)
+++ lams_tool_laqa/build.xml	(.../build.xml)	(revision 09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a)
@@ -59,14 +59,14 @@
 	</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>
 		      The JDBC driver you have specified by including one of the files in ${basedir}/config/database
-		      doesn't exist. You have to download this driver separately and put it in ${db.driver.jar}
+		      doesn't exist. You have to download this driver separately and put it in ${db.driver.dir}
 		      Please make sure you're using a version that is equal or superior to the one we looked for.
-		      If you name the driver jar file differently, please update the db.driver.jar property
+		      If you name the driver jar file differently, please update the db.driver.dir property
 		      in the ${basedir}/config/database/xxx.xml file accordingly.
 		     </fail>
 	</target>
@@ -76,7 +76,7 @@
 	<target name="middlegen" description="Run Middlegen For QA Tool" unless="middlegen.skip" depends="init,fail-if-no-xdoclet-1.2.x,check-driver-present,panic-if-driver-not-present">
 		<taskdef name="middlegen" classname="middlegen.MiddlegenTask" classpathref="all-libs" />
 
-		<middlegen appname="lams_tool_laqa11" prefsdir="${conf.middlegen.dir}" gui="${middlegen.gui}" databaseurl="${db.url}" driver="${db.driver}" username="${db.username}" password="${db.password}" includeViews="false">
+		<middlegen appname="lams_tool_laqa11" prefsdir="${conf.middlegen.dir}" gui="${middlegen.gui}" databaseurl="${db.url.build}" driver="${db.driver}" username="${db.username}" password="${db.password}" includeViews="false">
 
 			<hibernate destination="${conf.hibernate.mapping.dir}" package="${laqa11.package}" genXDocletTags="true" javaTypeMapper="middlegen.plugins.hibernate.HibernateJavaTypeMapper" />
 
@@ -255,9 +255,9 @@
 	<!-- Clean and rebuild the database. 									 -->
 	<!-- =================================================================== -->
 	<target name="rebuild-db" description="rebuild QA tables">
-		<sql driver="${db.driver}" url="${db.url}" userid="${db.username}" password="${db.password}" encoding="${db.encoding}">
+		<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_qa.sql" />
 			<transaction src="${db.scripts}/create_lams_tool_qa.sql" />
@@ -269,9 +269,9 @@
 	<!-- Clean tool database. 									 -->
 	<!-- =================================================================== -->
 	<target name="clean-tool-db" description="rebuild qa tables">
-		<sql driver="${db.driver}" url="${db.url}" userid="${db.username}" password="${db.password}" encoding="${db.encoding}">
+		<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_qa.sql" />
 		</sql>
@@ -287,10 +287,13 @@
 			<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" />
 
@@ -334,12 +337,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" />
@@ -357,7 +354,7 @@
 			<classpath refid="deploy.lib.classpath" />
 		</taskdef>
 
-		<generateDeployProperties depends="compile" mode="development" outputPath="${build.deploy}" generateForInstallers="${generate.for.installers}" dbPassword="${db.password}" dbUsername="${db.username}" dbDriverUrl="${db.url}" dbDriverClass="com.mysql.jdbc.Driver" deployFiles="${build.deploy}/${product}.war,${build.deploy}/${product}.jar" toolJarFileName="${product}.jar" toolSignature="${signature}" toolVersion="${tool.version}" hideTool="${hideTool}" minServerVersionNumber="${min.server.version.number}" toolUpdateScriptPath="${build.deploy}/sql/updatescripts/updateTo${tool.version}.sql" toolTablesScriptPath="${build.deploy}/sql/create_lams_tool_qa.sql" toolTablesDeleteScriptPath="${build.deploy}/sql/drop_lams_tool_qa.sql" toolActivityInsertScriptPath="${build.deploy}/sql/activity_insert.sql" toolLibraryInsertScriptPath="${build.deploy}/sql/library_insert.sql" toolInsertScriptPath="${build.deploy}/sql/tool_insert.sql" toolDBVersionScriptPath="${build.deploy}/sql/db_version_insert.sql" toolApplicationContextPath="/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml" lamsEarPath="${jboss.deploy}" toolContext="${toolContext}" toolWebUri="${product}.war" languageFilesPackage="org.lamsfoundation.lams.tool.qa">
+		<generateDeployProperties depends="compile" mode="development" outputPath="${build.deploy}" generateForInstallers="${generate.for.installers}" dbPassword="${db.password}" dbUsername="${db.username}" dbDriverUrl="${db.url.build}" dbDriverClass="com.mysql.jdbc.Driver" deployFiles="${build.deploy}/${product}.war,${build.deploy}/${product}.jar" toolJarFileName="${product}.jar" toolSignature="${signature}" toolVersion="${tool.version}" hideTool="${hideTool}" minServerVersionNumber="${min.server.version.number}" toolUpdateScriptPath="${build.deploy}/sql/updatescripts/updateTo${tool.version}.sql" toolTablesScriptPath="${build.deploy}/sql/create_lams_tool_qa.sql" toolTablesDeleteScriptPath="${build.deploy}/sql/drop_lams_tool_qa.sql" toolActivityInsertScriptPath="${build.deploy}/sql/activity_insert.sql" toolLibraryInsertScriptPath="${build.deploy}/sql/library_insert.sql" toolInsertScriptPath="${build.deploy}/sql/tool_insert.sql" toolDBVersionScriptPath="${build.deploy}/sql/db_version_insert.sql" toolApplicationContextPath="/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml" lamsEarPath="${jboss.deploy}" toolContext="${toolContext}" toolWebUri="${product}.war" languageFilesPackage="org.lamsfoundation.lams.tool.qa">
 
 			<!-- language files go as a fileset. Not nice but can't work out how to embed them in a tag. -->
 			<fileset dir="${build.deploy}/language">
@@ -386,11 +383,14 @@
 
 	<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 QA tool</echo>
 
Index: lams_tool_larsrc/build.xml
===================================================================
diff -u -ra20a8a284fe4d12369cefbec952022b58f437811 -r09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a
--- lams_tool_larsrc/build.xml	(.../build.xml)	(revision a20a8a284fe4d12369cefbec952022b58f437811)
+++ lams_tool_larsrc/build.xml	(.../build.xml)	(revision 09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a)
@@ -154,20 +154,20 @@
 	<!-- Share Resources Database tasks                                       -->
 	<!-- =================================================================== -->
 	<target name="clean-db"	description="clean share resources 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_rsrc.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_rsrc.sql"/>
 			<transaction src="${db.scripts}/create_lams_tool_rsrc.sql"/>
@@ -176,10 +176,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_rsrc_data.sql"/>
 		</sql>
@@ -314,14 +314,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"/> 
 		 
@@ -365,12 +368,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"/>
@@ -395,7 +392,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"
@@ -429,11 +426,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 Share Resources tool</echo>
 	
Index: lams_tool_mindmap/build.xml
===================================================================
diff -u -rd2057fdd8708c4c7e5665bdc3ee25b72212aaecb -r09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a
--- lams_tool_mindmap/build.xml	(.../build.xml)	(revision d2057fdd8708c4c7e5665bdc3ee25b72212aaecb)
+++ lams_tool_mindmap/build.xml	(.../build.xml)	(revision 09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a)
@@ -148,21 +148,21 @@
 		===================================================================
 	-->
 	<target name="clean-db" description="Deletes the Tool 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_mindmap.sql" />
 		</sql>
 	</target>
 
 	<target name="build-db" depends=""
 		description="Deletes and Creates the Tool tables and inserts default content">
-		<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}/create_lams_tool_mindmap.sql" />
 		</sql>
@@ -400,14 +400,17 @@
 	<target name="create-deploy-package" depends="build-war"
 		description="Generate the deployment package.">
 
-		<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}/lang" />
 
@@ -452,12 +455,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" />
@@ -480,7 +477,7 @@
 		<generateDeployProperties depends="compile"
 			mode="development" outputPath="${build.deploy}"
 			generateForInstallers="${generate.for.installers}" dbPassword="${db.password}"
-			dbUsername="${db.username}" dbDriverUrl="${db.url}" dbDriverClass="com.mysql.jdbc.Driver"
+			dbUsername="${db.username}" dbDriverUrl="${db.url.build}" dbDriverClass="com.mysql.jdbc.Driver"
 			deployFiles="${build.deploy}/${product}.war,${build.deploy}/${product}.jar"
 			toolJarFileName="${product}.jar" toolSignature="${signature}"
 			toolVersion="${tool.version}" hideTool="${hideTool}"
@@ -509,9 +506,12 @@
 	<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>
+			<fileset dir="${sharedlib}">
+				<include name="**/*.jar" />
+			</fileset>
 		</path>
 
 		<echo>Deploying the Mindmap Tool</echo>
Index: lams_tool_nb/build.xml
===================================================================
diff -u -r93aa85a72fd9f1ae7500829c8371d4b90765a1b1 -r09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a
--- lams_tool_nb/build.xml	(.../build.xml)	(revision 93aa85a72fd9f1ae7500829c8371d4b90765a1b1)
+++ lams_tool_nb/build.xml	(.../build.xml)	(revision 09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a)
@@ -133,30 +133,30 @@
 	<!-- Database Tasks                                             -->
 	<!-- =================================================================== -->
 		<target name="clean-db"	description="Deletes the Noticeboard Tool 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_nb.sql"/>
 			</sql>
 		</target>
 		
 		<target name="build-db" depends="" description="Deletes and Creates the Noticeboard Tool tables and inserts default content">
-			<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}/init_lams_tool_nb.sql"/>
 			</sql>
 		</target>	
 	
 	<!--	<target name="insert-test-data" depends="build-db" description="Inserts test data for noticeboard tool in order for test cases to run">
-				<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_lams_tool_nb_data.sql"/>
 				</sql>
@@ -171,10 +171,10 @@
 		                <filter token="default_content_id" value="${test.contentid}"/>
 			        </filterset>
 			    </copy>
-				<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_nb.sql"/>
 				<transaction src="${build.sql}/create_lams_tool_nb_test.sql"/>
@@ -271,7 +271,7 @@
 	         appname="${name}"
 	         prefsdir="${middlegen}"
 	         gui="${middlegen.gui}"
-	         databaseurl="${db.url}"
+	         databaseurl="${db.url.build}"
 	         initialContextFactory="${java.naming.factory.initial}"
 	         providerURL="${java.naming.provider.url}"
 	         datasourceJNDIName="${datasource.jndi.name}"
@@ -389,14 +389,17 @@
 		<target name="create-deploy-package" depends="build-war" 
 				description="Generate the deployment package.">
 
-				<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}/lang"/> 
 				<mkdir dir="${build.deploy}/language"/>
@@ -441,12 +444,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"/>
@@ -471,7 +468,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"
@@ -502,11 +499,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 Noticeboard Tool</echo>
 		
Index: lams_tool_notebook/build.xml
===================================================================
diff -u -r958ff334a0e0eefe817c84e80d6d87551ab43243 -r09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a
--- lams_tool_notebook/build.xml	(.../build.xml)	(revision 958ff334a0e0eefe817c84e80d6d87551ab43243)
+++ lams_tool_notebook/build.xml	(.../build.xml)	(revision 09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a)
@@ -135,18 +135,18 @@
 	<!-- Database Tasks                                             -->
 	<!-- =================================================================== -->
 	<target name="clean-db" description="Deletes the Tool Tables">
-		<sql driver="${db.driver}" url="${db.url}" userid="${db.username}" password="${db.password}"  encoding="${db.encoding}">
+		<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_notebook.sql" />
 		</sql>
 	</target>
 
 	<target name="build-db" depends="" description="Deletes and Creates the Tool tables and inserts default content">
-		<sql driver="${db.driver}" url="${db.url}" userid="${db.username}" password="${db.password}"  encoding="${db.encoding}">
+		<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}/create_lams_tool_notebook.sql" />
 		</sql>
@@ -368,10 +368,13 @@
 			<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}/lang" />
 
@@ -415,12 +418,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" />
@@ -445,7 +442,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"
@@ -478,9 +475,12 @@
 	<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>
+			<fileset dir="${sharedlib}">
+				<include name="**/*.jar" />
+			</fileset>
 		</path>
 
 		<echo>Deploying the Notebook Tool</echo>
Index: lams_tool_pixlr/build.xml
===================================================================
diff -u -re6db9414403d1ec43af7ffbe94a9efeb14b7ec79 -r09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a
--- lams_tool_pixlr/build.xml	(.../build.xml)	(revision e6db9414403d1ec43af7ffbe94a9efeb14b7ec79)
+++ lams_tool_pixlr/build.xml	(.../build.xml)	(revision 09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a)
@@ -135,18 +135,18 @@
 	<!-- Database Tasks                                             -->
 	<!-- =================================================================== -->
 	<target name="clean-db" description="Deletes the Tool Tables">
-		<sql driver="${db.driver}" url="${db.url}" userid="${db.username}" password="${db.password}"  encoding="${db.encoding}">
+		<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_pixlr.sql" />
 		</sql>
 	</target>
 
 	<target name="build-db" depends="" description="Deletes and Creates the Tool tables and inserts default content">
-		<sql driver="${db.driver}" url="${db.url}" userid="${db.username}" password="${db.password}"  encoding="${db.encoding}">
+		<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}/create_lams_tool_pixlr.sql" />
 		</sql>
@@ -335,14 +335,17 @@
 	<!-- =================================================================== -->
 	<target name="create-deploy-package" depends="build-war" description="Generate the deployment package.">
 
-		<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}/lang" />
 
@@ -386,12 +389,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" />
@@ -416,7 +413,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"
@@ -449,11 +446,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>
+			<fileset dir="${sharedlib}">
+				<include name="**/*.jar" />
+			</fileset>
 		</path>
-
 		<echo>Deploying the Pixlr Tool</echo>
 
 		<java classname="org.lamsfoundation.lams.tool.deploy.Deploy" classpathref="deploy.classpath" fork="true">
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>
 
Index: lams_tool_scribe/build.xml
===================================================================
diff -u -rd2057fdd8708c4c7e5665bdc3ee25b72212aaecb -r09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a
--- lams_tool_scribe/build.xml	(.../build.xml)	(revision d2057fdd8708c4c7e5665bdc3ee25b72212aaecb)
+++ lams_tool_scribe/build.xml	(.../build.xml)	(revision 09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a)
@@ -135,18 +135,18 @@
 	<!-- Database Tasks                                             -->
 	<!-- =================================================================== -->
 	<target name="clean-db" description="Deletes the Tool Tables">
-		<sql driver="${db.driver}" url="${db.url}" userid="${db.username}" password="${db.password}" encoding="${db.encoding}">
+		<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_scribe.sql" />
 		</sql>
 	</target>
 
 	<target name="build-db" depends="" description="Deletes and Creates the Tool tables and inserts default content">
-		<sql driver="${db.driver}" url="${db.url}" userid="${db.username}" password="${db.password}"  encoding="${db.encoding}">
+		<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}/create_lams_tool_scribe.sql" />
 		</sql>
@@ -335,14 +335,17 @@
 	<!-- =================================================================== -->
 	<target name="create-deploy-package" depends="build-war" description="Generate the deployment package.">
 
-		<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}/lang" />
 
@@ -386,12 +389,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" />
@@ -416,7 +413,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"
@@ -450,9 +447,12 @@
 
 
 		<path id="deploy.classpath">
-			<fileset dir="${build.deploy}">
-				<include name="lib/*.jar" />
+			<fileset dir="${deploy.tool.dir}/lib">
+				<include name="*.jar" />
 			</fileset>
+			<fileset dir="${sharedlib}">
+				<include name="**/*.jar" />
+			</fileset>
 		</path>
 
 		<echo>Deploying the Scribe Tool</echo>
@@ -463,9 +463,9 @@
 		</java>
 
 		<!-- echo>Marking activity as invalid - set it to valid if debugging or use the combined chat/scribe or forum/scribe activity. This is not an error.</echo>
-		<sql driver="${db.driver}" url="${db.url}" userid="${db.username}" password="${db.password}" encoding="${db.encoding}">
+		<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}/make_activity_invalid.sql" />
 		</sql -->
Index: lams_tool_spreadsheet/build.xml
===================================================================
diff -u -rd2057fdd8708c4c7e5665bdc3ee25b72212aaecb -r09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a
--- lams_tool_spreadsheet/build.xml	(.../build.xml)	(revision d2057fdd8708c4c7e5665bdc3ee25b72212aaecb)
+++ lams_tool_spreadsheet/build.xml	(.../build.xml)	(revision 09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a)
@@ -150,20 +150,20 @@
 	<!-- Spreadsheet Database tasks                                       -->
 	<!-- =================================================================== -->
 	<target name="clean-db"	description="clean spreadsheet 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_spreadsheet.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_spreadsheet.sql"/>
 			<transaction src="${db.scripts}/create_lams_tool_spreadsheet.sql"/>
@@ -172,10 +172,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_spreadsheet_data.sql"/>
 		</sql>
@@ -308,14 +308,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"/> 
 		 
@@ -359,12 +362,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"/>
@@ -389,7 +386,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"
@@ -423,11 +420,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 Spreadsheet tool</echo>
 	
Index: lams_tool_survey/build.xml
===================================================================
diff -u -rd2057fdd8708c4c7e5665bdc3ee25b72212aaecb -r09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a
--- lams_tool_survey/build.xml	(.../build.xml)	(revision d2057fdd8708c4c7e5665bdc3ee25b72212aaecb)
+++ lams_tool_survey/build.xml	(.../build.xml)	(revision 09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a)
@@ -151,20 +151,20 @@
 	<!-- Survey Database tasks                                       -->
 	<!-- =================================================================== -->
 	<target name="clean-db"	description="clean share surveys 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_survey.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_survey.sql"/>
 			<transaction src="${db.scripts}/create_lams_tool_survey.sql"/>
@@ -173,10 +173,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_survey_data.sql"/>
 		</sql>
@@ -307,12 +307,15 @@
 		<echo>+------------------------------------------+</echo>
 		<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"/> 
 		 
@@ -356,12 +359,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"/>
@@ -386,7 +383,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"
@@ -421,11 +418,14 @@
 
 	<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 Survey tool</echo>
 	
Index: lams_tool_task/build.xml
===================================================================
diff -u -rd2057fdd8708c4c7e5665bdc3ee25b72212aaecb -r09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a
--- lams_tool_task/build.xml	(.../build.xml)	(revision d2057fdd8708c4c7e5665bdc3ee25b72212aaecb)
+++ lams_tool_task/build.xml	(.../build.xml)	(revision 09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a)
@@ -155,20 +155,20 @@
 	<!-- TaskList Database tasks                                       -->
 	<!-- =================================================================== -->
 	<target name="clean-db"	description="clean taskList 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_taskList.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_taskList.sql"/>
 			<transaction src="${db.scripts}/create_lams_tool_taskList.sql"/>
@@ -177,10 +177,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_taskList_data.sql"/>
 		</sql>
@@ -309,14 +309,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"/> 
 		 
@@ -360,12 +363,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"/>
@@ -390,7 +387,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"
@@ -424,11 +421,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 TaskList tool</echo>
 	
Index: lams_tool_videorecorder/build.xml
===================================================================
diff -u -rf0bef7d11b4f82936c417e6e55c25fe9bfdb9a82 -r09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a
--- lams_tool_videorecorder/build.xml	(.../build.xml)	(revision f0bef7d11b4f82936c417e6e55c25fe9bfdb9a82)
+++ lams_tool_videorecorder/build.xml	(.../build.xml)	(revision 09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a)
@@ -135,18 +135,18 @@
 	<!-- Database Tasks                                             -->
 	<!-- =================================================================== -->
 	<target name="clean-db" description="Deletes the Tool Tables">
-		<sql driver="${db.driver}" url="${db.url}" userid="${db.username}" password="${db.password}"  encoding="${db.encoding}">
+		<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_videoRecorder.sql" />
 		</sql>
 	</target>
 
 	<target name="build-db" depends="" description="Deletes and Creates the Tool tables and inserts default content">
-		<sql driver="${db.driver}" url="${db.url}" userid="${db.username}" password="${db.password}"  encoding="${db.encoding}">
+		<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}/create_lams_tool_videoRecorder.sql" />
 		</sql>
@@ -358,10 +358,13 @@
 			<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}/lang" />
 
@@ -405,12 +408,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" />
@@ -435,7 +432,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"
@@ -467,11 +464,14 @@
 
 	<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 VideoRecorder Tool</echo>
 
Index: lams_tool_vote/build.xml
===================================================================
diff -u -r15dba48903f459fd983b525047ce21373d5a44ec -r09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a
--- lams_tool_vote/build.xml	(.../build.xml)	(revision 15dba48903f459fd983b525047ce21373d5a44ec)
+++ lams_tool_vote/build.xml	(.../build.xml)	(revision 09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a)
@@ -73,14 +73,14 @@
 		</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>
 		      The JDBC driver you have specified by including one of the files in ${basedir}/config/database
-		      doesn't exist. You have to download this driver separately and put it in ${db.driver.jar}
+		      doesn't exist. You have to download this driver separately and put it in ${db.driver.dir}
 		      Please make sure you're using a version that is equal or superior to the one we looked for.
-		      If you name the driver jar file differently, please update the db.driver.jar property
+		      If you name the driver jar file differently, please update the db.driver.dir property
 		      in the ${basedir}/config/database/xxx.xml file accordingly.
 		     </fail>
 	   </target>
@@ -93,7 +93,7 @@
 			<middlegen appname="lams_tool_vote11" 
 					   prefsdir="${conf.middlegen.dir}"
 					   gui="${middlegen.gui}"
-					   databaseurl="${db.url}"
+					   databaseurl="${db.url.build}"
 					   driver="${db.driver}"
 					   username="${db.username}"
 					   password="${db.password}"
@@ -302,10 +302,10 @@
 		<!-- =================================================================== -->
 		<target name="rebuild-db"
 			description="rebuild Voting 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_vote.sql"/>
 				<transaction src="${db.scripts}/create_lams_tool_vote.sql"/>
@@ -318,10 +318,10 @@
 		<!-- =================================================================== -->
 		<target name="clean-tool-db"
 			description="rebuild Voting 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_vote.sql"/>
 			</sql>
@@ -334,14 +334,17 @@
 		<target name="create-deploy-package" depends="lams-vote11-war" 
 			description="Generate the deployment package.">
 
-			<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"/>
 			 
@@ -385,12 +388,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"/>
@@ -415,7 +412,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"
@@ -448,10 +445,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 Voting tool</echo>
 	
Index: lams_tool_wiki/build.xml
===================================================================
diff -u -r958ff334a0e0eefe817c84e80d6d87551ab43243 -r09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a
--- lams_tool_wiki/build.xml	(.../build.xml)	(revision 958ff334a0e0eefe817c84e80d6d87551ab43243)
+++ lams_tool_wiki/build.xml	(.../build.xml)	(revision 09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a)
@@ -152,18 +152,18 @@
 	<!-- Database Tasks                                             -->
 	<!-- =================================================================== -->
 	<target name="clean-db" description="Deletes the Tool Tables">
-		<sql driver="${db.driver}" url="${db.url}" userid="${db.username}" password="${db.password}"  encoding="${db.encoding}">
+		<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_wiki.sql" />
 		</sql>
 	</target>
 
 	<target name="build-db" depends="" description="Deletes and Creates the Tool tables and inserts default content">
-		<sql driver="${db.driver}" url="${db.url}" userid="${db.username}" password="${db.password}"  encoding="${db.encoding}">
+		<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}/create_lams_tool_wiki.sql" />
 		</sql>
@@ -387,10 +387,13 @@
 			<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}/lang" />
 
@@ -434,12 +437,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" />
@@ -464,7 +461,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"
@@ -497,9 +494,12 @@
 	<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>
+			<fileset dir="${sharedlib}">
+				<include name="**/*.jar" />
+			</fileset>
 		</path>
 
 		<echo>Deploying the Wiki Tool</echo>
Index: lams_tool_wookie/build.xml
===================================================================
diff -u -r705d4b051cba5f8acaf541cd23d0846b92d82869 -r09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a
--- lams_tool_wookie/build.xml	(.../build.xml)	(revision 705d4b051cba5f8acaf541cd23d0846b92d82869)
+++ lams_tool_wookie/build.xml	(.../build.xml)	(revision 09e1ed92cb07d7de4564f9dd3a0b4465d8c94e8a)
@@ -135,18 +135,18 @@
 	<!-- Database Tasks                                             -->
 	<!-- =================================================================== -->
 	<target name="clean-db" description="Deletes the Tool Tables">
-		<sql driver="${db.driver}" url="${db.url}" userid="${db.username}" password="${db.password}"  encoding="${db.encoding}">
+		<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_wookie.sql" />
 		</sql>
 	</target>
 
 	<target name="build-db" depends="" description="Deletes and Creates the Tool tables and inserts default content">
-		<sql driver="${db.driver}" url="${db.url}" userid="${db.username}" password="${db.password}"  encoding="${db.encoding}">
+		<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}/create_lams_tool_wookie.sql" />
 		</sql>
@@ -336,14 +336,17 @@
 	<!-- =================================================================== -->
 	<target name="create-deploy-package" depends="build-war" description="Generate the deployment package.">
 
-		<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}/lang" />
 
@@ -387,12 +390,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" />
@@ -417,7 +414,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"
@@ -450,9 +447,12 @@
 	<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>
+			<fileset dir="${sharedlib}">
+				<include name="**/*.jar" />
+			</fileset>
 		</path>
 
 		<echo>Deploying the Wookie Tool</echo>