Index: lams_build/lib/lams/lams.jar
===================================================================
RCS file: /usr/local/cvsroot/lams_build/lib/lams/lams.jar,v
diff -u -r1.452 -r1.453
Binary files differ
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml,v
diff -u -r1.23 -r1.24
--- lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml	24 Jun 2014 09:47:20 -0000	1.23
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml	22 Jul 2015 08:00:03 -0000	1.24
@@ -65,7 +65,11 @@
 	<bean id="authoringService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
 		<property name ="transactionManager"><ref bean ="transactionManager"/></property>
 		<property name ="target"><ref bean="authoringServiceTarget"/></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-->
Index: lams_central/src/java/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml,v
diff -u -r1.10 -r1.11
--- lams_central/src/java/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml	1 Jul 2009 02:46:37 -0000	1.10
+++ lams_central/src/java/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml	22 Jul 2015 08:00:03 -0000	1.11
@@ -25,6 +25,11 @@
 	<bean id="workspaceManagementService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
 		<property name ="transactionManager"><ref bean ="transactionManager"/></property>
 		<property name ="target"><ref bean="workspaceServiceTarget"/></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 -->
Index: lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml,v
diff -u -r1.10 -r1.11
--- lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml	15 May 2015 09:09:52 -0000	1.10
+++ lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml	22 Jul 2015 08:00:18 -0000	1.11
@@ -53,5 +53,8 @@
 	<bean id="transactionManager" class="org.springframework.orm.hibernate3.HibernateTransactionManager">
 		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
-
+	
+	<!-- Extra wrapper for all proxied methods.
+		 In case of DataIntegrityViolationException it retrires the transaction up to 3 times -->
+	<bean id="transactionRetryInterceptor" class="org.lamsfoundation.lams.web.filter.TransactionRetryInterceptor" />
 </beans>
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/commonContext.xml,v
diff -u -r1.104 -r1.105
--- lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	23 Apr 2015 22:42:39 -0000	1.104
+++ lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	22 Jul 2015 08:00:18 -0000	1.105
@@ -44,7 +44,12 @@
 	<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="proxyTargetClass"><value>true</value></property>
+		<property name="preInterceptors">
+			<list>
+				<ref bean="transactionRetryInterceptor" />			
+			</list>
+		</property> 
 		<property name="transactionAttributes">
 			<props>
 				<prop key="get*">PROPAGATION_REQUIRED</prop>
@@ -74,6 +79,11 @@
 		<property name="transactionManager"><ref bean="transactionManager"/></property>
 		<property name="target"><ref local="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>
@@ -91,7 +101,12 @@
 	<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="proxyTargetClass"><value>true</value></property>
+		<property name="preInterceptors">
+			<list>
+				<ref bean="transactionRetryInterceptor" />			
+			</list>
+		</property>
 		<property name="transactionAttributes">
 			<props>
 				<prop key="get*">PROPAGATION_REQUIRED</prop>
@@ -108,7 +123,12 @@
 	<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="proxyTargetClass"><value>true</value></property>
+		<property name="preInterceptors">
+			<list>
+				<ref bean="transactionRetryInterceptor" />			
+			</list>
+		</property>
 		<property name="transactionAttributes">
 			<props>
 				<prop key="get*">PROPAGATION_REQUIRED</prop>
@@ -127,6 +147,11 @@
 		<property name="transactionManager"><ref bean="transactionManager" /></property>
 		<property name="target"><ref local="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>
@@ -151,7 +176,11 @@
 	<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-->
@@ -207,7 +236,11 @@
 	<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-->
@@ -237,7 +270,12 @@
 				<property name="userManagementService"><ref bean="userManagementService"/></property>
 			</bean>
 		</property>
-		<property name="proxyTargetClass"><value>true</value></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>
@@ -268,6 +306,11 @@
 
     <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">
 				<constructor-arg>
@@ -298,6 +341,11 @@
 	
 	<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="logEventDAO"><ref local="logEventDAO"/></property>
@@ -335,7 +383,12 @@
 	<bean id="securityService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
 		<property name="transactionManager"><ref bean="transactionManager"/></property>
 		<property name="target"><ref local="securityServiceTarget"/></property>
-		<property name="proxyTargetClass"><value>true</value></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>
Index: lams_common/src/java/org/lamsfoundation/lams/integrationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/integrationContext.xml,v
diff -u -r1.1 -r1.2
--- lams_common/src/java/org/lamsfoundation/lams/integrationContext.xml	15 Sep 2006 01:04:18 -0000	1.1
+++ lams_common/src/java/org/lamsfoundation/lams/integrationContext.xml	22 Jul 2015 08:00:18 -0000	1.2
@@ -12,7 +12,12 @@
 		<!-- 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="proxyTargetClass"><value>true</value></property>
+		<property name="preInterceptors">
+			<list>
+				<ref bean="transactionRetryInterceptor" />			
+			</list>
+		</property>  
 		<property name="transactionAttributes">
 			<props>
 				<prop key="get*">PROPAGATION_REQUIRED</prop>
Index: lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml,v
diff -u -r1.14 -r1.15
--- lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml	22 Apr 2014 19:44:46 -0000	1.14
+++ lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml	22 Jul 2015 08:00:18 -0000	1.15
@@ -32,6 +32,11 @@
 	<bean id="toolContentIDGenerator" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
 		<property name="transactionManager"><ref bean="transactionManager"/></property>
 		<property name="target"><ref local="toolContentIDGeneratorTarget"/></property>
+		<property name="preInterceptors">
+			<list>
+				<ref bean="transactionRetryInterceptor" />			
+			</list>
+		</property>
 		<property name="transactionAttributes">
 			<props>
 				<prop key="getNextToolContentIDFor">PROPAGATION_REQUIRES_NEW</prop>
@@ -50,6 +55,11 @@
 	<bean id="lamsCoreToolService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
 		<property name="transactionManager"><ref bean="transactionManager"/></property>
 		<property name="target"><ref local="lamsCoreToolServiceTarget"/></property>
