Index: lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml
===================================================================
diff -u -rf3fbbb8ec1732de7e5ce51567287b42b55ab33e1 -rc232c4aa06b466fbc54aea6e23ff87304abf609d
--- lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml	(.../authoringApplicationContext.xml)	(revision f3fbbb8ec1732de7e5ce51567287b42b55ab33e1)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml	(.../authoringApplicationContext.xml)	(revision c232c4aa06b466fbc54aea6e23ff87304abf609d)
@@ -68,7 +68,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
===================================================================
diff -u -rf3fbbb8ec1732de7e5ce51567287b42b55ab33e1 -rc232c4aa06b466fbc54aea6e23ff87304abf609d
--- lams_central/src/java/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml	(.../workspaceApplicationContext.xml)	(revision f3fbbb8ec1732de7e5ce51567287b42b55ab33e1)
+++ lams_central/src/java/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml	(.../workspaceApplicationContext.xml)	(revision c232c4aa06b466fbc54aea6e23ff87304abf609d)
@@ -28,6 +28,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
===================================================================
diff -u -rab2783b5b0d9727611c7e271f520300889254461 -rc232c4aa06b466fbc54aea6e23ff87304abf609d
--- lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml	(.../applicationContext.xml)	(revision ab2783b5b0d9727611c7e271f520300889254461)
+++ lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml	(.../applicationContext.xml)	(revision c232c4aa06b466fbc54aea6e23ff87304abf609d)
@@ -45,4 +45,7 @@
 	<!-- PostProcessor to convert Hibernate specific (checked) exceptions to Runtime DataAccessExceptions -->
 	<bean class="org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor"/>
 
+	<!-- 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
===================================================================
diff -u -r1c42119baf51e12d0ef19919cb5a266a186d4b7d -rc232c4aa06b466fbc54aea6e23ff87304abf609d
--- lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	(.../commonContext.xml)	(revision 1c42119baf51e12d0ef19919cb5a266a186d4b7d)
+++ lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	(.../commonContext.xml)	(revision c232c4aa06b466fbc54aea6e23ff87304abf609d)
@@ -44,6 +44,11 @@
 		<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>
@@ -74,6 +79,11 @@
 		<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>
@@ -92,6 +102,11 @@
 		<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>
@@ -109,6 +124,11 @@
 		<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>
@@ -127,6 +147,11 @@
 		<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>
@@ -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-->
@@ -238,6 +271,11 @@
 			</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>
@@ -280,6 +318,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">
 				<property name="eventDAO"><ref bean="eventDAO" /></property>
@@ -323,6 +366,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 bean="logEventDAO"/></property>
@@ -361,6 +409,11 @@
 		<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>
Index: lams_common/src/java/org/lamsfoundation/lams/integrationContext.xml
===================================================================
diff -u -rf3fbbb8ec1732de7e5ce51567287b42b55ab33e1 -rc232c4aa06b466fbc54aea6e23ff87304abf609d
--- lams_common/src/java/org/lamsfoundation/lams/integrationContext.xml	(.../integrationContext.xml)	(revision f3fbbb8ec1732de7e5ce51567287b42b55ab33e1)
+++ lams_common/src/java/org/lamsfoundation/lams/integrationContext.xml	(.../integrationContext.xml)	(revision c232c4aa06b466fbc54aea6e23ff87304abf609d)
@@ -17,6 +17,11 @@
 		<!-- 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="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/lesson/lessonApplicationContext.xml
===================================================================
diff -u -rf3fbbb8ec1732de7e5ce51567287b42b55ab33e1 -rc232c4aa06b466fbc54aea6e23ff87304abf609d
--- lams_common/src/java/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml	(.../lessonApplicationContext.xml)	(revision f3fbbb8ec1732de7e5ce51567287b42b55ab33e1)
+++ lams_common/src/java/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml	(.../lessonApplicationContext.xml)	(revision c232c4aa06b466fbc54aea6e23ff87304abf609d)
@@ -35,6 +35,11 @@
 		<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>
