Index: lams_build/conf/unix/lams/lams.xml
===================================================================
diff -u -r06a2f477d985337243bd368cbd675d355e11bf0c -r1658dcb3719ca82fe9c2d11b2414b0d486ef2cbc
--- lams_build/conf/unix/lams/lams.xml	(.../lams.xml)	(revision 06a2f477d985337243bd368cbd675d355e11bf0c)
+++ lams_build/conf/unix/lams/lams.xml	(.../lams.xml)	(revision 1658dcb3719ca82fe9c2d11b2414b0d486ef2cbc)
@@ -1,45 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Lams PUBLIC "-//LAMS//DTD LAMS//EN" "file:///usr/local/lamsconf/lams.dtd">
 <Lams>
-	<ServerURL>http://shaun.melcoe.mq.edu.au/lams/</ServerURL>
-	<Version>2.0 RC1</Version>
-	<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>
+	<ServerURL>http://localhost:8080/lams/</ServerURL>
+	<LamsHome>/usr/local/lams2</LamsHome>
+	<TempDir>/usr/local/lams2/temp</TempDir>
+	<DumpDir>/usr/local/lams2/dump</DumpDir>
 	<SMTPServer>mail.lib.mq.edu.au</SMTPServer>
 	<LamsSupportEmail>lams_support@melcoe.mq.edu.au</LamsSupportEmail>
 	<ContentRepositoryPath>/var/opt/lams/repository</ContentRepositoryPath>
 	<UploadFileMaxSize>1048576</UploadFileMaxSize>
 	<UploadLargeFileMaxSize>10485760</UploadLargeFileMaxSize>
 	<UploadFileMaxMemorySize>4096</UploadFileMaxMemorySize>
-	<ChatServerName></ChatServerName>
-	<ChatPortNumber>9800</ChatPortNumber>
-	<FileManagerDir>/usr/local/jboss-4.0.2/server/default/deploy/upload.war</FileManagerDir>
+	<FileManagerDir>/usr/local/lams2/jboss-4.0.2/server/default/deploy/upload.war</FileManagerDir>
 	<ExecutableExtensions>.bat,.bin,.com,.cmd,.exe,.msi,.msp,.ocx,.pif,.scr,.sct,.sh,.shs,.vbs</ExecutableExtensions>
-	<TicketFile>/usr/local/jboss-4.0.2/server/default/conf/lams.tck</TicketFile>
 	<!-- UserInactiveTimeout in seconds. 86400 seconds is one day-->
 	<UserInactiveTimeout>86400</UserInactiveTimeout>
-	<!-- If a user is allowed to login with different clients at the same time-->
-	<!-- It should be always false except when running testHarness-->
-	<AllowMultipleLogin>false</AllowMultipleLogin>
 	<!--  Turn on the cache debugging listener. Set to false in production -->
 	<UseCacheDebugListener>false</UseCacheDebugListener>
 	<!--  Number of days after which preview session data may be deleted. Recommend 7 days -->
 	<CleanupPreviewOlderThanDays>7</CleanupPreviewOlderThanDays>
 	<!--  client updates -->
-	<AuthoringClientVersion>1.0.@datetimestamp@</AuthoringClientVersion>
-	<MonitorClientVersion>1.0.@datetimestamp@</MonitorClientVersion>
-	<LearnerClientVersion>1.0.@datetimestamp@</LearnerClientVersion>
-	<ServerVersionNumber>1.1</ServerVersionNumber>
+	<AuthoringClientVersion>2.0.@datetimestamp@</AuthoringClientVersion>
+	<MonitorClientVersion>2.0.@datetimestamp@</MonitorClientVersion>
+	<LearnerClientVersion>2.0.@datetimestamp@</LearnerClientVersion>
+	<ServerVersionNumber>2.0.@datetimestamp@</ServerVersionNumber>
 	<ServerLanguage>en_AU</ServerLanguage>
 	<ServerPageDirection>LTR</ServerPageDirection>
 	<DictionaryDateCreated>2006-01-02</DictionaryDateCreated>
-	<HelpURL>http://wiki.lamsfoundation.org/display/lamsdocs/</HelpURL>
-	<XmppDomain>shaun.melcoe.mq.edu.au</XmppDomain>
-	<XmppConference>conference.shaun.melcoe.mq.edu.au</XmppConference>
-	<XmppAdmin>admin</XmppAdmin>
-	<XmppPassword>wildfire</XmppPassword>
+        <XmppDomain>localhost</XmppDomain>
+        <XmppConference>conference.localhost</XmppConference>
+        <XmppAdmin>admin</XmppAdmin>
+        <XmppPassword>wildfire</XmppPassword>
 	<DefaultFlashTheme>default</DefaultFlashTheme>
 	<DefaultHTMLTheme>defaultHTML</DefaultHTMLTheme>
-</Lams>
\ No newline at end of file
+</Lams>
Index: lams_build/conf/windows/lams/lams.xml
===================================================================
diff -u -r06a2f477d985337243bd368cbd675d355e11bf0c -r1658dcb3719ca82fe9c2d11b2414b0d486ef2cbc
--- lams_build/conf/windows/lams/lams.xml	(.../lams.xml)	(revision 06a2f477d985337243bd368cbd675d355e11bf0c)
+++ lams_build/conf/windows/lams/lams.xml	(.../lams.xml)	(revision 1658dcb3719ca82fe9c2d11b2414b0d486ef2cbc)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+OB<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Lams PUBLIC "-//LAMS//DTD LAMS//EN" "file:///C:/lamsconf/lams.dtd">
 <Lams>
 	<ServerURL>http://localhost:8080/lams/</ServerURL>
@@ -13,16 +13,10 @@
 	<UploadFileMaxSize>1048576</UploadFileMaxSize>
 	<UploadLargeFileMaxSize>10485760</UploadLargeFileMaxSize>
 	<UploadFileMaxMemorySize>4096</UploadFileMaxMemorySize>
-	<ChatServerName></ChatServerName>
-	<ChatPortNumber>9800</ChatPortNumber>
 	<FileManagerDir>d:/jboss-4.0.2/server/default/deploy/upload.war</FileManagerDir>
 	<ExecutableExtensions>.bat,.bin,.com,.cmd,.exe,.msi,.msp,.ocx,.pif,.scr,.sct,.sh,.shs,.vbs</ExecutableExtensions>
-	<TicketFile>d:/jboss-4.0.2/server/default/conf/lams.tck</TicketFile>
 	<!-- UserInactiveTimeout in seconds. 86400 seconds is one day-->
 	<UserInactiveTimeout>86400</UserInactiveTimeout>
-	<!-- If a user is allowed to login with different clients at the same time-->
-	<!-- It should be always false except when running testHarness-->
-	<AllowMultipleLogin>false</AllowMultipleLogin>
 	<!--  Turn on the cache debugging listener. Set to false in production -->
 	<UseCacheDebugListener>false</UseCacheDebugListener>
 	<!--  Number of days after which preview session data may be deleted. Recommend 7 days -->