+		<property name="preInterceptors">
+			<list>
+				<ref bean="transactionRetryInterceptor" />			
+			</list>
+		</property>
 		<property name="transactionAttributes">
 			<props>
 				<prop key="createToolSession*">PROPAGATION_REQUIRED</prop>
@@ -63,6 +73,11 @@
 	
 	<bean id="lamsToolService" 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.tool.service.LamsToolService">
 					<property name="toolDAO"><ref bean="toolDAO"/></property>	
Index: lams_common/src/java/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml,v
diff -u -r1.8 -r1.9
--- lams_common/src/java/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml	9 May 2007 01:07:27 -0000	1.8
+++ lams_common/src/java/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml	22 Jul 2015 08:00:18 -0000	1.9
@@ -36,6 +36,11 @@
 		<property name="transactionManager"><ref bean="transactionManager"/></property>
 		<property name="target"><ref local="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>
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/ldapContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/ldapContext.xml,v
diff -u -r1.2 -r1.3
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/ldapContext.xml	4 Oct 2007 01:06:33 -0000	1.2
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/ldapContext.xml	22 Jul 2015 08:00:18 -0000	1.3
@@ -8,11 +8,16 @@
 	<bean id="ldapService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
 		<property name ="transactionManager"><ref bean ="transactionManager"/></property>
 		<property name ="target"><ref bean="ldapServiceTarget"/></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="proxyTargetClass"><value>true</value></property>
 		<property name="transactionAttributes">
 			<props>
 				<prop key="addLDAPUser">PROPAGATION_REQUIRED</prop>
Index: lams_common/src/java/org/lamsfoundation/lams/web/filter/TransactionRetryInterceptor.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/web/filter/TransactionRetryInterceptor.java,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_common/src/java/org/lamsfoundation/lams/web/filter/TransactionRetryInterceptor.java	22 Jul 2015 08:00:18 -0000	1.1
@@ -0,0 +1,66 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/* TransactionRetryInterceptor.java,v 1.1 2015/07/22 08:00:18 marcin Exp */
+package org.lamsfoundation.lams.web.filter;
+
+import org.aopalliance.intercept.MethodInterceptor;
+import org.aopalliance.intercept.MethodInvocation;
+import org.apache.log4j.Logger;
+import org.springframework.dao.DataIntegrityViolationException;
+
+/**
+ * Retries proxied method in case of an exception.
+ * Is the first interceptor in the processing chain.
+ * @author Marcin Cieslak
+ *
+ */
+public class TransactionRetryInterceptor implements MethodInterceptor {
+    
+    private static final Logger log = Logger.getLogger(TransactionRetryInterceptor.class);
+
+    private static final int MAX_ATTEMPTS = 3;
+
+    @Override
+    public Object invoke(MethodInvocation invocation) throws Throwable {
+	int attempt = 1;
+	Throwable exception = null;
+	do {
+	    try {
+		return invocation.proceed();
+	    } catch (DataIntegrityViolationException e) {
+		exception = e;
+		StringBuilder message = new StringBuilder("When invoking method  ")
+			.append(invocation.getMethod().getName()).append(" caught ").append(e.getMessage())
+			.append(". Attempt #").append(attempt);
+		attempt++;
+		if (attempt <= TransactionRetryInterceptor.MAX_ATTEMPTS) {
+		    message.append(". Retrying.");
+		} else {
+		    message.append(". Giving up.");
+		}
+		TransactionRetryInterceptor.log.warn(message);
+	    }
+	} while (attempt <= TransactionRetryInterceptor.MAX_ATTEMPTS);
+	throw exception;
+    }
+}
\ No newline at end of file
Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/applicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/applicationContext.xml,v
diff -u -r1.11 -r1.12
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/applicationContext.xml	26 Mar 2009 10:00:35 -0000	1.11
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/applicationContext.xml	22 Jul 2015 08:00:05 -0000	1.12
@@ -47,6 +47,7 @@
 		</property>
 		<property name="preInterceptors">
 			<list>
+				<ref bean="transactionRetryInterceptor" />	
 				<ref local="checkCredentialTicketBeforeAdvice"/>
 			</list>
 		</property>
Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml,v
diff -u -r1.6 -r1.7
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml	11 Aug 2014 22:12:52 -0000	1.6
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml	22 Jul 2015 08:00:21 -0000	1.7
@@ -25,6 +25,11 @@
 	<bean id="gradebookService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean" >
 		<property name ="transactionManager"><ref bean ="transactionManager"/></property>
 		<property name ="target"><ref bean="gradebookServiceTarget"/></property>
+		<property name="preInterceptors">
+			<list>
+				<ref bean="transactionRetryInterceptor" />			
+			</list>
+		</property>
 		<property name="transactionAttributes">
 			<props>
 				<prop key="update*">PROPAGATION_REQUIRED</prop>
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml,v
diff -u -r1.32 -r1.33
--- lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml	12 Dec 2013 12:15:39 -0000	1.32
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml	22 Jul 2015 08:00:08 -0000	1.33
@@ -24,6 +24,11 @@
 	<!-- ========================= BUSINESS OBJECT DEFINITIONS ======================== -->
 		<bean id="learnerService" 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.learning.service.LearnerService">
 				<property name="progressEngine"><ref bean="progressEngine"/></property>
@@ -64,6 +69,11 @@
 	
 	<bean id="exportService" 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.learning.export.service.ExportPortfolioService">
 				<property name="lamsCoreToolService"><ref bean="lamsCoreToolService"/></property>
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java,v
diff -u -r1.32 -r1.33
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java	15 Jul 2015 09:28:07 -0000	1.32
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java	22 Jul 2015 08:00:08 -0000	1.33
@@ -50,7 +50,7 @@
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
-import org.springframework.dao.DataAccessException;
+import org.springframework.dao.CannotAcquireLockException;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
@@ -69,8 +69,6 @@
     // ---------------------------------------------------------------------
     public static final String PARAM_PROGRESS_ID = "progressID";
 