Index: lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml
===================================================================
diff -u -rf3fbbb8ec1732de7e5ce51567287b42b55ab33e1 -rc232c4aa06b466fbc54aea6e23ff87304abf609d
--- lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml	(.../toolApplicationContext.xml)	(revision f3fbbb8ec1732de7e5ce51567287b42b55ab33e1)
+++ lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml	(.../toolApplicationContext.xml)	(revision c232c4aa06b466fbc54aea6e23ff87304abf609d)
@@ -31,6 +31,11 @@
 	<bean id="toolContentIDGenerator" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
 		<property name="transactionManager"><ref bean="transactionManager"/></property>
 		<property name="target"><ref bean="toolContentIDGeneratorTarget"/></property>
+		<property name="preInterceptors">
+			<list>
+				<ref bean="transactionRetryInterceptor" />			
+			</list>
+		</property>
 		<property name="transactionAttributes">
 			<props>
 				<prop key="getNextToolContentIDFor">PROPAGATION_REQUIRES_NEW</prop>
@@ -49,6 +54,11 @@
 	<bean id="lamsCoreToolService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
 		<property name="transactionManager"><ref bean="transactionManager"/></property>
 		<property name="target"><ref bean="lamsCoreToolServiceTarget"/></property>
+		<property name="preInterceptors">
+			<list>
+				<ref bean="transactionRetryInterceptor" />			
+			</list>
+		</property>
 		<property name="transactionAttributes">
 			<props>
 				<prop key="createToolSession*">PROPAGATION_REQUIRED</prop>
@@ -62,6 +72,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/usermanagement/ldapContext.xml
===================================================================
diff -u -rf3fbbb8ec1732de7e5ce51567287b42b55ab33e1 -rc232c4aa06b466fbc54aea6e23ff87304abf609d
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/ldapContext.xml	(.../ldapContext.xml)	(revision f3fbbb8ec1732de7e5ce51567287b42b55ab33e1)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/ldapContext.xml	(.../ldapContext.xml)	(revision c232c4aa06b466fbc54aea6e23ff87304abf609d)
@@ -12,6 +12,11 @@
 	<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 -->
Index: lams_common/src/java/org/lamsfoundation/lams/web/filter/TransactionRetryInterceptor.java
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/web/filter/TransactionRetryInterceptor.java	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/web/filter/TransactionRetryInterceptor.java	(revision c232c4aa06b466fbc54aea6e23ff87304abf609d)
@@ -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
===================================================================
diff -u -rf3fbbb8ec1732de7e5ce51567287b42b55ab33e1 -rc232c4aa06b466fbc54aea6e23ff87304abf609d
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/applicationContext.xml	(.../applicationContext.xml)	(revision f3fbbb8ec1732de7e5ce51567287b42b55ab33e1)
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/applicationContext.xml	(.../applicationContext.xml)	(revision c232c4aa06b466fbc54aea6e23ff87304abf609d)
@@ -50,6 +50,7 @@
 		</property>
 		<property name="preInterceptors">
 			<list>
+				<ref bean="transactionRetryInterceptor" />	
 				<ref bean="checkCredentialTicketBeforeAdvice"/>
 			</list>
 		</property>
Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml
===================================================================
diff -u -rf3fbbb8ec1732de7e5ce51567287b42b55ab33e1 -rc232c4aa06b466fbc54aea6e23ff87304abf609d
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml	(.../gradebookApplicationContext.xml)	(revision f3fbbb8ec1732de7e5ce51567287b42b55ab33e1)
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml	(.../gradebookApplicationContext.xml)	(revision c232c4aa06b466fbc54aea6e23ff87304abf609d)
@@ -28,6 +28,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
===================================================================
diff -u -rf3fbbb8ec1732de7e5ce51567287b42b55ab33e1 -rc232c4aa06b466fbc54aea6e23ff87304abf609d
--- lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml	(.../learningApplicationContext.xml)	(revision f3fbbb8ec1732de7e5ce51567287b42b55ab33e1)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml	(.../learningApplicationContext.xml)	(revision c232c4aa06b466fbc54aea6e23ff87304abf609d)
@@ -26,6 +26,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>
@@ -66,6 +71,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
===================================================================
diff -u -r1182fcec228bfcab42ec52732193a6267f4f4b77 -rc232c4aa06b466fbc54aea6e23ff87304abf609d
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java	(.../LearningWebUtil.java)	(revision 1182fcec228bfcab42ec52732193a6267f4f4b77)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java	(.../LearningWebUtil.java)	(revision c232c4aa06b466fbc54aea6e23ff87304abf609d)
@@ -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
===================================================================
diff -u -rc208628989d52041b3765784f4c8cbfd6c80d47b -rc232c4aa06b466fbc54aea6e23ff87304abf609d
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml	(.../monitoringApplicationContext.xml)	(revision c208628989d52041b3765784f4c8cbfd6c80d47b)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml	(.../monitoringApplicationContext.xml)	(revision c232c4aa06b466fbc54aea6e23ff87304abf609d)
@@ -54,6 +54,11 @@
 	<bean id="monitoringService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
 		<property name="transactionManager"><ref bean="transactionManager"/></property>
 		<property name="target"><ref bean="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
