Index: lams_build/shared.properties
===================================================================
diff -u -r4fe37c041999fe089f4ae14dc4cd277812ea7e84 -rbc4c13e34d34c094ad4ef1d23d3c8d630d6b5609
--- lams_build/shared.properties	(.../shared.properties)	(revision 4fe37c041999fe089f4ae14dc4cd277812ea7e84)
+++ lams_build/shared.properties	(.../shared.properties)	(revision bc4c13e34d34c094ad4ef1d23d3c8d630d6b5609)
@@ -19,11 +19,12 @@
 
 # Properties needed to run master-build. These are platform independent properties
 
-assembly.dir=assembly
+assembly=assembly
 lams.ear=lams.ear
-assembly.lams.ear=${assembly.dir}/lams.ear
-assembly.temp.ear=${assembly.dir}/temp.ear
-lib.dir=lib
+assembly.lams.ear=${assembly}/lams.ear
+assembly.temp.ear=${assembly}/temp.ear
+deploy.tool=deploy-tool
+lib=lib
 app.xml=conf/j2ee/application.xml
 lams_common=lams_common
 lams_admin=lams_admin
@@ -33,16 +34,20 @@
 lams_workspace=lams_workspace
 lams_central=lams_central
 lams_contentrepository=lams_contentrepository
-sub.build.dir=build/lib
-lams.jar=${lams_common}/${sub.build.dir}/lams.jar
-lams_admin.war=${lams_admin}/${sub.build.dir}/lams_admin.war
-lams_learning.jar=${lams_learning}/${sub.build.dir}/lams-learning.jar
-lams_learning.war=${lams_learning}/${sub.build.dir}/lams-learning.war
-lams_authoring.jar=${lams_authoring}/${sub.build.dir}/lams-authoring.jar
-lams_authoring.war=${lams_authoring}/${sub.build.dir}/lams-authoring.war
-lams_monitoring.jar=${lams_monitoring}/${sub.build.dir}/lams-monitoring.jar
-lams_monitoring.war=${lams_monitoring}/${sub.build.dir}/lams-monitoring.war
-lams_workspace.jar=${lams_workspace}/${sub.build.dir}/lams-workspace.jar
-lams_workspace.war=${lams_workspace}/${sub.build.dir}/lams-workspace.war
-lams_central.war=${lams_central}/${sub.build.dir}/lams-central.war
-lams_contentrepository.jar=${lams_contentrepository}/${sub.build.dir}/lams-contentrepository.jar
+lams_tool_deploy=lams_tool_deploy
+sub.build=build/lib
+lams.jar=${lams_common}/${sub.build}/lams.jar
+lams-admin.war=${lams_admin}/${sub.build}/lams-admin.war
+lams-learning.jar=${lams_learning}/${sub.build}/lams-learning.jar
+lams-learning.war=${lams_learning}/${sub.build}/lams-learning.war
+lams-authoring.jar=${lams_authoring}/${sub.build}/lams-authoring.jar
+lams-authoring.war=${lams_authoring}/${sub.build}/lams-authoring.war
+lams-monitoring.jar=${lams_monitoring}/${sub.build}/lams-monitoring.jar
+lams-monitoring.war=${lams_monitoring}/${sub.build}/lams-monitoring.war
+lams-workspace.jar=${lams_workspace}/${sub.build}/lams-workspace.jar
+lams-workspace.war=${lams_workspace}/${sub.build}/lams-workspace.war
+lams-central.war=${lams_central}/${sub.build}/lams-central.war
+lams-contentrepository.jar=${lams_contentrepository}/${sub.build}/lams-contentrepository.jar
+
+# Known tools
+tool_imscp_dir=lams_tool_imscp