-    private static final int COMPLETE_ACTIVITY_MAX_ATTEMPTS = 3;
-
     // public static final String POPUP_WINDOW_NAME = "LearnerActivity";
     // public static final String LEARNER_WINDOW_NAME = "lWindow";
 
@@ -227,7 +225,7 @@
 	} else if (progress.getCompletedActivities().containsKey(currentActivity)) {
 	    return actionMappings.getCloseForward(currentActivity, lesson.getLessonId());
 	} else {
-	    progress = LearningWebUtil.completeActivity(learnerService, learnerId, progress, currentActivity, 1);
+	    progress = learnerService.completeActivity(learnerId, currentActivity, progress);
 	}
 
 	if ((currentActivity != null) && currentActivity.isFloating()) {
@@ -406,30 +404,4 @@
 	}
 	return positionDTO;
     }
-
-    /**
-     * Tries to complete the activity for the learner. Because of concurrency problems (deadlocks, indexes when
-     * inserting) the operation can fail and the easiet recovery is to repeat it.
-     */
-    private static LearnerProgress completeActivity(ICoreLearnerService learnerService, Integer learnerId,
-	    LearnerProgress progress, Activity currentActivity, int attempt) {
-	try {
-	    progress = learnerService.completeActivity(learnerId, currentActivity, progress);
-	} catch (DataAccessException e) {
-	    attempt++;
-	    StringBuilder message = new StringBuilder("Could not complete activity due to a data access exception.");
-	    if (attempt <= LearningWebUtil.COMPLETE_ACTIVITY_MAX_ATTEMPTS) {
-		message.append("Retrying. Attempt #").append(attempt).append(". The exception was: ")
-			.append(e.getMessage());
-		LearningWebUtil.log.warn(message.toString());
-		LearningWebUtil.completeActivity(learnerService, learnerId, progress, currentActivity, attempt);
-	    } else {
-		message.append("Reached limit of retries: " + LearningWebUtil.COMPLETE_ACTIVITY_MAX_ATTEMPTS);
-		LearningWebUtil.log.warn(message.toString());
-		throw e;
-	    }
-	}
-
-	return progress;
-    }
 }
\ No newline at end of file
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml,v
diff -u -r1.38 -r1.39
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml	20 Oct 2014 09:27:04 -0000	1.38
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml	22 Jul 2015 08:00:02 -0000	1.39
@@ -53,6 +53,11 @@
 	<bean id="monitoringService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
 		<property name="transactionManager"><ref bean="transactionManager"/></property>
 		<property name="target"><ref local="monitoringServiceTarget"/></property>
+		<property name="preInterceptors">
+			<list>
+				<ref bean="transactionRetryInterceptor" />			
+			</list>
+		</property>
 		<property name="transactionAttributes">
 			<props>
 				<prop key="initializeLesson*">PROPAGATION_REQUIRED</prop>
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml,v
diff -u -r1.16 -r1.17
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml	28 Jul 2014 17:54:04 -0000	1.16
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml	22 Jul 2015 07:59:57 -0000	1.17
@@ -129,6 +129,11 @@
         <property name="proxyTargetClass">
             <value>false</value>
         </property>
+        <property name="preInterceptors">
+			<list>
+				<ref bean="transactionRetryInterceptor" />			
+			</list>
+		</property>
         <property name="transactionAttributes">
             <props>
                 <prop key="create*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
Index: lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/bbbApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/bbbApplicationContext.xml,v
diff -u -r1.3 -r1.4
--- lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/bbbApplicationContext.xml	6 Jun 2014 16:41:49 -0000	1.3
+++ lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/bbbApplicationContext.xml	22 Jul 2015 08:00:16 -0000	1.4
@@ -14,6 +14,11 @@
 	<!-- ========================= BUSINESS OBJECT DEFINITIONS ======================== -->
 	<bean id="bbbService" 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.tool.bbb.service.BbbService">
 				<property name="bbbSessionDAO"><ref bean="bbbSessionDAO"/></property>
Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml,v
diff -u -r1.13 -r1.14
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml	6 Jun 2014 16:41:04 -0000	1.13
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml	22 Jul 2015 08:00:23 -0000	1.14
@@ -24,6 +24,11 @@
 	</bean> 
 	<bean id="chatService" 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.tool.chat.service.ChatService">
 				<property name="chatMessageDAO"><ref bean="chatMessageDAO"/></property>				
Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dacoApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dacoApplicationContext.xml,v
diff -u -r1.10 -r1.11
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dacoApplicationContext.xml	28 Jul 2014 19:43:46 -0000	1.10
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dacoApplicationContext.xml	22 Jul 2015 07:59:56 -0000	1.11
@@ -104,6 +104,11 @@
         <property name="proxyTargetClass">
             <value>false</value>
         </property>
+        <property name="preInterceptors">
+			<list>
+				<ref bean="transactionRetryInterceptor" />			
+			</list>
+		</property>
         <property name="transactionAttributes">
             <props>
                 <prop key="create*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
Index: lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/eadventureApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/eadventureApplicationContext.xml,v
diff -u -r1.6 -r1.7
--- lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/eadventureApplicationContext.xml	6 Jun 2014 16:41:12 -0000	1.6
+++ lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/eadventureApplicationContext.xml	22 Jul 2015 07:59:53 -0000	1.7
@@ -138,6 +138,11 @@
         <property name="proxyTargetClass">
             <value>false</value>
         </property>
+        <property name="preInterceptors">
+			<list>
+				<ref bean="transactionRetryInterceptor" />			
+			</list>
+		</property>
         <property name="transactionAttributes">
             <props>
                 <prop key="create*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml,v
diff -u -r1.29 -r1.30
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml	28 Jul 2014 19:43:55 -0000	1.29
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml	22 Jul 2015 08:00:06 -0000	1.30
@@ -161,6 +161,11 @@
 		<property name="proxyTargetClass">
 			<value>false</value>
 		</property>
+		<property name="preInterceptors">
+			<list>
+				<ref bean="transactionRetryInterceptor" />			
+			</list>
+		</property>
 		<property name="transactionAttributes">
 			<props>
 				<prop key="create*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/gmapApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/gmapApplicationContext.xml,v
