Index: lams_build/conf/unix/jboss/login-config.xml
===================================================================
diff -u -r30e760aea89a9cdcb92d8d2cf4bf8bc48bf62804 -rff699ca7b093afca3634544000aef419b70a1f27
--- lams_build/conf/unix/jboss/login-config.xml	(.../login-config.xml)	(revision 30e760aea89a9cdcb92d8d2cf4bf8bc48bf62804)
+++ lams_build/conf/unix/jboss/login-config.xml	(.../login-config.xml)	(revision ff699ca7b093afca3634544000aef419b70a1f27)
@@ -150,13 +150,13 @@
        </authentication>
     </application-policy>
 
-	<application-policy name = "lams-DB">
+	<application-policy name = "lams">
        <authentication>
-          <login-module code = "org.jboss.security.auth.spi.DatabaseServerLoginModule" flag = "required">
-             <module-option name="dsJndiName">java:/MySqlDS</module-option>
+          <login-module code = "org.lamsfoundation.lams.security.UniversalLoginModule" flag = "required">
+             <module-option name="dsJndiName">java:/jdbc/lams-ds</module-option>
              <module-option name="principalsQuery">select password from lams_user where login=?</module-option>
              <module-option name="rolesQuery">
-	            SELECT DISTINCT  r.name,'Roles' FROM
+             	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)
@@ -166,14 +166,6 @@
        </authentication>
     </application-policy>
 
-	<application-policy name = "lams">
-       <authentication>
-          <login-module code = "org.lamsfoundation.lams.security.UniversalLoginModule" flag = "required">
-             <module-option name="authenticationPropertyFile">@confdir@/lamsauthentication.xml</module-option>
-          </login-module>
-       </authentication>
-    </application-policy>
 
-
 </policy>