Index: lams_common/conf/xdoclet/web-settings.xml
===================================================================
diff -u -rb5e2e71d176c89c0685d090c662bc303fbc85ea7 -r75239a45d21d7acea900a9ddecf1ab0cc2d4d9a2
--- lams_common/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision b5e2e71d176c89c0685d090c662bc303fbc85ea7)
+++ lams_common/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 75239a45d21d7acea900a9ddecf1ab0cc2d4d9a2)
@@ -18,10 +18,14 @@
 
 http://www.gnu.org/licenses/gpl.txt
 -->
-<context-param>
-	<param-name>contextConfigLocation</param-name>
-	<param-value>/WEB-INF/spring/applicationContext.xml		  
-	/WEB-INF/spring/learningDesignApplicationContext.xml		  
-	/WEB-INF/spring/workspaceApplicationContext.xml 
-	</param-value>
-</context-param>
+	<context-param>
+		<param-name>contextConfigLocation</param-name>
+		<param-value>
+			classpath:/org/lamsfoundation/lams/applicationContext.xml
+		</param-value>
+	</context-param>
+	<listener>
+		<listener-class>
+			org.springframework.web.context.ContextLoaderListener
+		</listener-class>
+	</listener>	
Index: lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml
===================================================================
diff -u -rb0e60dcaf9e70b994ba004f4ce83feda7923ad39 -r75239a45d21d7acea900a9ddecf1ab0cc2d4d9a2
--- lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml	(.../applicationContext.xml)	(revision b0e60dcaf9e70b994ba004f4ce83feda7923ad39)
+++ lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml	(.../applicationContext.xml)	(revision 75239a45d21d7acea900a9ddecf1ab0cc2d4d9a2)
@@ -2,210 +2,33 @@
 <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
 
 <!--
-  - Application context definition for LAMS.
+ - Application context definition for LAMS. Used to deploy to JBOSS.
 -->
+
 <beans>
 
-	<!-- ========================= GENERAL DEFINITIONS ========================= -->
+	<import resource="commonContext.xml"/>
 
-	<!-- Configurer that replaces ${...} placeholders with values from a properties file -->
-	<!-- (in this case, JDBC-related settings for the dataSource definition below) -->
-	<!-- 
-	<bean id="propertyConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-		<property name="location"><value>/WEB-INF/dbConnection.properties</value></property>
+	<!-- 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>
 	</bean>
-	-->
-	<!-- Message source for this context, loaded from localized "messages_xx" files -->
-	<bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
-		<property name="basename"><value>messages</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>com.mysql.jdbc.Driver</value></property>
-		<property name="url"><value>jdbc:mysql://localhost/lams?zeroDateTimeBehavior=convertToNull&amp;characterEncoding=utf8</value></property>
-		<property name="username"><value>lams</value></property>
-		<property name="password"><value>lamsdemo</value></property>
+	<!-- JNDI DataSource for all tools				      -->
+	<!-- 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>
 
