Index: unix_installer/installer-package/install-lams.sh
===================================================================
RCS file: /usr/local/cvsroot/unix_installer/installer-package/install-lams.sh,v
diff -u -r1.3 -r1.4
Binary files differ
Index: unix_installer/installer-package/lams.properties
===================================================================
RCS file: /usr/local/cvsroot/unix_installer/installer-package/lams.properties,v
diff -u -r1.1 -r1.2
--- unix_installer/installer-package/lams.properties	10 May 2007 04:28:48 -0000	1.1
+++ unix_installer/installer-package/lams.properties	25 Jun 2007 05:30:10 -0000	1.2
@@ -17,7 +17,6 @@
 # 
 #   http://www.gnu.org/licenses/gpl.txt 
 #
-#   Author: Luke Foxton 
 
 #########################################################################################
 # Installation Options									#
@@ -55,7 +54,6 @@
 
 
 
-
 #########################################################################################
 # Essential Settings									#
 # These setting must be correct in order for the install to complete successfully	#
@@ -76,11 +74,15 @@
 JDK_DIR=/usr/bin/java/jdk1.6.0_01/
 
 # The location of your mysql executable (Must be 5.0 or higher)
-SQL_DIR=/usr/bin/
+SQL_DIR=/usr/bin
 
-# The URL that you jdbc driver will be running through
-SQL_URL=jdbc:mysql://localhost/${DB_NAME}?characterEncoding=utf8
+# The location of your MySql server, leave as localhost unless you are useing MySql on
+# a separate server
+SQL_HOST=localhost
 
+# The URL that your jdbc driver will be running through
+SQL_URL=jdbc:mysql://${SQL_HOST}/${DB_NAME}?characterEncoding=utf8&autoReconnect=true
+
 # The root password to access the database
 DB_ROOT_PASSWORD=
 
@@ -117,5 +119,8 @@
 SQL_DRIVER=com.mysql.jdbc.Driver
 SQL_JAR=mysql-connector-java-3.1.12-bin.jar
 
+# The URL of the default mysql database
+MYSQL_DB_URL=jdbc:mysql://${SQL_HOST}/mysql?characterEncoding=utf8
+
 #########################################################################################
 
Index: unix_installer/installer-package/license
===================================================================
RCS file: /usr/local/cvsroot/unix_installer/installer-package/license,v
diff -u -r1.1 -r1.2
Binary files differ
Index: unix_installer/installer-package/readme
===================================================================
RCS file: /usr/local/cvsroot/unix_installer/installer-package/readme,v
diff -u -r1.2 -r1.3
Binary files differ
Index: unix_installer/installer-package/assembly/lams-session.jar
===================================================================
RCS file: /usr/local/cvsroot/unix_installer/installer-package/assembly/Attic/lams-session.jar,v
diff -u -r1.3 -r1.4
Binary files differ
Index: unix_installer/installer-package/assembly/lams-valve.jar
===================================================================
RCS file: /usr/local/cvsroot/unix_installer/installer-package/assembly/Attic/lams-valve.jar,v
diff -u -r1.3 -r1.4
Binary files differ
Index: unix_installer/installer-package/bin/checkmysql.class
===================================================================
RCS file: /usr/local/cvsroot/unix_installer/installer-package/bin/checkmysql.class,v
diff -u -r1.1 -r1.2
Binary files differ
Index: unix_installer/installer-package/bin/run-lams.sh
===================================================================
RCS file: /usr/local/cvsroot/unix_installer/installer-package/bin/run-lams.sh,v
diff -u -r1.2 -r1.3
Binary files differ
Index: unix_installer/installer-package/conf/unix/authentication/lamsauthentication.xml
===================================================================
RCS file: /usr/local/cvsroot/unix_installer/installer-package/conf/unix/authentication/Attic/lamsauthentication.xml,v
diff -u -r1.2 -r1.3
--- unix_installer/installer-package/conf/unix/authentication/lamsauthentication.xml	16 May 2007 06:32:36 -0000	1.2
+++ unix_installer/installer-package/conf/unix/authentication/lamsauthentication.xml	25 Jun 2007 05:30:10 -0000	1.3
@@ -1,20 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Authentication PUBLIC "-//LAMS//DTD LAMS//EN" "http://lamsfoundation.org/dtd/lamsauthentication.dtd">
+<!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.provider.url">ldap://192.168.111.35</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="principalDNPrefix">cn=</Param>
+	<Param Name="principalDNSuffix">,dc=melcoe,dc=local</Param>
+	<Param Name="dsJndiName">java:/jdbc/lams-ds</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="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>
+	<!-- Uncomment the following if connecting using SSL
+	<Param Name="java.naming.security.protocol">ssl</Param>
 	<Param Name="truststore.path">D:/MQLdapTrustStore</Param>
 	<Param Name="truststore.password">webauth</Param>
+	-->
 </Method>
 
 
Index: unix_installer/installer-package/conf/unix/jboss/service/mysql-ds.xml
===================================================================
RCS file: /usr/local/cvsroot/unix_installer/installer-package/conf/unix/jboss/service/mysql-ds.xml,v
diff -u -r1.2 -r1.3
--- unix_installer/installer-package/conf/unix/jboss/service/mysql-ds.xml	16 May 2007 06:33:09 -0000	1.2
+++ unix_installer/installer-package/conf/unix/jboss/service/mysql-ds.xml	25 Jun 2007 05:30:10 -0000	1.3
@@ -9,7 +9,7 @@
   <!-- 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/@DB_NAME@</connection-url>
+    <connection-url>jdbc:mysql://@MYSQL_HOST@:3306/@DB_NAME@</connection-url>
     <driver-class>com.mysql.jdbc.Driver</driver-class>
     <!-- Tell MySQL Connector to use UTF-8 character encoding, -->
     <!-- and convert MySQL zero times to null -->
@@ -29,7 +29,7 @@
   <!-- tool-ds datasource for use by Tools -->
   <local-tx-datasource>
     <jndi-name>jdbc/tool-ds</jndi-name>
-    <connection-url>jdbc:mysql://localhost:3306/@DB_NAME@</connection-url>
+    <connection-url>jdbc:mysql://@MYSQL_HOST@:3306/@DB_NAME@</connection-url>
     <driver-class>com.mysql.jdbc.Driver</driver-class>
     <!-- Tell MySQL Connector to use UTF-8 character encoding, -->
     <!-- and convert MySQL zero times to null -->
@@ -49,7 +49,7 @@
   <!-- quartz-ds datasource for use by Quartz -->
   <local-tx-datasource>
     <jndi-name>jdbc/quartz-ds</jndi-name>
-    <connection-url>jdbc:mysql://localhost:3306/@DB_NAME@</connection-url>
+    <connection-url>jdbc:mysql://@MYSQL_HOST@:3306/@DB_NAME@</connection-url>
     <driver-class>com.mysql.jdbc.Driver</driver-class>
     <!-- Set transaction isolation level to match db -->
     <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation>	
Index: unix_installer/installer-package/database/create-database.sql
===================================================================
RCS file: /usr/local/cvsroot/unix_installer/installer-package/database/Attic/create-database.sql,v
diff -u
Binary files differ
Index: unix_installer/installer-package/database/lams.dump
===================================================================
RCS file: /usr/local/cvsroot/unix_installer/installer-package/database/Attic/lams.dump,v
diff -u -r1.1 -r1.2
Binary files differ
Index: unix_installer/installer-package/sql-scripts/create-database.sql
===================================================================
RCS file: /usr/local/cvsroot/unix_installer/installer-package/sql-scripts/create-database.sql,v
diff -u
Binary files differ