Index: lams_build/lib/lams/lams-central.jar
===================================================================
diff -u -rcad516bd852b193b61c821c5177cecacf3e5d016 -rebd388504924fe0a06bbf20a06fe0032abbf8d15
Binary files differ
Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -ra2d72bee6029b7e05e8cd696c02db214f3049365 -rebd388504924fe0a06bbf20a06fe0032abbf8d15
Binary files differ
Index: lams_build/lib/spring/spring.module.xml
===================================================================
diff -u -r969b1185a18d028b10bb0bd4aa2af6ea93e0f8b5 -rebd388504924fe0a06bbf20a06fe0032abbf8d15
--- lams_build/lib/spring/spring.module.xml	(.../spring.module.xml)	(revision 969b1185a18d028b10bb0bd4aa2af6ea93e0f8b5)
+++ lams_build/lib/spring/spring.module.xml	(.../spring.module.xml)	(revision ebd388504924fe0a06bbf20a06fe0032abbf8d15)
@@ -1,56 +1,57 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  ~ JBoss, Home of Professional Open Source.
-  ~ Copyright 2010, Red Hat, Inc., and individual contributors
-  ~ as indicated by the @author tags. See the copyright.txt file in the
-  ~ distribution for a full listing of individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
-
-<module xmlns="urn:jboss:module:1.5" name="org.springframework">
-  <resources>
-    <resource-root path="spring-core-4.3.12.RELEASE.jar"/>
-    <resource-root path="spring-aop-4.3.12.RELEASE.jar"/>
-    <resource-root path="spring-beans-4.3.12.RELEASE.jar"/>
-    <resource-root path="spring-context-4.3.12.RELEASE.jar"/>
-    <resource-root path="spring-context-support-4.3.12.RELEASE.jar"/>
-    <resource-root path="spring-expression-4.3.12.RELEASE.jar"/>
-    <resource-root path="spring-jdbc-4.3.12.RELEASE.jar"/>
-    <resource-root path="spring-orm-4.3.12.RELEASE.jar"/>
-    <resource-root path="spring-tx-4.3.12.RELEASE.jar"/>
-    <resource-root path="spring-web-4.3.12.RELEASE.jar"/>
-    <resource-root path="spring-webmvc-4.3.12.RELEASE.jar"/>
-  </resources>
-  
-  <dependencies>
-    <system>
-  		<paths>
-  			<path name="org/xml/sax"/>
-  			<path name="org/w3c/dom"/>
-  			<path name="javax/xml/parsers"/>
-  			<path name="javax/naming"/>
-  		</paths>
-  	</system>
-  	<module name="javax.servlet.api" />
-  	<module name="javaee.api" />
-  	<module name="org.apache.commons.logging" />
-  	<module name="org.hibernate" />
-  	<module name="org.jboss.vfs" />
-  	<module name="org.quartz" />
-  </dependencies>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ JBoss, Home of Professional Open Source.
+  ~ Copyright 2010, Red Hat, Inc., and individual contributors
+  ~ as indicated by the @author tags. See the copyright.txt file in the
+  ~ distribution for a full listing of individual contributors.
+  ~
+  ~ This is free software; you can redistribute it and/or modify it
+  ~ under the terms of the GNU Lesser General Public License as
+  ~ published by the Free Software Foundation; either version 2.1 of
+  ~ the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  ~ Lesser General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU Lesser General Public
+  ~ License along with this software; if not, write to the Free
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  -->
+
+<module xmlns="urn:jboss:module:1.5" name="org.springframework">
+  <resources>
+    <resource-root path="spring-core-4.3.12.RELEASE.jar"/>
+    <resource-root path="spring-aop-4.3.12.RELEASE.jar"/>
+    <resource-root path="spring-beans-4.3.12.RELEASE.jar"/>
+    <resource-root path="spring-context-4.3.12.RELEASE.jar"/>
+    <resource-root path="spring-context-support-4.3.12.RELEASE.jar"/>
+    <resource-root path="spring-expression-4.3.12.RELEASE.jar"/>
+    <resource-root path="spring-jdbc-4.3.12.RELEASE.jar"/>
+    <resource-root path="spring-orm-4.3.12.RELEASE.jar"/>
+    <resource-root path="spring-tx-4.3.12.RELEASE.jar"/>
+    <resource-root path="spring-web-4.3.12.RELEASE.jar"/>
+    <resource-root path="spring-webmvc-4.3.12.RELEASE.jar"/>
+  </resources>
+  
+  <dependencies>
+    <system>
+  		<paths>
+  			<path name="org/xml/sax"/>
+  			<path name="org/w3c/dom"/>
+  			<path name="javax/xml/parsers"/>
+  			<path name="javax/naming"/>
+  		</paths>
+  	</system>
+  	<module name="javax.servlet.api" />
+  	<module name="javaee.api" />
+  	<module name="org.apache.commons.logging" />
+  	<module name="org.apache.commons.fileupload" />
+  	<module name="org.hibernate" />
+  	<module name="org.jboss.vfs" />
+  	<module name="org.quartz" />
+  </dependencies>
 </module>
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
===================================================================
diff -u -rad8707a3e0b0501d651993f3da9dd0ba975f39fc -rebd388504924fe0a06bbf20a06fe0032abbf8d15
--- lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	(.../commonContext.xml)	(revision ad8707a3e0b0501d651993f3da9dd0ba975f39fc)
+++ lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	(.../commonContext.xml)	(revision ebd388504924fe0a06bbf20a06fe0032abbf8d15)
@@ -1,631 +1,632 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
-           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
-
-	<!-- ========================= GENERAL DEFINITIONS ========================= -->
-
-	<import resource="messageContext.xml"/>
-
-	<!-- ========================= RESOURCE DEFINITIONS ========================= -->
-
- 	<!-- Hibernate SessionFactory. Since LAMS 2.3 it is used in all tools and other parts of LAMS,
- 		 rather than several local Session Factiories.
- 	-->
-	<bean id="coreSessionFactory" class="org.springframework.orm.hibernate5.LocalSessionFactoryBean">
-		<property name="dataSource"><ref bean="dataSource"/></property>
-		<property name="mappingLocations">
-			<list>
-				<value>classpath*:org/lamsfoundation/lams/**/*.hbm.xml</value>
-				<value>classpath*:org/eucm/lams/**/*.hbm.xml</value>
-			</list>
-		</property>
-		<property name="hibernateProperties"><ref bean="hibernateProperties"/></property>
-	</bean>
-	
-	<bean id="transactionRetryService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
-		<property name="transactionManager"><ref bean ="transactionManager"/></property>
-		<property name ="target">
-			<bean class="org.lamsfoundation.lams.util.TransactionRetryService" />
-		</property>
-		<property name="proxyTargetClass"><value>true</value></property> 
-		<property name="transactionAttributes">
-			<props>
-				<prop key="*">PROPAGATION_REQUIRES_NEW</prop>
-			</props>
-		</property>
-	</bean>	
-	
-	<!-- ========================= BUSINESS OBJECT DEFINITIONS ========================= -->
-
-	<!-- LAMS primary business object: Hibernate implementation -->
-	<bean id="userManagementServiceTarget" class="org.lamsfoundation.lams.usermanagement.service.UserManagementService"
-		  scope="prototype"
-	>
-		<property name="baseDAO"><ref bean="baseDAO"/></property>
-		<property name="groupDAO"><ref bean="groupDAO"/></property>
-		<property name="roleDAO"><ref bean="roleDAO"/></property>
-		<property name="organisationDAO"><ref bean="organisationDAO"/></property>
-		<property name="favoriteOrganisationDAO"><ref bean="favoriteOrganisationDAO"/></property>
-		<property name="userDAO"><ref bean="userDAO"/></property>
-		<property name="userOrganisationDAO"><ref bean="userOrganisationDAO"/></property>
-		<property name="messageService"><ref bean="commonMessageService"/></property>
-		<property name="centralToolContentHandler"><ref bean="centralToolContentHandler"/></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 bean="userManagementServiceTarget"/></property>
-		<property name="proxyTargetClass"><value>true</value></property> 
-		<property name="preInterceptors">
-			<list>
-				<ref bean="transactionRetryInterceptor" />			
-			</list>
-		</property> 
-		<property name="transactionAttributes">
-			<props>
-				<prop key="get*">PROPAGATION_REQUIRED</prop>
-				<prop key="find*">PROPAGATION_REQUIRED</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>
-				<prop key="disable*">PROPAGATION_REQUIRED</prop>
-				<prop key="set*">PROPAGATION_REQUIRED</prop>
-				<prop key="is*">PROPAGATION_REQUIRED</prop>
-				<prop key="toggleOrganisationFavorite">PROPAGATION_REQUIRED</prop>
-				<prop key="userHasData">PROPAGATION_REQUIRED</prop>
-				<prop key="upload*">PROPAGATION_REQUIRED</prop>
-			</props>
-		</property>
-	</bean>
-	
-	<bean id="learningDesignServiceTarget" class="org.lamsfoundation.lams.learningdesign.service.LearningDesignService">
-		<property name="messageService"><ref bean="commonMessageService"/></property>
-		<property name="learningDesignDAO"><ref bean="learningDesignDAO"/></property>
-		<property name="activityDAO"><ref bean="activityDAO"/></property>
-		<property name="groupingDAO"><ref bean="groupingDAO"/></property>
-		<property name="toolDAO"><ref bean="toolDAO"/></property>
-		<property name="learningLibraryDAO"><ref bean="learningLibraryDAO"/></property>
-		<property name="toolActMessageService"><ref bean="loadedMessageSourceService"/></property>
-	</bean>
-	
-	<bean id="learningDesignService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
-		<property name="transactionManager"><ref bean="transactionManager"/></property>
-		<property name="target"><ref bean="learningDesignServiceTarget"/></property>
-		<property name="proxyTargetClass"><value>true</value></property> 
-		<property name="preInterceptors">
-			<list>
-				<ref bean="transactionRetryInterceptor" />			
-			</list>
-		</property>
-		<property name="transactionAttributes">
-			<props>
-				<prop key="validateLearningDesign">PROPAGATION_REQUIRED</prop>
-				<prop key="setValid">PROPAGATION_REQUIRED</prop>
-				<prop key="getAllLearningLibraryDetails">PROPAGATION_REQUIRED</prop>
-				<prop key="getToolDTOs">PROPAGATION_REQUIRED</prop>
-				<prop key="getLearning*">PROPAGATION_REQUIRED</prop>
-				<prop key="save*">PROPAGATION_REQUIRED</prop>
-				<prop key="fillLearningLibraryID">PROPAGATION_REQUIRED</prop>
-			</props>
-		</property>
-	</bean>
-	
-	<bean id="lessonServiceTarget" class="org.lamsfoundation.lams.lesson.service.LessonService">
-		<property name="lessonDAO"><ref bean="lessonDAO"/></property>
-		<property name="lessonClassDAO"><ref bean="lessonClassDAO"/></property>
-		<property name="groupingDAO"><ref bean="groupingDAO"/></property>
-		<property name="baseDAO"><ref bean="baseDAO"/></property>
-		<property name="learnerProgressDAO"><ref bean="learnerProgressDAO"/></property>
-		<property name="messageService"><ref bean="commonMessageService"/></property>
-	</bean>
-	
-	<bean id="lessonService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
-		<property name="transactionManager"><ref bean="transactionManager"/></property>
-		<property name="target"><ref bean="lessonServiceTarget"/></property>
-		<property name="proxyTargetClass"><value>true</value></property> 
-		<property name="preInterceptors">
-			<list>
-				<ref bean="transactionRetryInterceptor" />			
-			</list>
-		</property>
-		<property name="transactionAttributes">
-			<props>
-				<prop key="perform*">PROPAGATION_REQUIRED</prop>
-				<prop key="remove*">PROPAGATION_REQUIRED</prop>
-				<prop key="get*">PROPAGATION_REQUIRED</prop>
-				<prop key="add*">PROPAGATION_REQUIRED</prop>
-				<prop key="create*">PROPAGATION_REQUIRED</prop>
-				<prop key="update*">PROPAGATION_REQUIRED</prop>
-				<prop key="save*">PROPAGATION_REQUIRED</prop>
-			</props>
-		</property>
-	</bean>
-	
-	<bean id="themeServiceTarget" class="org.lamsfoundation.lams.themes.service.ThemeService">
-		<property name="themeDAO"><ref bean="themeDAO"/></property>
-		<property name="userManagementService"><ref bean="userManagementService"/></property>
-	</bean>
-	
-	<bean id="themeService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
-		<property name ="transactionManager"><ref bean ="transactionManager"/></property>
-		<property name ="target"><ref bean="themeServiceTarget"/></property>
-		<property name="proxyTargetClass"><value>true</value></property> 
-		<property name="preInterceptors">
-			<list>
-				<ref bean="transactionRetryInterceptor" />			
-			</list>
-		</property>
-		<property name="transactionAttributes">
-			<props>
-				<prop key="get*">PROPAGATION_REQUIRED</prop>
-				<prop key="store*">PROPAGATION_REQUIRED</prop>
-				<prop key="set*">PROPAGATION_REQUIRED</prop>
-			</props>
-		</property>
-	</bean>
-	
-	<bean id="timezoneServiceTarget" class="org.lamsfoundation.lams.timezone.service.TimezoneService">
-		<property name="timezoneDAO"><ref bean="timezoneDAO"/></property>
-	</bean>
-	
-	<bean id="timezoneService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
-		<property name ="transactionManager"><ref bean ="transactionManager"/></property>
-		<property name ="target"><ref bean="timezoneServiceTarget"/></property>
-		<property name="proxyTargetClass"><value>true</value></property> 
-		<property name="preInterceptors">
-			<list>
-				<ref bean="transactionRetryInterceptor" />			
-			</list>
-		</property>
-		<property name="transactionAttributes">
-			<props>
-				<prop key="get*">PROPAGATION_REQUIRED</prop>
-				<prop key="update*">PROPAGATION_REQUIRED</prop>
-			</props>
-		</property>
-	</bean>
-
-	<bean id="signupServiceTarget" class="org.lamsfoundation.lams.signup.service.SignupService">
-		<property name="signupDAO"><ref bean="signupDAO" /></property>
-		<property name="userManagementService"><ref bean="userManagementService" /></property>
-		<property name="lessonService"><ref bean="lessonService" /></property>
-	</bean>
-
-	<bean id="signupService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
-		<property name="transactionManager"><ref bean="transactionManager" /></property>
-		<property name="target"><ref bean="signupServiceTarget" /></property>
-		<property name="proxyTargetClass"><value>true</value></property>
-		<property name="preInterceptors">
-			<list>
-				<ref bean="transactionRetryInterceptor" />			
-			</list>
-		</property>
-		<property name="transactionAttributes">
-			<props>
-				<prop key="signupUser">PROPAGATION_REQUIRED</prop>
-			</props>
-		</property>
-	</bean>
-	
-	<bean id="exportToolContentServiceTarget" class="org.lamsfoundation.lams.learningdesign.service.ExportToolContentService">
-		<property name="activityDAO"><ref bean="activityDAO"/></property>
-		<property name="toolDAO"><ref bean="toolDAO"/></property>
-		<property name="toolContentDAO"><ref bean="toolContentDAO"/></property>
-		<property name="systemToolDAO"><ref bean="systemToolDAO"/></property>
-		<property name="baseDAO"><ref bean="baseDAO"/></property>
-		<property name="licenseDAO"><ref bean="licenseDAO"/></property>
-		<property name="groupingDAO"><ref bean="groupingDAO"/></property>
-		<property name="transitionDAO"><ref bean="transitionDAO"/></property>
-		<property name="learningDesignDAO"><ref bean="learningDesignDAO"/></property>
-		<property name="learningLibraryDAO"><ref bean="learningLibraryDAO"/></property>
-	</bean>
-	
-	<bean id="exportToolContentService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
-		<property name ="transactionManager"><ref bean ="transactionManager"/></property>
-		<property name ="target"><ref bean="exportToolContentServiceTarget"/></property>
-		<property name="preInterceptors">
-			<list>
-				<ref bean="transactionRetryInterceptor" />			
-			</list>
-		</property>
-		<!-- TransactionProxyFactoryBean by default just proxies all interfaces implemented by the target object -->
-		<!-- AuthoringService is class so needs to be proxied via CGLIB -->
-		<!-- Specify "proxyTargetClass" = "true" to generate a CGLIB proxy-->
-		<property name="proxyTargetClass"><value>true</value></property>     
-		
-		<property name="transactionAttributes">
-			<props>
-				<prop key="save*">PROPAGATION_REQUIRED</prop>
-				<prop key="remove*">PROPAGATION_REQUIRED</prop>
-				<prop key="export*">PROPAGATION_REQUIRED,+java.lang.Exception</prop>
-				<prop key="import*">PROPAGATION_REQUIRED,+java.lang.Exception</prop>
-			</props>
-		</property>
-	</bean>
-	
-	<!--  Access a message service related to a programatically loaded message file. -->
-	<!--  Can be used to arbitrarily access any message file that is on the classpath -->
-	<!--  as long as you know the file's name and full path.                          -->
-	<bean id="loadedMessageSourceService" class="org.lamsfoundation.lams.util.LoadedMessageSourceService">
-    </bean>
-    	
-    <!--  Each message service created by loadedMessageService is a ResourceBundleMessageSource -->
-	<bean id="loadedMessageSource" class="org.springframework.context.support.ResourceBundleMessageSource" scope="prototype">
-	</bean>
-			
-	<!--  Core Notebook Service -->
-	<bean id="coreNotebookServiceTarget" class="org.lamsfoundation.lams.notebook.service.CoreNotebookService">
-		<property name="messageService"><ref bean="commonMessageService"/></property>
-		<property name="userManagementService"><ref bean="userManagementService"/></property>
-		<property name="notebookEntryDAO"><ref bean="notebookEntryDAO" /></property>
-		<property name="baseDAO"><ref bean="baseDAO" /></property>
-	</bean>
-	
-	<bean id="coreNotebookService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
-		<property name ="transactionManager"><ref bean ="transactionManager"/></property>
-		<property name ="target"><ref bean="coreNotebookServiceTarget"/></property>
-		<property name="preInterceptors">
-			<list>
-				<ref bean="transactionRetryInterceptor" />			
-			</list>
-		</property>
-		<!-- TransactionProxyFactoryBean by default just proxies all interfaces implemented by the target object -->
-		<!-- AuthoringService is class so needs to be proxied via CGLIB -->
-		<!-- Specify "proxyTargetClass" = "true" to generate a CGLIB proxy-->
-		<property name="proxyTargetClass"><value>true</value></property>     
-		
-		<property name="transactionAttributes">
-			<props>
-				<prop key="get*">PROPAGATION_REQUIRED</prop>
-				<prop key="update*">PROPAGATION_REQUIRED</prop>
-				<prop key="save*">PROPAGATION_REQUIRED</prop>
-				<prop key="create*">PROPAGATION_REQUIRED</prop>
-			</props>
-		</property>
-	</bean>
-
-	<!--  Rating Service -->
-
-	<bean id="ratingService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
-
-		<property name ="transactionManager"><ref bean ="transactionManager"/></property>
-		<property name ="target">
-			<bean class="org.lamsfoundation.lams.rating.service.RatingService">
-				<property name="messageService"><ref bean="commonMessageService"/></property>
-				<property name="ratingDAO"><ref bean="ratingDAO" /></property>
-				<property name="ratingCommentDAO"><ref bean="ratingCommentDAO" /></property>
-				<property name="ratingCriteriaDAO"><ref bean="ratingCriteriaDAO" /></property>
-				<property name="userManagementService"><ref bean="userManagementService"/></property>
-			</bean>
-		</property>
-		<property name="proxyTargetClass"><value>true</value></property> 
-		<property name="preInterceptors">
-			<list>
-				<ref bean="transactionRetryInterceptor" />			
-			</list>
-		</property>
-		<property name="transactionAttributes">
-			<props>
-				<prop key="get*">PROPAGATION_REQUIRED</prop>
-				<prop key="update*">PROPAGATION_REQUIRED</prop>
-				<prop key="save*">PROPAGATION_REQUIRED</prop>
-				<prop key="create*">PROPAGATION_REQUIRED</prop>
-				<prop key="rateItem">PROPAGATION_REQUIRED</prop>
-				<prop key="commentItem">PROPAGATION_REQUIRED</prop>
-			</props>
-		</property>
-
-	</bean>
-	
-	<!-- Event notification Service -->
-
-	 <bean id="scheduler" class="org.springframework.scheduling.quartz.SchedulerFactoryBean">
-        <property name="applicationContextSchedulerContextKey" value="context.central"/>
-        <property name="schedulerName" value="LAMS"/>
-    	<property name="quartzProperties">
-			<props>
-				<prop key="org.quartz.jobStore.class">org.springframework.scheduling.quartz.LocalDataSourceJobStore</prop>
-				<prop key="org.quartz.jobStore.driverDelegateClass">org.quartz.impl.jdbcjobstore.StdJDBCDelegate</prop>
-				<prop key="org.quartz.jobStore.tablePrefix">lams_qtz_</prop>
-			</props>
-		</property> 
-		<property name="dataSource"><ref bean="dataSource"/></property>
-	
-		<property name="jobDetails">
-			<list>
-				<ref bean="resendMessagesJob" />
-			</list>
-		</property>
-		<property name="triggers">
-			<list>
-				<ref bean="resendMessagesJobTrigger" />
-			</list>
-		</property>    
-    </bean>
-
-
-    <bean id="eventNotificationService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
-		<property name ="transactionManager"><ref bean="transactionManager"/></property>
-		<property name="preInterceptors">
-			<list>
-				<ref bean="transactionRetryInterceptor" />			
-			</list>
-		</property>
-		<property name ="target">
-			<bean class="org.lamsfoundation.lams.events.EventNotificationService">
-				<property name="eventDAO"><ref bean="eventDAO" /></property>
-				<property name="userManagementService"><ref bean="userManagementService"/></property>
-        		<property name="messageService"><ref bean="commonMessageService"/></property>
-        		<property name="lessonService"><ref bean="lessonService"/></property>
-        		<property name="toolService"><ref bean="lamsToolService"/></property>
-			</bean>	
-		</property>
-		<property name="transactionAttributes">
-			<props>
-				<prop key="create*">PROPAGATION_REQUIRED</prop>
-				<prop key="eventExists">PROPAGATION_REQUIRED</prop>
-				<prop key="sendMessage">PROPAGATION_REQUIRED</prop>
-				<prop key="resendMessages">PROPAGATION_REQUIRED</prop>
-				<prop key="notify*">PROPAGATION_REQUIRED</prop>
-				<prop key="subscribe">PROPAGATION_REQUIRED</prop>
-				<prop key="unsubscribe">PROPAGATION_REQUIRED</prop>
-				<prop key="trigger*">PROPAGATION_REQUIRED</prop>
-				<prop key="isSubscribed">PROPAGATION_REQUIRED</prop>
-				<prop key="getNotification*">PROPAGATION_REQUIRED</prop>
-			</props>
-		</property>
-	</bean>
-	
-	<bean name="resendMessagesJob" class="org.springframework.scheduling.quartz.JobDetailFactoryBean">
-		<property name="jobClass" value="org.lamsfoundation.lams.events.ResendMessagesJob" />
-		<property name="name" value="Resend Messages Job"/>
-		<property name="durability" value="true" />
-	</bean>
-	
-	<bean id="resendMessagesJobTrigger" 
-                class="org.springframework.scheduling.quartz.SimpleTriggerFactoryBean">
-		<property name="jobDetail" ref="resendMessagesJob" />
-		<property name="name" value="Resend Messages Job Trigger"/>
-		<property name="repeatInterval" value="3600000" />
-		<property name="startDelay" value="120000" />
-	</bean>
-	
-	
-	<!-- Log Event notification Service -->
-	
-	<bean id="logEventService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
-		<property name ="transactionManager"><ref bean ="transactionManager"/></property>
-		<property name="preInterceptors">
-			<list>
-				<ref bean="transactionRetryInterceptor" />			
-			</list>
-		</property>
-		<property name ="target">
-			<bean class="org.lamsfoundation.lams.logevent.service.LogEventService">
-				<property name="lessonDAO"><ref bean="lessonDAO"/></property>
-				<property name="logEventDAO"><ref bean="logEventDAO"/></property>
-				<property name="messageService"><ref bean="commonMessageService"/></property>
-				<property name="userManagementService"><ref bean="userManagementService"/></property>
-			</bean>	
-		</property>
-		<property name="proxyTargetClass"><value>true</value></property> 
-		<property name="transactionAttributes">
-			<props>
-				<prop key="get*">PROPAGATION_REQUIRED</prop>
-				<prop key="logEvent">PROPAGATION_REQUIRED</prop>
-			</props>
-		</property>
-	</bean>	
-	
-	<!--  Configuration service -->
-	<bean id="configurationService"  class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
-		<property name ="transactionManager"><ref bean ="transactionManager"/></property>
-		<property name="preInterceptors">
-			<list>
-				<ref bean="transactionRetryInterceptor" />			
-			</list>
-		</property>
-		<property name ="target">
-			<bean class="org.lamsfoundation.lams.util.Configuration">
-				<property name="configurationDAO"><ref bean="configurationDAO" /></property>
-				<property name="messageService"><ref bean="commonMessageService" /></property>
-				<property name="scheduler"><ref bean="scheduler" /></property>
-			</bean>
-		</property>
-		<property name="proxyTargetClass"><value>true</value></property> 
-		<property name="transactionAttributes">
-			<props>
-				<prop key="save*">PROPAGATION_REQUIRED</prop>
-				<prop key="persist*">PROPAGATION_REQUIRED</prop>
-			</props>
-		</property>
-	</bean>
-
-	<!-- Security service -->
-	<bean id="securityServiceTarget" class="org.lamsfoundation.lams.security.SecurityService">
-		<property name="securityDAO"><ref bean="securityDAO"/></property>
-		<property name="logEventService"><ref bean="logEventService"/></property>
-	</bean>	
-	
-	<bean id="securityService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
-		<property name="transactionManager"><ref bean="transactionManager"/></property>
-		<property name="target"><ref bean="securityServiceTarget"/></property>
-		<property name="proxyTargetClass"><value>true</value></property> 
-		<property name="preInterceptors">
-			<list>
-				<ref bean="transactionRetryInterceptor" />			
-			</list>
-		</property>
-		<property name="transactionAttributes">
-			<props>
-				<prop key="is*">PROPAGATION_REQUIRED,readOnly</prop>
-				<prop key="has*">PROPAGATION_REQUIRED,readOnly</prop>
-			</props>
-		</property>
-	</bean>
-
-	<!-- Learning Design related beans-->
-	
-	<bean id="activityDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.ActivityDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>
-	<bean id="branchActivityEntryDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.BranchActivityEntryDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>
-	<bean id="learningLibraryDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.LearningLibraryDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>
-	<bean id="learningDesignDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.LearningDesignDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>	
-	<bean id="transitionDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.TransitionDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>	
-	<bean id="groupingDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.GroupingDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>	
-	<bean id="groupDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.GroupDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>
-	<bean id="groupUserDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.GroupUserDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>
-	<bean id="licenseDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.LicenseDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>
-	
-	<!-- Lesson related beans -->
-	
-	<bean id="lessonDAO" class="org.lamsfoundation.lams.lesson.dao.hibernate.LessonDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>
-
-	<bean id="lessonClassDAO" class="org.lamsfoundation.lams.lesson.dao.hibernate.LessonClassDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>
-
-	<bean id="learnerProgressDAO" class="org.lamsfoundation.lams.lesson.dao.hibernate.LearnerProgressDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>
-	
-	<!--User management related beans -->
-	
-	<bean id="baseDAO" class="org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>
-	<!--  Theme beans -->
-	<bean id="themeDAO" class="org.lamsfoundation.lams.themes.dao.hibernate.ThemeDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>
-	
-	<bean id="roleDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.RoleDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>
-	
-	<bean id="organisationDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.OrganisationDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>
-	
-	<bean id="favoriteOrganisationDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.FavoriteOrganisationDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>
-	
-	<bean id="userDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.UserDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>
-	
-	<bean id="userOrganisationDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.UserOrganisationDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>
-	
-	<!--  Timezone service related beans -->
-	<bean id="timezoneDAO" class="org.lamsfoundation.lams.timezone.dao.hibernate.TimezoneDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>	
-	
-	<!--  Signup service related beans -->
-	<bean id="signupDAO" class="org.lamsfoundation.lams.signup.dao.hibernate.SignupDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory" /></property>
-	</bean>
-	
-	<!--Event service related beans -->
-	<bean id="eventDAO" class="org.lamsfoundation.lams.events.dao.hibernate.EventDAOHibernate">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>
-	
-	<!--  LogEvent service related beans -->
-	<bean id="logEventDAO" class="org.lamsfoundation.lams.logevent.dao.hibernate.LogEventDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>		
-	
-	<!-- Core Notebook related beans -->
-	<bean id="notebookEntryDAO" class="org.lamsfoundation.lams.notebook.dao.hibernate.NotebookEntryDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>	
-
-	<!-- Rating related beans -->
-	<bean id="ratingDAO" class="org.lamsfoundation.lams.rating.dao.hibernate.RatingDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>	
-	<bean id="ratingCommentDAO" class="org.lamsfoundation.lams.rating.dao.hibernate.RatingCommentDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>	
-	<bean id="ratingCriteriaDAO" class="org.lamsfoundation.lams.rating.dao.hibernate.RatingCriteriaDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>
-	
-	<!--  Configuration related beans -->
-	<bean id="configurationDAO" class="org.lamsfoundation.lams.config.dao.hibernate.ConfigurationDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>
-	
-	<!--  Competence related beans -->
-	<bean id="competenceDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.CompetenceDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>
-	<bean id="competenceMappingDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.CompetenceMappingDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>
-	
-	<!--  Pedagogical Planner related beans -->
-	<bean id="pedagogicalPlannerDAO" class="org.lamsfoundation.lams.planner.dao.hibernate.PedagogicalPlannerDAOHibernate">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>
-	
-	<!--  Gradebook related beans -->
-	<bean id="gradebookDAO" class="org.lamsfoundation.lams.gradebook.dao.hibernate.GradebookDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>
-	
-	<!--  Data flow related beans -->
-	<bean id="dataFlowDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.DataFlowDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>
-	
-	<!--  Data flow related beans -->
-	<bean id="securityDAO" class="org.lamsfoundation.lams.security.SecurityDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>
-	
-	<!--  System Session bean -->
-	<bean id="SystemSession"
-	    class="org.lamsfoundation.lams.web.session.SessionManager"
-	    init-method="init"
-	    destroy-method="destroy" />
-	
-	<bean id="statisticsService" class="org.lamsfoundation.lams.statistics.service.StatisticsService">
-   		<property name="baseDAO">
-   			<ref bean="baseDAO"/>
-   		</property>	
-   		<property name="userService">
-   			<ref bean="userManagementService"/>
-   		</property>
-    </bean>
-	
-</beans>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
+
+	<!-- ========================= GENERAL DEFINITIONS ========================= -->
+
+	<import resource="messageContext.xml"/>
+
+	<!-- ========================= RESOURCE DEFINITIONS ========================= -->
+
+ 	<!-- Hibernate SessionFactory. Since LAMS 2.3 it is used in all tools and other parts of LAMS,
+ 		 rather than several local Session Factiories.
+ 	-->
+	<bean id="coreSessionFactory" class="org.springframework.orm.hibernate5.LocalSessionFactoryBean">
+		<property name="dataSource"><ref bean="dataSource"/></property>
+		<property name="mappingLocations">
+			<list>
+				<value>classpath*:org/lamsfoundation/lams/**/*.hbm.xml</value>
+				<value>classpath*:org/eucm/lams/**/*.hbm.xml</value>
+			</list>
+		</property>
+		<property name="hibernateProperties"><ref bean="hibernateProperties"/></property>
+	</bean>
+	
+	<bean id="multipartResolver" class="org.springframework.web.multipart.commons.CommonsMultipartResolver" />
+	
+	<bean id="transactionRetryService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+		<property name="transactionManager"><ref bean ="transactionManager"/></property>
+		<property name ="target">
+			<bean class="org.lamsfoundation.lams.util.TransactionRetryService" />
+		</property>
+		<property name="proxyTargetClass"><value>true</value></property> 
+		<property name="transactionAttributes">
+			<props>
+				<prop key="*">PROPAGATION_REQUIRES_NEW</prop>
+			</props>
+		</property>
+	</bean>	
+	
+	<!-- ========================= BUSINESS OBJECT DEFINITIONS ========================= -->
+
+	<!-- LAMS primary business object: Hibernate implementation -->
+	<bean id="userManagementServiceTarget" class="org.lamsfoundation.lams.usermanagement.service.UserManagementService"
+		  scope="prototype"
+	>
+		<property name="baseDAO"><ref bean="baseDAO"/></property>
+		<property name="groupDAO"><ref bean="groupDAO"/></property>
+		<property name="roleDAO"><ref bean="roleDAO"/></property>
+		<property name="organisationDAO"><ref bean="organisationDAO"/></property>
+		<property name="favoriteOrganisationDAO"><ref bean="favoriteOrganisationDAO"/></property>
+		<property name="userDAO"><ref bean="userDAO"/></property>
+		<property name="userOrganisationDAO"><ref bean="userOrganisationDAO"/></property>
+		<property name="messageService"><ref bean="commonMessageService"/></property>
+		<property name="centralToolContentHandler"><ref bean="centralToolContentHandler"/></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 bean="userManagementServiceTarget"/></property>
+		<property name="proxyTargetClass"><value>true</value></property> 
+		<property name="preInterceptors">
+			<list>
+				<ref bean="transactionRetryInterceptor" />			
+			</list>
+		</property> 
+		<property name="transactionAttributes">
+			<props>
+				<prop key="get*">PROPAGATION_REQUIRED</prop>
+				<prop key="find*">PROPAGATION_REQUIRED</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>
+				<prop key="disable*">PROPAGATION_REQUIRED</prop>
+				<prop key="set*">PROPAGATION_REQUIRED</prop>
+				<prop key="is*">PROPAGATION_REQUIRED</prop>
+				<prop key="toggleOrganisationFavorite">PROPAGATION_REQUIRED</prop>
+				<prop key="userHasData">PROPAGATION_REQUIRED</prop>
+				<prop key="upload*">PROPAGATION_REQUIRED</prop>
+			</props>
+		</property>
+	</bean>
+	
+	<bean id="learningDesignServiceTarget" class="org.lamsfoundation.lams.learningdesign.service.LearningDesignService">
+		<property name="messageService"><ref bean="commonMessageService"/></property>
+		<property name="learningDesignDAO"><ref bean="learningDesignDAO"/></property>
+		<property name="activityDAO"><ref bean="activityDAO"/></property>
+		<property name="groupingDAO"><ref bean="groupingDAO"/></property>
+		<property name="toolDAO"><ref bean="toolDAO"/></property>
+		<property name="learningLibraryDAO"><ref bean="learningLibraryDAO"/></property>
+		<property name="toolActMessageService"><ref bean="loadedMessageSourceService"/></property>
+	</bean>
+	
+	<bean id="learningDesignService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+		<property name="transactionManager"><ref bean="transactionManager"/></property>
+		<property name="target"><ref bean="learningDesignServiceTarget"/></property>
+		<property name="proxyTargetClass"><value>true</value></property> 
+		<property name="preInterceptors">
+			<list>
+				<ref bean="transactionRetryInterceptor" />			
+			</list>
+		</property>
+		<property name="transactionAttributes">
+			<props>
+				<prop key="validateLearningDesign">PROPAGATION_REQUIRED</prop>
+				<prop key="setValid">PROPAGATION_REQUIRED</prop>
+				<prop key="getAllLearningLibraryDetails">PROPAGATION_REQUIRED</prop>
+				<prop key="getToolDTOs">PROPAGATION_REQUIRED</prop>
+				<prop key="getLearning*">PROPAGATION_REQUIRED</prop>
+				<prop key="save*">PROPAGATION_REQUIRED</prop>
+				<prop key="fillLearningLibraryID">PROPAGATION_REQUIRED</prop>
+			</props>
+		</property>
+	</bean>
+	
+	<bean id="lessonServiceTarget" class="org.lamsfoundation.lams.lesson.service.LessonService">
+		<property name="lessonDAO"><ref bean="lessonDAO"/></property>
+		<property name="lessonClassDAO"><ref bean="lessonClassDAO"/></property>
+		<property name="groupingDAO"><ref bean="groupingDAO"/></property>
+		<property name="baseDAO"><ref bean="baseDAO"/></property>
+		<property name="learnerProgressDAO"><ref bean="learnerProgressDAO"/></property>
+		<property name="messageService"><ref bean="commonMessageService"/></property>
+	</bean>
+	
+	<bean id="lessonService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+		<property name="transactionManager"><ref bean="transactionManager"/></property>
+		<property name="target"><ref bean="lessonServiceTarget"/></property>
+		<property name="proxyTargetClass"><value>true</value></property> 
+		<property name="preInterceptors">
+			<list>
+				<ref bean="transactionRetryInterceptor" />			
+			</list>
+		</property>
+		<property name="transactionAttributes">
+			<props>
+				<prop key="perform*">PROPAGATION_REQUIRED</prop>
+				<prop key="remove*">PROPAGATION_REQUIRED</prop>
+				<prop key="get*">PROPAGATION_REQUIRED</prop>
+				<prop key="add*">PROPAGATION_REQUIRED</prop>
+				<prop key="create*">PROPAGATION_REQUIRED</prop>
+				<prop key="update*">PROPAGATION_REQUIRED</prop>
+				<prop key="save*">PROPAGATION_REQUIRED</prop>
+			</props>
+		</property>
+	</bean>
+	
+	<bean id="themeServiceTarget" class="org.lamsfoundation.lams.themes.service.ThemeService">
+		<property name="themeDAO"><ref bean="themeDAO"/></property>
+		<property name="userManagementService"><ref bean="userManagementService"/></property>
+	</bean>
+	
+	<bean id="themeService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+		<property name ="transactionManager"><ref bean ="transactionManager"/></property>
+		<property name ="target"><ref bean="themeServiceTarget"/></property>
+		<property name="proxyTargetClass"><value>true</value></property> 
+		<property name="preInterceptors">
+			<list>
+				<ref bean="transactionRetryInterceptor" />			
+			</list>
+		</property>
+		<property name="transactionAttributes">
+			<props>
+				<prop key="get*">PROPAGATION_REQUIRED</prop>
+				<prop key="store*">PROPAGATION_REQUIRED</prop>
+				<prop key="set*">PROPAGATION_REQUIRED</prop>
+			</props>
+		</property>
+	</bean>
+	
+	<bean id="timezoneServiceTarget" class="org.lamsfoundation.lams.timezone.service.TimezoneService">
+		<property name="timezoneDAO"><ref bean="timezoneDAO"/></property>
+	</bean>
+	
+	<bean id="timezoneService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+		<property name ="transactionManager"><ref bean ="transactionManager"/></property>
+		<property name ="target"><ref bean="timezoneServiceTarget"/></property>
+		<property name="proxyTargetClass"><value>true</value></property> 
+		<property name="preInterceptors">
+			<list>
+				<ref bean="transactionRetryInterceptor" />			
+			</list>
+		</property>
+		<property name="transactionAttributes">
+			<props>
+				<prop key="get*">PROPAGATION_REQUIRED</prop>
+				<prop key="update*">PROPAGATION_REQUIRED</prop>
+			</props>
+		</property>
+	</bean>
+
+	<bean id="signupServiceTarget" class="org.lamsfoundation.lams.signup.service.SignupService">
+		<property name="signupDAO"><ref bean="signupDAO" /></property>
+		<property name="userManagementService"><ref bean="userManagementService" /></property>
+		<property name="lessonService"><ref bean="lessonService" /></property>
+	</bean>
+
+	<bean id="signupService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+		<property name="transactionManager"><ref bean="transactionManager" /></property>
+		<property name="target"><ref bean="signupServiceTarget" /></property>
+		<property name="proxyTargetClass"><value>true</value></property>
+		<property name="preInterceptors">
+			<list>
+				<ref bean="transactionRetryInterceptor" />			
+			</list>
+		</property>
+		<property name="transactionAttributes">
+			<props>
+				<prop key="signupUser">PROPAGATION_REQUIRED</prop>
+			</props>
+		</property>
+	</bean>
+	
+	<bean id="exportToolContentServiceTarget" class="org.lamsfoundation.lams.learningdesign.service.ExportToolContentService">
+		<property name="activityDAO"><ref bean="activityDAO"/></property>
+		<property name="toolDAO"><ref bean="toolDAO"/></property>
+		<property name="toolContentDAO"><ref bean="toolContentDAO"/></property>
+		<property name="systemToolDAO"><ref bean="systemToolDAO"/></property>
+		<property name="baseDAO"><ref bean="baseDAO"/></property>
+		<property name="licenseDAO"><ref bean="licenseDAO"/></property>
+		<property name="groupingDAO"><ref bean="groupingDAO"/></property>
+		<property name="transitionDAO"><ref bean="transitionDAO"/></property>
+		<property name="learningDesignDAO"><ref bean="learningDesignDAO"/></property>
+		<property name="learningLibraryDAO"><ref bean="learningLibraryDAO"/></property>
+	</bean>
+	
+	<bean id="exportToolContentService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+		<property name ="transactionManager"><ref bean ="transactionManager"/></property>
+		<property name ="target"><ref bean="exportToolContentServiceTarget"/></property>
+		<property name="preInterceptors">
+			<list>
+				<ref bean="transactionRetryInterceptor" />			
+			</list>
+		</property>
+		<!-- TransactionProxyFactoryBean by default just proxies all interfaces implemented by the target object -->
+		<!-- AuthoringService is class so needs to be proxied via CGLIB -->
+		<!-- Specify "proxyTargetClass" = "true" to generate a CGLIB proxy-->
+		<property name="proxyTargetClass"><value>true</value></property>     
+		
+		<property name="transactionAttributes">
+			<props>
+				<prop key="save*">PROPAGATION_REQUIRED</prop>
+				<prop key="remove*">PROPAGATION_REQUIRED</prop>
+				<prop key="export*">PROPAGATION_REQUIRED,+java.lang.Exception</prop>
+				<prop key="import*">PROPAGATION_REQUIRED,+java.lang.Exception</prop>
+			</props>
+		</property>
+	</bean>
+	
+	<!--  Access a message service related to a programatically loaded message file. -->
+	<!--  Can be used to arbitrarily access any message file that is on the classpath -->
+	<!--  as long as you know the file's name and full path.                          -->
+	<bean id="loadedMessageSourceService" class="org.lamsfoundation.lams.util.LoadedMessageSourceService">
+    </bean>
+    	
+    <!--  Each message service created by loadedMessageService is a ResourceBundleMessageSource -->
+	<bean id="loadedMessageSource" class="org.springframework.context.support.ResourceBundleMessageSource" scope="prototype">
+	</bean>
+			
+	<!--  Core Notebook Service -->
+	<bean id="coreNotebookServiceTarget" class="org.lamsfoundation.lams.notebook.service.CoreNotebookService">
+		<property name="messageService"><ref bean="commonMessageService"/></property>
+		<property name="userManagementService"><ref bean="userManagementService"/></property>
+		<property name="notebookEntryDAO"><ref bean="notebookEntryDAO" /></property>
+		<property name="baseDAO"><ref bean="baseDAO" /></property>
+	</bean>
+	
+	<bean id="coreNotebookService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+		<property name ="transactionManager"><ref bean ="transactionManager"/></property>
+		<property name ="target"><ref bean="coreNotebookServiceTarget"/></property>
+		<property name="preInterceptors">
+			<list>
+				<ref bean="transactionRetryInterceptor" />			
+			</list>
+		</property>
+		<!-- TransactionProxyFactoryBean by default just proxies all interfaces implemented by the target object -->
+		<!-- AuthoringService is class so needs to be proxied via CGLIB -->
+		<!-- Specify "proxyTargetClass" = "true" to generate a CGLIB proxy-->
+		<property name="proxyTargetClass"><value>true</value></property>     
+		
+		<property name="transactionAttributes">
+			<props>
+				<prop key="get*">PROPAGATION_REQUIRED</prop>
+				<prop key="update*">PROPAGATION_REQUIRED</prop>
+				<prop key="save*">PROPAGATION_REQUIRED</prop>
+				<prop key="create*">PROPAGATION_REQUIRED</prop>
+			</props>
+		</property>
+	</bean>
+
+	<!--  Rating Service -->
+
+	<bean id="ratingService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+
+		<property name ="transactionManager"><ref bean ="transactionManager"/></property>
+		<property name ="target">
+			<bean class="org.lamsfoundation.lams.rating.service.RatingService">
+				<property name="messageService"><ref bean="commonMessageService"/></property>
+				<property name="ratingDAO"><ref bean="ratingDAO" /></property>
+				<property name="ratingCommentDAO"><ref bean="ratingCommentDAO" /></property>
+				<property name="ratingCriteriaDAO"><ref bean="ratingCriteriaDAO" /></property>
+				<property name="userManagementService"><ref bean="userManagementService"/></property>
+			</bean>
+		</property>
+		<property name="proxyTargetClass"><value>true</value></property> 
+		<property name="preInterceptors">
+			<list>
+				<ref bean="transactionRetryInterceptor" />			
+			</list>
+		</property>
+		<property name="transactionAttributes">
+			<props>
+				<prop key="get*">PROPAGATION_REQUIRED</prop>
+				<prop key="update*">PROPAGATION_REQUIRED</prop>
+				<prop key="save*">PROPAGATION_REQUIRED</prop>
+				<prop key="create*">PROPAGATION_REQUIRED</prop>
+				<prop key="rateItem">PROPAGATION_REQUIRED</prop>
+				<prop key="commentItem">PROPAGATION_REQUIRED</prop>
+			</props>
+		</property>
+
+	</bean>
+	
+	<!-- Event notification Service -->
+
+	 <bean id="scheduler" class="org.springframework.scheduling.quartz.SchedulerFactoryBean">
+        <property name="applicationContextSchedulerContextKey" value="context.central"/>
+        <property name="schedulerName" value="LAMS"/>
+    	<property name="quartzProperties">
+			<props>
+				<prop key="org.quartz.jobStore.class">org.springframework.scheduling.quartz.LocalDataSourceJobStore</prop>
+				<prop key="org.quartz.jobStore.driverDelegateClass">org.quartz.impl.jdbcjobstore.StdJDBCDelegate</prop>
+				<prop key="org.quartz.jobStore.tablePrefix">lams_qtz_</prop>
+			</props>
+		</property> 
+		<property name="dataSource"><ref bean="dataSource"/></property>
+	
+		<property name="jobDetails">
+			<list>
+				<ref bean="resendMessagesJob" />
+			</list>
+		</property>
+		<property name="triggers">
+			<list>
+				<ref bean="resendMessagesJobTrigger" />
+			</list>
+		</property>    
+    </bean>
+
+
+    <bean id="eventNotificationService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+		<property name ="transactionManager"><ref bean="transactionManager"/></property>
+		<property name="preInterceptors">
+			<list>
+				<ref bean="transactionRetryInterceptor" />			
+			</list>
+		</property>
+		<property name ="target">
+			<bean class="org.lamsfoundation.lams.events.EventNotificationService">
+				<property name="eventDAO"><ref bean="eventDAO" /></property>
+				<property name="userManagementService"><ref bean="userManagementService"/></property>
+        		<property name="messageService"><ref bean="commonMessageService"/></property>
+        		<property name="lessonService"><ref bean="lessonService"/></property>
+        		<property name="toolService"><ref bean="lamsToolService"/></property>
+			</bean>	
+		</property>
+		<property name="transactionAttributes">
+			<props>
+				<prop key="create*">PROPAGATION_REQUIRED</prop>
+				<prop key="eventExists">PROPAGATION_REQUIRED</prop>
+				<prop key="sendMessage">PROPAGATION_REQUIRED</prop>
+				<prop key="resendMessages">PROPAGATION_REQUIRED</prop>
+				<prop key="notify*">PROPAGATION_REQUIRED</prop>
+				<prop key="subscribe">PROPAGATION_REQUIRED</prop>
+				<prop key="unsubscribe">PROPAGATION_REQUIRED</prop>
+				<prop key="trigger*">PROPAGATION_REQUIRED</prop>
+				<prop key="isSubscribed">PROPAGATION_REQUIRED</prop>
+				<prop key="getNotification*">PROPAGATION_REQUIRED</prop>
+			</props>
+		</property>
+	</bean>
+	
+	<bean name="resendMessagesJob" class="org.springframework.scheduling.quartz.JobDetailFactoryBean">
+		<property name="jobClass" value="org.lamsfoundation.lams.events.ResendMessagesJob" />
+		<property name="name" value="Resend Messages Job"/>
+		<property name="durability" value="true" />
+	</bean>
+	
+	<bean id="resendMessagesJobTrigger" 
+                class="org.springframework.scheduling.quartz.SimpleTriggerFactoryBean">
+		<property name="jobDetail" ref="resendMessagesJob" />
+		<property name="name" value="Resend Messages Job Trigger"/>
+		<property name="repeatInterval" value="3600000" />
+		<property name="startDelay" value="120000" />
+	</bean>
+	
+	
+	<!-- Log Event notification Service -->
+	
+	<bean id="logEventService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+		<property name ="transactionManager"><ref bean ="transactionManager"/></property>
+		<property name="preInterceptors">
+			<list>
+				<ref bean="transactionRetryInterceptor" />			
+			</list>
+		</property>
+		<property name ="target">
+			<bean class="org.lamsfoundation.lams.logevent.service.LogEventService">
+				<property name="lessonDAO"><ref bean="lessonDAO"/></property>
+				<property name="logEventDAO"><ref bean="logEventDAO"/></property>
+				<property name="messageService"><ref bean="commonMessageService"/></property>
+				<property name="userManagementService"><ref bean="userManagementService"/></property>
+			</bean>	
+		</property>
+		<property name="proxyTargetClass"><value>true</value></property> 
+		<property name="transactionAttributes">
+			<props>
+				<prop key="get*">PROPAGATION_REQUIRED</prop>
+				<prop key="logEvent">PROPAGATION_REQUIRED</prop>
+			</props>
+		</property>
+	</bean>	
+	
+	<!--  Configuration service -->
+	<bean id="configurationService"  class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+		<property name ="transactionManager"><ref bean ="transactionManager"/></property>
+		<property name="preInterceptors">
+			<list>
+				<ref bean="transactionRetryInterceptor" />			
+			</list>
+		</property>
+		<property name ="target">
+			<bean class="org.lamsfoundation.lams.util.Configuration">
+				<property name="configurationDAO"><ref bean="configurationDAO" /></property>
+				<property name="messageService"><ref bean="commonMessageService" /></property>
+				<property name="scheduler"><ref bean="scheduler" /></property>
+			</bean>
+		</property>
+		<property name="proxyTargetClass"><value>true</value></property> 
+		<property name="transactionAttributes">
+			<props>
+				<prop key="save*">PROPAGATION_REQUIRED</prop>
+				<prop key="persist*">PROPAGATION_REQUIRED</prop>
+			</props>
+		</property>
+	</bean>
+
+	<!-- Security service -->
+	<bean id="securityServiceTarget" class="org.lamsfoundation.lams.security.SecurityService">
+		<property name="securityDAO"><ref bean="securityDAO"/></property>
+		<property name="logEventService"><ref bean="logEventService"/></property>
+	</bean>	
+	
+	<bean id="securityService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+		<property name="transactionManager"><ref bean="transactionManager"/></property>
+		<property name="target"><ref bean="securityServiceTarget"/></property>
+		<property name="proxyTargetClass"><value>true</value></property> 
+		<property name="preInterceptors">
+			<list>
+				<ref bean="transactionRetryInterceptor" />			
+			</list>
+		</property>
+		<property name="transactionAttributes">
+			<props>
+				<prop key="is*">PROPAGATION_REQUIRED,readOnly</prop>
+				<prop key="has*">PROPAGATION_REQUIRED,readOnly</prop>
+			</props>
+		</property>
+	</bean>
+
+	<!-- Learning Design related beans-->
+	
+	<bean id="activityDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.ActivityDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+	<bean id="branchActivityEntryDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.BranchActivityEntryDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+	<bean id="learningLibraryDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.LearningLibraryDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+	<bean id="learningDesignDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.LearningDesignDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>	
+	<bean id="transitionDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.TransitionDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>	
+	<bean id="groupingDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.GroupingDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>	
+	<bean id="groupDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.GroupDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+	<bean id="groupUserDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.GroupUserDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+	<bean id="licenseDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.LicenseDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+	
+	<!-- Lesson related beans -->
+	
+	<bean id="lessonDAO" class="org.lamsfoundation.lams.lesson.dao.hibernate.LessonDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+
+	<bean id="lessonClassDAO" class="org.lamsfoundation.lams.lesson.dao.hibernate.LessonClassDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+
+	<bean id="learnerProgressDAO" class="org.lamsfoundation.lams.lesson.dao.hibernate.LearnerProgressDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+	
+	<!--User management related beans -->
+	
+	<bean id="baseDAO" class="org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+	<!--  Theme beans -->
+	<bean id="themeDAO" class="org.lamsfoundation.lams.themes.dao.hibernate.ThemeDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+	
+	<bean id="roleDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.RoleDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+	
+	<bean id="organisationDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.OrganisationDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+	
+	<bean id="favoriteOrganisationDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.FavoriteOrganisationDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+	
+	<bean id="userDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.UserDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+	
+	<bean id="userOrganisationDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.UserOrganisationDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+	
+	<!--  Timezone service related beans -->
+	<bean id="timezoneDAO" class="org.lamsfoundation.lams.timezone.dao.hibernate.TimezoneDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>	
+	
+	<!--  Signup service related beans -->
+	<bean id="signupDAO" class="org.lamsfoundation.lams.signup.dao.hibernate.SignupDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory" /></property>
+	</bean>
+	
+	<!--Event service related beans -->
+	<bean id="eventDAO" class="org.lamsfoundation.lams.events.dao.hibernate.EventDAOHibernate">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+	
+	<!--  LogEvent service related beans -->
+	<bean id="logEventDAO" class="org.lamsfoundation.lams.logevent.dao.hibernate.LogEventDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>		
+	
+	<!-- Core Notebook related beans -->
+	<bean id="notebookEntryDAO" class="org.lamsfoundation.lams.notebook.dao.hibernate.NotebookEntryDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>	
+
+	<!-- Rating related beans -->
+	<bean id="ratingDAO" class="org.lamsfoundation.lams.rating.dao.hibernate.RatingDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>	
+	<bean id="ratingCommentDAO" class="org.lamsfoundation.lams.rating.dao.hibernate.RatingCommentDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>	
+	<bean id="ratingCriteriaDAO" class="org.lamsfoundation.lams.rating.dao.hibernate.RatingCriteriaDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+	
+	<!--  Configuration related beans -->
+	<bean id="configurationDAO" class="org.lamsfoundation.lams.config.dao.hibernate.ConfigurationDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+	
+	<!--  Competence related beans -->
+	<bean id="competenceDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.CompetenceDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+	<bean id="competenceMappingDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.CompetenceMappingDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+	
+	<!--  Pedagogical Planner related beans -->
+	<bean id="pedagogicalPlannerDAO" class="org.lamsfoundation.lams.planner.dao.hibernate.PedagogicalPlannerDAOHibernate">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+	
+	<!--  Gradebook related beans -->
+	<bean id="gradebookDAO" class="org.lamsfoundation.lams.gradebook.dao.hibernate.GradebookDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+	
+	<!--  Data flow related beans -->
+	<bean id="dataFlowDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.DataFlowDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+	
+	<!--  Data flow related beans -->
+	<bean id="securityDAO" class="org.lamsfoundation.lams.security.SecurityDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+	
+	<!--  System Session bean -->
+	<bean id="SystemSession"
+	    class="org.lamsfoundation.lams.web.session.SessionManager"
+	    init-method="init"
+	    destroy-method="destroy" />
+	
+	<bean id="statisticsService" class="org.lamsfoundation.lams.statistics.service.StatisticsService">
+   		<property name="baseDAO">
+   			<ref bean="baseDAO"/>
+   		</property>	
+   		<property name="userService">
+   			<ref bean="userManagementService"/>
+   		</property>
+    </bean>
+</beans>
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbAuthoringController.java
===================================================================
diff -u -r36580dd1c205ab30b25db66efa5e8499ae5a308e -rebd388504924fe0a06bbf20a06fe0032abbf8d15
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbAuthoringController.java	(.../NbAuthoringController.java)	(revision 36580dd1c205ab30b25db66efa5e8499ae5a308e)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbAuthoringController.java	(.../NbAuthoringController.java)	(revision ebd388504924fe0a06bbf20a06fe0032abbf8d15)
@@ -102,7 +102,7 @@
 	String contentIdString = nbAuthoringForm.getToolContentID();
 //	Long contentId = NbWebUtil.convertToLong(nbAuthoringForm.getToolContentID());
 //	String contentFolderId = nbAuthoringForm.getContentFolderID();