-
-
-	<!-- Hibernate SessionFactory -->
-	<bean id="coreSessionFactory" class="org.springframework.orm.hibernate.LocalSessionFactoryBean">
-		<property name="dataSource"><ref local="dataSource"/></property>
-		<property name="mappingResources">
-			<list>
-				<!-- usermanagement related mapping files -->	
-				<value>org/lamsfoundation/lams/usermanagement/AuthenticationMethod.hbm.xml</value>
-				<value>org/lamsfoundation/lams/usermanagement/AuthenticationMethodType.hbm.xml</value>
-				<value>org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml</value>
-				<value>org/lamsfoundation/lams/usermanagement/OrganisationType.hbm.xml</value>
-				<value>org/lamsfoundation/lams/usermanagement/Role.hbm.xml</value>
-				<value>org/lamsfoundation/lams/usermanagement/User.hbm.xml</value>
-				<value>org/lamsfoundation/lams/usermanagement/UserOrganisation.hbm.xml</value>
-				<value>org/lamsfoundation/lams/usermanagement/UserOrganisationRole.hbm.xml</value>
-				<value>org/lamsfoundation/lams/usermanagement/Workspace.hbm.xml</value>
-				<value>org/lamsfoundation/lams/usermanagement/WorkspaceFolder.hbm.xml</value>
-				
-				<!-- learning design related mapping files -->
-				<value>org/lamsfoundation/lams/learningdesign/Activity.hbm.xml</value>
-				<value>org/lamsfoundation/lams/learningdesign/Group.hbm.xml</value>				
-				<value>org/lamsfoundation/lams/learningdesign/Grouping.hbm.xml</value>
-				<value>org/lamsfoundation/lams/learningdesign/LearningDesign.hbm.xml</value>
-				<value>org/lamsfoundation/lams/learningdesign/LearningLibrary.hbm.xml</value>	
-				<value>org/lamsfoundation/lams/learningdesign/Transition.hbm.xml</value>	
-				<value>org/lamsfoundation/lams/learningdesign/License.hbm.xml</value>	
-				
-				
-				<!-- lesson related mapping files-->
-				<value>org/lamsfoundation/lams/lesson/LearnerProgress.hbm.xml</value>
-				<value>org/lamsfoundation/lams/lesson/Lesson.hbm.xml</value>
- 				
-				<!-- Tool related mapping files-->
-				<value>org/lamsfoundation/lams/tool/Tool.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/ToolContent.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/ToolSession.hbm.xml</value>
-				
-				<!-- Workspace related mapping files -->
-				<value>org/lamsfoundation/lams/workspace/WorkspaceFolderContent.hbm.xml</value>
-				
-				<!-- Theme related mapping files -->
-				<value>org/lamsfoundation/lams/themes/CSSProperty.hbm.xml</value>
-				<value>org/lamsfoundation/lams/themes/CSSStyle.hbm.xml</value>
-				<value>org/lamsfoundation/lams/themes/CSSThemeVisualElement.hbm.xml</value>
-			</list>
-		</property>
-		<property name="hibernateProperties">
-			<props>
-				<prop key="hibernate.dialect">net.sf.hibernate.dialect.MySQLDialect</prop>
-				<prop key="hibernate.show_sql">false</prop>
-				<prop key="hibernate.c3p0.minPoolSize">5</prop>
-				<prop key="hibernate.c3p0.maxPoolSize">20</prop>
-				<prop key="hibernate.c3p0.timeout">1800</prop>
-				<prop key="hibernate.c3p0.max_statement">50</prop>
-			</props>
-		</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="coreSessionFactory"/></property>
-	</bean>
-
-
-
-	<!-- ========================= BUSINESS OBJECT DEFINITIONS ========================= -->
-
-	<!-- LAMS primary business object: Hibernate implementation -->
-	<bean id="userManagementServiceTarget" class="org.lamsfoundation.lams.usermanagement.service.UserManagementService"
-		singleton="false"
-	>
-		<property name="userDAO"><ref local="userDAO"/></property>
-		<property name="roleDAO"><ref local="roleDAO"/></property>
-		<property name="organisationDAO"><ref local="organisationDAO"/></property>
-		<property name="organisationTypeDAO"><ref local="organisationTypeDAO"/></property>
-		<property name="userOrganisationDAO"><ref local="userOrganisationDAO"/></property>
-		<property name="userOrganisationRoleDAO"><ref local="userOrganisationRoleDAO"/></property>
-		<property name="authenticationMethodDAO"><ref local="authenticationMethodDAO"/></property>
-		<property name="workspaceFolderDAO"><ref bean="workspaceFolderDAO"/></property>
-		<property name="userManagementWorkspaceDAO"><ref bean="userManagementWorkspaceDAO"/></property>
-		<property name="learningDesignDAO"><ref bean="learningDesignDAO"/></property>
-	</bean>	
+	<!--  Transaction manager for all transactions involving the core classes or the content repository. -->
 	
