Index: lams_build/common.properties
===================================================================
diff -u -r45d5d0f28821d8bef170927cf179c71f1ae35b73 -r4467c6fe0d440952c6ae1a172216d1e5289bfe9d
--- lams_build/common.properties	(.../common.properties)	(revision 45d5d0f28821d8bef170927cf179c71f1ae35b73)
+++ lams_build/common.properties	(.../common.properties)	(revision 4467c6fe0d440952c6ae1a172216d1e5289bfe9d)
@@ -9,7 +9,7 @@
 
 # Directory where third party jars reside.
 sharedlib=../lams_build/lib
-j2eelibs=D:/eclipseplugins/myeclipse/eclipse/plugins/com.genuitec.eclipse.j2eedt.core_3.8.4/data/libraryset/1.4
+j2eelibs=D:/Program Files/myeclipse/eclipse/plugins/com.genuitec.eclipse.j2eedt.core_3.8.4/data/libraryset/1.4
 
 #deploy tool directory
 deploy.tool.dir=../lams_build/deploy-tool
@@ -56,7 +56,9 @@
 
 #JBoss deploy directory
 jboss.home=D:/jboss-4.0.2/
+jboss.ear.deploy=${jboss.home}server/default/deploy/
 jboss.deploy=${jboss.home}server/default/deploy/lams.ear
+jboss.server=${jboss.home}server/
 
 #middlegen properties
 middlegen = ${conf.dir}/middlegen
Index: lams_build/master-build.xml
===================================================================
diff -u -r84af64052b65a5a8f91e42f58f03e8362c5eb3de -r4467c6fe0d440952c6ae1a172216d1e5289bfe9d
--- lams_build/master-build.xml	(.../master-build.xml)	(revision 84af64052b65a5a8f91e42f58f03e8362c5eb3de)
+++ lams_build/master-build.xml	(.../master-build.xml)	(revision 4467c6fe0d440952c6ae1a172216d1e5289bfe9d)
@@ -3,6 +3,7 @@
 <project name="LAMS" default="usage" basedir=".">
 
 	<!-- import properties from the shared and o/s specific files -->
+	<property file="common.properties" />
 	<property file="shared.properties" />
 	<property file="windows.properties" />
 
@@ -152,7 +153,7 @@
 
 	<target name="deploy-ear" 
 		description="Deploys previously assembled ear to jboss">
-		<copy todir="${jboss.deploy}" overwrite="true"
+		<copy todir="${jboss.ear.deploy}" overwrite="true"
 			failonerror="true" verbose="true">
 			<fileset dir="${assembly}">
 				<include name="${lams.ear}/**/*.*" />
@@ -168,25 +169,25 @@
 	<target name="deploy-tools">
 		<ant antfile="../${tool_forum_dir}/build.xml" target="deploy-tool"
 				inheritAll="false" >
-			<property name="jboss.deploy" location="${jboss.deploy}/lams.ear"/>
+			<property name="jboss.deploy" location="${jboss.deploy}"/>
 		</ant>
 		<ant antfile="../${tool_imscp_dir}/build.xml" target="deploy-tool"
 				inheritAll="false" >
-			<property name="jboss.deploy" location="${jboss.deploy}/lams.ear"/>
+			<property name="jboss.deploy" location="${jboss.deploy}"/>
 		</ant>
 		<ant antfile="../${tool_laqa_dir}/build.xml" target="deploy-tool"
 				inheritAll="false" >
-			<property name="jboss.deploy" location="${jboss.deploy}/lams.ear"/>
+			<property name="jboss.deploy" location="${jboss.deploy}"/>
 		</ant>
 
 		<ant antfile="../${tool_lanb_dir}/build.xml" target="deploy-tool"
 				inheritAll="false" >
-			<property name="jboss.deploy" location="${jboss.deploy}/lams.ear"/>
+			<property name="jboss.deploy" location="${jboss.deploy}"/>
 		</ant>
 
 		<ant antfile="../${tool_sbmt_dir}/build.xml" target="deploy-tool"
 				inheritAll="false" >
-			<property name="jboss.deploy" location="${jboss.deploy}/lams.ear"/>
+			<property name="jboss.deploy" location="${jboss.deploy}"/>
 		</ant>
 
 	</target>
@@ -218,7 +219,7 @@
 				<include name="*.dtd" />
 			</fileset>
 		</copy>
-		<copy overwrite="yes" todir="${jboss.deploy}">
+		<copy overwrite="yes" todir="${jboss.ear.deploy}">
 			<fileset dir="${conf.jboss}/service">
 				<include name="mysql*.xml" />
 			</fileset>
Index: lams_build/unix.properties
===================================================================
diff -u -rbc4c13e34d34c094ad4ef1d23d3c8d630d6b5609 -r4467c6fe0d440952c6ae1a172216d1e5289bfe9d
--- lams_build/unix.properties	(.../unix.properties)	(revision bc4c13e34d34c094ad4ef1d23d3c8d630d6b5609)
+++ lams_build/unix.properties	(.../unix.properties)	(revision 4467c6fe0d440952c6ae1a172216d1e5289bfe9d)
@@ -22,10 +22,6 @@
 # of *nix. Named unix.properties for convenience - linuxunix.properties 
 # would have looked odd, as does otheros.properties.
 
-jboss.home=/var/jboss
-jboss.server=${jboss.home}/server/
-jboss.deploy=${jboss.server}/default/deploy
-
 conf=${basedir}/conf/unix
 conf.jboss=${conf}/jboss
 conf.auth=${conf}/authentication
Index: lams_build/windows.properties
===================================================================
diff -u -rbc4c13e34d34c094ad4ef1d23d3c8d630d6b5609 -r4467c6fe0d440952c6ae1a172216d1e5289bfe9d
--- lams_build/windows.properties	(.../windows.properties)	(revision bc4c13e34d34c094ad4ef1d23d3c8d630d6b5609)
+++ lams_build/windows.properties	(.../windows.properties)	(revision 4467c6fe0d440952c6ae1a172216d1e5289bfe9d)
@@ -20,10 +20,6 @@
 # Properties needed to run master-build. 
 # These are OS dependent properties, configured for windows
 
-jboss.home=D:/jboss-3.2.6/
-jboss.server=${jboss.home}/server/
-jboss.deploy=${jboss.server}/default/deploy
-
 conf=${basedir}/conf/windows
 conf.jboss=${conf}/jboss
 conf.auth=${conf}/authentication