Index: lams_build/.classpath
===================================================================
diff -u -rb11fdf8e6de8f399b37b5382808063fd323d2958 -r49c977067df3da97570afce0d9a470d71c529169
--- lams_build/.classpath	(.../.classpath)	(revision b11fdf8e6de8f399b37b5382808063fd323d2958)
+++ lams_build/.classpath	(.../.classpath)	(revision 49c977067df3da97570afce0d9a470d71c529169)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry excluding="lib" kind="src" path=""/>
+	<classpathentry kind="src" path="conf"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path=""/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>
Index: lams_build/conf/j2ee/application.xml
===================================================================
diff -u -rb11fdf8e6de8f399b37b5382808063fd323d2958 -r49c977067df3da97570afce0d9a470d71c529169
--- lams_build/conf/j2ee/application.xml	(.../application.xml)	(revision b11fdf8e6de8f399b37b5382808063fd323d2958)
+++ lams_build/conf/j2ee/application.xml	(.../application.xml)	(revision 49c977067df3da97570afce0d9a470d71c529169)
@@ -11,10 +11,98 @@
             <context-root>/lams</context-root>
 	</web>
     </module>
-    <module>
+<!--     <module>
         <web>
             <web-uri>lams_monitoring.war</web-uri>
             <context-root>/lams/lams_monitoring</context-root>
 	</web>
     </module>
+    -->
+    <!--  Third Party JAR Files -->
+	<module>
+		<java>aopalliance.jar</java>
+	</module>
+	<module>
+		<java>cglib-full-2.0.2.jar</java>
+	</module>
+	<module>
+		<java>dom4j-1.5.2.jar</java>
+	</module>
+	<module>
+		<java>ehcache-1.0.jar</java>
+	</module>
+	<module>
+		<java>hibernate2.jar</java>
+	</module>
+	<module>
+		<java>hibernate-tools.jar</java>
+	</module>
+	<module>
+		<java>jstl-1.0.jar</java>
+	</module>
+	<module>
+		<java>commons-beanutils.jar</java>
+	</module>
+	<module>
+		<java>commons-collections-3.1.jar</java>
+	</module>
+	<module>
+		<java>commons-digester.jar</java>
+	</module>
+	<module>
+		<java>commons-fileupload-1.0.jar</java>
+	</module>
+	<module>
+		<java>commons-lang-2.0.jar</java>
+	</module>
+	<module>
+		<java>commons-logging.jar</java>
+	</module>
+	<module>
+		<java>poi-2.5.1-final-20040804.jar</java>
+	</module>
+	<module>
+		<java>standard.jar</java>
+	</module>
+	<module>
+		<java>jboss-cache.jar</java>
+	</module>
+	<module>
+		<java>jgroups.jar</java>
+	</module>
+	<module>
+		<java>jdom.jar</java>
+	</module>
+	<module>
+		<java>log4j-1.2.9.jar</java>
+	</module>
+	<module>
+		<java>mysql-connector-java-3.1.7-bin.jar</java>
+	</module>
+	<module>
+		<java>odmg-3.0.jar</java>
+	</module>
+	<module>
+		<java>spring.jar</java>
+	</module>
+	<module>
+		<java>struts.jar</java>
+	</module>
+	<module>
+		<java>struts-el.jar</java>
+	</module>
+	<module>
+		<java>wddx-1.0a-lfl-0.2.jar</java>
+	</module>
+    <!--  End Third Party JAR Files -->
+    
+    <!--  Tools -->
+<!--     <module>
+        <web>
+            <web-uri>lams_tool_imscp.war</web-uri>
+            <context-root>/lams/tool/imscp</context-root>
+	</web>
+    </module>
+    -->
+    
 </application>
