Index: lams_build/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_build/build.xml,v
diff -u -r1.43 -r1.44
--- lams_build/build.xml	28 Sep 2006 23:41:33 -0000	1.43
+++ lams_build/build.xml	17 Oct 2006 08:19:21 -0000	1.44
@@ -280,13 +280,23 @@
 				<include name="log4j.xml" />
 				<include name="jboss-service.xml" />
 			</fileset>
+	        <filterset>
+	                <filter token="confdir" value="${jboss.server.instance}/conf"/>
+	        </filterset>
 		</copy>
-		<tstamp/>
-		<copy overwrite="yes" todir="${lamsconf}">
+		
+		<copy overwrite="yes" todir="${jboss.server.instance}/conf/">
 			<fileset dir="${conf.auth}/">
 				<include name="*.xml" />
 				<include name="*.dtd" />
 			</fileset>
+	        <filterset>
+	                <filter token="confdir" value="${jboss.server.instance}/conf"/>
+	        </filterset>
+		</copy>
+
+		<tstamp/>
+		<copy overwrite="yes" todir="${lamsconf}">
 			<fileset dir="${conf.lams}/">
 				<include name="*.xml" />
 				<include name="*.dtd" />
@@ -295,6 +305,7 @@
 	                <filter token="datetimestamp" value="${DSTAMP}${TSTAMP}"/>
 	        </filterset>
 		</copy>
+
 		<copy overwrite="yes" todir="${jboss.ear.deploy}">
 			<fileset dir="${conf.jboss}/service">
 				<include name="mysql*.xml" />
@@ -320,7 +331,7 @@
 		<ant antfile="../${lams_common}/build.xml" target="copy-shared-session-jar" inheritAll="false"/>
 		<ant antfile="../${lams_common}/build.xml" target="copy-lams-valve-jar" inheritAll="false"/>
 		<echo message="Please copy jboss-cache.jar and jgroups.jar from server/all/lib to server/default/lib"
-			level="warning"/>
+			level="warning"/> 
 	</target>
 
 	<target name="test-report" description="Run all the test cases across the system. Takes a long time.">
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_build/conf/unix/authentication/authentication.dtd'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.4 refers to a dead (removed) revision in file `lams_build/conf/unix/authentication/authentication.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_build/conf/unix/authentication/lamsauthentication.dtd
===================================================================
RCS file: /usr/local/cvsroot/lams_build/conf/unix/authentication/Attic/lamsauthentication.dtd,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_build/conf/unix/authentication/lamsauthentication.dtd	17 Oct 2006 08:19:21 -0000	1.1
@@ -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/lamsauthentication.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_build/conf/unix/authentication/Attic/lamsauthentication.xml,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_build/conf/unix/authentication/lamsauthentication.xml	17 Oct 2006 08:19:21 -0000	1.1
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE Authentication PUBLIC "-//LAMS//DTD LAMS//EN" "file:///@confdir@/lamsauthentication.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:/jdbc/lams-ds</Param>
+	<Param Name="principalsQuery">select password from lams_user where login=?</Param>
+	<Param Name="rolesQuery">
+	            SELECT DISTINCT  r.name,'Roles' FROM
+             	lams_user u LEFT OUTER JOIN lams_user_organisation uo USING(user_id)
+             	LEFT OUTER JOIN lams_user_organisation_role urr USING(user_organisation_id)
+             	LEFT OUTER JOIN lams_role r USING (role_id)
+             	WHERE u.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 DISTINCT  r.name,'Roles' FROM
+             	lams_user u LEFT OUTER JOIN lams_user_organisation uo USING(user_id)
+             	LEFT OUTER JOIN lams_user_organisation_role urr USING(user_organisation_id)
+             	LEFT OUTER JOIN lams_role r USING (role_id)
+             	WHERE u.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 DISTINCT  r.name,'Roles' FROM
+             	lams_user u LEFT OUTER JOIN lams_user_organisation uo USING(user_id)
+             	LEFT OUTER JOIN lams_user_organisation_role urr USING(user_organisation_id)
+             	LEFT OUTER JOIN lams_role r USING (role_id)
+             	WHERE u.login=?
+	</Param>
+</Method>
+
+</Authentication>
Index: lams_build/conf/unix/jboss/login-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_build/conf/unix/jboss/login-config.xml,v
diff -u -r1.3 -r1.4
--- lams_build/conf/unix/jboss/login-config.xml	6 Oct 2005 02:00:04 -0000	1.3
+++ lams_build/conf/unix/jboss/login-config.xml	17 Oct 2006 08:19:21 -0000	1.4
@@ -169,7 +169,7 @@
 	<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>