-	
+
 	Long contentId = WebUtil.readLongParam(request, NoticeboardConstants.TOOL_CONTENT_ID);
 	String contentFolderId = WebUtil.readStrParam(request, NoticeboardConstants.CONTENT_FOLDER_ID);
 
@@ -163,16 +163,12 @@
 	}
 
 	request.setAttribute(FORM, nbAuthoringForm);
-	
+
 	return "authoring/authoring";
     }
 
     /**
      * Checks the session to see if the title and content session variables exist or not.
-     *
-     * @param session
-     *            The HttpSession to check.
-     * @return true if the parameters title and content exists in the session, false otherwise
      */
     private boolean contentExists(INoticeboardService service, Long id) {
 	NoticeboardContent nb = service.retrieveNoticeboard(id);
@@ -184,19 +180,20 @@
 
     }
 
-    @RequestMapping(value = "/authoring/save", method = RequestMethod.POST)
+    @RequestMapping(value = "/save", method = RequestMethod.POST)
     public String save(@ModelAttribute NbAuthoringForm nbAuthoringForm, HttpServletRequest request) {
 
 	//copyAuthoringFormValuesIntoFormBean(request, nbForm);
-	String contentId = WebUtil.readStrParam(request, NoticeboardConstants.TOOL_CONTENT_ID);
-	Long content_id = WebUtil.readLongParam(request,NoticeboardConstants.TOOL_CONTENT_ID);
+	String idAsString = nbAuthoringForm.getToolContentID();
 
-	if (contentId == null) {
+	if (idAsString == null) {
 	    String error = messageService.getMessage(NoticeboardConstants.ERR_MISSING_PARAM, "Tool Content Id");
 	    logger.error(error);
 	    throw new NbApplicationException(error);
 	}
 
+	Long content_id = NbWebUtil.convertToLong(nbAuthoringForm.getToolContentID());
+
 	//throws exception if the content id does not exist
 	checkContentId(content_id);
 
@@ -226,9 +223,6 @@
     /**
      * It is assumed that the contentId is passed as a http parameter
      * if the contentId is null, an exception is thrown, otherwise proceed as normal
-     *
-     * @param contentId
-     *            the <code>toolContentId</code> to check
      */
     private void checkContentId(Long contentId) {
 	if (contentId == null) {
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbLearnerController.java
===================================================================
diff -u -re998cf2de8c4714022559cb5f67e61b677a2dd28 -rebd388504924fe0a06bbf20a06fe0032abbf8d15
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbLearnerController.java	(.../NbLearnerController.java)	(revision e998cf2de8c4714022559cb5f67e61b677a2dd28)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbLearnerController.java	(.../NbLearnerController.java)	(revision ebd388504924fe0a06bbf20a06fe0032abbf8d15)
@@ -112,12 +112,6 @@
     /**
      * Indicates that the user has finished viewing the noticeboard.
      * The session is set to complete and leaveToolSession is called.
-     *
-     * @param mapping
-     * @param form
-     * @param request
-     * @param response
-     * @return
      */
     @RequestMapping("/finish")
     public String finish(@ModelAttribute NbLearnerForm nbLearnerForm, HttpServletRequest request,
@@ -189,12 +183,6 @@
     /**
      * Indicates that the user has finished viewing the noticeboard, and will be
      * passed onto the Notebook reflection screen.
-     *
-     * @param mapping
-     * @param form
-     * @param request
-     * @param response
-     * @return
      */
     @RequestMapping("/reflect")
     public String reflect(@ModelAttribute NbLearnerForm nbLearnerForm, HttpServletRequest request) {
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbLearnerStarterController.java
===================================================================
diff -u -re998cf2de8c4714022559cb5f67e61b677a2dd28 -rebd388504924fe0a06bbf20a06fe0032abbf8d15
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbLearnerStarterController.java	(.../NbLearnerStarterController.java)	(revision e998cf2de8c4714022559cb5f67e61b677a2dd28)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbLearnerStarterController.java	(.../NbLearnerStarterController.java)	(revision ebd388504924fe0a06bbf20a06fe0032abbf8d15)
@@ -23,6 +23,8 @@
 
 package org.lamsfoundation.lams.tool.noticeboard.web.controller;
 
+import java.util.List;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
@@ -47,7 +49,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Controller;
-import org.springframework.validation.Errors;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.context.WebApplicationContext;
@@ -114,35 +115,32 @@
 	return WebUtil.readLongParam(request, AttributeNames.PARAM_USER_ID, false);
     }
 
-    public String unspecified(@ModelAttribute NbLearnerForm NbLearnerForm, Errors errors, HttpServletRequest request,
-	    HttpServletResponse response) {
+    public String unspecified(@ModelAttribute NbLearnerForm NbLearnerForm, List<String> messages,
+	    HttpServletRequest request, HttpServletResponse response) {
 
-	return learner(NbLearnerForm, errors, request, response);
+	return learner(NbLearnerForm, messages, request, response);
     }
 
     @RequestMapping("/learner")
-    public String learner(@ModelAttribute NbLearnerForm NbLearnerForm, Errors errors, HttpServletRequest request,
-	    HttpServletResponse response) {
+    public String learner(@ModelAttribute NbLearnerForm NbLearnerForm, List<String> messages,
+	    HttpServletRequest request, HttpServletResponse response) {
 
 	NoticeboardContent nbContent = null;
 	NoticeboardUser nbUser = null;
-//	saveMessages(request, null);
 
 	Long toolSessionID = NbWebUtil.convertToLong(NbLearnerForm.getToolSessionID());
 
 	if (toolSessionID == null) {
 	    String error = "Unable to continue. The parameters tool session id is missing";
-	    logger.error(error);
-	    throw new NbApplicationException(error);
+	    messages.add(error);
 	}
 
 	nbContent = nbService.retrieveNoticeboardBySessionID(toolSessionID);
 	// nbSession = nbService.retrieveNoticeboardSession(toolSessionId);
 
 	if (nbContent == null) {
 	    String error = "An Internal error has occurred. Please exit and retry this sequence";
-	    logger.error(error);
-	    throw new NbApplicationException(error);
+	    messages.add(error);
 	}
 
 	if (isFlagSet(nbContent, NoticeboardConstants.FLAG_DEFINE_LATER)) {
@@ -201,27 +199,26 @@
 	 * If the particular flag is set, control is forwarded to jsp page
 	 * displaying to the user the message according to what flag is set.
 	 */
-//	if (displayMessageToUser(nbContent, errors)) {
-//	    saveMessages(request, message);
-//A	    request.setAttribute("messageForm", );	
-//A	    return ("message");
-//	}
+	if (displayMessageToUser(nbContent, messages)) {
+	    request.setAttribute("messages", messages);
+//	    return ("message");
+	}
 
 	return "learnerContent";
 
     }
 
     @RequestMapping("/teacher")
-    public String teacher(@ModelAttribute NbLearnerForm NbLearnerForm, Errors errors, HttpServletRequest request,
-	    HttpServletResponse response) throws NbApplicationException {
-	return learner(NbLearnerForm, errors, request, response);
+    public String teacher(@ModelAttribute NbLearnerForm NbLearnerForm, List<String> messages,
+	    HttpServletRequest request, HttpServletResponse response) throws NbApplicationException {
+	return learner(NbLearnerForm, messages, request, response);
     }
 
     @RequestMapping("/author")
-    public String author(@ModelAttribute NbLearnerForm NbLearnerForm, Errors errors, HttpServletRequest request,
+    public String author(@ModelAttribute NbLearnerForm NbLearnerForm, List<String> messages, HttpServletRequest request,
 	    HttpServletResponse response) throws NbApplicationException {
 
-	return learner(NbLearnerForm, errors, request, response);
+	return learner(NbLearnerForm, messages, request, response);
 
     }
 
@@ -272,11 +269,11 @@
      *            the instance of ActtionMessages
      * @return true if any of the flags are set, false otherwise
      */
-    private boolean displayMessageToUser(NoticeboardContent content, Errors errors) {
+    private boolean displayMessageToUser(NoticeboardContent content, List<String> messages) {
 	boolean isDefineLaterSet = isFlagSet(content, NoticeboardConstants.FLAG_DEFINE_LATER);
 	if (isDefineLaterSet) {
 	    if (isDefineLaterSet) {
-		errors.reject("message.defineLaterSet");
+		messages.add("message.defineLaterSet");
 	    }
 	    return true;
 	} else {
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbMonitoringController.java
===================================================================
diff -u -re998cf2de8c4714022559cb5f67e61b677a2dd28 -rebd388504924fe0a06bbf20a06fe0032abbf8d15
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbMonitoringController.java	(.../NbMonitoringController.java)	(revision e998cf2de8c4714022559cb5f67e61b677a2dd28)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbMonitoringController.java	(.../NbMonitoringController.java)	(revision ebd388504924fe0a06bbf20a06fe0032abbf8d15)
@@ -41,7 +41,6 @@
 import org.lamsfoundation.lams.tool.noticeboard.NoticeboardUser;
 import org.lamsfoundation.lams.tool.noticeboard.dto.ReflectionDTO;
 import org.lamsfoundation.lams.tool.noticeboard.service.INoticeboardService;
-import org.lamsfoundation.lams.tool.noticeboard.util.NbApplicationException;
 import org.lamsfoundation.lams.tool.noticeboard.util.NbWebUtil;
 import org.lamsfoundation.lams.tool.noticeboard.web.form.NbMonitoringForm;
 import org.lamsfoundation.lams.util.WebUtil;
@@ -70,14 +69,15 @@
     public final static String FORM = "NbMonitoringForm";
 
     @RequestMapping("/monitoring")
-    public String unspecified(@ModelAttribute NbMonitoringForm nbMonitoringForm, HttpServletRequest request) {
+    public String unspecified(@ModelAttribute NbMonitoringForm nbMonitoringForm, List<String> messages,
+	    HttpServletRequest request) {
 
 	Long toolContentId = NbWebUtil.convertToLong(request.getParameter(NoticeboardConstants.TOOL_CONTENT_ID));
 	String contentFolderID = WebUtil.readStrParam(request, NoticeboardConstants.CONTENT_FOLDER_ID);
 	if (toolContentId == null) {
 	    String error = "Unable to continue. Tool content id missing";
-	    logger.error(error);
-	    throw new NbApplicationException(error);
+	    messages.add(error);
+	    request.setAttribute("messages", messages);
 	}
 
 	NoticeboardContent content = nbService.retrieveNoticeboard(toolContentId);
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbPedagogicalPlannerController.java
===================================================================
diff -u -re998cf2de8c4714022559cb5f67e61b677a2dd28 -rebd388504924fe0a06bbf20a06fe0032abbf8d15
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbPedagogicalPlannerController.java	(.../NbPedagogicalPlannerController.java)	(revision e998cf2de8c4714022559cb5f67e61b677a2dd28)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbPedagogicalPlannerController.java	(.../NbPedagogicalPlannerController.java)	(revision ebd388504924fe0a06bbf20a06fe0032abbf8d15)
@@ -23,6 +23,9 @@
 
 package org.lamsfoundation.lams.tool.noticeboard.web.controller;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.log4j.Logger;
@@ -34,7 +37,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Controller;
-import org.springframework.validation.Errors;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 
@@ -75,10 +77,10 @@
 
     @RequestMapping("/saveorupdate")
     public String saveOrUpdatePedagogicalPlannerForm(@ModelAttribute NbPedagogicalPlannerForm plannerForm,
-	    Errors errors, HttpServletRequest request) {
+	    List<String> messages, HttpServletRequest request) {
 
-	plannerForm.validate(errors);
-	if (!errors.hasErrors()) {
+	plannerForm.validate(messages);
+	if (messages != null && !messages.isEmpty()) {
 	    String content = plannerForm.getBasicContent();
 	    Long toolContentID = plannerForm.getToolContentID();
 	    NoticeboardContent noticeboard = nbService.retrieveNoticeboard(toolContentID);
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/form/NbPedagogicalPlannerForm.java
===================================================================
diff -u -ra2d72bee6029b7e05e8cd696c02db214f3049365 -rebd388504924fe0a06bbf20a06fe0032abbf8d15
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/form/NbPedagogicalPlannerForm.java	(.../NbPedagogicalPlannerForm.java)	(revision a2d72bee6029b7e05e8cd696c02db214f3049365)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/form/NbPedagogicalPlannerForm.java	(.../NbPedagogicalPlannerForm.java)	(revision ebd388504924fe0a06bbf20a06fe0032abbf8d15)
@@ -22,6 +22,8 @@
 
 package org.lamsfoundation.lams.tool.noticeboard.web.form;
 
+import java.util.List;
+
 import org.lamsfoundation.lams.tool.noticeboard.NoticeboardContent;
 import org.lamsfoundation.lams.web.planner.PedagogicalPlannerActivityForm;
 import org.springframework.util.StringUtils;
@@ -59,7 +61,7 @@
 	}
     }
 
-    public void validate(Errors errors) {
+    public void validate(List<String> messages) {
 	boolean valid = true;
 	boolean allEmpty = true;
 	if (basicContent != null && !basicContent.isEmpty()) {
@@ -68,7 +70,7 @@
 	    }
 	}
 	if (allEmpty) {
-	    errors.reject("authoring.msg.no.tasks.save");
+	    messages.add("authoring.msg.no.tasks.save");
 	    valid = false;
 	    basicContent = null;
 	}
Index: lams_tool_nb/web/authoring/authoring.jsp
===================================================================
diff -u -r36580dd1c205ab30b25db66efa5e8499ae5a308e -rebd388504924fe0a06bbf20a06fe0032abbf8d15
--- lams_tool_nb/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision 36580dd1c205ab30b25db66efa5e8499ae5a308e)
+++ lams_tool_nb/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision ebd388504924fe0a06bbf20a06fe0032abbf8d15)
@@ -53,7 +53,7 @@
 
 <body class="stripes" onLoad="init()">
 
-<form:form modelAttribute="nbAuthoringForm" action="authoring/save.do" id="nbAuthoringForm" enctype="multipart/form-data">
+<form:form modelAttribute="nbAuthoringForm" action="save.do" id="nbAuthoringForm" enctype="multipart/form-data">
 
 <c:set var="title"><fmt:message key="activity.title" /></c:set>
 <lams:Page title="${title}" type="navbar">
@@ -62,7 +62,7 @@
 			<form:hidden path="contentFolderID" />
 			<form:hidden path="currentTab" id="currentTab" />
 			<form:hidden path="defineLater" />
-		
+		 <c:out value="${nbAuthoringForm.toolContentID}"/>
 		 	<lams:Tabs control="true" title="${title}" helpToolSignature="<%= NoticeboardConstants.TOOL_SIGNATURE %>" helpModule="authoring">
 				<lams:Tab id="1" key="label.authoring.heading.basic" />
 				<lams:Tab id="2" key="label.authoring.heading.advanced" />
@@ -88,7 +88,7 @@
 				<form:hidden path="method" value="save" />
 				<c:set var="accessMode">
 					<c:choose>
-						<c:when test="${NbAuthoringForm.defineLater == 'true'}">
+						<c:when test="${nbAuthoringForm.defineLater == 'true'}">
 							teacher
 						</c:when>
 						<c:otherwise>
@@ -98,11 +98,11 @@
 				</c:set>
 				<lams:AuthoringButton formID="nbAuthoringForm"
 					clearSessionActionUrl="/clearsession.do" toolSignature="lanb11"
-					toolContentID="${NbAuthoringForm.toolContentID}"
+					toolContentID="${nbAuthoringForm.toolContentID}"
 					cancelButtonLabelKey="button.cancel"
 					saveButtonLabelKey="button.save"
 					accessMode="${accessMode}"
-					defineLater="${NbAuthoringForm.defineLater}"
+					defineLater="${nbAuthoringForm.defineLater}"
 					contentFolderID="${NbAuthoringForm.contentFolderID}" />
 			</lams:TabBodyArea>