Index: lams_tool_pixlr/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_pixlr/build.xml,v
diff -u -r1.4 -r1.5
--- lams_tool_pixlr/build.xml	24 Apr 2009 01:49:28 -0000	1.4
+++ lams_tool_pixlr/build.xml	6 Mar 2012 11:16:47 -0000	1.5
@@ -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">