\ No newline at end of file
Index: lams_build/conf/unix/authentication/authentication.dtd
===================================================================
diff -u
--- lams_build/conf/unix/authentication/authentication.dtd	(revision 0)
+++ lams_build/conf/unix/authentication/authentication.dtd	(revision 49c977067df3da97570afce0d9a470d71c529169)
@@ -0,0 +1,6 @@
+<!ELEMENT Authentication (Method+)>
+<!ELEMENT Method (Param*)>
+<!ATTLIST Method Name CDATA #REQUIRED>
+<!ATTLIST Method Enabled CDATA "true">
+<!ELEMENT Param (#PCDATA)>
+<!ATTLIST Param Name CDATA #REQUIRED>
\ No newline at end of file
Index: lams_build/conf/unix/authentication/authentication.xml
===================================================================
diff -u
--- lams_build/conf/unix/authentication/authentication.xml	(revision 0)
+++ lams_build/conf/unix/authentication/authentication.xml	(revision 49c977067df3da97570afce0d9a470d71c529169)
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE Authentication PUBLIC "-//LAMS//DTD LAMS//EN" "file:///usr/local/lamsconf/authentication.dtd">
+
+<Authentication>
+
+<Method Name="MQ-LDAP" Enabled="true">
+	<Param Name="java.naming.factory.initial">com.sun.jndi.ldap.LdapCtxFactory</Param>
+	<Param Name="java.naming.provider.url">ldap://mams.melcoe.mq.edu.au:636</Param>
+	<Param Name="java.naming.security.authentication">simple</Param>
+	<Param Name="java.naming.security.protocol">ssl</Param>
+	<Param Name="principalDNPrefix">uid=</Param>
+	<Param Name="principalDNSuffix">,ou=mams,dc=melcoe,dc=mq,dc=edu,dc=au</Param>
+	<Param Name="dsJndiName">java:/MySqlDS</Param>
+	<Param Name="principalsQuery">select password from lams_user where login=?</Param>
+	<Param Name="rolesQuery">select name,'Roles' from lams_role, lams_user where login=?</Param>
+	<Param Name="truststore.path">D:/MQLdapTrustStore</Param>
+	<Param Name="truststore.password">webauth</Param>
+</Method>
+
+
+<Method Name="LAMS-Database" Enabled="true">
+	<Param Name="dsJndiName">java:/MySqlDS</Param>
+	<Param Name="principalsQuery">select password from lams_user where login=?</Param>
+	<Param Name="rolesQuery">select name,'Roles' from lams_role, lams_user where login=?</Param>
+</Method>
+
+<Method Name="Oxford-WebAuth" Enabled="true">
+	<Param Name="WebAuthTokenName">WEBAUTH_USER</Param>
+	<Param Name="WebAuthTriggerPage">https://array00.melcoe.mq.edu.au/webauth.html</Param>
+	<Param Name="DummyPasswordForWebAuthUser">dummy</Param>
+	<Param Name="dsJndiName">java:/MySqlDS</Param>
+	<Param Name="rolesQuery">select name,'Roles' from lams_role, lams_user where login=?</Param>
+</Method>
+
+<!-- NOT in USE -->
+<Method Name="MQ-LDAP-BULK-IMPORT" Enabled="true">
+	<Param Name="com.lams.naming.import.ldap.provider.url">ldap://mams.melcoe.mq.edu.au:636</Param>
+	<Param Name="com.lams.naming.import.ldap.security.protocol">ssl</Param>
+	<!--giving name only means it can be found under classpath -->
+	<Param Name="truststore.path">MQLdapTrustStore</Param>
+	<Param Name="com.lams.naming.import.ldap.security.authentication">simple</Param>
+	<Param Name="com.lams.naming.import.ldap.security.principal">cn=admin,dc=melcoe,dc=mq,dc=edu,dc=au</Param>
+	<Param Name="com.lams.naming.import.ldap.security.credentials">KingKong</Param>
+	<Param Name="com.lams.naming.import.ldap.searchbase">ou=mams,dc=melcoe,dc=mq,dc=edu,dc=au</Param>
+	<!-- Schema Mapping Format: ApplicationPropertyName=LDAPSchemaAttributeName -->
+	<Param Name="com.lams.naming.import.ldap.mapping">login=uid,firstName=givenName,lastName=sn,email=mail</Param>
+	<Param Name="com.lams.naming.import.ldap.factory.initial">com.sun.jndi.ldap.LdapCtxFactory</Param>
+	<Param Name="dsJndiName">java:/MySqlDS</Param>
+	<Param Name="principalsQuery">select password from lams_user where login=?</Param>
+	<Param Name="rolesQuery">select name,'Roles' from lams_role, lams_user where login=?</Param>
+</Method>
+
+</Authentication>
Index: lams_build/conf/unix/jboss/login-config.xml
===================================================================
diff -u
--- lams_build/conf/unix/jboss/login-config.xml	(revision 0)
+++ lams_build/conf/unix/jboss/login-config.xml	(revision 49c977067df3da97570afce0d9a470d71c529169)
@@ -0,0 +1,161 @@
+<?xml version='1.0'?>
+<!DOCTYPE policy PUBLIC
+      "-//JBoss//DTD JBOSS Security Config 3.0//EN"
+      "http://www.jboss.org/j2ee/dtd/security_config.dtd">
+
+<!-- The XML based JAAS login configuration read by the
+org.jboss.security.auth.login.XMLLoginConfig mbean. Add
+an application-policy element for each security domain.
+
+The outline of the application-policy is:
+<application-policy name="security-domain-name">
+  <authentication>
+    <login-module code="login.module1.class.name" flag="control_flag">
+      <module-option name = "option1-name">option1-value</module-option>
+      <module-option name = "option2-name">option2-value</module-option>
+      ...
+    </login-module>
+
+    <login-module code="login.module2.class.name" flag="control_flag">
+      ...
+    </login-module>
+    ...
+  </authentication>
+</application-policy>
+
+$Revision$
+-->
+
+<policy>
+    <!-- Used by clients within the application server VM such as
+    mbeans and servlets that access EJBs.
+    -->
+    <application-policy name = "client-login">
+       <authentication>
+          <login-module code = "org.jboss.security.ClientLoginModule"
+             flag = "required">
+          </login-module>
+       </authentication>
+    </application-policy>
+
+    <!-- Security domain for JBossMQ -->
+    <application-policy name = "jbossmq">
+       <authentication>
+          <login-module code = "org.jboss.security.auth.spi.DatabaseServerLoginModule"
+             flag = "required">
+             <module-option name = "unauthenticatedIdentity">guest</module-option>
+             <module-option name = "dsJndiName">java:/DefaultDS</module-option>
+             <module-option name = "principalsQuery">SELECT PASSWD FROM JMS_USERS WHERE USERID=?</module-option>
+             <module-option name = "rolesQuery">SELECT ROLEID, 'Roles' FROM JMS_ROLES WHERE USERID=?</module-option>
+          </login-module>
+       </authentication>
+    </application-policy>
+
+    <!-- Security domains for testing new jca framework -->
+    <application-policy name = "HsqlDbRealm">
+       <authentication>
+          <login-module code = "org.jboss.resource.security.ConfiguredIdentityLoginModule"
+             flag = "required">
+             <module-option name = "principal">sa</module-option>
+             <module-option name = "userName">sa</module-option>
+             <module-option name = "password"></module-option>
+             <module-option name = "managedConnectionFactoryName">jboss.jca:service=LocalTxCM,name=DefaultDS</module-option>
+          </login-module>
+       </authentication>
+    </application-policy>
+
+    <application-policy name = "FirebirdDBRealm">
+       <authentication>
+          <login-module code = "org.jboss.resource.security.ConfiguredIdentityLoginModule"
+             flag = "required">
+             <module-option name = "principal">sysdba</module-option>
+             <module-option name = "userName">sysdba</module-option>
+             <module-option name = "password">masterkey</module-option>
+             <module-option name = "managedConnectionFactoryName">jboss.jca:service=XaTxCM,name=FirebirdDS</module-option>
+          </login-module>
+       </authentication>
+    </application-policy>
+
+    <application-policy name = "JmsXARealm">
+       <authentication>
+          <login-module code = "org.jboss.resource.security.ConfiguredIdentityLoginModule"
+             flag = "required">
+             <module-option name = "principal">guest</module-option>
+             <module-option name = "userName">guest</module-option>
+             <module-option name = "password">guest</module-option>
+             <module-option name = "managedConnectionFactoryName">jboss.jca:service=TxCM,name=JmsXA</module-option>
+          </login-module>
+       </authentication>
+    </application-policy>
+
+    <!-- A template configuration for the jmx-console web application. This
+      defaults to the UsersRolesLoginModule the same as other and should be
+      changed to a stronger authentication mechanism as required.
+    -->
+    <application-policy name = "jmx-console">
+       <authentication>
+          <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
+             flag = "required">
+             <module-option name="usersProperties">jmx-console-users.properties</module-option>
+             <module-option name="rolesProperties">jmx-console-roles.properties</module-option>
+          </login-module>
+       </authentication>
+    </application-policy>
+
+    <!-- A template configuration for the web-console web application. This
+      defaults to the UsersRolesLoginModule the same as other and should be
+      changed to a stronger authentication mechanism as required.
+    -->
+    <application-policy name = "web-console">
+       <authentication>
+          <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
+             flag = "required">
+             <module-option name="usersProperties">web-console-users.properties</module-option>
+             <module-option name="rolesProperties">web-console-roles.properties</module-option>
+          </login-module>
+       </authentication>
+    </application-policy>
+
+    <!-- The default login configuration used by any security domain that
+    does not have a application-policy entry with a matching name
+    -->
+    <application-policy name = "other">
+       <!-- A simple server login module, which can be used when the number 
+       of users is relatively small. It uses two properties files:
+       users.properties, which holds users (key) and their password (value).
+       roles.properties, which holds users (key) and a comma-separated list of
+       their roles (value).
+       The unauthenticatedIdentity property defines the name of the principal
+       that will be used when a null username and password are presented as is
+       the case for an unuathenticated web client or MDB. If you want to
+       allow such users to be authenticated add the property, e.g.,
+       unauthenticatedIdentity="nobody"
+       -->
+       <authentication>
+          <login-module code = "org.jboss.security.auth.spi.UsersRolesLoginModule"
+             flag = "required" />
+       </authentication>
+    </application-policy>
+
+
+	<application-policy name = "lams-DB">
+       <authentication>
+          <login-module code = "org.jboss.security.auth.spi.DatabaseServerLoginModule" flag = "required">
+             <module-option name="dsJndiName">java:/MySqlDS</module-option>
+             <module-option name="principalsQuery">select password from lams_user where login=?</module-option>
+             <module-option name="rolesQuery">select name,'Roles' from lams_role, lams_user where login=?</module-option>
+          </login-module>
+       </authentication>
+    </application-policy>
+
+	<application-policy name = "lams">
+       <authentication>
+          <login-module code = "org.lamsfoundation.lams.security.UniversalLoginModule" flag = "required">
+             <module-option name="authenticationPropertyFile">/usr/local/lamsconf/authentication.xml</module-option>
+          </login-module>
+       </authentication>
+    </application-policy>
+
+
+</policy>
+
Index: lams_build/conf/unix/jboss/service/mysql-ds.xml
===================================================================
diff -u
--- lams_build/conf/unix/jboss/service/mysql-ds.xml	(revision 0)
+++ lams_build/conf/unix/jboss/service/mysql-ds.xml	(revision 49c977067df3da97570afce0d9a470d71c529169)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Id$ -->
+<!--  Datasource config for MySQL using 3.0.9 available from:
+http://www.mysql.com/downloads/api-jdbc-stable.html
+-->
+
+<datasources>
+  <!-- lams-ds datasource for use by LAMS Core and Services -->
+  <local-tx-datasource>
+    <jndi-name>jdbc/lams-ds</jndi-name>
+    <connection-url>jdbc:mysql://localhost:3306/lams</connection-url>
+    <driver-class>com.mysql.jdbc.Driver</driver-class>
+    <!-- Tell MySQL Connector to use UTF-8 character encoding -->
+    <connection-property name="characterEncoding">utf8</connection-property>
+    <!-- Set transaction isolation level to match db -->
+    <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation>	
+    <user-name>lams</user-name>
+    <password>lamsdemo</password>
+    <!-- Set minimum adn maximum size of pool -->
+    <max-pool-size>32</max-pool-size>
+    <min-pool-size>0</min-pool-size>
+    <!-- Connections not used after 5 minutes will be closed and removed -->
+    <idle-timeout-minutes>5</idle-timeout-minutes>
+  </local-tx-datasource>
+
+  <!-- tool-ds datasource for use by Tools -->
+  <local-tx-datasource>
+    <jndi-name>jdbc/tool-ds</jndi-name>
+    <connection-url>jdbc:mysql://localhost:3306/lams</connection-url>
+    <driver-class>com.mysql.jdbc.Driver</driver-class>
+    <!-- Tell MySQL Connector to use UTF-8 character encoding -->
+    <connection-property name="characterEncoding">utf8</connection-property>
+    <!-- Set transaction isolation level to match db -->
+    <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation>	
+    <user-name>lams</user-name>
+    <password>lamsdemo</password>
+    <!-- Set minimum adn maximum size of pool -->
+    <max-pool-size>32</max-pool-size>
+    <min-pool-size>0</min-pool-size>
+    <!-- Connections not used after 5 minutes will be closed and removed -->
+    <idle-timeout-minutes>5</idle-timeout-minutes>
+  </local-tx-datasource>
+</datasources>
Index: lams_build/conf/unix/lams/lams.dtd
===================================================================
diff -u
--- lams_build/conf/unix/lams/lams.dtd	(revision 0)
+++ lams_build/conf/unix/lams/lams.dtd	(revision 49c977067df3da97570afce0d9a470d71c529169)
@@ -0,0 +1,16 @@
+<!ELEMENT Lams (ServerURL,LamsHome,TempDir,SMTPServer,LamsSupportEmail,UploadFileMaxSize,UploadLargeFileMaxSize,UploadFileMaxMemorySize,ChatServerName,ChatPortNumber,FileManagerDir,ExecutableExtensions,TicketFile,UserInactiveTimeout,AllowMultipleLogin)>
+<!ELEMENT ServerURL (#PCDATA)>
+<!ELEMENT LamsHome (#PCDATA)>
+<!ELEMENT TempDir (#PCDATA)>
+<!ELEMENT SMTPServer (#PCDATA)>
+<!ELEMENT LamsSupportEmail (#PCDATA)>
+<!ELEMENT UploadFileMaxSize (#PCDATA)>
+<!ELEMENT UploadLargeFileMaxSize (#PCDATA)>
+<!ELEMENT UploadFileMaxMemorySize (#PCDATA)>
+<!ELEMENT ChatServerName (#PCDATA)>
+<!ELEMENT ChatPortNumber (#PCDATA)>
+<!ELEMENT FileManagerDir (#PCDATA)>
+<!ELEMENT ExecutableExtensions (#PCDATA)>
+<!ELEMENT TicketFile (#PCDATA)>
+<!ELEMENT UserInactiveTimeout (#PCDATA)>
+<!ELEMENT AllowMultipleLogin (#PCDATA)>
Index: lams_build/conf/unix/lams/lams.xml
===================================================================
diff -u
--- lams_build/conf/unix/lams/lams.xml	(revision 0)
+++ lams_build/conf/unix/lams/lams.xml	(revision 49c977067df3da97570afce0d9a470d71c529169)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE Lams PUBLIC "-//LAMS//DTD LAMS//EN" "file:///usr/local/lamsconf/lams.dtd">
+<Lams>
+	<ServerURL></ServerURL>
+	<LamsHome>/var/opt/lams</LamsHome>
+	<TempDir>/var/opt/lams/temp</TempDir>
+	<SMTPServer>mail.lib.mq.edu.au</SMTPServer>
+	<LamsSupportEmail>lams_support@melcoe.mq.edu.au</LamsSupportEmail>
+	<UploadFileMaxSize>1048576</UploadFileMaxSize>
+	<UploadLargeFileMaxSize>10485760</UploadLargeFileMaxSize>
+	<UploadFileMaxMemorySize>4096</UploadFileMaxMemorySize>
+	<ChatServerName></ChatServerName>
+	<ChatPortNumber>9800</ChatPortNumber>
+	<FileManagerDir>/usr/local/jboss-3.2.6/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-3.2.6/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>
+</Lams>
Index: lams_build/conf/windows/authentication.dtd
===================================================================
diff -u
--- lams_build/conf/windows/authentication.dtd	(revision 0)
+++ lams_build/conf/windows/authentication.dtd	(revision 49c977067df3da97570afce0d9a470d71c529169)
@@ -0,0 +1,6 @@
+<!ELEMENT Authentication (Method+)>
+<!ELEMENT Method (Param*)>
+<!ATTLIST Method Name CDATA #REQUIRED>
+<!ATTLIST Method Enabled CDATA "true">
+<!ELEMENT Param (#PCDATA)>
+<!ATTLIST Param Name CDATA #REQUIRED>
\ No newline at end of file
Index: lams_build/conf/windows/authentication.xml
===================================================================
diff -u
--- lams_build/conf/windows/authentication.xml	(revision 0)
+++ lams_build/conf/windows/authentication.xml	(revision 49c977067df3da97570afce0d9a470d71c529169)
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE Authentication PUBLIC "-//LAMS//DTD LAMS//EN" "file:///C:/lamsconf/authentication.dtd">
+
+<Authentication>
+
+<Method Name="MQ-LDAP" Enabled="true">
+	<Param Name="java.naming.factory.initial">com.sun.jndi.ldap.LdapCtxFactory</Param>
+	<Param Name="java.naming.provider.url">ldap://mams.melcoe.mq.edu.au:636</Param>
+	<Param Name="java.naming.security.authentication">simple</Param>
+	<Param Name="java.naming.security.protocol">ssl</Param>
+	<Param Name="principalDNPrefix">uid=</Param>
+	<Param Name="principalDNSuffix">,ou=mams,dc=melcoe,dc=mq,dc=edu,dc=au</Param>
+	<Param Name="dsJndiName">java:/MySqlDS</Param>
+	<Param Name="principalsQuery">select password from lams_user where login=?</Param>
+	<Param Name="rolesQuery">select name,'Roles' from lams_role, lams_user where login=?</Param>
+	<Param Name="truststore.path">D:/MQLdapTrustStore</Param>
+	<Param Name="truststore.password">webauth</Param>
+</Method>
+
+
+<Method Name="LAMS-Database" Enabled="true">
+	<Param Name="dsJndiName">java:/MySqlDS</Param>
+	<Param Name="principalsQuery">select password from lams_user where login=?</Param>
+	<Param Name="rolesQuery">select name,'Roles' from lams_role, lams_user where login=?</Param>
+</Method>
+
+<Method Name="Oxford-WebAuth" Enabled="true">
+	<Param Name="WebAuthTokenName">WEBAUTH_USER</Param>
+	<Param Name="WebAuthTriggerPage">https://array00.melcoe.mq.edu.au/webauth.html</Param>
+	<Param Name="DummyPasswordForWebAuthUser">dummy</Param>
+	<Param Name="dsJndiName">java:/MySqlDS</Param>
+	<Param Name="rolesQuery">select name,'Roles' from lams_role, lams_user where login=?</Param>
+</Method>
+
+<!-- NOT in USE -->
+<Method Name="MQ-LDAP-BULK-IMPORT" Enabled="true">
+	<Param Name="com.lams.naming.import.ldap.provider.url">ldap://mams.melcoe.mq.edu.au:636</Param>
+	<Param Name="com.lams.naming.import.ldap.security.protocol">ssl</Param>
+	<!--giving name only means it can be found under classpath -->
+	<Param Name="truststore.path">MQLdapTrustStore</Param>
+	<Param Name="com.lams.naming.import.ldap.security.authentication">simple</Param>
+	<Param Name="com.lams.naming.import.ldap.security.principal">cn=admin,dc=melcoe,dc=mq,dc=edu,dc=au</Param>
+	<Param Name="com.lams.naming.import.ldap.security.credentials">KingKong</Param>
+	<Param Name="com.lams.naming.import.ldap.searchbase">ou=mams,dc=melcoe,dc=mq,dc=edu,dc=au</Param>
+	<!-- Schema Mapping Format: ApplicationPropertyName=LDAPSchemaAttributeName -->
+	<Param Name="com.lams.naming.import.ldap.mapping">login=uid,firstName=givenName,lastName=sn,email=mail</Param>
+	<Param Name="com.lams.naming.import.ldap.factory.initial">com.sun.jndi.ldap.LdapCtxFactory</Param>
+	<Param Name="dsJndiName">java:/MySqlDS</Param>
+	<Param Name="principalsQuery">select password from lams_user where login=?</Param>
+	<Param Name="rolesQuery">select name,'Roles' from lams_role, lams_user where login=?</Param>
+</Method>
+
+</Authentication>
Index: lams_build/conf/windows/authentication/authentication.dtd
===================================================================
diff -u
--- lams_build/conf/windows/authentication/authentication.dtd	(revision 0)
+++ lams_build/conf/windows/authentication/authentication.dtd	(revision 49c977067df3da97570afce0d9a470d71c529169)
@@ -0,0 +1,6 @@
+<!ELEMENT Authentication (Method+)>
+<!ELEMENT Method (Param*)>
+<!ATTLIST Method Name CDATA #REQUIRED>
+<!ATTLIST Method Enabled CDATA "true">
+<!ELEMENT Param (#PCDATA)>
+<!ATTLIST Param Name CDATA #REQUIRED>
\ No newline at end of file
Index: lams_build/conf/windows/authentication/authentication.xml
===================================================================
diff -u
--- lams_build/conf/windows/authentication/authentication.xml	(revision 0)
+++ lams_build/conf/windows/authentication/authentication.xml	(revision 49c977067df3da97570afce0d9a470d71c529169)
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE Authentication PUBLIC "-//LAMS//DTD LAMS//EN" "file:///C:/lamsconf/authentication.dtd">
+
+<Authentication>
+
+<Method Name="MQ-LDAP" Enabled="true">
+	<Param Name="java.naming.factory.initial">com.sun.jndi.ldap.LdapCtxFactory</Param>
+	<Param Name="java.naming.provider.url">ldap://mams.melcoe.mq.edu.au:636</Param>
+	<Param Name="java.naming.security.authentication">simple</Param>
+	<Param Name="java.naming.security.protocol">ssl</Param>
+	<Param Name="principalDNPrefix">uid=</Param>
+	<Param Name="principalDNSuffix">,ou=mams,dc=melcoe,dc=mq,dc=edu,dc=au</Param>
+	<Param Name="dsJndiName">java:/MySqlDS</Param>
+	<Param Name="principalsQuery">select password from lams_user where login=?</Param>
+	<Param Name="rolesQuery">select name,'Roles' from lams_role, lams_user where login=?</Param>
+	<Param Name="truststore.path">D:/MQLdapTrustStore</Param>
+	<Param Name="truststore.password">webauth</Param>
+</Method>
+
+
+<Method Name="LAMS-Database" Enabled="true">
+	<Param Name="dsJndiName">java:/MySqlDS</Param>
+	<Param Name="principalsQuery">select password from lams_user where login=?</Param>
+	<Param Name="rolesQuery">select name,'Roles' from lams_role, lams_user where login=?</Param>
+</Method>
+
+<Method Name="Oxford-WebAuth" Enabled="true">
+	<Param Name="WebAuthTokenName">WEBAUTH_USER</Param>
+	<Param Name="WebAuthTriggerPage">https://array00.melcoe.mq.edu.au/webauth.html</Param>
+	<Param Name="DummyPasswordForWebAuthUser">dummy</Param>
+	<Param Name="dsJndiName">java:/MySqlDS</Param>
+	<Param Name="rolesQuery">select name,'Roles' from lams_role, lams_user where login=?</Param>
+</Method>
+
+<!-- NOT in USE -->
+<Method Name="MQ-LDAP-BULK-IMPORT" Enabled="true">
+	<Param Name="com.lams.naming.import.ldap.provider.url">ldap://mams.melcoe.mq.edu.au:636</Param>
+	<Param Name="com.lams.naming.import.ldap.security.protocol">ssl</Param>
+	<!--giving name only means it can be found under classpath -->
+	<Param Name="truststore.path">MQLdapTrustStore</Param>
+	<Param Name="com.lams.naming.import.ldap.security.authentication">simple</Param>
+	<Param Name="com.lams.naming.import.ldap.security.principal">cn=admin,dc=melcoe,dc=mq,dc=edu,dc=au</Param>
+	<Param Name="com.lams.naming.import.ldap.security.credentials">KingKong</Param>
+	<Param Name="com.lams.naming.import.ldap.searchbase">ou=mams,dc=melcoe,dc=mq,dc=edu,dc=au</Param>
+	<!-- Schema Mapping Format: ApplicationPropertyName=LDAPSchemaAttributeName -->
+	<Param Name="com.lams.naming.import.ldap.mapping">login=uid,firstName=givenName,lastName=sn,email=mail</Param>
+	<Param Name="com.lams.naming.import.ldap.factory.initial">com.sun.jndi.ldap.LdapCtxFactory</Param>
+	<Param Name="dsJndiName">java:/MySqlDS</Param>
+	<Param Name="principalsQuery">select password from lams_user where login=?</Param>
+	<Param Name="rolesQuery">select name,'Roles' from lams_role, lams_user where login=?</Param>
+</Method>
+
+</Authentication>
Index: lams_build/conf/windows/jboss/login-config.xml
===================================================================
diff -u
--- lams_build/conf/windows/jboss/login-config.xml	(revision 0)
+++ lams_build/conf/windows/jboss/login-config.xml	(revision 49c977067df3da97570afce0d9a470d71c529169)
@@ -0,0 +1,161 @@
+<?xml version='1.0'?>
+<!DOCTYPE policy PUBLIC
+      "-//JBoss//DTD JBOSS Security Config 3.0//EN"
+      "http://www.jboss.org/j2ee/dtd/security_config.dtd">
+
+<!-- The XML based JAAS login configuration read by the
+org.jboss.security.auth.login.XMLLoginConfig mbean. Add
+an application-policy element for each security domain.
+
+The outline of the application-policy is:
+<application-policy name="security-domain-name">
+  <authentication>
+    <login-module code="login.module1.class.name" flag="control_flag">
+      <module-option name = "option1-name">option1-value</module-option>
+      <module-option name = "option2-name">option2-value</module-option>
+      ...
+    </login-module>
+
+    <login-module code="login.module2.class.name" flag="control_flag">
+      ...
+    </login-module>
+    ...
+  </authentication>
+</application-policy>
+
+$Revision$
+-->
+
+<policy>
+    <!-- Used by clients within the application server VM such as
+    mbeans and servlets that access EJBs.
+    -->
+    <application-policy name = "client-login">
+       <authentication>
+          <login-module code = "org.jboss.security.ClientLoginModule"
+             flag = "required">
+          </login-module>
+       </authentication>
+    </application-policy>
+
+    <!-- Security domain for JBossMQ -->
+    <application-policy name = "jbossmq">
+       <authentication>
+          <login-module code = "org.jboss.security.auth.spi.DatabaseServerLoginModule"
+             flag = "required">
+             <module-option name = "unauthenticatedIdentity">guest</module-option>
+             <module-option name = "dsJndiName">java:/DefaultDS</module-option>
+             <module-option name = "principalsQuery">SELECT PASSWD FROM JMS_USERS WHERE USERID=?</module-option>
+             <module-option name = "rolesQuery">SELECT ROLEID, 'Roles' FROM JMS_ROLES WHERE USERID=?</module-option>
+          </login-module>
+       </authentication>
+    </application-policy>
+
+    <!-- Security domains for testing new jca framework -->
+    <application-policy name = "HsqlDbRealm">
+       <authentication>
+          <login-module code = "org.jboss.resource.security.ConfiguredIdentityLoginModule"
+             flag = "required">
+             <module-option name = "principal">sa</module-option>
+             <module-option name = "userName">sa</module-option>
+             <module-option name = "password"></module-option>
+             <module-option name = "managedConnectionFactoryName">jboss.jca:service=LocalTxCM,name=DefaultDS</module-option>
+          </login-module>
+       </authentication>
+    </application-policy>
+
+    <application-policy name = "FirebirdDBRealm">
+       <authentication>
+          <login-module code = "org.jboss.resource.security.ConfiguredIdentityLoginModule"
+             flag = "required">
+             <module-option name = "principal">sysdba</module-option>
+             <module-option name = "userName">sysdba</module-option>
+             <module-option name = "password">masterkey</module-option>
+             <module-option name = "managedConnectionFactoryName">jboss.jca:service=XaTxCM,name=FirebirdDS</module-option>
+          </login-module>
+       </authentication>
+    </application-policy>
+
+    <application-policy name = "JmsXARealm">
+       <authentication>
+          <login-module code = "org.jboss.resource.security.ConfiguredIdentityLoginModule"
+             flag = "required">
+             <module-option name = "principal">guest</module-option>
+             <module-option name = "userName">guest</module-option>
+             <module-option name = "password">guest</module-option>
+             <module-option name = "managedConnectionFactoryName">jboss.jca:service=TxCM,name=JmsXA</module-option>
+          </login-module>
+       </authentication>
+    </application-policy>
+
+    <!-- A template configuration for the jmx-console web application. This
+      defaults to the UsersRolesLoginModule the same as other and should be
+      changed to a stronger authentication mechanism as required.
+    -->
+    <application-policy name = "jmx-console">
+       <authentication>
+          <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
+             flag = "required">
+             <module-option name="usersProperties">jmx-console-users.properties</module-option>
+             <module-option name="rolesProperties">jmx-console-roles.properties</module-option>
+          </login-module>
+       </authentication>
+    </application-policy>
+
+    <!-- A template configuration for the web-console web application. This
+      defaults to the UsersRolesLoginModule the same as other and should be
+      changed to a stronger authentication mechanism as required.
+    -->
+    <application-policy name = "web-console">
+       <authentication>
+          <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
+             flag = "required">
+             <module-option name="usersProperties">web-console-users.properties</module-option>
+             <module-option name="rolesProperties">web-console-roles.properties</module-option>
+          </login-module>
+       </authentication>
+    </application-policy>
+
+    <!-- The default login configuration used by any security domain that
+    does not have a application-policy entry with a matching name
+    -->
+    <application-policy name = "other">
+       <!-- A simple server login module, which can be used when the number 
+       of users is relatively small. It uses two properties files:
+       users.properties, which holds users (key) and their password (value).
+       roles.properties, which holds users (key) and a comma-separated list of
+       their roles (value).
+       The unauthenticatedIdentity property defines the name of the principal
+       that will be used when a null username and password are presented as is
+       the case for an unuathenticated web client or MDB. If you want to
+       allow such users to be authenticated add the property, e.g.,
+       unauthenticatedIdentity="nobody"
+       -->
+       <authentication>
+          <login-module code = "org.jboss.security.auth.spi.UsersRolesLoginModule"
+             flag = "required" />
+       </authentication>
+    </application-policy>
+
+
+	<application-policy name = "lams-DB">
+       <authentication>
+          <login-module code = "org.jboss.security.auth.spi.DatabaseServerLoginModule" flag = "required">
+             <module-option name="dsJndiName">java:/MySqlDS</module-option>
+             <module-option name="principalsQuery">select password from lams_user where login=?</module-option>
+             <module-option name="rolesQuery">select name,'Roles' from lams_role, lams_user where login=?</module-option>
+          </login-module>
+       </authentication>
+    </application-policy>
+
+	<application-policy name = "lams">
+       <authentication>
+          <login-module code = "org.lamsfoundation.lams.security.UniversalLoginModule" flag = "required">
+             <module-option name="authenticationPropertyFile">c:/lamsconf/authentication.xml</module-option>
+          </login-module>
+       </authentication>
+    </application-policy>
+
+
+</policy>
+
Index: lams_build/conf/windows/jboss/service/mysql-ds.xml
===================================================================
diff -u
--- lams_build/conf/windows/jboss/service/mysql-ds.xml	(revision 0)
+++ lams_build/conf/windows/jboss/service/mysql-ds.xml	(revision 49c977067df3da97570afce0d9a470d71c529169)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Id$ -->
+<!--  Datasource config for MySQL using 3.0.9 available from:
+http://www.mysql.com/downloads/api-jdbc-stable.html
+-->
+
+<datasources>
+  <!-- lams-ds datasource for use by LAMS Core and Services -->
+  <local-tx-datasource>
+    <jndi-name>jdbc/lams-ds</jndi-name>
+    <connection-url>jdbc:mysql://localhost:3306/lams</connection-url>
+    <driver-class>com.mysql.jdbc.Driver</driver-class>
+    <!-- Tell MySQL Connector to use UTF-8 character encoding -->
+    <connection-property name="characterEncoding">utf8</connection-property>
+    <!-- Set transaction isolation level to match db -->
+    <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation>	
+    <user-name>lams</user-name>
+    <password>lamsdemo</password>
+    <!-- Set minimum adn maximum size of pool -->
+    <max-pool-size>32</max-pool-size>
+    <min-pool-size>0</min-pool-size>
+    <!-- Connections not used after 5 minutes will be closed and removed -->
+    <idle-timeout-minutes>5</idle-timeout-minutes>
+  </local-tx-datasource>
+
+  <!-- tool-ds datasource for use by Tools -->
+  <local-tx-datasource>
+    <jndi-name>jdbc/tool-ds</jndi-name>
+    <connection-url>jdbc:mysql://localhost:3306/lams</connection-url>
+    <driver-class>com.mysql.jdbc.Driver</driver-class>
+    <!-- Tell MySQL Connector to use UTF-8 character encoding -->
+    <connection-property name="characterEncoding">utf8</connection-property>
+    <!-- Set transaction isolation level to match db -->
+    <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation>	
+    <user-name>lams</user-name>
+    <password>lamsdemo</password>
+    <!-- Set minimum adn maximum size of pool -->
+    <max-pool-size>32</max-pool-size>
+    <min-pool-size>0</min-pool-size>
+    <!-- Connections not used after 5 minutes will be closed and removed -->
+    <idle-timeout-minutes>5</idle-timeout-minutes>
+  </local-tx-datasource>
+</datasources>
Index: lams_build/conf/windows/lams.dtd
===================================================================
diff -u
--- lams_build/conf/windows/lams.dtd	(revision 0)
+++ lams_build/conf/windows/lams.dtd	(revision 49c977067df3da97570afce0d9a470d71c529169)
@@ -0,0 +1,28 @@
+<!ELEMENT Lams (ServerURL,LamsHome,TempDir,SMTPServer,LamsSupportEmail,UploadFileMaxSize,UploadLargeFileMaxSize,UploadFileMaxMemorySize,ChatServerName,ChatPortNumber,FileManagerDir,ExecutableExtensions,TicketFile,UserInactiveTimeout,AllowMultipleLogin)>
+<!ELEMENT ServerURL (#PCDATA)>
+<!ELEMENT LamsHome (#PCDATA)>
+<!ELEMENT TempDir (#PCDATA)>
+<!ELEMENT SMTPServer (#PCDATA)>
+<!ELEMENT LamsSupportEmail (#PCDATA)>
+<!ELEMENT UploadFileMaxSize (#PCDATA)>
+<!ELEMENT UploadLargeFileMaxSize (#PCDATA)>
+<!ELEMENT UploadFileMaxMemorySize (#PCDATA)>
+<!ELEMENT ChatServerName (#PCDATA)>
+<!ELEMENT ChatPortNumber (#PCDATA)>
+<!ELEMENT FileManagerDir (#PCDATA)>
+<!ELEMENT ExecutableExtensions (#PCDATA)>
+<!ELEMENT TicketFile (#PCDATA)>
+<!ELEMENT UserInactiveTimeout (#PCDATA)>
+<!ELEMENT AllowMultipleLogin (#PCDATA)>
+
+
+
+
+
+
+
+
+
+
+
+
Index: lams_build/conf/windows/lams.xml
===================================================================
diff -u
--- lams_build/conf/windows/lams.xml	(revision 0)
+++ lams_build/conf/windows/lams.xml	(revision 49c977067df3da97570afce0d9a470d71c529169)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE Lams PUBLIC "-//LAMS//DTD LAMS//EN" "file:///C:/lamsconf/lams.dtd">
+<Lams>
+	<ServerURL></ServerURL>
+	<LamsHome>C:/lams</LamsHome>
+	<TempDir>C:/lams/temp</TempDir>
+	<SMTPServer>mail.lib.mq.edu.au</SMTPServer>
+	<LamsSupportEmail>lams_support@melcoe.mq.edu.au</LamsSupportEmail>
+	<UploadFileMaxSize>1048576</UploadFileMaxSize>
+	<UploadLargeFileMaxSize>10485760</UploadLargeFileMaxSize>
+	<UploadFileMaxMemorySize>4096</UploadFileMaxMemorySize>
+	<ChatServerName></ChatServerName>
+	<ChatPortNumber>9800</ChatPortNumber>
+	<FileManagerDir>d:/jboss-3.2.6/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-3.2.6/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>
+</Lams>
Index: lams_build/conf/windows/lams/lams.dtd
===================================================================
diff -u
--- lams_build/conf/windows/lams/lams.dtd	(revision 0)
+++ lams_build/conf/windows/lams/lams.dtd	(revision 49c977067df3da97570afce0d9a470d71c529169)
@@ -0,0 +1,28 @@
+<!ELEMENT Lams (ServerURL,LamsHome,TempDir,SMTPServer,LamsSupportEmail,UploadFileMaxSize,UploadLargeFileMaxSize,UploadFileMaxMemorySize,ChatServerName,ChatPortNumber,FileManagerDir,ExecutableExtensions,TicketFile,UserInactiveTimeout,AllowMultipleLogin)>
+<!ELEMENT ServerURL (#PCDATA)>
+<!ELEMENT LamsHome (#PCDATA)>
+<!ELEMENT TempDir (#PCDATA)>
+<!ELEMENT SMTPServer (#PCDATA)>
+<!ELEMENT LamsSupportEmail (#PCDATA)>
+<!ELEMENT UploadFileMaxSize (#PCDATA)>
+<!ELEMENT UploadLargeFileMaxSize (#PCDATA)>
+<!ELEMENT UploadFileMaxMemorySize (#PCDATA)>
+<!ELEMENT ChatServerName (#PCDATA)>
+<!ELEMENT ChatPortNumber (#PCDATA)>
+<!ELEMENT FileManagerDir (#PCDATA)>
+<!ELEMENT ExecutableExtensions (#PCDATA)>
+<!ELEMENT TicketFile (#PCDATA)>
+<!ELEMENT UserInactiveTimeout (#PCDATA)>
+<!ELEMENT AllowMultipleLogin (#PCDATA)>
+
+
+
+
+
+
+
+
+
+
+
+
Index: lams_build/conf/windows/lams/lams.xml
===================================================================
diff -u
--- lams_build/conf/windows/lams/lams.xml	(revision 0)
+++ lams_build/conf/windows/lams/lams.xml	(revision 49c977067df3da97570afce0d9a470d71c529169)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE Lams PUBLIC "-//LAMS//DTD LAMS//EN" "file:///C:/lamsconf/lams.dtd">
+<Lams>
+	<ServerURL></ServerURL>
+	<LamsHome>C:/lams</LamsHome>
+	<TempDir>C:/lams/temp</TempDir>
+	<SMTPServer>mail.lib.mq.edu.au</SMTPServer>
+	<LamsSupportEmail>lams_support@melcoe.mq.edu.au</LamsSupportEmail>
+	<UploadFileMaxSize>1048576</UploadFileMaxSize>
+	<UploadLargeFileMaxSize>10485760</UploadLargeFileMaxSize>
+	<UploadFileMaxMemorySize>4096</UploadFileMaxMemorySize>
+	<ChatServerName></ChatServerName>
+	<ChatPortNumber>9800</ChatPortNumber>
+	<FileManagerDir>d:/jboss-3.2.6/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-3.2.6/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>
+</Lams>
Index: lams_build/lib/j2ee/jstl-1.0/META-INF/MANIFEST.MF
===================================================================
diff -u
--- lams_build/lib/j2ee/jstl-1.0/META-INF/MANIFEST.MF	(revision 0)
+++ lams_build/lib/j2ee/jstl-1.0/META-INF/MANIFEST.MF	(revision 49c977067df3da97570afce0d9a470d71c529169)
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Extension-Name: javax.servlet.jsp.jstl
+Specification-Title: JavaServer Pages Standard Tag Library (JSTL)
+Implementation-Vendor-Id: com.sun
+Created-By: Ant 1.4.1
+Implementation-Vendor: Sun Microsystems, Inc.
+Specification-Version: 1.0
+Implementation-Version: 1.0.3
+Implementation-Title: JavaServer Pages Standard Tag Library API Refere
+ nce Implementation
+
Index: lams_build/lib/jboss/jboss-cache.jar
===================================================================
diff -u
Binary files differ
Index: lams_build/lib/jboss/jgroups.jar
===================================================================
diff -u
Binary files differ
Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u
Binary files differ
Index: lams_build/lib/lams/lams_contentrepository.jar
===================================================================
diff -u
Binary files differ
Index: lams_build/lib/struts/struts.jar
===================================================================
diff -u -rb11fdf8e6de8f399b37b5382808063fd323d2958 -r49c977067df3da97570afce0d9a470d71c529169
Binary files differ
Index: lams_build/master-build.xml
===================================================================
diff -u -rb11fdf8e6de8f399b37b5382808063fd323d2958 -r49c977067df3da97570afce0d9a470d71c529169
--- lams_build/master-build.xml	(.../master-build.xml)	(revision b11fdf8e6de8f399b37b5382808063fd323d2958)
+++ lams_build/master-build.xml	(.../master-build.xml)	(revision 49c977067df3da97570afce0d9a470d71c529169)
@@ -1,114 +1,160 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
 <project name="LAMS" default="usage" basedir=".">
 
-    <!--  <property name="jboss.home" value="/var/jboss"/> -->
-    <property name="jboss.home" value="D:\jboss-3.2.6\"/>
-    <property name="jboss.deploy.dir" value="${jboss.home}/server/default/deploy"/>
-    <property name="assembly.dir" value="assembly"/>
-    <property name="lams.ear" value="lams.ear"/>
-    <property name="assembly.lams.ear" value="${assembly.dir}/lams.ear"/>
-    <property name="assembly.temp.ear" value="${assembly.dir}/temp.ear"/>
-    <property name="lib.dir" value="lib"/>
-    <property name="app.xml" value="conf/j2ee/application.xml"/>
-    <property name="lams_common" value="lams_common"/>
-    <property name="lams_admin" value="lams_admin"/>
-    <property name="lams_learning" value="lams_learning"/>
-    <property name="lams_monitoring" value="lams_monitoring"/>
-    <property name="lams_authoring" value="lams_authoring"/>
-    <property name="lams_central" value="lams_central"/>
-    <property name="lams_contentrepository" value="lams_contentrepository"/>
-    <property name="sub.build.dir" value="build/lib"/>
-    <property name="lams.jar" value="${lams_common}/${sub.build.dir}/lams.jar"/>
-    <property name="lams_admin.war" value="${lams_admin}/${sub.build.dir}/lams_admin.war"/>
-    <property name="lams_learning.war" value="${lams_learning}/${sub.build.dir}/lams_learning.war"/>
-    <property name="lams_authoring.war" value="${lams_authoring}/${sub.build.dir}/lams_authoring.war"/>
-    <property name="lams_monitoring.war" value="${lams_monitoring}/${sub.build.dir}/lams_monitoring.war"/>
-    <property name="lams_central.war" value="${lams_central}/${sub.build.dir}/lams_central.war"/>
-    <property name="lams_contentrepository.jar" value="${lams_contentrepository}/${sub.build.dir}/lams_contentrepository.jar"/>
-    
-    <target name="init">
-        <mkdir dir="${assembly.dir}"/>
-    </target>
-    
-    <target name="usage" description="print usage message">
-        <echo>usage: this message</echo>
-        <echo>clean: clean the ear assembly directories</echo>
-        <echo>clean-subprojects: clean sub project build directories</echo>
-        <echo>build-subprojects: build sub projects</echo>
-        <echo>assemble-ear: assemble ear structure</echo>
-        <echo>deploy-ear: copy ear to loca jboss server</echo>
-    </target>
-    
-    <!-- clean dirs for this script only -->
-    <target name="clean" description="cleans assembly">
-        <delete includeEmptyDirs="true" dir="${assembly.dir}" includes="**/*"/>
-    </target>
-    
-    <!-- clean all projects -->
-    <target name="clean-subporjects" description="cleans sub projects">
-    </target>
-    
-    <!-- build sub-projects -->
-    <target name="build-subprojects" description="builds sub porjects">
-        <ant antfile="../${lams_common}/build.xml" target="build-jar" inheritAll="false"/>
-        <ant antfile="../${lams_contentrepository}/build.xml"  target="build-jar" inheritAll="false"/>
-        <ant antfile="../${lams_central}/build.xml" target="build-war" inheritAll="false"/>
-        <!--  <ant antfile="../${lams_authoring}/build.xml"  target="build-war" inheritAll="false"/> -->
-        <!--  <ant antfile="../${lams_learning}/build.xml" target="build-war" inheritAll="false"/> -->
-        <ant antfile="../${lams_monitoring}/build.xml"  target="build-war" inheritAll="false"/>
-        <!--
-        <ant antfile="../${lams_admin}/build.xml" target="build-war" inheritAll="false"/>
-        -->
-    </target>
-    
-    <!-- assemble ear -->
-    <target name="assemble-ear" depends="init, clean, build-subprojects" description="Assemble lasm ear in exploded form">
-        <!-- have to copy the libs etc. to a temp location otherwise we end up with all the directories under lib as well-->
-        <mkdir dir="${assembly.dir}/temp"/>
-        <copy todir="${assembly.dir}/temp" failonerror="true" flatten="true">
-            <fileset dir="${lib.dir}">
-                <patternset id="lib.jars">
-                    <include name="**/*.jar"/>
-                    <exclude name="middlegen/*"/>
-                    <exclude name="mysql/*"/>
-                    <exclude name="xdoclet/*"/>
-                    <exclude name="httpunit/*"/>
-                    <exclude name="junit/*"/>
-                    <exclude name="strutstestcase/*"/>
-                </patternset>   
-            </fileset>
-            <fileset dir="..">
-                <include name="${lams.jar}"/>
-                <include name="${lams_contentrepository.jar}"/>
-                <include name="${lams_central.war}"/>
-                <!--<include name="lams_authoring.war"/>-->
-                <include name="${lams_monitoring.war}"/>
-                <!--  <include name="lams_learning.war"/>
-                <include name="lams_admin.war"/-->
-                
-            </fileset>
-        </copy>
-        <!-- create a temporary ear -->
-        <ear destfile="${assembly.temp.ear}" compress="false" appxml="${app.xml}">
-            <fileset dir="${assembly.dir}/temp" includes="*"/>
-        </ear>
-        <!-- remove temp lib -->
-        <delete dir="${assembly.dir}/temp" includeEmptyDirs="true"/> 
-        <!-- explode the ear (Why doesn't the EAR task support exploded format?) -->
-        <unjar src="${assembly.temp.ear}" dest="${assembly.lams.ear}"/>
-        <!-- delete temp.ear -->
-        <delete file="${assembly.temp.ear}"/>
-    </target>
-    
-    
-    <!-- deploy -->
-    <target name="deploy-ear" description="Assembles and deploy to jboss">
-        <copy todir="${jboss.deploy.dir}" overwrite="true" failonerror="true" verbose="true">
-            <fileset dir="${assembly.dir}">
-            	<include name="${lams.ear}/**/*.*"/>
-            </fileset>
-            
-        </copy>
-    </target>
-    
+	<!-- import properties from the specified file -->
+	<property file="shared.properties" />
+	<property file="windows.properties" />
+	<!--<property file="linux.properties"/>-->
+
+
+	<target name="init">
+		<mkdir dir="${assembly.dir}" />
+	</target>
+
+	<target name="usage" description="print usage message">
+		<echo>usage: this message</echo>
+		<echo>clean: clean the ear assembly directories</echo>
+		<echo>
+			clean-subprojects: clean sub project build directories
+		</echo>
+		<echo>build-subprojects: build sub projects</echo>
+		<echo>assemble-ear: assemble ear structure</echo>
+		<echo>deploy-ear: copy ear to local jboss server</echo>
+		<echo>
+			copyfiles: copy configuration files to local jboss server
+		</echo>
+	</target>
+
+	<!-- clean dirs for this script only -->
+	<target name="clean" description="cleans assembly">
+		<delete includeEmptyDirs="true" dir="${assembly.dir}"
+			includes="**/*" />
+	</target>
+
+	<!-- clean all projects -->
+	<target name="clean-subporjects" description="cleans sub projects" />
+
+
+	<!-- build sub-projects -->
+	<target name="build-subprojects"
+		description="builds sub porjects">
+		<ant antfile="../${lams_common}/build.xml" target="build-jar"
+			inheritAll="false" />
+		<ant antfile="../${lams_contentrepository}/build.xml"
+			target="build-jar" inheritAll="false" />
+		<ant antfile="../${lams_central}/build.xml" target="build-war"
+			inheritAll="false" />
+		<!--  <ant antfile="../${lams_authoring}/build.xml"  target="build-war" inheritAll="false"/> -->
+		<!--  <ant antfile="../${lams_learning}/build.xml" target="build-war" inheritAll="false"/> -->
+		<!--  <ant antfile="../${lams_monitoring}/build.xml"  target="build-war" inheritAll="false"/> -->
+		<!--
+			<ant antfile="../${lams_admin}/build.xml" target="build-war" inheritAll="false"/>
+		-->
+	</target>
+
+	<!-- assemble ear -->
+	<target name="assemble-ear" depends="init, clean, build-subprojects"
+		description="Assemble lasm ear in exploded form">
+		<!-- have to copy the libs etc. to a temp location otherwise we end up with all the directories under lib as well-->
+		<mkdir dir="${assembly.dir}/temp" />
+		<copy todir="${assembly.dir}/temp" failonerror="true"
+			flatten="true">
+			<fileset dir="${lib.dir}">
+				<patternset id="lib.jars">
+					<!--  the desired jars are nominated explicitly so -->
+					<!--  we don't release a build only one by accident -->
+					<include name="aopalliance/*.jar" />
+					<include name="cglib/*.jar" />
+					<include name="dom4j/*.jar" />
+					<include name="ehcache/*.jar" />
+					<include name="hibernate/*.jar" />
+					<include name="j2ee/*.jar" />
+					<include name="jakarta-commons/*.jar" />
+					<include name="jakarta-poi/*.jar" />
+					<include name="jakarta-taglibs/*.jar" />
+					<include name="jboss/*.jar" />
+					<include name="jdom/*.jar" />
+					<include name="log4j/*.jar" />
+					<include name="mysql/*.jar" />
+					<include name="odmg/*.jar" />
+					<include name="spring/*.jar" />
+					<include name="struts/*.jar" />
+					<include name="wddx/*.jar" />
+				</patternset>
+			</fileset>
+			<fileset dir="..">
+				<include name="${lams.jar}" />
+				<include name="${lams_contentrepository.jar}" />
+				<include name="${lams_central.war}" />
+				<!--<include name="lams_authoring.war"/>
+				<include name="${lams_monitoring.war}"/>
+				<include name="lams_learning.war"/>
+					<include name="lams_admin.war"/-->
+
+			</fileset>
+		</copy>
+		<!-- create a temporary ear -->
+		<ear destfile="${assembly.temp.ear}" compress="false"
+			appxml="${app.xml}">
+			<fileset dir="${assembly.dir}/temp" includes="*" />
+		</ear>
+		<!-- remove temp lib -->
+		<delete dir="${assembly.dir}/temp" includeEmptyDirs="true" />
+		<!-- explode the ear (Why doesn't the EAR task support exploded format?) -->
+		<unjar src="${assembly.temp.ear}" dest="${assembly.lams.ear}" />
+		<!-- delete temp.ear -->
+		<delete file="${assembly.temp.ear}" />
+	</target>
+
+
+	<!-- ============================================================================== -->
+	<!-- Deploy the ear file to the server                                              -->
+	<!-- ============================================================================== -->
+
+	<target name="deploy-ear" 
+		description="Deploys previously assembled ear to jboss">
+		<copy todir="${jboss.deploy.dir}" overwrite="true"
+			failonerror="true" verbose="true">
+			<fileset dir="${assembly.dir}">
+				<include name="${lams.ear}/**/*.*" />
+			</fileset>
+
+		</copy>
+	</target>
+
+	<!-- ============================================================================== -->
+	<!-- Copy the third party jar files and cofiguration files for deployment           -->
+	<!-- ============================================================================== -->
+	<target name="makeconfdir">
+		<delete quiet="true">
+			<fileset dir="${lamsconf}" />
+		</delete>
+		<mkdir dir="${lamsconf}" />
+	</target>
+
+	<target name="copyfiles" depends="makeconfdir"
+		description="copy lib and config files">
+		<copy overwrite="yes" todir="${jboss.server.dir}/conf/">
+			<fileset dir="${conf.jboss}/">
+				<include name="login-config.xml" />
+			</fileset>
+		</copy>
+		<copy overwrite="yes" todir="${lamsconf}">
+			<fileset dir="${conf.auth}/">
+				<include name="*.xml" />
+				<include name="*.dtd" />
+			</fileset>
+			<fileset dir="${conf.lams}/">
+				<include name="*.xml" />
+				<include name="*.dtd" />
+			</fileset>
+		</copy>
+		<copy overwrite="yes" todir="${jboss.deploy.dir}">
+			<fileset dir="${conf.jboss}/service">
+				<include name="mysql*.xml" />
+			</fileset>
+		</copy>
+	</target>
+
 </project>
Index: lams_build/shared.properties
===================================================================
diff -u
--- lams_build/shared.properties	(revision 0)
+++ lams_build/shared.properties	(revision 49c977067df3da97570afce0d9a470d71c529169)
@@ -0,0 +1,42 @@
+#   Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+# 
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 2 of the License, or
+#   (at your option) any later version.
+# 
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+# 
+#   You should have received a copy of the GNU General Public License
+#   along with this program; if not, write to the Free Software
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+#   USA
+# 
+#   http://www.gnu.org/licenses/gpl.txt 
+
+# Properties needed to run master-build. These are platform independent properties
+
+assembly.dir=assembly
+lams.ear=lams.ear
+assembly.lams.ear=${assembly.dir}/lams.ear
+assembly.temp.ear=${assembly.dir}/temp.ear
+lib.dir=lib
+app.xml=conf/j2ee/application.xml
+lams_common=lams_common
+lams_admin=lams_admin
+lams_learning=lams_learning
+lams_monitoring=lams_monitoring
+lams_authoring=lams_authoring
+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.war=${lams_learning}/${sub.build.dir}/lams_learning.war
+lams_authoring.war=${lams_authoring}/${sub.build.dir}/lams_authoring.war
+lams_monitoring.war=${lams_monitoring}/${sub.build.dir}/lams_monitoring.war
+lams_central.war=${lams_central}/${sub.build.dir}/lams_central.war
+lams_contentrepository.jar=${lams_contentrepository}/${sub.build.dir}/lams_contentrepository.jar
Index: lams_build/unix.properties
===================================================================
diff -u
--- lams_build/unix.properties	(revision 0)
+++ lams_build/unix.properties	(revision 49c977067df3da97570afce0d9a470d71c529169)
@@ -0,0 +1,34 @@
+#   Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+# 
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 2 of the License, or
+#   (at your option) any later version.
+# 
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+# 
+#   You should have received a copy of the GNU General Public License
+#   along with this program; if not, write to the Free Software
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+#   USA
+# 
+#   http://www.gnu.org/licenses/gpl.txt 
+
+# Properties needed to run master-build. 
+# These are OS dependent properties, configured for various flavours
+# of *nix. Named unix.properties for convenience - linuxunix.properties 
+# would have looked odd, as does otheros.properties.
+
+jboss.home=/var/jboss
+jboss.server.dir=${jboss.home}/server/
+jboss.deploy.dir=${jboss.server.dir}/default/deploy
+
+conf=${basedir}/conf/unix
+conf.jboss=${conf}/jboss
+conf.auth=${conf}/authentication
+conf.lams=${conf}/lams
+
+lamsconf=/usr/local/lamsconf
\ No newline at end of file
Index: lams_build/windows.properties
===================================================================
diff -u
--- lams_build/windows.properties	(revision 0)
+++ lams_build/windows.properties	(revision 49c977067df3da97570afce0d9a470d71c529169)
@@ -0,0 +1,33 @@
+#   Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+# 
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 2 of the License, or
+#   (at your option) any later version.
+# 
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+# 
+#   You should have received a copy of the GNU General Public License
+#   along with this program; if not, write to the Free Software
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+#   USA
+# 
+#   http://www.gnu.org/licenses/gpl.txt 
+
+# Properties needed to run master-build. 
+# These are OS dependent properties, configured for windows
+
+jboss.home=D:/jboss-3.2.6/
+jboss.server.dir=${jboss.home}/server/
+jboss.deploy.dir=${jboss.server.dir}/default/deploy
+
+conf=${basedir}/conf/windows
+conf.jboss=${conf}/jboss
+conf.auth=${conf}/authentication
+conf.lams=${conf}/lams
+
+lamsconf=C:/lamsconf
+