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.25 -r1.26 --- lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml 5 Aug 2015 16:49:41 -0000 1.25 +++ lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml 10 Aug 2015 15:08:00 -0000 1.26 @@ -65,7 +65,7 @@ - + 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.12 -r1.13 --- lams_central/src/java/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml 5 Aug 2015 16:49:41 -0000 1.12 +++ lams_central/src/java/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml 10 Aug 2015 15:08:00 -0000 1.13 @@ -25,7 +25,7 @@ - + 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.11 -r1.12 --- lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml 22 Jul 2015 08:00:18 -0000 1.11 +++ lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml 10 Aug 2015 15:08:15 -0000 1.12 @@ -56,5 +56,7 @@ - + + + \ 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.106 -r1.107 --- lams_common/src/java/org/lamsfoundation/lams/commonContext.xml 5 Aug 2015 16:49:39 -0000 1.106 +++ lams_common/src/java/org/lamsfoundation/lams/commonContext.xml 10 Aug 2015 15:08:15 -0000 1.107 @@ -26,6 +26,19 @@ + + + + + + true + + + PROPAGATION_REQUIRES_NEW + + + + @@ -45,7 +58,7 @@ true - + @@ -79,7 +92,7 @@ true - + @@ -102,7 +115,7 @@ true - + @@ -124,7 +137,7 @@ true - + @@ -147,7 +160,7 @@ true - + @@ -176,7 +189,7 @@ - + @@ -236,7 +249,7 @@ - + @@ -271,7 +284,7 @@ true - + @@ -306,7 +319,7 @@ - + @@ -341,7 +354,7 @@ - + @@ -384,7 +397,7 @@ true - + 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.3 -r1.4 --- lams_common/src/java/org/lamsfoundation/lams/integrationContext.xml 5 Aug 2015 16:49:39 -0000 1.3 +++ lams_common/src/java/org/lamsfoundation/lams/integrationContext.xml 10 Aug 2015 15:08:15 -0000 1.4 @@ -13,7 +13,7 @@ true - + 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.16 -r1.17 --- lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml 5 Aug 2015 16:49:39 -0000 1.16 +++ lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml 10 Aug 2015 15:08:15 -0000 1.17 @@ -32,7 +32,7 @@ - + @@ -55,7 +55,7 @@ - + @@ -73,7 +73,7 @@ - + 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.10 -r1.11 --- lams_common/src/java/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml 5 Aug 2015 16:49:39 -0000 1.10 +++ lams_common/src/java/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml 10 Aug 2015 15:08:15 -0000 1.11 @@ -36,7 +36,7 @@ true - + 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.4 -r1.5 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/ldapContext.xml 5 Aug 2015 16:49:39 -0000 1.4 +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/ldapContext.xml 10 Aug 2015 15:08:15 -0000 1.5 @@ -8,7 +8,7 @@ - + Index: lams_common/src/java/org/lamsfoundation/lams/util/ITransactionRetryService.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/util/ITransactionRetryService.java,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_common/src/java/org/lamsfoundation/lams/util/ITransactionRetryService.java 10 Aug 2015 15:08:15 -0000 1.1 @@ -0,0 +1,30 @@ +/**************************************************************** + * 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 + * **************************************************************** + */ + +/* ITransactionRetryService.java,v 1.1 2015/08/10 15:08:15 marcin Exp */ +package org.lamsfoundation.lams.util; + +import org.aopalliance.intercept.MethodInvocation; + +public interface ITransactionRetryService { + Object retry(MethodInvocation invocation) throws Throwable; +} \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/util/TransactionRetryService.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/util/TransactionRetryService.java,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_common/src/java/org/lamsfoundation/lams/util/TransactionRetryService.java 10 Aug 2015 15:08:15 -0000 1.1 @@ -0,0 +1,35 @@ +/**************************************************************** + * 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 + * **************************************************************** + */ +package org.lamsfoundation.lams.util; + +import org.aopalliance.intercept.MethodInvocation; + +/** + * Invokes the given service method with a new transaction. + */ +public class TransactionRetryService implements ITransactionRetryService { + @Override + public Object retry(MethodInvocation invocation) throws Throwable { + return invocation.proceed(); + } +} \ No newline at end of file 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 -r1.2 -r1.3 --- lams_common/src/java/org/lamsfoundation/lams/web/filter/TransactionRetryInterceptor.java 5 Aug 2015 16:49:39 -0000 1.2 +++ lams_common/src/java/org/lamsfoundation/lams/web/filter/TransactionRetryInterceptor.java 10 Aug 2015 15:08:15 -0000 1.3 @@ -23,44 +23,75 @@ /* TransactionRetryInterceptor.java,v 1.1 2015/07/22 08:00:18 marcin Exp */ package org.lamsfoundation.lams.web.filter; +import java.util.Random; + import org.aopalliance.intercept.MethodInterceptor; import org.aopalliance.intercept.MethodInvocation; import org.apache.log4j.Logger; +import org.hibernate.exception.ConstraintViolationException; +import org.lamsfoundation.lams.util.ITransactionRetryService; +import org.springframework.dao.CannotAcquireLockException; import org.springframework.dao.DataIntegrityViolationException; +import org.springframework.transaction.UnexpectedRollbackException; /** - * Retries proxied method in case of an exception. It should kick in after Hibernate session gets created. + * Retries proxied method in case of an exception. First attempt is processed as usual. Retrying requires a new + * transaction, which is done by the service. * * @author Marcin Cieslak * */ public class TransactionRetryInterceptor implements MethodInterceptor { - private static final Logger log = Logger.getLogger(TransactionRetryInterceptor.class); - private static final int MAX_ATTEMPTS = 3; + private ITransactionRetryService transactionRetryService; + private static final int MAX_ATTEMPTS = 5; + @Override public Object invoke(MethodInvocation invocation) throws Throwable { int attempt = 1; Throwable exception = null; do { try { - return invocation.proceed(); + if (attempt == 1) { + return invocation.proceed(); + } else { + return transactionRetryService.retry(invocation); + } } 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); + TransactionRetryInterceptor.processException(e, invocation, attempt); + } catch (ConstraintViolationException e) { + exception = e; + attempt++; + TransactionRetryInterceptor.processException(e, invocation, attempt); + } catch (CannotAcquireLockException e) { + exception = e; + attempt++; + TransactionRetryInterceptor.processException(e, invocation, attempt); + } catch (UnexpectedRollbackException e) { + exception = e; + attempt++; + TransactionRetryInterceptor.processException(e, invocation, attempt); } } while (attempt <= TransactionRetryInterceptor.MAX_ATTEMPTS); throw exception; } + + private static void processException(Exception e, MethodInvocation invocation, int attempt) { + StringBuilder message = new StringBuilder("When invoking method \"").append(invocation.getMethod().getName()) + .append("\" caught ").append(e.getMessage()).append(". Attempt #").append(attempt - 1); + if (attempt <= TransactionRetryInterceptor.MAX_ATTEMPTS) { + message.append(". Retrying."); + } else { + message.append(". Giving up."); + } + TransactionRetryInterceptor.log.warn(message); + } + + public void setTransactionRetryService(ITransactionRetryService transactionRetryService) { + this.transactionRetryService = transactionRetryService; + } } \ 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.13 -r1.14 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/applicationContext.xml 5 Aug 2015 16:49:12 -0000 1.13 +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/applicationContext.xml 10 Aug 2015 15:07:51 -0000 1.14 @@ -47,14 +47,10 @@ + - - - - - 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.8 -r1.9 --- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml 5 Aug 2015 16:49:35 -0000 1.8 +++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml 10 Aug 2015 15:08:01 -0000 1.9 @@ -25,7 +25,7 @@ - + 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.34 -r1.35 --- lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml 5 Aug 2015 16:49:22 -0000 1.34 +++ lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml 10 Aug 2015 15:07:37 -0000 1.35 @@ -24,7 +24,7 @@ - + @@ -69,7 +69,7 @@ - + Index: lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java =================================================================== RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java,v diff -u -r1.113 -r1.114 --- lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java 11 Aug 2014 21:35:59 -0000 1.113 +++ lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java 10 Aug 2015 15:07:37 -0000 1.114 @@ -651,7 +651,8 @@ } } else { - + // load the activity again so it is attached to the current Hibernate session + activity = getActivity(activity.getActivityId()); nextLearnerProgress = calculateProgress(activity, learnerId, progress); ToolSession toolSession = lamsCoreToolService.getToolSessionByLearner(progress.getUser(), activity); 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.40 -r1.41 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml 5 Aug 2015 16:49:42 -0000 1.40 +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml 10 Aug 2015 15:08:11 -0000 1.41 @@ -53,7 +53,7 @@ - + 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.18 -r1.19 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml 5 Aug 2015 16:49:26 -0000 1.18 +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml 10 Aug 2015 15:07:40 -0000 1.19 @@ -129,7 +129,7 @@ false - + 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.5 -r1.6 --- lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/bbbApplicationContext.xml 5 Aug 2015 16:49:19 -0000 1.5 +++ lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/bbbApplicationContext.xml 10 Aug 2015 15:07:44 -0000 1.6 @@ -14,7 +14,7 @@ - + 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.15 -r1.16 --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml 5 Aug 2015 16:49:25 -0000 1.15 +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml 10 Aug 2015 15:07:52 -0000 1.16 @@ -24,7 +24,7 @@ - + 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.12 -r1.13 --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dacoApplicationContext.xml 5 Aug 2015 16:49:17 -0000 1.12 +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dacoApplicationContext.xml 10 Aug 2015 15:07:49 -0000 1.13 @@ -104,7 +104,7 @@ false - + 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.8 -r1.9 --- lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/eadventureApplicationContext.xml 5 Aug 2015 16:49:34 -0000 1.8 +++ lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/eadventureApplicationContext.xml 10 Aug 2015 15:07:41 -0000 1.9 @@ -138,7 +138,7 @@ false - + 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.31 -r1.32 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml 5 Aug 2015 16:49:37 -0000 1.31 +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml 10 Aug 2015 15:07:43 -0000 1.32 @@ -161,7 +161,7 @@ false - + 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.9 -r1.10 --- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/gmapApplicationContext.xml 5 Aug 2015 16:49:43 -0000 1.9 +++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/gmapApplicationContext.xml 10 Aug 2015 15:07:53 -0000 1.10 @@ -15,7 +15,7 @@ - + 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.15 -r1.16 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/imageGalleryApplicationContext.xml 5 Aug 2015 16:49:29 -0000 1.15 +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/imageGalleryApplicationContext.xml 10 Aug 2015 15:07:57 -0000 1.16 @@ -136,7 +136,7 @@ false - + 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.5 -r1.6 --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/commonCartridgeApplicationContext.xml 5 Aug 2015 16:49:38 -0000 1.5 +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/commonCartridgeApplicationContext.xml 10 Aug 2015 15:07:48 -0000 1.6 @@ -110,7 +110,7 @@ false - + 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.7 -r1.8 --- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/kalturaApplicationContext.xml 5 Aug 2015 16:49:18 -0000 1.7 +++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/kalturaApplicationContext.xml 10 Aug 2015 15:08:10 -0000 1.8 @@ -23,7 +23,7 @@ - + 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.26 -r1.27 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml 5 Aug 2015 16:49:23 -0000 1.26 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml 10 Aug 2015 15:07:50 -0000 1.27 @@ -62,7 +62,7 @@ - + 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.35 -r1.36 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml 5 Aug 2015 16:49:16 -0000 1.35 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml 10 Aug 2015 15:07:42 -0000 1.36 @@ -67,7 +67,7 @@ - + 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.24 -r1.25 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml 5 Aug 2015 16:49:16 -0000 1.24 +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml 10 Aug 2015 15:07:56 -0000 1.25 @@ -103,7 +103,7 @@ false - + 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.4 -r1.5 --- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/leaderselectionApplicationContext.xml 5 Aug 2015 16:49:13 -0000 1.4 +++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/leaderselectionApplicationContext.xml 10 Aug 2015 15:07:43 -0000 1.5 @@ -24,7 +24,7 @@ - + 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.5 -r1.6 --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/mindmapApplicationContext.xml 5 Aug 2015 16:49:32 -0000 1.5 +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/mindmapApplicationContext.xml 10 Aug 2015 15:08:03 -0000 1.6 @@ -23,7 +23,7 @@ - + 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.6 -r1.7 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/nbApplicationContext.xml 5 Aug 2015 16:49:32 -0000 1.6 +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/nbApplicationContext.xml 10 Aug 2015 15:07:55 -0000 1.7 @@ -13,7 +13,7 @@ - + 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.12 -r1.13 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml 5 Aug 2015 16:49:21 -0000 1.12 +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml 10 Aug 2015 15:08:04 -0000 1.13 @@ -24,7 +24,7 @@ - + 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.8 -r1.9 --- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/pixlrApplicationContext.xml 5 Aug 2015 16:49:44 -0000 1.8 +++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/pixlrApplicationContext.xml 10 Aug 2015 15:08:14 -0000 1.9 @@ -24,7 +24,7 @@ - + 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.30 -r1.31 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml 5 Aug 2015 16:49:31 -0000 1.30 +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml 10 Aug 2015 15:07:45 -0000 1.31 @@ -62,7 +62,7 @@ - + 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.19 -r1.20 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml 5 Aug 2015 16:49:40 -0000 1.19 +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml 10 Aug 2015 15:08:05 -0000 1.20 @@ -115,7 +115,7 @@ false - + 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.10 -r1.11 --- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/scribeApplicationContext.xml 5 Aug 2015 16:49:27 -0000 1.10 +++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/scribeApplicationContext.xml 10 Aug 2015 15:08:06 -0000 1.11 @@ -14,7 +14,7 @@ - + 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.7 -r1.8 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/spreadsheetApplicationContext.xml 5 Aug 2015 16:49:24 -0000 1.7 +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/spreadsheetApplicationContext.xml 10 Aug 2015 15:08:07 -0000 1.8 @@ -93,7 +93,7 @@ false - + 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.14 -r1.15 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/surveyApplicationContext.xml 5 Aug 2015 16:49:15 -0000 1.14 +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/surveyApplicationContext.xml 10 Aug 2015 15:07:48 -0000 1.15 @@ -97,7 +97,7 @@ false - + 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.11 -r1.12 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/taskListApplicationContext.xml 5 Aug 2015 16:49:36 -0000 1.11 +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/taskListApplicationContext.xml 10 Aug 2015 15:07:38 -0000 1.12 @@ -104,7 +104,7 @@ false - + 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.10 -r1.11 --- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/videoRecorderApplicationContext.xml 5 Aug 2015 16:49:28 -0000 1.10 +++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/videoRecorderApplicationContext.xml 10 Aug 2015 15:07:59 -0000 1.11 @@ -24,7 +24,7 @@ - + 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.18 -r1.19 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml 5 Aug 2015 16:49:43 -0000 1.18 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml 10 Aug 2015 15:08:08 -0000 1.19 @@ -57,7 +57,7 @@ - + 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.8 -r1.9 --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/wikiApplicationContext.xml 5 Aug 2015 16:49:23 -0000 1.8 +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/wikiApplicationContext.xml 10 Aug 2015 15:07:35 -0000 1.9 @@ -14,7 +14,7 @@ - + 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.7 -r1.8 --- lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/wookieApplicationContext.xml 5 Aug 2015 16:49:33 -0000 1.7 +++ lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/wookieApplicationContext.xml 10 Aug 2015 15:07:54 -0000 1.8 @@ -24,7 +24,7 @@ - +