===================================================================
diff -u -rf3fbbb8ec1732de7e5ce51567287b42b55ab33e1 -rc232c4aa06b466fbc54aea6e23ff87304abf609d
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml	(.../assessmentApplicationContext.xml)	(revision f3fbbb8ec1732de7e5ce51567287b42b55ab33e1)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml	(.../assessmentApplicationContext.xml)	(revision c232c4aa06b466fbc54aea6e23ff87304abf609d)
@@ -130,6 +130,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
===================================================================
diff -u -rf3fbbb8ec1732de7e5ce51567287b42b55ab33e1 -rc232c4aa06b466fbc54aea6e23ff87304abf609d
--- lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/bbbApplicationContext.xml	(.../bbbApplicationContext.xml)	(revision f3fbbb8ec1732de7e5ce51567287b42b55ab33e1)
+++ lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/bbbApplicationContext.xml	(.../bbbApplicationContext.xml)	(revision c232c4aa06b466fbc54aea6e23ff87304abf609d)
@@ -12,6 +12,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
===================================================================
diff -u -rf3fbbb8ec1732de7e5ce51567287b42b55ab33e1 -rc232c4aa06b466fbc54aea6e23ff87304abf609d
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml	(.../chatApplicationContext.xml)	(revision f3fbbb8ec1732de7e5ce51567287b42b55ab33e1)
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml	(.../chatApplicationContext.xml)	(revision c232c4aa06b466fbc54aea6e23ff87304abf609d)
@@ -22,6 +22,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
===================================================================
diff -u -rf3fbbb8ec1732de7e5ce51567287b42b55ab33e1 -rc232c4aa06b466fbc54aea6e23ff87304abf609d
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dacoApplicationContext.xml	(.../dacoApplicationContext.xml)	(revision f3fbbb8ec1732de7e5ce51567287b42b55ab33e1)
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dacoApplicationContext.xml	(.../dacoApplicationContext.xml)	(revision c232c4aa06b466fbc54aea6e23ff87304abf609d)
@@ -105,6 +105,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
===================================================================
diff -u -rf3fbbb8ec1732de7e5ce51567287b42b55ab33e1 -rc232c4aa06b466fbc54aea6e23ff87304abf609d
--- lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/eadventureApplicationContext.xml	(.../eadventureApplicationContext.xml)	(revision f3fbbb8ec1732de7e5ce51567287b42b55ab33e1)
+++ lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/eadventureApplicationContext.xml	(.../eadventureApplicationContext.xml)	(revision c232c4aa06b466fbc54aea6e23ff87304abf609d)
@@ -139,6 +139,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
===================================================================
diff -u -r7f3e39b97ee1d87f7324338d7181203d3aa7f244 -rc232c4aa06b466fbc54aea6e23ff87304abf609d
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml	(.../forumApplicationContext.xml)	(revision 7f3e39b97ee1d87f7324338d7181203d3aa7f244)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml	(.../forumApplicationContext.xml)	(revision c232c4aa06b466fbc54aea6e23ff87304abf609d)
@@ -164,6 +164,11 @@
 		<property name="proxyTargetClass">
 			<value>false</value>
 		</property>