diff -u -r1.7 -r1.8
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/gmapApplicationContext.xml	6 Jun 2014 16:42:57 -0000	1.7
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/gmapApplicationContext.xml	22 Jul 2015 08:00:00 -0000	1.8
@@ -15,6 +15,11 @@
 	<!-- ========================= BUSINESS OBJECT DEFINITIONS ======================== -->
 	<bean id="gmapService" 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.tool.gmap.service.GmapService">
 				<property name="gmapSessionDAO"><ref bean="gmapSessionDAO"/></property>
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/imageGalleryApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/imageGalleryApplicationContext.xml,v
diff -u -r1.13 -r1.14
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/imageGalleryApplicationContext.xml	26 Mar 2015 21:21:21 -0000	1.13
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/imageGalleryApplicationContext.xml	22 Jul 2015 08:00:17 -0000	1.14
@@ -136,6 +136,11 @@
         <property name="proxyTargetClass">
             <value>false</value>
         </property>
+        <property name="preInterceptors">
+			<list>
+				<ref bean="transactionRetryInterceptor" />			
+			</list>
+		</property>
         <property name="transactionAttributes">
             <props>
                 <prop key="create*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/commonCartridgeApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/commonCartridgeApplicationContext.xml,v
diff -u -r1.3 -r1.4
--- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/commonCartridgeApplicationContext.xml	6 Jun 2014 16:41:06 -0000	1.3
+++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/commonCartridgeApplicationContext.xml	22 Jul 2015 08:00:22 -0000	1.4
@@ -110,6 +110,11 @@
         <property name="proxyTargetClass">
             <value>false</value>
         </property>
+        <property name="preInterceptors">
+			<list>
+				<ref bean="transactionRetryInterceptor" />			
+			</list>
+		</property>
         <property name="transactionAttributes">
             <props>
                 <prop key="create*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/kalturaApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/kalturaApplicationContext.xml,v
diff -u -r1.5 -r1.6
--- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/kalturaApplicationContext.xml	6 Jun 2014 16:42:37 -0000	1.5
+++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/kalturaApplicationContext.xml	22 Jul 2015 08:00:24 -0000	1.6
@@ -23,6 +23,11 @@
 	</bean> 
 	<bean id="kalturaService" 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.tool.kaltura.service.KalturaService">
 				<property name="kalturaSessionDao"><ref bean="kalturaSessionDao"/></property>
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml,v
diff -u -r1.24 -r1.25
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml	9 Sep 2014 16:42:13 -0000	1.24
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml	22 Jul 2015 08:00:15 -0000	1.25
@@ -62,44 +62,49 @@
 	
 	<bean id="mcService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
 		<property name="transactionManager"><ref bean="transactionManager"/></property>
-			<property name="target">
-				<bean class="org.lamsfoundation.lams.tool.mc.service.McServicePOJO">
-					<property name="mcContentDAO"><ref bean="mcContentDAO"/></property>
-					<property name="mcSessionDAO"><ref bean="mcSessionDAO"/></property>
-					<property name="mcUserDAO"><ref bean="mcUserDAO"/></property>
-					<property name="mcQueContentDAO"><ref bean="mcQueContentDAO"/></property>
-					<property name="mcOptionsContentDAO"><ref bean="mcOptionsContentDAO"/></property>								
-					<property name="mcUsrAttemptDAO"><ref bean="mcUsrAttemptDAO"/></property>	
-					<property name="toolService"><ref bean="lamsToolService"/></property>
-			 		<property name="learnerService"><ref bean="learnerService"/></property>		
-					<property name="mcToolContentHandler"><ref bean="mcToolContentHandler"/></property>		
-					<property name="auditService"><ref bean="auditService"/></property>					
-					<property name="exportContentService"><ref bean="exportToolContentService"/></property>
-					<property name="gradebookService"><ref bean="gradebookService" /></property>
-			   		<property name="coreNotebookService"><ref bean="coreNotebookService"/></property>										
-			   		<property name="mcOutputFactory"><ref bean="mcOutputFactory"/></property>	
-			   		<property name="messageService"><ref bean="lamcMessageService"/></property>
-			   		<property name="userManagementService"><ref bean="userManagementService"/></property>
-				</bean>
-			</property>
-			<property name="transactionAttributes">
-				<props>
-					<prop key="create*">PROPAGATION_REQUIRED,-McApplicationException</prop>
-					<prop key="copy*">PROPAGATION_REQUIRED,-McApplicationException</prop>
-					<prop key="save*">PROPAGATION_REQUIRED, -McApplicationException</prop>
-					<prop key="update*">PROPAGATION_REQUIRED,-McApplicationException</prop>
-					<prop key="get*">PROPAGATION_REQUIRED, -MccpApplicationException</prop>
-					<prop key="remove*">PROPAGATION_REQUIRED,-McApplicationException</prop>
-                	<prop key="resetDefineLater">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
-					<prop key="persistFile">PROPAGATION_REQUIRED,-McApplicationException</prop>
-					<prop key="importToolContent">PROPAGATION_REQUIRED,-McApplicationException</prop>
-					<prop key="exportToolContent">PROPAGATION_REQUIRED,-McApplicationException</prop>
-					<prop key="import102ToolContent">PROPAGATION_REQUIRED,-McApplicationException</prop>
-					<prop key="setReflectiveData">PROPAGATION_REQUIRED,-McApplicationException</prop>
-					<prop key="setDefineLater">PROPAGATION_REQUIRED,-McApplicationException</prop>
-					<prop key="checkLeaderSelectToolForSessionLeader">PROPAGATION_REQUIRED,-McApplicationException</prop>
-				</props>
-			</property>
+		<property name="preInterceptors">
+			<list>
+				<ref bean="transactionRetryInterceptor" />			
+			</list>
+		</property>
+		<property name="target">
+			<bean class="org.lamsfoundation.lams.tool.mc.service.McServicePOJO">
+				<property name="mcContentDAO"><ref bean="mcContentDAO"/></property>
+				<property name="mcSessionDAO"><ref bean="mcSessionDAO"/></property>
+				<property name="mcUserDAO"><ref bean="mcUserDAO"/></property>
+				<property name="mcQueContentDAO"><ref bean="mcQueContentDAO"/></property>
+				<property name="mcOptionsContentDAO"><ref bean="mcOptionsContentDAO"/></property>								
+				<property name="mcUsrAttemptDAO"><ref bean="mcUsrAttemptDAO"/></property>	
+				<property name="toolService"><ref bean="lamsToolService"/></property>
+		 		<property name="learnerService"><ref bean="learnerService"/></property>		
+				<property name="mcToolContentHandler"><ref bean="mcToolContentHandler"/></property>		
+				<property name="auditService"><ref bean="auditService"/></property>					
+				<property name="exportContentService"><ref bean="exportToolContentService"/></property>
+				<property name="gradebookService"><ref bean="gradebookService" /></property>
+		   		<property name="coreNotebookService"><ref bean="coreNotebookService"/></property>										
+		   		<property name="mcOutputFactory"><ref bean="mcOutputFactory"/></property>	
+		   		<property name="messageService"><ref bean="lamcMessageService"/></property>
+		   		<property name="userManagementService"><ref bean="userManagementService"/></property>
+			</bean>
+		</property>
+		<property name="transactionAttributes">
+			<props>
+				<prop key="create*">PROPAGATION_REQUIRED,-McApplicationException</prop>
+				<prop key="copy*">PROPAGATION_REQUIRED,-McApplicationException</prop>
+				<prop key="save*">PROPAGATION_REQUIRED, -McApplicationException</prop>
+				<prop key="update*">PROPAGATION_REQUIRED,-McApplicationException</prop>
+				<prop key="get*">PROPAGATION_REQUIRED, -MccpApplicationException</prop>
+				<prop key="remove*">PROPAGATION_REQUIRED,-McApplicationException</prop>
+               	<prop key="resetDefineLater">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
+				<prop key="persistFile">PROPAGATION_REQUIRED,-McApplicationException</prop>
+				<prop key="importToolContent">PROPAGATION_REQUIRED,-McApplicationException</prop>
+				<prop key="exportToolContent">PROPAGATION_REQUIRED,-McApplicationException</prop>
+				<prop key="import102ToolContent">PROPAGATION_REQUIRED,-McApplicationException</prop>
+				<prop key="setReflectiveData">PROPAGATION_REQUIRED,-McApplicationException</prop>
+				<prop key="setDefineLater">PROPAGATION_REQUIRED,-McApplicationException</prop>
+				<prop key="checkLeaderSelectToolForSessionLeader">PROPAGATION_REQUIRED,-McApplicationException</prop>
+			</props>
+		</property>
 	</bean>  
 	
 	
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml,v
diff -u -r1.33 -r1.34
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml	21 May 2015 23:43:12 -0000	1.33
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml	22 Jul 2015 07:59:55 -0000	1.34
@@ -67,46 +67,51 @@
 	
 	<bean id="qaService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
 		<property name="transactionManager"><ref bean="transactionManager"/></property>
