Index: lams_tool_forum/src/java/forumApplicationContext.xml
===================================================================
diff -u -re16f09694ef763b1acafa32958762c90332b8228 -r5f015bed03f28f95ee08f3c03a1f3f03254cf426
--- lams_tool_forum/src/java/forumApplicationContext.xml	(.../forumApplicationContext.xml)	(revision e16f09694ef763b1acafa32958762c90332b8228)
+++ lams_tool_forum/src/java/forumApplicationContext.xml	(.../forumApplicationContext.xml)	(revision 5f015bed03f28f95ee08f3c03a1f3f03254cf426)
@@ -4,9 +4,7 @@
 
     <!-- Hibernate SessionFactory -->
     <bean id="sessionFactory" class="org.springframework.orm.hibernate.LocalSessionFactoryBean">
-        <property name="dataSource">
-            <ref local="dataSource"/>
-        </property>
+		<property name="dataSource"><ref bean="toolDataSource"/></property>
 
         <!-- Must references all OR mapping files. -->
         <property name="mappingResources">
@@ -26,48 +24,8 @@
         </property>
     </bean>
 
-    <!-- Data Source -->
-   <!-- <bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource" destroy-method="close">
-        <property name="driverClassName">
-            <value>org.hsqldb.jdbcDriver</value>
-        </property>
-        <property name="url">
-            <value>jdbc:hsqldb:.</value>
-        </property>
-        <property name="username">
-            <value>sa</value>
-        </property>
-        <property name="password">
-            <value></value>
-        </property>
-    </bean>
-    -->
-
-    <bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource" destroy-method="close">
-        <property name="driverClassName">
-            <value>com.mysql.jdbc.Driver</value>
-        </property>
-        <property name="url">
-            <value>jdbc:mysql://localhost/lams</value>
-        </property>
-        <property name="username">
-            <value>lams</value>
-        </property>
-        <property name="password">
-            <value>lamsdemo</value>
-        </property>
-    </bean>
-
-
-    <!-- Spring Hibernate Transaction Manager -->
-    <bean id="transactionManager" class="org.springframework.orm.hibernate.HibernateTransactionManager">
-        <property name="sessionFactory">
-            <ref bean="sessionFactory"/>
-        </property>
-    </bean>
-
     <!-- core beans -->
-<bean id="persistenceDelegate" class="org.lamsfoundation.lams.tool.forum.core.PersistenceDelegateImpl"/>
+	<bean id="persistenceDelegate" class="org.lamsfoundation.lams.tool.forum.core.PersistenceDelegateImpl"/>
 
     <bean id="genericEntityDao" class="org.lamsfoundation.lams.tool.forum.persistence.GenericEntityDao">
         <property name="sessionFactory">
@@ -99,19 +57,14 @@
     <bean id="permissionManager" class="org.lamsfoundation.lams.tool.forum.permissions.PermissionManagerImpl">
     </bean>
 
-    <!-- Spring Hibernate Transaction Manager -->
-
-
     <bean id="forumManagerTarget" class="org.lamsfoundation.lams.tool.forum.service.ForumManagerImpl">
         <property name="persistenceDelegate">
             <ref local="persistenceDelegate"/>
         </property>
     </bean>
 
     <bean id="forumManager" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
-        <property name="transactionManager">
-            <ref local="transactionManager"/>
-        </property>
+		<property name="transactionManager"><ref bean="transactionManager"/></property>
         <property name="target">
             <ref local="forumManagerTarget"/>
         </property>
Index: lams_tool_forum/web/WEB-INF/web.xml
===================================================================
diff -u -r2c810bb0c592aa2a70f4c858f1b81a2e61c6012b -r5f015bed03f28f95ee08f3c03a1f3f03254cf426
--- lams_tool_forum/web/WEB-INF/web.xml	(.../web.xml)	(revision 2c810bb0c592aa2a70f4c858f1b81a2e61c6012b)
+++ lams_tool_forum/web/WEB-INF/web.xml	(.../web.xml)	(revision 5f015bed03f28f95ee08f3c03a1f3f03254cf426)
@@ -14,6 +14,7 @@
 	<context-param>
 		<param-name>contextConfigLocation</param-name>
 		<param-value>