-	<!-- Transactional proxy for the user management primary business object -->
-	<bean id="userManagementService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
-		<property name="transactionManager"><ref local="transactionManager"/></property>
-		<property name="target"><ref local="userManagementServiceTarget"/></property>
-		<property name="proxyTargetClass"><value>true</value></property> 
-		<property name="transactionAttributes">
-			<props>
-				<prop key="get*">PROPAGATION_REQUIRED,readOnly</prop>
-				<prop key="save*">PROPAGATION_REQUIRED</prop>
-				<prop key="create*">PROPAGATION_REQUIRED</prop>
-				<prop key="update*">PROPAGATION_REQUIRED</prop>
-				<prop key="remove*">PROPAGATION_REQUIRED</prop>
-				<prop key="delete*">PROPAGATION_REQUIRED</prop>
-			</props>
-		</property>
+	<!--  If your code calls classes in the content repository or in the core, and your data needs   -->
+	<!--  to be consistent with the rest of the system (and what data doesn't.... ), then you 		 -->
+	<!--  must use this transaction manager. If you do not, then the core code data changes will be  -->
+	<!--  committed independent of your changes. 			 										 -->
+	<bean id="transactionManager" class="org.springframework.transaction.jta.JtaTransactionManager">
 	</bean>
-	
-	<!-- Learning Design related beans-->
-	
-	<bean id="activityDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.ActivityDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
-	</bean>
-	<bean id="learningLibraryDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.LearningLibraryDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
-	</bean>
-	<bean id="learningDesignDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.LearningDesignDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
-	</bean>	
-	<bean id="transitionDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.TransitionDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
-	</bean>	
-	<bean id="toolDAO" class="org.lamsfoundation.lams.tool.dao.hibernate.ToolDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
-	</bean>	
-	<bean id="groupingDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.GroupingDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
-	</bean>	
-	<bean id="groupDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.GroupDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
-	</bean>
-	<bean id="licenseDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.LicenseDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
-	</bean>	
-	
-	<!--User management related beans -->
-	
-	<bean id="userDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.UserDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
-	</bean>
 
-	<bean id="roleDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.RoleDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
-	</bean>
-	
-	<bean id="organisationDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.OrganisationDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
-	</bean>
-
-	<bean id="organisationTypeDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.OrganisationTypeDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
-	</bean>
-
-	<bean id="authenticationMethodDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.AuthenticationMethodDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
-	</bean>
-
-	<bean id="userOrganisationDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.UserOrganisationDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
-	</bean>
-
-	<bean id="userOrganisationRoleDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.UserOrganisationRoleDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
-	</bean>	
-	
-	<bean id="userManagementWorkspaceDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.WorkspaceDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
-	</bean>
-	
-	<bean id="workspaceFolderDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.WorkspaceFolderDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
-	</bean>	
-	
-	<bean id="workspaceFolderContentDAO" class="org.lamsfoundation.lams.workspace.dao.hibernate.WorkspaceFolderContentDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
-	</bean>
-	
-	<!--  Theme beans -->
-	<bean id="themeDAO" class="org.lamsfoundation.lams.themes.dao.hibernate.CSSThemeDAO">
-		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
-	</bean>
-	
 </beans>
+
Index: lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	(revision 75239a45d21d7acea900a9ddecf1ab0cc2d4d9a2)
@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+
+<!--
+  - Application context definition for LAMS. Used to deploy to JBOSS.
+-->
+<beans>
+
+	<!-- ========================= GENERAL DEFINITIONS ========================= -->
+
+	<!-- Message source for this context, loaded from localized "messages_xx" files -->
+	<bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
+		<property name="basename"><value>messages</value></property>										
+	</bean>
+
+	<!-- ========================= RESOURCE DEFINITIONS ========================= -->
+  
+	<!-- Hibernate SessionFactory -->
+	<bean id="coreSessionFactory" class="org.springframework.orm.hibernate.LocalSessionFactoryBean">
+		<property name="dataSource"><ref bean="dataSource"/></property>
+		<property name="mappingResources">
+			<list>
+				<!-- usermanagement related mapping files -->	
+				<value>org/lamsfoundation/lams/usermanagement/AuthenticationMethod.hbm.xml</value>
+				<value>org/lamsfoundation/lams/usermanagement/AuthenticationMethodType.hbm.xml</value>
+				<value>org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml</value>
+				<value>org/lamsfoundation/lams/usermanagement/OrganisationType.hbm.xml</value>
+				<value>org/lamsfoundation/lams/usermanagement/Role.hbm.xml</value>
+				<value>org/lamsfoundation/lams/usermanagement/User.hbm.xml</value>
+				<value>org/lamsfoundation/lams/usermanagement/UserOrganisation.hbm.xml</value>
+				<value>org/lamsfoundation/lams/usermanagement/UserOrganisationRole.hbm.xml</value>
+				<value>org/lamsfoundation/lams/usermanagement/Workspace.hbm.xml</value>
+				<value>org/lamsfoundation/lams/usermanagement/WorkspaceFolder.hbm.xml</value>
+				
+				<!-- learning design related mapping files -->
+				<value>org/lamsfoundation/lams/learningdesign/Activity.hbm.xml</value>
+				<value>org/lamsfoundation/lams/learningdesign/Group.hbm.xml</value>				
+				<value>org/lamsfoundation/lams/learningdesign/Grouping.hbm.xml</value>
+				<value>org/lamsfoundation/lams/learningdesign/LearningDesign.hbm.xml</value>
+				<value>org/lamsfoundation/lams/learningdesign/LearningLibrary.hbm.xml</value>	
+				<value>org/lamsfoundation/lams/learningdesign/Transition.hbm.xml</value>	
+				<value>org/lamsfoundation/lams/learningdesign/License.hbm.xml</value>	
+				
+				
+				<!-- lesson related mapping files-->
+				<value>org/lamsfoundation/lams/lesson/LearnerProgress.hbm.xml</value>
+				<value>org/lamsfoundation/lams/lesson/Lesson.hbm.xml</value>
+ 				
+				<!-- Tool related mapping files-->
+				<value>org/lamsfoundation/lams/tool/Tool.hbm.xml</value>
+				<value>org/lamsfoundation/lams/tool/ToolContent.hbm.xml</value>
+				<value>org/lamsfoundation/lams/tool/ToolSession.hbm.xml</value>
+				
+				<!-- Workspace related mapping files -->
+				<value>org/lamsfoundation/lams/workspace/WorkspaceFolderContent.hbm.xml</value>
+				
+				<!-- Theme related mapping files -->
+				<value>org/lamsfoundation/lams/themes/CSSProperty.hbm.xml</value>
+				<value>org/lamsfoundation/lams/themes/CSSStyle.hbm.xml</value>
+				<value>org/lamsfoundation/lams/themes/CSSThemeVisualElement.hbm.xml</value>
+			</list>
+		</property>
+		<property name="hibernateProperties">
+			<props>
+				<prop key="hibernate.dialect">net.sf.hibernate.dialect.MySQLDialect</prop>
+				<prop key="hibernate.show_sql">false</prop>
+				<prop key="hibernate.c3p0.minPoolSize">5</prop>
+				<prop key="hibernate.c3p0.maxPoolSize">20</prop>
+				<prop key="hibernate.c3p0.timeout">1800</prop>
+				<prop key="hibernate.c3p0.max_statement">50</prop>
+			</props>
+		</property>
+	</bean>
+	
+	<!-- ========================= BUSINESS OBJECT DEFINITIONS ========================= -->
+
+	<!-- LAMS primary business object: Hibernate implementation -->
+	<bean id="userManagementServiceTarget" class="org.lamsfoundation.lams.usermanagement.service.UserManagementService"
+		singleton="false"
+	>
+		<property name="userDAO"><ref local="userDAO"/></property>
+		<property name="roleDAO"><ref local="roleDAO"/></property>
+		<property name="organisationDAO"><ref local="organisationDAO"/></property>
+		<property name="organisationTypeDAO"><ref local="organisationTypeDAO"/></property>
+		<property name="userOrganisationDAO"><ref local="userOrganisationDAO"/></property>
+		<property name="userOrganisationRoleDAO"><ref local="userOrganisationRoleDAO"/></property>
+		<property name="authenticationMethodDAO"><ref local="authenticationMethodDAO"/></property>
+		<property name="workspaceFolderDAO"><ref bean="workspaceFolderDAO"/></property>
+		<property name="userManagementWorkspaceDAO"><ref bean="userManagementWorkspaceDAO"/></property>
+		<property name="learningDesignDAO"><ref bean="learningDesignDAO"/></property>
+	</bean>	
+	
+	<!-- Transactional proxy for the user management primary business object -->
+	<bean id="userManagementService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+		<property name="transactionManager"><ref bean="transactionManager"/></property>
+		<property name="target"><ref local="userManagementServiceTarget"/></property>
+		<property name="proxyTargetClass"><value>true</value></property> 
+		<property name="transactionAttributes">
+			<props>
+				<prop key="get*">PROPAGATION_REQUIRED,readOnly</prop>
+				<prop key="save*">PROPAGATION_REQUIRED</prop>
+				<prop key="create*">PROPAGATION_REQUIRED</prop>
+				<prop key="update*">PROPAGATION_REQUIRED</prop>
+				<prop key="remove*">PROPAGATION_REQUIRED</prop>
+				<prop key="delete*">PROPAGATION_REQUIRED</prop>
+			</props>
+		</property>
+	</bean>
+	
+	<!-- Learning Design related beans-->
+	
+	<bean id="activityDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.ActivityDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>
+	<bean id="learningLibraryDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.LearningLibraryDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>
+	<bean id="learningDesignDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.LearningDesignDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>	
+	<bean id="transitionDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.TransitionDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>	
+	<bean id="toolDAO" class="org.lamsfoundation.lams.tool.dao.hibernate.ToolDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>	
+	<bean id="groupingDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.GroupingDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>	
+	<bean id="groupDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.GroupDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>
+	<bean id="licenseDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.LicenseDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>	
+	
+	<!--User management related beans -->
+	
+	<bean id="userDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.UserDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>
+
+	<bean id="roleDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.RoleDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>
+	
+	<bean id="organisationDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.OrganisationDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>
+
+	<bean id="organisationTypeDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.OrganisationTypeDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>
+
+	<bean id="authenticationMethodDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.AuthenticationMethodDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>
+
+	<bean id="userOrganisationDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.UserOrganisationDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>
+
+	<bean id="userOrganisationRoleDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.UserOrganisationRoleDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>	
+	
+	<bean id="userManagementWorkspaceDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.WorkspaceDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>
+	
+	<bean id="workspaceFolderDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.WorkspaceFolderDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>	
+	
+	<bean id="workspaceFolderContentDAO" class="org.lamsfoundation.lams.workspace.dao.hibernate.WorkspaceFolderContentDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>
+	
+	<!--  Theme beans -->
+	<bean id="themeDAO" class="org.lamsfoundation.lams.themes.dao.hibernate.CSSThemeDAO">
+		<property name="sessionFactory"><ref local="coreSessionFactory"/></property>
+	</bean>
+	
+</beans>
Index: lams_common/src/java/org/lamsfoundation/lams/localApplicationContext.xml
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/localApplicationContext.xml	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/localApplicationContext.xml	(revision 75239a45d21d7acea900a9ddecf1ab0cc2d4d9a2)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+
+<!--
+ - Application context definition for LAMS. Do not use in production.
+ - This uses a local datasource and Hibernate transaction manager and
+ - is designed for junit testing.
+-->
+
+<beans>
+
+	<import resource="commonContext.xml"/>
+	
+	<bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource">
+		<property name="driverClassName"><value>com.mysql.jdbc.Driver</value></property>
+		<property name="url"><value>jdbc:mysql://localhost/lams?zeroDateTimeBehavior=convertToNull&amp;characterEncoding=utf8&amp;autoReconnect=true</value></property>
+		<property name="username"><value>lams</value></property>
+		<property name="password"><value>lamsdemo</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?zeroDateTimeBehavior=convertToNull&amp;characterEncoding=utf8&amp;autoReconnect=true</value></property>
+		<property name="username"><value>lams</value></property>
+		<property name="password"><value>lamsdemo</value></property>
+	</bean>
+
+	<!--  Note - as this is only a Hibernate based transaction manager (and not JTA) some transactions may 
+	 - go awry when working across jars.
+	-->
+ 	<bean id="transactionManager" class="org.springframework.orm.hibernate.HibernateTransactionManager">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+
+
+</beans>
+