-			<property name="target">
-				<bean class="org.lamsfoundation.lams.tool.qa.service.QaServicePOJO">
-					<property name="qaDAO"><ref bean="qaContentDAO"/></property>
-					<property name="qaSessionDAO"><ref bean="qaSessionDAO"/></property>
-					<property name="qaQueUsrDAO"><ref bean="qaQueUsrDAO"/></property>
-					<property name="qaQuestionDAO"><ref bean="qaQuestionDAO"/></property>
-					<property name="qaUsrRespDAO"><ref bean="qaUsrRespDAO"/></property>	
-					<property name="qaConfigItemDAO"><ref bean="qaConfigItemDAO"/></property>
-					<property name="qaWizardDAO"><ref bean="qaWizardDAO"/></property>								
-					<property name="toolService"><ref bean="lamsToolService"/></property>
-					<property name="learnerService"><ref bean="learnerService"/></property>			
-					<property name="auditService"><ref bean="auditService"/></property>
-					<property name="qaOutputFactory"><ref bean="qaOutputFactory"/></property>
-					<property name="qaToolContentHandler"><ref bean="qaToolContentHandler"/></property>								
-					<property name="exportContentService"><ref bean="exportToolContentService"/></property>											
-			   		<property name="coreNotebookService"><ref bean="coreNotebookService"/></property>
-			   		<property name="ratingService"><ref bean="ratingService"/></property>   
-			   		<property name="userManagementService"><ref bean="userManagementService"/></property>
-			   		<property name="eventNotificationService"><ref bean="eventNotificationService"/></property> 
-			   		<property name="messageService"><ref bean="qaMessageService"/></property>
-				</bean>
-			</property>
-			<property name="transactionAttributes">
-				<props>
-					<prop key="create*">PROPAGATION_REQUIRED,-QaApplicationException</prop>
-					<prop key="copy*">PROPAGATION_REQUIRED,-QaApplicationException</prop>
-					<prop key="save*">PROPAGATION_REQUIRED, -QaApplicationException</prop>
-					<prop key="update*">PROPAGATION_REQUIRED,-QaApplicationException</prop>
-					<prop key="get*">PROPAGATION_REQUIRED, -QaApplicationException</prop>
-					<prop key="remove*">PROPAGATION_REQUIRED,-QaApplicationException</prop>
-                	<prop key="resetDefineLater">PROPAGATION_REQUIRED,-QaApplicationException</prop>
-                	<prop key="setDefineLater">PROPAGATION_REQUIRED,-QaApplicationException</prop>
-                	<prop key="notifyTeachersOnResponseSubmit">PROPAGATION_REQUIRED,-QaApplicationException</prop>
-					<prop key="checkLeaderSelectToolForSessionLeader">PROPAGATION_REQUIRED,-QaApplicationException</prop>
-					<prop key="importToolContent">PROPAGATION_REQUIRED,-QaApplicationException</prop>
-					<prop key="exportToolContent">PROPAGATION_REQUIRED,-QaApplicationException</prop>
-					<prop key="import102ToolContent">PROPAGATION_REQUIRED,-QaApplicationException</prop>
-					<prop key="setReflectiveData">PROPAGATION_REQUIRED,-QaApplicationException</prop>
-				</props>
-			</property>
+		<property name="preInterceptors">
+			<list>
+				<ref bean="transactionRetryInterceptor" />			
+			</list>
+		</property>
+		<property name="target">
+			<bean class="org.lamsfoundation.lams.tool.qa.service.QaServicePOJO">
+				<property name="qaDAO"><ref bean="qaContentDAO"/></property>
+				<property name="qaSessionDAO"><ref bean="qaSessionDAO"/></property>
+				<property name="qaQueUsrDAO"><ref bean="qaQueUsrDAO"/></property>
+				<property name="qaQuestionDAO"><ref bean="qaQuestionDAO"/></property>
+				<property name="qaUsrRespDAO"><ref bean="qaUsrRespDAO"/></property>	
+				<property name="qaConfigItemDAO"><ref bean="qaConfigItemDAO"/></property>
+				<property name="qaWizardDAO"><ref bean="qaWizardDAO"/></property>								
+				<property name="toolService"><ref bean="lamsToolService"/></property>
+				<property name="learnerService"><ref bean="learnerService"/></property>			
+				<property name="auditService"><ref bean="auditService"/></property>
+				<property name="qaOutputFactory"><ref bean="qaOutputFactory"/></property>
+				<property name="qaToolContentHandler"><ref bean="qaToolContentHandler"/></property>								
+				<property name="exportContentService"><ref bean="exportToolContentService"/></property>											
+		   		<property name="coreNotebookService"><ref bean="coreNotebookService"/></property>
+		   		<property name="ratingService"><ref bean="ratingService"/></property>   
+		   		<property name="userManagementService"><ref bean="userManagementService"/></property>
+		   		<property name="eventNotificationService"><ref bean="eventNotificationService"/></property> 
+		   		<property name="messageService"><ref bean="qaMessageService"/></property>
+			</bean>
+		</property>
+		<property name="transactionAttributes">
+			<props>
+				<prop key="create*">PROPAGATION_REQUIRED,-QaApplicationException</prop>
+				<prop key="copy*">PROPAGATION_REQUIRED,-QaApplicationException</prop>
+				<prop key="save*">PROPAGATION_REQUIRED, -QaApplicationException</prop>
+				<prop key="update*">PROPAGATION_REQUIRED,-QaApplicationException</prop>
+				<prop key="get*">PROPAGATION_REQUIRED, -QaApplicationException</prop>
+				<prop key="remove*">PROPAGATION_REQUIRED,-QaApplicationException</prop>
+               	<prop key="resetDefineLater">PROPAGATION_REQUIRED,-QaApplicationException</prop>
+               	<prop key="setDefineLater">PROPAGATION_REQUIRED,-QaApplicationException</prop>
+               	<prop key="notifyTeachersOnResponseSubmit">PROPAGATION_REQUIRED,-QaApplicationException</prop>
+				<prop key="checkLeaderSelectToolForSessionLeader">PROPAGATION_REQUIRED,-QaApplicationException</prop>
+				<prop key="importToolContent">PROPAGATION_REQUIRED,-QaApplicationException</prop>
+				<prop key="exportToolContent">PROPAGATION_REQUIRED,-QaApplicationException</prop>
+				<prop key="import102ToolContent">PROPAGATION_REQUIRED,-QaApplicationException</prop>
+				<prop key="setReflectiveData">PROPAGATION_REQUIRED,-QaApplicationException</prop>
+			</props>
+		</property>
 	</bean>  
 
 </beans>
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml,v
diff -u -r1.22 -r1.23
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml	28 Jul 2014 19:43:51 -0000	1.22
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml	22 Jul 2015 08:00:20 -0000	1.23
@@ -103,6 +103,11 @@
         <property name="proxyTargetClass">
             <value>false</value>
         </property>