+			classpath:/org/lamsfoundation/lams/applicationContext.xml
 			classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml
 	  		classpath:/forumApplicationContext.xml
 		</param-value>
Index: lams_tool_laqa/build.properties
===================================================================
diff -u -r2324d2f357190c9cc7457cf90a3dc49b9423838b -r5f015bed03f28f95ee08f3c03a1f3f03254cf426
--- lams_tool_laqa/build.properties	(.../build.properties)	(revision 2324d2f357190c9cc7457cf90a3dc49b9423838b)
+++ lams_tool_laqa/build.properties	(.../build.properties)	(revision 5f015bed03f28f95ee08f3c03a1f3f03254cf426)
@@ -3,10 +3,6 @@
 #name of this project
 signature=laqa11
 
-# Directory where third party jars reside.
-j2eelibs=C:/Program Files/MyEclipse/eclipse/plugins/com.genuitec.eclipse.j2eedt.core_3.8.4/data/libraryset/1.4
-
-
 #submit files package definition
 qa.package=org.lamsfoundation.lams.tool.qa
 qa.path=org/lamsfoundation/lams/tool/qa
@@ -24,5 +20,4 @@
 testweb=${basedir}/test/web
 testwebinf=${testweb}/WEB-INF
 
-jboss.home=D:/jboss-3.2.6/
-contentrepository.location = D:/repository
+contentrepository.location = /tmp/repository
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml
===================================================================
diff -u -r11b1827ff684ae7472bb77194d2c35a9dafc0bc1 -r5f015bed03f28f95ee08f3c03a1f3f03254cf426
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml	(.../qaApplicationContext.xml)	(revision 11b1827ff684ae7472bb77194d2c35a9dafc0bc1)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml	(.../qaApplicationContext.xml)	(revision 5f015bed03f28f95ee08f3c03a1f3f03254cf426)
@@ -10,28 +10,11 @@
 
 	<!-- ========================= GENERAL DEFINITIONS ========================= -->
 
-	<!-- Configurer that replaces ${...} placeholders with values from a properties file -->
-	<!-- (in this case, hibernate-related settings for the session factory definition below) -->
-	
-	<bean id="propertyConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-		<property name="location"><value>/WEB-INF/dbConnection.properties</value></property>
-	</bean>
-
-
 	<!-- ========================= RESOURCE DEFINITIONS ========================= -->
 	
-		<!-- Local DataSource that works in any environment -->
-	<bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource">
-		<property name="driverClassName"><value>${jdbc.driverClassName}</value></property>
-		<property name="url"><value>${jdbc.url}</value></property>
-		<property name="username"><value>${jdbc.username}</value></property>
-		<property name="password"><value>${jdbc.password}</value></property>
-	</bean>
-	
-	
 	<!-- Hibernate SessionFactory -->
 	<bean id="qaSessionFactory" class="org.springframework.orm.hibernate.LocalSessionFactoryBean">
-		<property name="dataSource"><ref local="dataSource"/></property>
+		<property name="dataSource"><ref bean="toolDataSource"/></property>
 		<property name="mappingResources">
 			<list>	
 				<value>/WEB-INF/QaContent.hbm.xml</value>
@@ -54,14 +37,6 @@
 		</property>
 	</bean>
 
-	<!-- If we really use multiple SessionFactory, we have to change to JTA Transaction Manager -->
-	<!-- bean id="transactionManager" class="org.springframework.transaction.jta.JtaTransactionManager"/-->
-	<!-- Transaction manager for a single Hibernate SessionFactory (alternative to JTA) -->
-	<bean id="transactionManager" class="org.springframework.orm.hibernate.HibernateTransactionManager">
-		<property name="sessionFactory"><ref local="qaSessionFactory"/></property>
-	</bean>
-
-	
 	<!-- ========================= BUSINESS OBJECT DEFINITIONS ======================== -->
 
 	<!-- tool beans -->
