Index: lams_tool_vote/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/build.xml,v
diff -u -r1.23 -r1.24
--- lams_tool_vote/build.xml	10 Feb 2012 21:13:21 -0000	1.23
+++ lams_tool_vote/build.xml	6 Mar 2012 11:15:40 -0000	1.24
@@ -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>