Index: lams_build/conf/standalone.xml
===================================================================
diff -u -r406b3a48bcf593843e5d25346c9a72f53bccf31f -r281aed83b99fe03afc3bfeda0d48753f9cf2b4c5
--- lams_build/conf/standalone.xml	(.../standalone.xml)	(revision 406b3a48bcf593843e5d25346c9a72f53bccf31f)
+++ lams_build/conf/standalone.xml	(.../standalone.xml)	(revision 281aed83b99fe03afc3bfeda0d48753f9cf2b4c5)
@@ -138,7 +138,7 @@
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:datasources:2.0">
             <datasources>
-                <datasource enabled="true" jndi-name="java:jboss/datasources/jdbc/lams-ds" jta="true" pool-name="jdbc/lams-ds" spy="false" use-ccm="true" use-java-context="true">
+                <datasource jndi-name="java:jboss/datasources/lams-ds" pool-name="lams-ds">
 				    <connection-url>@db.url.run@</connection-url>
 				    <driver>MySQL</driver>
 				    <connection-property name="characterEncoding">utf8</connection-property>
@@ -210,7 +210,7 @@
                     <managed-thread-factory name="default" jndi-name="java:jboss/ee/concurrency/factory/default" context-service="default"/>
                 </managed-thread-factories>
             </concurrent>
-            <default-bindings context-service="java:jboss/ee/concurrency/context/default" datasource="java:jboss/datasources/ExampleDS" jms-connection-factory="java:jboss/DefaultJMSConnectionFactory" 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" jms-connection-factory="java:jboss/DefaultJMSConnectionFactory" 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:ejb3:2.0">
             <session-bean>
Index: lams_build/conf/unix/jboss/login-config.xml
===================================================================
diff -u -r2f21856ec2ab85b47c93cfcc3fa2c8769be65077 -r281aed83b99fe03afc3bfeda0d48753f9cf2b4c5
--- lams_build/conf/unix/jboss/login-config.xml	(.../login-config.xml)	(revision 2f21856ec2ab85b47c93cfcc3fa2c8769be65077)
+++ lams_build/conf/unix/jboss/login-config.xml	(.../login-config.xml)	(revision 281aed83b99fe03afc3bfeda0d48753f9cf2b4c5)
@@ -129,7 +129,7 @@
 	<application-policy name = "lams">
        <authentication>
           <login-module code = "org.lamsfoundation.lams.security.UniversalLoginModule" flag = "required">
-             <module-option name="dsJndiName">java:/jdbc/lams-ds</module-option>
+             <module-option name="dsJndiName">java:jboss/datasources/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
Index: lams_build/conf/windows/jboss/login-config.xml
===================================================================
diff -u -r2f21856ec2ab85b47c93cfcc3fa2c8769be65077 -r281aed83b99fe03afc3bfeda0d48753f9cf2b4c5
--- lams_build/conf/windows/jboss/login-config.xml	(.../login-config.xml)	(revision 2f21856ec2ab85b47c93cfcc3fa2c8769be65077)
+++ lams_build/conf/windows/jboss/login-config.xml	(.../login-config.xml)	(revision 281aed83b99fe03afc3bfeda0d48753f9cf2b4c5)
@@ -129,7 +129,7 @@
 	<application-policy name = "lams">
        <authentication>
           <login-module code = "org.lamsfoundation.lams.security.UniversalLoginModule" flag = "required">
-             <module-option name="dsJndiName">java:/jdbc/lams-ds</module-option>
+             <module-option name="dsJndiName">java:jboss/datasources/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
Index: lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml
===================================================================
diff -u -r4f40b2a39d2e2a4fcaeebe3568eb91858732fb8f -r281aed83b99fe03afc3bfeda0d48753f9cf2b4c5
--- lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml	(.../applicationContext.xml)	(revision 4f40b2a39d2e2a4fcaeebe3568eb91858732fb8f)
+++ lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml	(.../applicationContext.xml)	(revision 281aed83b99fe03afc3bfeda0d48753f9cf2b4c5)
@@ -45,7 +45,7 @@
 	<!-- JNDI DataSource for all "core" components 		  -->
 	<!-- uses lams-ds datasource set up in the app-server -->
 	<bean id="dataSource" class="org.springframework.jndi.JndiObjectFactoryBean">
-		<property name="jndiName"><value>java:jdbc/lams-ds</value></property>
+		<property name="jndiName"><value>java:jboss/datasources/lams-ds</value></property>
 	</bean>
 
 	<!--  Transaction manager for all transactions involving the core classes or the content repository.