+        <property name="preInterceptors">
+			<list>
+				<ref bean="transactionRetryInterceptor" />			
+			</list>
+		</property>
         <property name="transactionAttributes">
             <props>
                 <prop key="create*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/leaderselectionApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/leaderselectionApplicationContext.xml,v
diff -u -r1.2 -r1.3
--- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/leaderselectionApplicationContext.xml	17 Jan 2014 22:06:30 -0000	1.2
+++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/leaderselectionApplicationContext.xml	22 Jul 2015 08:00:05 -0000	1.3
@@ -24,6 +24,11 @@
 	</bean> 
 	<bean id="leaderselectionService" 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.tool.leaderselection.service.LeaderselectionService">
 				<property name="leaderselectionSessionDAO"><ref bean="leaderselectionSessionDAO"/></property>
Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/mindmapApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/mindmapApplicationContext.xml,v
diff -u -r1.3 -r1.4
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/mindmapApplicationContext.xml	6 Jun 2014 16:42:44 -0000	1.3
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/mindmapApplicationContext.xml	22 Jul 2015 07:59:59 -0000	1.4
@@ -23,6 +23,11 @@
 	
 	<bean id="mindmapService" 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.tool.mindmap.service.MindmapService">
 				<property name="mindmapSessionDAO"><ref bean="mindmapSessionDAO"/></property>
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/nbApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/nbApplicationContext.xml,v
diff -u -r1.4 -r1.5
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/nbApplicationContext.xml	6 Jun 2014 16:42:54 -0000	1.4
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/nbApplicationContext.xml	22 Jul 2015 08:00:09 -0000	1.5
@@ -13,6 +13,11 @@
 	<!-- ========================= BUSINESS OBJECT DEFINITIONS ======================== -->
 	<bean id="nbService" 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.tool.noticeboard.service.NoticeboardServicePOJO">
 				<property name="nbContentDAO"><ref bean="nbContentDAO"/></property>
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml,v
diff -u -r1.10 -r1.11
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml	31 Jul 2014 01:07:48 -0000	1.10
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml	22 Jul 2015 08:00:01 -0000	1.11
@@ -24,6 +24,11 @@
 	</bean> 
 	<bean id="notebookService" 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.tool.notebook.service.NotebookService">
 				<property name="notebookSessionDAO"><ref bean="notebookSessionDAO"/></property>
Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/pixlrApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/pixlrApplicationContext.xml,v
diff -u -r1.6 -r1.7
--- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/pixlrApplicationContext.xml	6 Jun 2014 16:41:09 -0000	1.6
+++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/pixlrApplicationContext.xml	22 Jul 2015 07:59:59 -0000	1.7
@@ -24,6 +24,11 @@
 	</bean> 
 	<bean id="pixlrService" 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.tool.pixlr.service.PixlrService">
 				<property name="pixlrSessionDAO"><ref bean="pixlrSessionDAO"/></property>
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml,v
diff -u -r1.28 -r1.29
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml	6 Jun 2014 16:41:51 -0000	1.28
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml	22 Jul 2015 07:59:54 -0000	1.29
@@ -62,7 +62,11 @@
 	<bean id="submitFilesService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
 		<property name ="transactionManager"><ref bean ="transactionManager"/></property>
 		<property name ="target"><ref bean="submitFilesServiceTarget"/></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-->
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml,v
diff -u -r1.17 -r1.18
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml	11 Feb 2015 23:00:52 -0000	1.17
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml	22 Jul 2015 08:00:26 -0000	1.18
@@ -115,6 +115,11 @@
         <property name="proxyTargetClass">
             <value>false</value>
         </property>