Index: lams_tool_laqa/test/web/WEB-INF/web.xml
===================================================================
diff -u -r1a3ba47c7a8bfccfd83b51645739dec49f30f44b -r5f015bed03f28f95ee08f3c03a1f3f03254cf426
--- lams_tool_laqa/test/web/WEB-INF/web.xml	(.../web.xml)	(revision 1a3ba47c7a8bfccfd83b51645739dec49f30f44b)
+++ lams_tool_laqa/test/web/WEB-INF/web.xml	(.../web.xml)	(revision 5f015bed03f28f95ee08f3c03a1f3f03254cf426)
@@ -116,7 +116,7 @@
    
    <taglib>
     <taglib-uri>fck-editor</taglib-uri>
-    <taglib-location>/WEB-INF/fckEditor/tlds/FCKeditor.tld</taglib-location>
+    <taglib-location>/WEB-INF/fckeditor/tlds/FCKeditor.tld</taglib-location>
   </taglib>
 
    <!--
Index: lams_tool_nb/build.properties
===================================================================
diff -u -r6d258aecc0c812e10b46498c0a2edfc1d5c92f44 -r5f015bed03f28f95ee08f3c03a1f3f03254cf426
--- lams_tool_nb/build.properties	(.../build.properties)	(revision 6d258aecc0c812e10b46498c0a2edfc1d5c92f44)
+++ lams_tool_nb/build.properties	(.../build.properties)	(revision 5f015bed03f28f95ee08f3c03a1f3f03254cf426)
@@ -23,11 +23,6 @@
 package=org/lamsfoundation/lams/tool/noticeboard
 package.name=org.lamsfoundation.lams.tool.noticeboard
 
-# path properties 
-j2eelibs=C:/Program Files/MyEclipse/eclipse/plugins/com.genuitec.eclipse.j2eedt.core_3.8.4/data/libraryset/1.4
 
-# /var/jboss
-jboss.home=D:/jboss-3.2.6/
 
 
-
Index: lams_tool_nb/build.xml
===================================================================
diff -u -r0d5387167b9fa41e042bf47cc8774bba06799731 -r5f015bed03f28f95ee08f3c03a1f3f03254cf426
--- lams_tool_nb/build.xml	(.../build.xml)	(revision 0d5387167b9fa41e042bf47cc8774bba06799731)
+++ lams_tool_nb/build.xml	(.../build.xml)	(revision 5f015bed03f28f95ee08f3c03a1f3f03254cf426)
@@ -267,7 +267,7 @@
 		<!-- =================================================================== -->
 		<!-- Run JUnit Tests                                                     -->
 		<!-- =================================================================== -->
-		<target name="test" depends="compile-test"> 
+		<target name="test" depends="compile-test, insert-test-data"> 
 			<mkdir dir="${build.report}"/>
 			<junit printsummary="yes" haltonerror="no" haltonfailure="no"
 				   fork="yes">
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/applicationContext.xml
===================================================================
diff -u -r47989c309b7d757320c6536f139fac57f814919a -r5f015bed03f28f95ee08f3c03a1f3f03254cf426
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/applicationContext.xml	(.../applicationContext.xml)	(revision 47989c309b7d757320c6536f139fac57f814919a)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/applicationContext.xml	(.../applicationContext.xml)	(revision 5f015bed03f28f95ee08f3c03a1f3f03254cf426)
@@ -9,24 +9,9 @@
 	<!-- ========================= GENERAL DEFINITIONS ========================= -->
 
 	<!-- ========================= RESOURCE DEFINITIONS ========================= -->
