Index: lams_build/build_tools_base.xml
===================================================================
diff -u -rcb69f2265bc2857b84eb7c06039b1c14658cce86 -r088dbcf441a1443c55042ca298850077bdee7028
--- lams_build/build_tools_base.xml	(.../build_tools_base.xml)	(revision cb69f2265bc2857b84eb7c06039b1c14658cce86)
+++ lams_build/build_tools_base.xml	(.../build_tools_base.xml)	(revision 088dbcf441a1443c55042ca298850077bdee7028)
@@ -14,7 +14,7 @@
 	<import file="${toolsbase.dir}/build_base.xml"/> 
 	
 	<path id="deploy.classpath">
-		<fileset dir="${deploy.tool.dir}/lib">
+		<fileset dir="../lams_build/deploy-tool/lib">
 			<include name="*.jar" />
 		</fileset>
 	</path>
@@ -71,12 +71,12 @@
 		</taskdef>
 			
 		<echo>${ant.project.name}: Preparing Hibernate connection configuration</echo>
-		<copy todir="${build}" verbose="true">
-			<fileset dir="${conf.hibernate.mapping.dir}">
+		<copy todir="${basedir}/build" verbose="true">
+			<fileset dir="${conf.dir}/hibernate/mappings">
 				<include name="hibernate.cfg.xml" />
 			</fileset>
 	        <filterset>
-	        	<filter token="db.driver" value="${db.driver}"/>
+	        	<filter token="db.driver" value="com.mysql.jdbc.Driver"/>
 	        	<filter token="db.url.run" value="${db.url.run}"/>
                 <filter token="db.username" value="${db.username}"/>
                 <filter token="db.password" value="${db.password}"/>
@@ -85,13 +85,13 @@
 		
 		<echo>${ant.project.name}: Running schema export for all hbm.xml files in build dir</echo>
 		<schemaexport
-			config="${build}/hibernate.cfg.xml"
+			config="${basedir}/build/hibernate.cfg.xml"
 			quiet="no"
 			text="no"
 			drop="no"
 			delimiter=";"
 			output="${db.scripts}/table-schema.sql">
-			<fileset dir="${build.classes.java}">
+			<fileset dir="${basedir}/build/classes/java">
 				<include name="**/*.hbm.xml"/>
 			</fileset>
 		</schemaexport>	
@@ -116,14 +116,14 @@
 		<echo>${ant.project.name}: Creating deployment package</echo>
 
 		<echo>${ant.project.name}: Copying additional libraries and scripts for deployment</echo>
-		<copy todir="${build.deploy}" overwrite="true" verbose="true">
-			<fileset dir="${deploy.tool.dir}">
+		<copy todir="${basedir}/build/deploy" overwrite="true" verbose="true">
+			<fileset dir="../lams_build/deploy-tool">
 				<include name="**" />
 			</fileset>
 		</copy>
 		
 		<echo>${ant.project.name}: Copying Tool SQL files</echo>
-		<copy overwrite="true" todir="${build.deploy.sql}" verbose="true">
+		<copy overwrite="true" todir="${basedir}/build/deploy/sql" verbose="true">
 			<fileset dir="${db.scripts}/">
 				<include name="${tool.build.sql.drop}" />
 				<include name="${tool.build.sql.create}" />
@@ -132,7 +132,7 @@
 			</fileset>
 		</copy>
 		
-		<copy todir="${build.deploy.sql}" overwrite="true" verbose="true">
+		<copy todir="${basedir}/build/deploy/sql" overwrite="true" verbose="true">
 			<fileset dir="${db.scripts}/">
 				<include name="tool_insert.sql" />
 			</fileset>	
@@ -141,7 +141,7 @@
 			</filterset>
 		</copy>
 		
-		<copy todir="${build.deploy.sql}" overwrite="true" verbose="true">
+		<copy todir="${basedir}/build/deploy/sql" overwrite="true" verbose="true">
 			<fileset dir="${db.scripts}/">
 				<include name="db_version_insert.sql" />
 			</fileset>	
@@ -152,16 +152,16 @@
 		</copy>
 		
 		<echo>${ant.project.name}: Copying Tool language files</echo>
-		<copy todir="${build.deploy.language}" overwrite="true">
-			<fileset dir="${conf.language.dir}">
+		<copy todir="${basedir}/build/deploy/language" overwrite="true">
+			<fileset dir="${conf.dir}/language/lams">
 				<include name="*.properties" />
 				<include name="*.txt" />
 			</fileset>
 		</copy>
 		
 		<echo>${ant.project.name}: Copying Tool JAR and WAR</echo>
-		<copy todir="${build.deploy}" overwrite="true" verbose="true">
-			<fileset dir="${build.lib}">
+		<copy todir="${basedir}/build/deploy" overwrite="true" verbose="true">
+			<fileset dir="${basedir}/build/lib">
 				<include name="*.jar"/>
 				<include name="*.war"/>
 			</fileset>
@@ -174,33 +174,33 @@
 		<echo>${ant.project.name}: Preparing Deployment Properties file</echo>
 		<generateDeployProperties depends="compile"
 			mode="development" 
-			outputPath="${build.deploy}" 
+			outputPath="${basedir}/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" 
+			deployFiles="${basedir}/build/deploy/${product}.war,${basedir}/build/deploy/${product}.jar" 
 			toolJarFileName="${product}.jar"
 			toolSignature="${signature}"
 			toolVersion="${tool.version}"
 			hideTool="${tool.hide}"
 			minServerVersionNumber="${min.server.version.number}"
-			toolTablesScriptPath="${build.deploy.sql}/${tool.build.sql.create}" 
-			toolTablesDeleteScriptPath="${build.deploy.sql}/${tool.build.sql.drop}" 
-			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"
+			toolTablesScriptPath="${basedir}/build/deploy/sql/${tool.build.sql.create}" 
+			toolTablesDeleteScriptPath="${basedir}/build/deploy/sql/${tool.build.sql.drop}" 
+			toolActivityInsertScriptPath="${basedir}/build/deploy/sql/activity_insert.sql" 
+			toolLibraryInsertScriptPath="${basedir}/build/deploy/sql/library_insert.sql" 
+			toolInsertScriptPath="${basedir}/build/deploy/sql/tool_insert.sql" 
+			toolDBVersionScriptPath="${basedir}/build/deploy/sql/db_version_insert.sql"
 			toolApplicationContextPath="/${product.path.filesystem}/${tool.application.context.file}"
-			lamsEarPath="${jboss.deploy}"
+			lamsEarPath="${jboss.home}server/default/deploy/lams.ear"
 			toolContext="${toolContext}" 
 			toolWebUri="${product}.war"
 			languageFilesPackage="${product.path.java}">
 			
 			<!-- 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}">
+			<fileset dir="${basedir}/build/deploy/language">
 				<include name="**/*.properties" />
 				<include name="**/*.txt" />
 			</fileset>
@@ -213,7 +213,7 @@
 		<!-- Internal target: Deploys Tool package. -->
 		<echo>Deploying ${ant.project.name} package</echo>
 		<java classname="org.lamsfoundation.lams.tool.deploy.Deploy" classpathref="deploy.classpath" fork="true">
-			<arg file="${build.deploy}/deploy.xml" />
+			<arg file="${basedir}/build/deploy/deploy.xml" />
 			<arg value="True" /> <!-- forcedb -->
 		</java>
 	</target>