Index: lams_build/build.xml
===================================================================
diff -u -r8e94e526d650b32f7a3506eb8764c7ba6c0d49eb -r49837cb33031653ee8aa5ed3fd8cad25cd9bfbd6
--- lams_build/build.xml	(.../build.xml)	(revision 8e94e526d650b32f7a3506eb8764c7ba6c0d49eb)
+++ lams_build/build.xml	(.../build.xml)	(revision 49837cb33031653ee8aa5ed3fd8cad25cd9bfbd6)
@@ -35,8 +35,11 @@
 
 	<!-- clean dirs for this script only -->
 	<target name="clean" description="cleans assembly">
-		<delete dir="${assembly}"
-			includes="**/*" />
+		<delete includeemptydirs="true">
+			<fileset dir="${assembly}">
+				<include name="**/*" />
+			</fileset>
+		</delete>
 	</target>
 
 	<!-- clean all projects -->
@@ -164,6 +167,9 @@
 <!--		<delete dir="${assembly}/temp" includeEmptyDirs="true" /> -->
 		<!-- explode the ear (Why doesn't the EAR task support exploded format?) -->
 		<unjar src="${assembly.temp.ear}" dest="${assembly.lams.ear}" />
+		<move file="${assembly.lams.ear}/lams-central.war" tofile="${assembly.lams.ear}/temp.war"/>
+		<unjar src="${assembly.lams.ear}/temp.war" dest="${assembly.lams.ear}/lams-central.war"/>
+		<delete file="${assembly.lams.ear}/temp.war"/>
 		<!-- delete temp.ear -->
 		<delete file="${assembly.temp.ear}" />
 	</target>
@@ -175,7 +181,7 @@
 	<target name="deploy-ear" 
 		description="Deploys previously assembled ear to jboss">
 		<copy todir="${jboss.ear.deploy}" overwrite="true"
-			failonerror="true" verbose="true">
+			failonerror="true">
 			<fileset dir="${assembly}">
 				<include name="${lams.ear}/**/*.*" />
 			</fileset>
Index: lams_build/conf/unix/lams/lams.dtd
===================================================================
diff -u -rb279f005485d2e09ed9b608749d8c21f6d6a5957 -r49837cb33031653ee8aa5ed3fd8cad25cd9bfbd6
--- lams_build/conf/unix/lams/lams.dtd	(.../lams.dtd)	(revision b279f005485d2e09ed9b608749d8c21f6d6a5957)
+++ lams_build/conf/unix/lams/lams.dtd	(.../lams.dtd)	(revision 49837cb33031653ee8aa5ed3fd8cad25cd9bfbd6)
@@ -1,8 +1,9 @@
-<!ELEMENT Lams (ServerURL,LamsHome,TempDir,DumpDir,SMTPServer,LamsSupportEmail,ContentRepositoryPath,UploadFileMaxSize,UploadLargeFileMaxSize,UploadFileMaxMemorySize,ChatServerName,ChatPortNumber,FileManagerDir,ExecutableExtensions,TicketFile,UserInactiveTimeout,AllowMultipleLogin,UseCacheDebugListener,CleanupPreviewOlderThanDays,AuthoringClientVersion,MonitorClientVersion,LearnerClientVersion,ServerVersionNumber,ServerLanguage, DictionaryDateslanguage, createDate, XmppDomain, XmppConference, XmppAdmin, XmppPassword)>
+<!ELEMENT Lams (ServerURL,LamsHome,TempDir,DumpDir,EARDir,SMTPServer,LamsSupportEmail,ContentRepositoryPath,UploadFileMaxSize,UploadLargeFileMaxSize,UploadFileMaxMemorySize,ChatServerName,ChatPortNumber,FileManagerDir,ExecutableExtensions,TicketFile,UserInactiveTimeout,AllowMultipleLogin,UseCacheDebugListener,CleanupPreviewOlderThanDays,AuthoringClientVersion,MonitorClientVersion,LearnerClientVersion,ServerVersionNumber,ServerLanguage, DictionaryDates,language, createDate, XmppDomain, XmppConference, XmppAdmin, XmppPassword)>
 <!ELEMENT ServerURL (#PCDATA)>
 <!ELEMENT LamsHome (#PCDATA)>
 <!ELEMENT TempDir (#PCDATA)>
 <!ELEMENT DumpDir (#PCDATA)>
+<!ELEMENT EARDir (#PCDATA)>
 <!ELEMENT SMTPServer (#PCDATA)>
 <!ELEMENT LamsSupportEmail (#PCDATA)>
 <!ELEMENT ContentRepositoryPath (#PCDATA)>
@@ -41,4 +42,3 @@
 
 
 
-
Index: lams_build/conf/unix/lams/lams.xml
===================================================================
diff -u -r426b357d062c154d5e33e575d44abab5f12dca62 -r49837cb33031653ee8aa5ed3fd8cad25cd9bfbd6
--- lams_build/conf/unix/lams/lams.xml	(.../lams.xml)	(revision 426b357d062c154d5e33e575d44abab5f12dca62)
+++ lams_build/conf/unix/lams/lams.xml	(.../lams.xml)	(revision 49837cb33031653ee8aa5ed3fd8cad25cd9bfbd6)
@@ -5,6 +5,7 @@
 	<LamsHome>/var/opt/lams</LamsHome>
 	<TempDir>/var/opt/lams/temp</TempDir>
 	<DumpDir>/var/opt/lams/dump</DumpDir>
+	<EARDir>/usr/local/jboss-4.0.2/server/default/deploy/lams.ear</EARDir>
 	<SMTPServer>mail.lib.mq.edu.au</SMTPServer>
 	<LamsSupportEmail>lams_support@melcoe.mq.edu.au</LamsSupportEmail>
 	<ContentRepositoryPath>/var/opt/lams/repository</ContentRepositoryPath>
Index: lams_build/conf/windows/lams/lams.dtd
===================================================================
diff -u -rb279f005485d2e09ed9b608749d8c21f6d6a5957 -r49837cb33031653ee8aa5ed3fd8cad25cd9bfbd6
--- lams_build/conf/windows/lams/lams.dtd	(.../lams.dtd)	(revision b279f005485d2e09ed9b608749d8c21f6d6a5957)
+++ lams_build/conf/windows/lams/lams.dtd	(.../lams.dtd)	(revision 49837cb33031653ee8aa5ed3fd8cad25cd9bfbd6)
@@ -1,8 +1,9 @@
-<!ELEMENT Lams (ServerURL,LamsHome,TempDir,DumpDir,SMTPServer,LamsSupportEmail,ContentRepositoryPath,UploadFileMaxSize,UploadLargeFileMaxSize,UploadFileMaxMemorySize,ChatServerName,ChatPortNumber,FileManagerDir,ExecutableExtensions,TicketFile,UserInactiveTimeout,AllowMultipleLogin,UseCacheDebugListener,CleanupPreviewOlderThanDays,AuthoringClientVersion,MonitorClientVersion,LearnerClientVersion,ServerVersionNumber,ServerLanguage, DictionaryDates,language, createDate, XmppDomain, XmppConference, XmppAdmin, XmppPassword)>
+<!ELEMENT Lams (ServerURL,LamsHome,TempDir,DumpDir,EARDir,SMTPServer,LamsSupportEmail,ContentRepositoryPath,UploadFileMaxSize,UploadLargeFileMaxSize,UploadFileMaxMemorySize,ChatServerName,ChatPortNumber,FileManagerDir,ExecutableExtensions,TicketFile,UserInactiveTimeout,AllowMultipleLogin,UseCacheDebugListener,CleanupPreviewOlderThanDays,AuthoringClientVersion,MonitorClientVersion,LearnerClientVersion,ServerVersionNumber,ServerLanguage, DictionaryDates,language, createDate, XmppDomain, XmppConference, XmppAdmin, XmppPassword)>
 <!ELEMENT ServerURL (#PCDATA)>
 <!ELEMENT LamsHome (#PCDATA)>
 <!ELEMENT TempDir (#PCDATA)>
 <!ELEMENT DumpDir (#PCDATA)>
+<!ELEMENT EARDir (#PCDATA)>
 <!ELEMENT SMTPServer (#PCDATA)>
 <!ELEMENT LamsSupportEmail (#PCDATA)>
 <!ELEMENT ContentRepositoryPath (#PCDATA)>
Index: lams_build/conf/windows/lams/lams.xml
===================================================================
diff -u -r426b357d062c154d5e33e575d44abab5f12dca62 -r49837cb33031653ee8aa5ed3fd8cad25cd9bfbd6
--- lams_build/conf/windows/lams/lams.xml	(.../lams.xml)	(revision 426b357d062c154d5e33e575d44abab5f12dca62)
+++ lams_build/conf/windows/lams/lams.xml	(.../lams.xml)	(revision 49837cb33031653ee8aa5ed3fd8cad25cd9bfbd6)
@@ -5,6 +5,7 @@
 	<LamsHome>C:\lams</LamsHome>
 	<TempDir>C:\lams\temp</TempDir>
 	<DumpDir>C:\lams\dump</DumpDir>
+	<EARDir>d:/jboss-4.0.2/server/default/deploy/lams.ear</EARDir>
 	<SMTPServer>mail.lib.mq.edu.au</SMTPServer>
 	<LamsSupportEmail>lams_support@melcoe.mq.edu.au</LamsSupportEmail>
 	<ContentRepositoryPath>C:\lams\repository</ContentRepositoryPath>
Index: lams_build/deploy-tool/lib/lams-tool-deploy.jar
===================================================================
diff -u -r8909bd72899e998b2cb871d4ffa0bb8f9db80bde -r49837cb33031653ee8aa5ed3fd8cad25cd9bfbd6
Binary files differ
Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -r426b357d062c154d5e33e575d44abab5f12dca62 -r49837cb33031653ee8aa5ed3fd8cad25cd9bfbd6
Binary files differ