Index: lams_build/conf/standalone.xml
===================================================================
diff -u -ra1064a52a646aa043ea1fe371726537fd305c5de -r08c6a122c4ad83bf970409c0875bd1768d205c92
--- lams_build/conf/standalone.xml	(.../standalone.xml)	(revision a1064a52a646aa043ea1fe371726537fd305c5de)
+++ lams_build/conf/standalone.xml	(.../standalone.xml)	(revision 08c6a122c4ad83bf970409c0875bd1768d205c92)
@@ -241,10 +241,7 @@
                         <use-strict-min>false</use-strict-min>
                         <flush-strategy>FailingConnectionOnly</flush-strategy>
                     </pool>
-                    <security>
-                        <user-name>@db.username@</user-name>
-                        <password>@db.password@</password>
-                    </security>
+                    <security user-name="@db.username@" password="@db.password@" />
                     <validation>
                         <valid-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.mysql.MySQLValidConnectionChecker"/>
                         <validate-on-match>true</validate-on-match>
@@ -298,7 +295,7 @@
                     <managed-scheduled-executor-service name="default" jndi-name="java:jboss/ee/concurrency/scheduler/default" context-service="default" hung-task-termination-period="0" hung-task-threshold="60000" keepalive-time="3000"/>
                 </managed-scheduled-executor-services>
             </concurrent>
-            <default-bindings context-service="java:jboss/ee/concurrency/context/default" datasource="java:jboss/datasources/ExampleDS" managed-executor-service="java:jboss/ee/concurrency/executor/default" managed-scheduled-executor-service="java:jboss/ee/concurrency/scheduler/default" managed-thread-factory="java:jboss/ee/concurrency/factory/default"/>
+            <default-bindings context-service="java:jboss/ee/concurrency/context/default" datasource="java:jboss/datasources/lams-ds" managed-executor-service="java:jboss/ee/concurrency/executor/default" managed-scheduled-executor-service="java:jboss/ee/concurrency/scheduler/default" managed-thread-factory="java:jboss/ee/concurrency/factory/default"/>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:ee-security:1.0"/>
         <subsystem xmlns="urn:jboss:domain:ejb3:10.0">
@@ -365,12 +362,8 @@
                     <realm name="ManagementRealm" role-decoder="groups-to-roles"/>
                     <realm name="local" role-mapper="super-user-mapper"/>
                 </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"/>
-                        </login-module>
-                    </authentication>
+                <security-domain name="lams" default-realm="lamsSecurityRealm">
+                    <realm name="lamsSecurityRealm"/>
                 </security-domain>
             </security-domains>
             <security-realms>
@@ -383,6 +376,7 @@
                     <users-properties path="mgmt-users.properties" relative-to="jboss.server.config.dir" digest-realm-name="ManagementRealm"/>
                     <groups-properties path="mgmt-groups.properties" relative-to="jboss.server.config.dir"/>
                 </properties-realm>
+                <custom-realm name="lamsSecurityRealm" module="org.lamsfoundation.lams" class-name="org.lamsfoundation.lams.security.SecurityRealm"></custom-realm>
             </security-realms>
             <mappers>
                 <simple-permission-mapper name="default-permission-mapper" mapping-mode="first">
@@ -412,13 +406,13 @@
                 </permission-set>
             </permission-sets>
             <http>
-<!--                <http-authentication-factory name="application-http-authentication" security-domain="ApplicationDomain" http-server-mechanism-factory="global">-->
-<!--                    <mechanism-configuration>-->
-<!--                        <mechanism mechanism-name="BASIC">-->
-<!--                            <mechanism-realm realm-name="ApplicationRealm"/>-->
-<!--                        </mechanism>-->
-<!--                    </mechanism-configuration>-->
-<!--                </http-authentication-factory>-->
+                <http-authentication-factory name="application-http-authentication" security-domain="ApplicationDomain" http-server-mechanism-factory="global">
+                    <mechanism-configuration>
+                        <mechanism mechanism-name="BASIC">
+                            <mechanism-realm realm-name="ApplicationRealm"/>
+                        </mechanism>
+                    </mechanism-configuration>
+                </http-authentication-factory>
                 <http-authentication-factory name="management-http-authentication" security-domain="ManagementDomain" http-server-mechanism-factory="global">
                     <mechanism-configuration>
                         <mechanism mechanism-name="DIGEST">
@@ -614,6 +608,7 @@
                 <file name="welcome-content" path="${jboss.home.dir}/welcome-content"/>
             </handlers>
             <application-security-domains>
+                <application-security-domain name="lams" security-domain="lams" enable-jacc="true" />
                 <application-security-domain name="other" security-domain="ApplicationDomain"/>
             </application-security-domains>
         </subsystem>