-	<!-- JNDI DataSource  - uses tool-ds Datasource set up in the app-server -->
-  <!--	<bean id="toolDataSource" class="org.springframework.jndi.JndiObjectFactoryBean">
-		<property name="jndiName"><value>java:jdbc/tool-ds</value></property>
-	</bean>  -->
-	
-	<!--  <bean id="toolDataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource">
-		<property name="driverClassName"><value>com.mysql.jdbc.Driver</value></property>
-		<property name="url"><value>jdbc:mysql://localhost/lams?characterEncoding=utf8</value></property>
-		<property name="username"><value>lams</value></property>
-		<property name="password"><value>lamsdemo</value></property>
-	</bean> -->
-	<bean id="toolDataSource" class="org.springframework.jndi.JndiObjectFactoryBean">
-		<property name="jndiName"><value>java:jdbc/tool-ds</value></property>
-	</bean>
-
 	<!-- Hibernate SessionFactory -->
 	  <bean id="nbSessionFactory" class="org.springframework.orm.hibernate.LocalSessionFactoryBean">
-		<property name="dataSource"><ref local="toolDataSource"/></property>
+		<property name="dataSource"><ref bean="toolDataSource"/></property>
 		<property name="mappingResources">
 			<list>	
 				<value>org/lamsfoundation/lams/tool/noticeboard/NoticeboardContent.hbm.xml</value>
@@ -47,14 +32,6 @@
 		</property>
 	</bean>
 
-	<!-- If we really use multiple SessionFactory, we have to change to JTA Transaction Manager -->
-	<!-- bean id="transactionManager" class="org.springframework.transaction.jta.JtaTransactionManager"/-->
-	<!-- Transaction manager for a single Hibernate SessionFactory (alternative to JTA) -->
-	<bean id="transactionManager" class="org.springframework.orm.hibernate.HibernateTransactionManager">
-		<property name="sessionFactory"><ref local="nbSessionFactory"/></property>
-	</bean>
-
-	
 	<!-- ========================= BUSINESS OBJECT DEFINITIONS ======================== -->
 	<bean id="nbService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
 		<property name="transactionManager"><ref bean="transactionManager"/></property>
Index: lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/NbDataAccessTestCase.java
===================================================================
diff -u -r09f53aadc7e65fbbda0d3dc592c50621ac578a81 -r5f015bed03f28f95ee08f3c03a1f3f03254cf426
--- lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/NbDataAccessTestCase.java	(.../NbDataAccessTestCase.java)	(revision 09f53aadc7e65fbbda0d3dc592c50621ac578a81)
+++ lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/NbDataAccessTestCase.java	(.../NbDataAccessTestCase.java)	(revision 5f015bed03f28f95ee08f3c03a1f3f03254cf426)
@@ -27,7 +27,7 @@
 
 package org.lamsfoundation.lams.tool.noticeboard;
 
-import org.lamsfoundation.lams.AbstractLamsTestCase;
+import org.lamsfoundation.lams.test.AbstractLamsTestCase;
 import org.lamsfoundation.lams.tool.noticeboard.dao.hibernate.NoticeboardContentDAO;
 import org.lamsfoundation.lams.tool.noticeboard.dao.hibernate.NoticeboardSessionDAO;
 import org.lamsfoundation.lams.tool.noticeboard.dao.hibernate.NoticeboardUserDAO;
@@ -139,7 +139,7 @@
 	 /** Define the context files. Overrides method in AbstractLamsTestCase */
     protected String[] getContextConfigLocation() {
     	return new String[] {
-    	        //"org/lamsfoundation/lams/applicationContext.xml",
+    	        "org/lamsfoundation/lams/localApplicationContext.xml",
     			//"org/lamsfoundation/lams/lesson/lessonApplicationContext.xml",
     			//"org/lamsfoundation/lams/tool/toolApplicationContext.xml",
     			//"org/lamsfoundation/lams/learning/learningApplicationContext.xml",