+		<property name="preInterceptors">
+			<list>
+				<ref bean="transactionRetryInterceptor" />			
+			</list>
+		</property>
 		<property name="transactionAttributes">
 			<props>
 			    <prop key="get*">PROPAGATION_REQUIRED,readOnly,-java.lang.Exception</prop>
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/gmapApplicationContext.xml
===================================================================
diff -u -rf3fbbb8ec1732de7e5ce51567287b42b55ab33e1 -rc232c4aa06b466fbc54aea6e23ff87304abf609d
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/gmapApplicationContext.xml	(.../gmapApplicationContext.xml)	(revision f3fbbb8ec1732de7e5ce51567287b42b55ab33e1)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/gmapApplicationContext.xml	(.../gmapApplicationContext.xml)	(revision c232c4aa06b466fbc54aea6e23ff87304abf609d)
@@ -13,6 +13,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
===================================================================
diff -u -rf3be94729c90c7390a6aea11d1886a4b72d96670 -rc232c4aa06b466fbc54aea6e23ff87304abf609d
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/imageGalleryApplicationContext.xml	(.../imageGalleryApplicationContext.xml)	(revision f3be94729c90c7390a6aea11d1886a4b72d96670)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/imageGalleryApplicationContext.xml	(.../imageGalleryApplicationContext.xml)	(revision c232c4aa06b466fbc54aea6e23ff87304abf609d)
@@ -137,6 +137,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
===================================================================
diff -u -rf3fbbb8ec1732de7e5ce51567287b42b55ab33e1 -rc232c4aa06b466fbc54aea6e23ff87304abf609d
--- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/commonCartridgeApplicationContext.xml	(.../commonCartridgeApplicationContext.xml)	(revision f3fbbb8ec1732de7e5ce51567287b42b55ab33e1)
+++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/commonCartridgeApplicationContext.xml	(.../commonCartridgeApplicationContext.xml)	(revision c232c4aa06b466fbc54aea6e23ff87304abf609d)
@@ -111,6 +111,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
===================================================================
diff -u -rf3fbbb8ec1732de7e5ce51567287b42b55ab33e1 -rc232c4aa06b466fbc54aea6e23ff87304abf609d
--- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/kalturaApplicationContext.xml	(.../kalturaApplicationContext.xml)	(revision f3fbbb8ec1732de7e5ce51567287b42b55ab33e1)
+++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/kalturaApplicationContext.xml	(.../kalturaApplicationContext.xml)	(revision c232c4aa06b466fbc54aea6e23ff87304abf609d)
@@ -22,6 +22,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
===================================================================
diff -u -rf3fbbb8ec1732de7e5ce51567287b42b55ab33e1 -rc232c4aa06b466fbc54aea6e23ff87304abf609d
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml	(.../mcApplicationContext.xml)	(revision f3fbbb8ec1732de7e5ce51567287b42b55ab33e1)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml	(.../mcApplicationContext.xml)	(revision c232c4aa06b466fbc54aea6e23ff87304abf609d)
@@ -64,6 +64,11 @@
 	
 	<bean id="mcService" 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.mc.service.McServicePOJO">
 					<property name="mcContentDAO"><ref bean="mcContentDAO"/></property>
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml
===================================================================
diff -u -r55645d4b796f36715b66a70fce66406a986ee647 -rc232c4aa06b466fbc54aea6e23ff87304abf609d
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml	(.../qaApplicationContext.xml)	(revision 55645d4b796f36715b66a70fce66406a986ee647)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml	(.../qaApplicationContext.xml)	(revision c232c4aa06b466fbc54aea6e23ff87304abf609d)
@@ -64,6 +64,11 @@
 	
 	<bean id="qaService" 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.qa.service.QaServicePOJO">
 					<property name="qaDAO"><ref bean="qaContentDAO"/></property>
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml
===================================================================
diff -u -rf3fbbb8ec1732de7e5ce51567287b42b55ab33e1 -rc232c4aa06b466fbc54aea6e23ff87304abf609d
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml	(.../rsrcApplicationContext.xml)	(revision f3fbbb8ec1732de7e5ce51567287b42b55ab33e1)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml	(.../rsrcApplicationContext.xml)	(revision c232c4aa06b466fbc54aea6e23ff87304abf609d)
@@ -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_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/leaderselectionApplicationContext.xml
===================================================================
diff -u -rf3fbbb8ec1732de7e5ce51567287b42b55ab33e1 -rc232c4aa06b466fbc54aea6e23ff87304abf609d
--- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/leaderselectionApplicationContext.xml	(.../leaderselectionApplicationContext.xml)	(revision f3fbbb8ec1732de7e5ce51567287b42b55ab33e1)
+++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/leaderselectionApplicationContext.xml	(.../leaderselectionApplicationContext.xml)	(revision c232c4aa06b466fbc54aea6e23ff87304abf609d)
@@ -22,6 +22,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
===================================================================
diff -u -rf3fbbb8ec1732de7e5ce51567287b42b55ab33e1 -rc232c4aa06b466fbc54aea6e23ff87304abf609d
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/mindmapApplicationContext.xml	(.../mindmapApplicationContext.xml)	(revision f3fbbb8ec1732de7e5ce51567287b42b55ab33e1)
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/mindmapApplicationContext.xml	(.../mindmapApplicationContext.xml)	(revision c232c4aa06b466fbc54aea6e23ff87304abf609d)
@@ -25,6 +25,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
===================================================================
diff -u -rf3fbbb8ec1732de7e5ce51567287b42b55ab33e1 -rc232c4aa06b466fbc54aea6e23ff87304abf609d
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/nbApplicationContext.xml	(.../nbApplicationContext.xml)	(revision f3fbbb8ec1732de7e5ce51567287b42b55ab33e1)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/nbApplicationContext.xml	(.../nbApplicationContext.xml)	(revision c232c4aa06b466fbc54aea6e23ff87304abf609d)
@@ -15,6 +15,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
===================================================================
diff -u -rf3fbbb8ec1732de7e5ce51567287b42b55ab33e1 -rc232c4aa06b466fbc54aea6e23ff87304abf609d
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml	(.../notebookApplicationContext.xml)	(revision f3fbbb8ec1732de7e5ce51567287b42b55ab33e1)
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml	(.../notebookApplicationContext.xml)	(revision c232c4aa06b466fbc54aea6e23ff87304abf609d)
@@ -21,6 +21,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
===================================================================
diff -u -rf3fbbb8ec1732de7e5ce51567287b42b55ab33e1 -rc232c4aa06b466fbc54aea6e23ff87304abf609d
--- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/pixlrApplicationContext.xml	(.../pixlrApplicationContext.xml)	(revision f3fbbb8ec1732de7e5ce51567287b42b55ab33e1)
+++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/pixlrApplicationContext.xml	(.../pixlrApplicationContext.xml)	(revision c232c4aa06b466fbc54aea6e23ff87304abf609d)
@@ -22,6 +22,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
===================================================================
diff -u -rf3fbbb8ec1732de7e5ce51567287b42b55ab33e1 -rc232c4aa06b466fbc54aea6e23ff87304abf609d
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml	(.../submitFilesApplicationContext.xml)	(revision f3fbbb8ec1732de7e5ce51567287b42b55ab33e1)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml	(.../submitFilesApplicationContext.xml)	(revision c232c4aa06b466fbc54aea6e23ff87304abf609d)
@@ -63,7 +63,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
===================================================================
diff -u -r78f8f7f68003caab2c2097b59663cbd4ef5dc29b -rc232c4aa06b466fbc54aea6e23ff87304abf609d
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml	(.../scratchieApplicationContext.xml)	(revision 78f8f7f68003caab2c2097b59663cbd4ef5dc29b)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml	(.../scratchieApplicationContext.xml)	(revision c232c4aa06b466fbc54aea6e23ff87304abf609d)
@@ -117,6 +117,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
===================================================================
diff -u -rf3fbbb8ec1732de7e5ce51567287b42b55ab33e1 -rc232c4aa06b466fbc54aea6e23ff87304abf609d
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/scribeApplicationContext.xml	(.../scribeApplicationContext.xml)	(revision f3fbbb8ec1732de7e5ce51567287b42b55ab33e1)
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/scribeApplicationContext.xml	(.../scribeApplicationContext.xml)	(revision c232c4aa06b466fbc54aea6e23ff87304abf609d)
@@ -12,6 +12,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
===================================================================
diff -u -rf3fbbb8ec1732de7e5ce51567287b42b55ab33e1 -rc232c4aa06b466fbc54aea6e23ff87304abf609d
--- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/spreadsheetApplicationContext.xml	(.../spreadsheetApplicationContext.xml)	(revision f3fbbb8ec1732de7e5ce51567287b42b55ab33e1)
+++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/spreadsheetApplicationContext.xml	(.../spreadsheetApplicationContext.xml)	(revision c232c4aa06b466fbc54aea6e23ff87304abf609d)
@@ -94,6 +94,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
===================================================================
diff -u -r098d686653002409f33aff0f69b1183e07c1eab3 -rc232c4aa06b466fbc54aea6e23ff87304abf609d
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/surveyApplicationContext.xml	(.../surveyApplicationContext.xml)	(revision 098d686653002409f33aff0f69b1183e07c1eab3)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/surveyApplicationContext.xml	(.../surveyApplicationContext.xml)	(revision c232c4aa06b466fbc54aea6e23ff87304abf609d)
@@ -98,6 +98,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
===================================================================
diff -u -rf3fbbb8ec1732de7e5ce51567287b42b55ab33e1 -rc232c4aa06b466fbc54aea6e23ff87304abf609d
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/taskListApplicationContext.xml	(.../taskListApplicationContext.xml)	(revision f3fbbb8ec1732de7e5ce51567287b42b55ab33e1)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/taskListApplicationContext.xml	(.../taskListApplicationContext.xml)	(revision c232c4aa06b466fbc54aea6e23ff87304abf609d)
@@ -105,6 +105,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
===================================================================
diff -u -rf3fbbb8ec1732de7e5ce51567287b42b55ab33e1 -rc232c4aa06b466fbc54aea6e23ff87304abf609d
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/videoRecorderApplicationContext.xml	(.../videoRecorderApplicationContext.xml)	(revision f3fbbb8ec1732de7e5ce51567287b42b55ab33e1)
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/videoRecorderApplicationContext.xml	(.../videoRecorderApplicationContext.xml)	(revision c232c4aa06b466fbc54aea6e23ff87304abf609d)
@@ -22,6 +22,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
===================================================================
diff -u -rf3fbbb8ec1732de7e5ce51567287b42b55ab33e1 -rc232c4aa06b466fbc54aea6e23ff87304abf609d
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml	(.../voteApplicationContext.xml)	(revision f3fbbb8ec1732de7e5ce51567287b42b55ab33e1)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml	(.../voteApplicationContext.xml)	(revision c232c4aa06b466fbc54aea6e23ff87304abf609d)
@@ -54,6 +54,11 @@
 	
 	<bean id="voteService" 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.vote.service.VoteServicePOJO">
 					<property name="voteContentDAO"><ref bean="voteContentDAO"/></property>
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/wikiApplicationContext.xml
===================================================================
diff -u -rf3fbbb8ec1732de7e5ce51567287b42b55ab33e1 -rc232c4aa06b466fbc54aea6e23ff87304abf609d
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/wikiApplicationContext.xml	(.../wikiApplicationContext.xml)	(revision f3fbbb8ec1732de7e5ce51567287b42b55ab33e1)
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/wikiApplicationContext.xml	(.../wikiApplicationContext.xml)	(revision c232c4aa06b466fbc54aea6e23ff87304abf609d)
@@ -12,6 +12,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
===================================================================
diff -u -rf3fbbb8ec1732de7e5ce51567287b42b55ab33e1 -rc232c4aa06b466fbc54aea6e23ff87304abf609d
--- lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/wookieApplicationContext.xml	(.../wookieApplicationContext.xml)	(revision f3fbbb8ec1732de7e5ce51567287b42b55ab33e1)
+++ lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/wookieApplicationContext.xml	(.../wookieApplicationContext.xml)	(revision c232c4aa06b466fbc54aea6e23ff87304abf609d)
@@ -22,6 +22,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>