+        <property name="preInterceptors">
+			<list>
+				<ref bean="transactionRetryInterceptor" />			
+			</list>
+		</property>
         <property name="transactionAttributes">
             <props>
             	<prop key="recalculate*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/scribeApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/scribeApplicationContext.xml,v
diff -u -r1.8 -r1.9
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/scribeApplicationContext.xml	6 Jun 2014 16:43:02 -0000	1.8
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/scribeApplicationContext.xml	22 Jul 2015 07:59:52 -0000	1.9
@@ -14,6 +14,11 @@
 	<!-- ========================= BUSINESS OBJECT DEFINITIONS ======================== -->
 	<bean id="lascrbScribeService" 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.tool.scribe.service.ScribeService">
 				<property name="scribeSessionDAO"><ref bean="lascrbScribeSessionDAO"/></property>
Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/spreadsheetApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/spreadsheetApplicationContext.xml,v
diff -u -r1.5 -r1.6
--- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/spreadsheetApplicationContext.xml	6 Jun 2014 16:43:06 -0000	1.5
+++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/spreadsheetApplicationContext.xml	22 Jul 2015 07:59:58 -0000	1.6
@@ -93,6 +93,11 @@
         <property name="proxyTargetClass">
             <value>false</value>
         </property>
+        <property name="preInterceptors">
+			<list>
+				<ref bean="transactionRetryInterceptor" />			
+			</list>
+		</property>
         <property name="transactionAttributes">
             <props>
                 <prop key="create*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/surveyApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/surveyApplicationContext.xml,v
diff -u -r1.12 -r1.13
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/surveyApplicationContext.xml	28 Oct 2014 23:23:27 -0000	1.12
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/surveyApplicationContext.xml	22 Jul 2015 08:00:04 -0000	1.13
@@ -97,6 +97,11 @@
         <property name="proxyTargetClass">
             <value>false</value>
         </property>
+        <property name="preInterceptors">
+			<list>
+				<ref bean="transactionRetryInterceptor" />			
+			</list>
+		</property>
         <property name="transactionAttributes">
             <props>
                 <prop key="create*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/taskListApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/taskListApplicationContext.xml,v
diff -u -r1.9 -r1.10
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/taskListApplicationContext.xml	6 Jun 2014 16:42:51 -0000	1.9
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/taskListApplicationContext.xml	22 Jul 2015 08:00:25 -0000	1.10
@@ -104,6 +104,11 @@
         <property name="proxyTargetClass">
             <value>false</value>
         </property>
+        <property name="preInterceptors">
+			<list>
+				<ref bean="transactionRetryInterceptor" />			
+			</list>
+		</property>
         <property name="transactionAttributes">
             <props>
                 <prop key="create*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/videoRecorderApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/videoRecorderApplicationContext.xml,v
diff -u -r1.8 -r1.9
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/videoRecorderApplicationContext.xml	6 Jun 2014 16:41:54 -0000	1.8
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/videoRecorderApplicationContext.xml	22 Jul 2015 08:00:07 -0000	1.9
@@ -24,6 +24,11 @@
 	</bean> 
 	<bean id="videoRecorderService" 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.tool.videoRecorder.service.VideoRecorderService">
 				<property name="videoRecorderSessionDAO"><ref bean="videoRecorderSessionDAO"/></property>
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml,v
diff -u -r1.16 -r1.17
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml	9 Sep 2014 16:45:00 -0000	1.16
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml	22 Jul 2015 08:00:27 -0000	1.17
@@ -57,42 +57,47 @@
 	
 	<bean id="voteService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
 		<property name="transactionManager"><ref bean="transactionManager"/></property>