+             <module-option name="authenticationPropertyFile">@confdir@/lamsauthentication.xml</module-option>
           </login-module>
        </authentication>
     </application-policy>
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_build/conf/windows/authentication/authentication.dtd'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.4 refers to a dead (removed) revision in file `lams_build/conf/windows/authentication/authentication.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_build/conf/windows/authentication/lamsauthentication.dtd
===================================================================
RCS file: /usr/local/cvsroot/lams_build/conf/windows/authentication/Attic/lamsauthentication.dtd,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_build/conf/windows/authentication/lamsauthentication.dtd	17 Oct 2006 08:19:21 -0000	1.1
@@ -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/lamsauthentication.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_build/conf/windows/authentication/Attic/lamsauthentication.xml,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_build/conf/windows/authentication/lamsauthentication.xml	17 Oct 2006 08:19:21 -0000	1.1
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE Authentication PUBLIC "-//LAMS//DTD LAMS//EN" "file:///@confdir@/lamsauthentication.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 DISTINCT  r.name,'Roles' FROM
+             	lams_user u LEFT OUTER JOIN lams_user_organisation uo USING(user_id)
+             	LEFT OUTER JOIN lams_user_organisation_role urr USING(user_organisation_id)
+             	LEFT OUTER JOIN lams_role r USING (role_id)
+             	WHERE u.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:/jdbc/lams-ds</Param>
+	<Param Name="principalsQuery">select password from lams_user where login=?</Param>
+	<Param Name="rolesQuery">
+	            SELECT DISTINCT  r.name,'Roles' FROM
+             	lams_user u LEFT OUTER JOIN lams_user_organisation uo USING(user_id)
+             	LEFT OUTER JOIN lams_user_organisation_role urr USING(user_organisation_id)
+             	LEFT OUTER JOIN lams_role r USING (role_id)
+             	WHERE u.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 DISTINCT  r.name,'Roles' FROM
+             	lams_user u LEFT OUTER JOIN lams_user_organisation uo USING(user_id)
+             	LEFT OUTER JOIN lams_user_organisation_role urr USING(user_organisation_id)
+             	LEFT OUTER JOIN lams_role r USING (role_id)
+             	WHERE u.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 DISTINCT  r.name,'Roles' FROM
+             	lams_user u LEFT OUTER JOIN lams_user_organisation uo USING(user_id)
+             	LEFT OUTER JOIN lams_user_organisation_role urr USING(user_organisation_id)
+             	LEFT OUTER JOIN lams_role r USING (role_id)
+             	WHERE u.login=?
+	</Param>
+</Method>
+
+</Authentication>
Index: lams_build/conf/windows/jboss/login-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_build/conf/windows/jboss/login-config.xml,v
diff -u -r1.3 -r1.4
--- lams_build/conf/windows/jboss/login-config.xml	6 Oct 2005 01:55:59 -0000	1.3
+++ lams_build/conf/windows/jboss/login-config.xml	17 Oct 2006 08:19:21 -0000	1.4
@@ -169,7 +169,7 @@
 	<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>
+             <module-option name="authenticationPropertyFile">@confdir@/lamsauthentication.xml</module-option>
           </login-module>
        </authentication>
     </application-policy>
Index: lams_build/conf/windows/lams/lams.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_build/conf/windows/lams/Attic/lams.xml,v
diff -u -r1.18 -r1.19
--- lams_build/conf/windows/lams/lams.xml	12 Oct 2006 02:20:59 -0000	1.18
+++ lams_build/conf/windows/lams/lams.xml	17 Oct 2006 08:19:21 -0000	1.19
@@ -6,7 +6,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>
+	<EARDir>c:/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>