Index: lams_build/conf/j2ee/jboss-app.xml
===================================================================
diff -u
--- lams_build/conf/j2ee/jboss-app.xml	(revision 0)
+++ lams_build/conf/j2ee/jboss-app.xml	(revision 9bfa89e11ba6cdcbf87f128f142a24047abb139d)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<jboss-app xmlns="http://www.jboss.com/xml/ns/javaee"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:schemaLocation="http://www.jboss.org/j2ee/schema/jboss-app_7_0.xsd"
+           version="7.0">
+           
+	<security-domain>lams</security-domain>
+</jboss-app>
\ No newline at end of file
Index: lams_build/conf/standalone.xml
===================================================================
diff -u -r1844238a2f60615475db8855871a1488d04e629b -r9bfa89e11ba6cdcbf87f128f142a24047abb139d
--- lams_build/conf/standalone.xml	(.../standalone.xml)	(revision 1844238a2f60615475db8855871a1488d04e629b)
+++ lams_build/conf/standalone.xml	(.../standalone.xml)	(revision 9bfa89e11ba6cdcbf87f128f142a24047abb139d)
@@ -163,7 +163,7 @@
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:datasources:2.0">
             <datasources>
-                <datasource jndi-name="java:jboss/datasources/lams-ds" pool-name="lams-ds" spy="true">
+                <datasource jndi-name="java:jboss/datasources/lams-ds" pool-name="lams-ds" spy="false">
 				    <connection-url>@db.url.run@</connection-url>
 				    <driver>MySQL</driver>
 				    <connection-property name="characterEncoding">utf8</connection-property>
@@ -366,6 +366,21 @@
                         </login-module>
                     </authentication>
                 </security-domain>
+                <security-domain name="lams" cache-type="default">
+                    <authentication>
+                        <login-module code="org.lamsfoundation.lams.security.UniversalLoginModule" flag="required">
+                            <module-option name="dsJndiName" value="java:jboss/datasources/lams-ds"/>
+                            <module-option name="principalsQuery" value="SELECT password FROM lams_user WHERE login=?"/>
+                            <module-option name="rolesQuery" value="
+				             	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=?"
+				             />
+                        </login-module>
+                    </authentication>
+                </security-domain>
                 <security-domain name="jboss-web-policy" cache-type="default">
                     <authorization>
                         <policy-module code="Delegating" flag="required"/>