-			<property name="target">
-				<bean class="org.lamsfoundation.lams.tool.vote.service.VoteServicePOJO">
-					<property name="voteContentDAO"><ref bean="voteContentDAO"/></property>
-					<property name="voteSessionDAO"><ref bean="voteSessionDAO"/></property>
-					<property name="voteUserDAO"><ref bean="voteUserDAO"/></property>
-					<property name="voteQueContentDAO"><ref bean="voteQueContentDAO"/></property>
-					<property name="voteUsrAttemptDAO"><ref bean="voteUsrAttemptDAO"/></property>
-			 		<property name="dataFlowDAO"><ref bean="dataFlowDAO"/></property>
-					<property name="toolService"><ref bean="lamsToolService"/></property>
-			 		<property name="learnerService"><ref bean="learnerService"/></property>		
-					<property name="auditService"><ref bean="auditService"/></property>			 		
-					<property name="voteToolContentHandler"><ref bean="voteToolContentHandler"/></property>		
-			   		<property name="exportContentService"><ref bean="exportToolContentService"/></property>						
-			   		<property name="coreNotebookService"><ref bean="coreNotebookService"/></property>								   		
-			   		<property name="voteOutputFactory"><ref bean="voteOutputFactory"/></property>
-			   		<property name="messageService"><ref bean="lavoteMessageService"/></property>
-			   		<property name="userManagementService"><ref bean="userManagementService"/></property>
-				</bean>
-			</property>
-			<property name="transactionAttributes">
-				<props>
-					<prop key="create*">PROPAGATION_REQUIRED,-VoteApplicationException</prop>
-					<prop key="buildQuestionMap">PROPAGATION_REQUIRED,-VoteApplicationException</prop>
-					<prop key="copy*">PROPAGATION_REQUIRED,-VoteApplicationException</prop>
-					<prop key="save*">PROPAGATION_REQUIRED, -VoteApplicationException</prop>
-					<prop key="update*">PROPAGATION_REQUIRED,-VoteApplicationException</prop>
-					<prop key="get*">PROPAGATION_REQUIRED, -VoteApplicationException</prop>
-					<prop key="remove*">PROPAGATION_REQUIRED,-VoteApplicationException</prop>
-              	    <prop key="resetDefineLater">PROPAGATION_REQUIRED,-VoteApplicationException</prop>
-					<prop key="persistFile">PROPAGATION_REQUIRED,-VoteApplicationException</prop>
-					<prop key="importToolContent">PROPAGATION_REQUIRED,-VoteApplicationException</prop>
-					<prop key="exportToolContent">PROPAGATION_REQUIRED,-VoteApplicationException</prop>
-					<prop key="import102ToolContent">PROPAGATION_REQUIRED,-VoteApplicationException</prop>
-					<prop key="setReflectiveData">PROPAGATION_REQUIRED,-VoteApplicationException</prop>
-				</props>
-			</property>
+		<property name="preInterceptors">
+			<list>
+				<ref bean="transactionRetryInterceptor" />			
+			</list>
+		</property>
+		<property name="target">
+			<bean class="org.lamsfoundation.lams.tool.vote.service.VoteServicePOJO">
+				<property name="voteContentDAO"><ref bean="voteContentDAO"/></property>
+				<property name="voteSessionDAO"><ref bean="voteSessionDAO"/></property>
+				<property name="voteUserDAO"><ref bean="voteUserDAO"/></property>
+				<property name="voteQueContentDAO"><ref bean="voteQueContentDAO"/></property>
+				<property name="voteUsrAttemptDAO"><ref bean="voteUsrAttemptDAO"/></property>
+		 		<property name="dataFlowDAO"><ref bean="dataFlowDAO"/></property>
+				<property name="toolService"><ref bean="lamsToolService"/></property>
+		 		<property name="learnerService"><ref bean="learnerService"/></property>		
+				<property name="auditService"><ref bean="auditService"/></property>			 		
+				<property name="voteToolContentHandler"><ref bean="voteToolContentHandler"/></property>		
+		   		<property name="exportContentService"><ref bean="exportToolContentService"/></property>						
+		   		<property name="coreNotebookService"><ref bean="coreNotebookService"/></property>								   		
+		   		<property name="voteOutputFactory"><ref bean="voteOutputFactory"/></property>
+		   		<property name="messageService"><ref bean="lavoteMessageService"/></property>
+		   		<property name="userManagementService"><ref bean="userManagementService"/></property>
+			</bean>
+		</property>
+		<property name="transactionAttributes">
+			<props>
+				<prop key="create*">PROPAGATION_REQUIRED,-VoteApplicationException</prop>
+				<prop key="buildQuestionMap">PROPAGATION_REQUIRED,-VoteApplicationException</prop>
+				<prop key="copy*">PROPAGATION_REQUIRED,-VoteApplicationException</prop>
+				<prop key="save*">PROPAGATION_REQUIRED, -VoteApplicationException</prop>
+				<prop key="update*">PROPAGATION_REQUIRED,-VoteApplicationException</prop>
+				<prop key="get*">PROPAGATION_REQUIRED, -VoteApplicationException</prop>
+				<prop key="remove*">PROPAGATION_REQUIRED,-VoteApplicationException</prop>
+             	    <prop key="resetDefineLater">PROPAGATION_REQUIRED,-VoteApplicationException</prop>
+				<prop key="persistFile">PROPAGATION_REQUIRED,-VoteApplicationException</prop>
+				<prop key="importToolContent">PROPAGATION_REQUIRED,-VoteApplicationException</prop>
+				<prop key="exportToolContent">PROPAGATION_REQUIRED,-VoteApplicationException</prop>
+				<prop key="import102ToolContent">PROPAGATION_REQUIRED,-VoteApplicationException</prop>
+				<prop key="setReflectiveData">PROPAGATION_REQUIRED,-VoteApplicationException</prop>
+			</props>
+		</property>
 	</bean>  
 </beans>
 
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/wikiApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/wikiApplicationContext.xml,v
diff -u -r1.6 -r1.7
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/wikiApplicationContext.xml	6 Jun 2014 16:41:17 -0000	1.6
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/wikiApplicationContext.xml	22 Jul 2015 08:00:28 -0000	1.7
@@ -14,6 +14,11 @@
 	<!-- ========================= BUSINESS OBJECT DEFINITIONS ======================== -->
 	<bean id="wikiService" 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.tool.wiki.service.WikiService">
 				<property name="wikiSessionDAO"><ref bean="wikiSessionDAO"/></property>
Index: lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/wookieApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/wookieApplicationContext.xml,v
diff -u -r1.5 -r1.6
--- lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/wookieApplicationContext.xml	6 Jun 2014 16:41:36 -0000	1.5
+++ lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/wookieApplicationContext.xml	22 Jul 2015 08:00:19 -0000	1.6
@@ -24,6 +24,11 @@
 	</bean> 
 	<bean id="wookieService" 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.tool.wookie.service.WookieService">
 				<property name="wookieSessionDAO"><ref bean="wookieSessionDAO"/></property>