Index: lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml =================================================================== diff -u -r324b7c421823a48f491b38eed2470525fd3fc52c -ra6641bf9262a01d07740a517643f8fe187ec5b1f --- lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml (.../authoringApplicationContext.xml) (revision 324b7c421823a48f491b38eed2470525fd3fc52c) +++ lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml (.../authoringApplicationContext.xml) (revision a6641bf9262a01d07740a517643f8fe187ec5b1f) @@ -68,7 +68,7 @@ - + Index: lams_central/src/java/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml =================================================================== diff -u -r324b7c421823a48f491b38eed2470525fd3fc52c -ra6641bf9262a01d07740a517643f8fe187ec5b1f --- lams_central/src/java/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml (.../workspaceApplicationContext.xml) (revision 324b7c421823a48f491b38eed2470525fd3fc52c) +++ lams_central/src/java/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml (.../workspaceApplicationContext.xml) (revision a6641bf9262a01d07740a517643f8fe187ec5b1f) @@ -28,7 +28,7 @@ - + Index: lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml =================================================================== diff -u -rc232c4aa06b466fbc54aea6e23ff87304abf609d -ra6641bf9262a01d07740a517643f8fe187ec5b1f --- lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml (.../applicationContext.xml) (revision c232c4aa06b466fbc54aea6e23ff87304abf609d) +++ lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml (.../applicationContext.xml) (revision a6641bf9262a01d07740a517643f8fe187ec5b1f) @@ -46,6 +46,8 @@ - + In case of optimistic locking exceptions it retrires the transaction up to 5 times --> + + + \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/commonContext.xml =================================================================== diff -u -r324b7c421823a48f491b38eed2470525fd3fc52c -ra6641bf9262a01d07740a517643f8fe187ec5b1f --- lams_common/src/java/org/lamsfoundation/lams/commonContext.xml (.../commonContext.xml) (revision 324b7c421823a48f491b38eed2470525fd3fc52c) +++ lams_common/src/java/org/lamsfoundation/lams/commonContext.xml (.../commonContext.xml) (revision a6641bf9262a01d07740a517643f8fe187ec5b1f) @@ -25,6 +25,19 @@ + + + + + + true + + + PROPAGATION_REQUIRES_NEW + + + + @@ -44,7 +57,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 - + @@ -318,7 +331,7 @@ - + @@ -366,7 +379,7 @@ - + @@ -409,7 +422,7 @@ true - + Index: lams_common/src/java/org/lamsfoundation/lams/integrationContext.xml =================================================================== diff -u -r324b7c421823a48f491b38eed2470525fd3fc52c -ra6641bf9262a01d07740a517643f8fe187ec5b1f --- lams_common/src/java/org/lamsfoundation/lams/integrationContext.xml (.../integrationContext.xml) (revision 324b7c421823a48f491b38eed2470525fd3fc52c) +++ lams_common/src/java/org/lamsfoundation/lams/integrationContext.xml (.../integrationContext.xml) (revision a6641bf9262a01d07740a517643f8fe187ec5b1f) @@ -17,7 +17,7 @@ true - + Index: lams_common/src/java/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml =================================================================== diff -u -r324b7c421823a48f491b38eed2470525fd3fc52c -ra6641bf9262a01d07740a517643f8fe187ec5b1f --- lams_common/src/java/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml (.../lessonApplicationContext.xml) (revision 324b7c421823a48f491b38eed2470525fd3fc52c) +++ lams_common/src/java/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml (.../lessonApplicationContext.xml) (revision a6641bf9262a01d07740a517643f8fe187ec5b1f) @@ -35,7 +35,7 @@ true - + Index: lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml =================================================================== diff -u -r324b7c421823a48f491b38eed2470525fd3fc52c -ra6641bf9262a01d07740a517643f8fe187ec5b1f --- lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml (.../toolApplicationContext.xml) (revision 324b7c421823a48f491b38eed2470525fd3fc52c) +++ lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml (.../toolApplicationContext.xml) (revision a6641bf9262a01d07740a517643f8fe187ec5b1f) @@ -31,7 +31,7 @@ - + @@ -54,7 +54,7 @@ - + @@ -72,7 +72,7 @@ - + Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/ldapContext.xml =================================================================== diff -u -r324b7c421823a48f491b38eed2470525fd3fc52c -ra6641bf9262a01d07740a517643f8fe187ec5b1f --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/ldapContext.xml (.../ldapContext.xml) (revision 324b7c421823a48f491b38eed2470525fd3fc52c) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/ldapContext.xml (.../ldapContext.xml) (revision a6641bf9262a01d07740a517643f8fe187ec5b1f) @@ -12,7 +12,7 @@ - + Index: lams_common/src/java/org/lamsfoundation/lams/util/ITransactionRetryService.java =================================================================== diff -u --- lams_common/src/java/org/lamsfoundation/lams/util/ITransactionRetryService.java (revision 0) +++ lams_common/src/java/org/lamsfoundation/lams/util/ITransactionRetryService.java (revision a6641bf9262a01d07740a517643f8fe187ec5b1f) @@ -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 =================================================================== diff -u --- lams_common/src/java/org/lamsfoundation/lams/util/TransactionRetryService.java (revision 0) +++ lams_common/src/java/org/lamsfoundation/lams/util/TransactionRetryService.java (revision a6641bf9262a01d07740a517643f8fe187ec5b1f) @@ -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 =================================================================== diff -u -r324b7c421823a48f491b38eed2470525fd3fc52c -ra6641bf9262a01d07740a517643f8fe187ec5b1f --- lams_common/src/java/org/lamsfoundation/lams/web/filter/TransactionRetryInterceptor.java (.../TransactionRetryInterceptor.java) (revision 324b7c421823a48f491b38eed2470525fd3fc52c) +++ lams_common/src/java/org/lamsfoundation/lams/web/filter/TransactionRetryInterceptor.java (.../TransactionRetryInterceptor.java) (revision a6641bf9262a01d07740a517643f8fe187ec5b1f) @@ -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 =================================================================== diff -u -r324b7c421823a48f491b38eed2470525fd3fc52c -ra6641bf9262a01d07740a517643f8fe187ec5b1f --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/applicationContext.xml (.../applicationContext.xml) (revision 324b7c421823a48f491b38eed2470525fd3fc52c) +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/applicationContext.xml (.../applicationContext.xml) (revision a6641bf9262a01d07740a517643f8fe187ec5b1f) @@ -50,14 +50,10 @@ + - - - - - Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml =================================================================== diff -u -r324b7c421823a48f491b38eed2470525fd3fc52c -ra6641bf9262a01d07740a517643f8fe187ec5b1f --- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml (.../gradebookApplicationContext.xml) (revision 324b7c421823a48f491b38eed2470525fd3fc52c) +++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml (.../gradebookApplicationContext.xml) (revision a6641bf9262a01d07740a517643f8fe187ec5b1f) @@ -28,7 +28,7 @@ - + Index: lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml =================================================================== diff -u -r324b7c421823a48f491b38eed2470525fd3fc52c -ra6641bf9262a01d07740a517643f8fe187ec5b1f --- lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml (.../learningApplicationContext.xml) (revision 324b7c421823a48f491b38eed2470525fd3fc52c) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml (.../learningApplicationContext.xml) (revision a6641bf9262a01d07740a517643f8fe187ec5b1f) @@ -26,7 +26,7 @@ - + @@ -71,7 +71,7 @@ - + Index: lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java =================================================================== diff -u -re9144c94e842e1e1609999a71cca9e6ea30dd054 -ra6641bf9262a01d07740a517643f8fe187ec5b1f --- lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java (.../LearnerService.java) (revision e9144c94e842e1e1609999a71cca9e6ea30dd054) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java (.../LearnerService.java) (revision a6641bf9262a01d07740a517643f8fe187ec5b1f) @@ -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 =================================================================== diff -u -r324b7c421823a48f491b38eed2470525fd3fc52c -ra6641bf9262a01d07740a517643f8fe187ec5b1f --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml (.../monitoringApplicationContext.xml) (revision 324b7c421823a48f491b38eed2470525fd3fc52c) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml (.../monitoringApplicationContext.xml) (revision a6641bf9262a01d07740a517643f8fe187ec5b1f) @@ -54,7 +54,7 @@ - + Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml =================================================================== diff -u -r324b7c421823a48f491b38eed2470525fd3fc52c -ra6641bf9262a01d07740a517643f8fe187ec5b1f --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml (.../assessmentApplicationContext.xml) (revision 324b7c421823a48f491b38eed2470525fd3fc52c) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml (.../assessmentApplicationContext.xml) (revision a6641bf9262a01d07740a517643f8fe187ec5b1f) @@ -130,7 +130,7 @@ false - + Index: lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/bbbApplicationContext.xml =================================================================== diff -u -r324b7c421823a48f491b38eed2470525fd3fc52c -ra6641bf9262a01d07740a517643f8fe187ec5b1f --- lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/bbbApplicationContext.xml (.../bbbApplicationContext.xml) (revision 324b7c421823a48f491b38eed2470525fd3fc52c) +++ lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/bbbApplicationContext.xml (.../bbbApplicationContext.xml) (revision a6641bf9262a01d07740a517643f8fe187ec5b1f) @@ -12,7 +12,7 @@ - + Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml =================================================================== diff -u -r324b7c421823a48f491b38eed2470525fd3fc52c -ra6641bf9262a01d07740a517643f8fe187ec5b1f --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml (.../chatApplicationContext.xml) (revision 324b7c421823a48f491b38eed2470525fd3fc52c) +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml (.../chatApplicationContext.xml) (revision a6641bf9262a01d07740a517643f8fe187ec5b1f) @@ -22,7 +22,7 @@ - + Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dacoApplicationContext.xml =================================================================== diff -u -r324b7c421823a48f491b38eed2470525fd3fc52c -ra6641bf9262a01d07740a517643f8fe187ec5b1f --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dacoApplicationContext.xml (.../dacoApplicationContext.xml) (revision 324b7c421823a48f491b38eed2470525fd3fc52c) +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dacoApplicationContext.xml (.../dacoApplicationContext.xml) (revision a6641bf9262a01d07740a517643f8fe187ec5b1f) @@ -105,7 +105,7 @@ false - + Index: lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/eadventureApplicationContext.xml =================================================================== diff -u -r324b7c421823a48f491b38eed2470525fd3fc52c -ra6641bf9262a01d07740a517643f8fe187ec5b1f --- lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/eadventureApplicationContext.xml (.../eadventureApplicationContext.xml) (revision 324b7c421823a48f491b38eed2470525fd3fc52c) +++ lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/eadventureApplicationContext.xml (.../eadventureApplicationContext.xml) (revision a6641bf9262a01d07740a517643f8fe187ec5b1f) @@ -139,7 +139,7 @@ false - + Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml =================================================================== diff -u -r324b7c421823a48f491b38eed2470525fd3fc52c -ra6641bf9262a01d07740a517643f8fe187ec5b1f --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml (.../forumApplicationContext.xml) (revision 324b7c421823a48f491b38eed2470525fd3fc52c) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml (.../forumApplicationContext.xml) (revision a6641bf9262a01d07740a517643f8fe187ec5b1f) @@ -164,7 +164,7 @@ false - + Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/gmapApplicationContext.xml =================================================================== diff -u -r324b7c421823a48f491b38eed2470525fd3fc52c -ra6641bf9262a01d07740a517643f8fe187ec5b1f --- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/gmapApplicationContext.xml (.../gmapApplicationContext.xml) (revision 324b7c421823a48f491b38eed2470525fd3fc52c) +++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/gmapApplicationContext.xml (.../gmapApplicationContext.xml) (revision a6641bf9262a01d07740a517643f8fe187ec5b1f) @@ -13,7 +13,7 @@ - + Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/imageGalleryApplicationContext.xml =================================================================== diff -u -r324b7c421823a48f491b38eed2470525fd3fc52c -ra6641bf9262a01d07740a517643f8fe187ec5b1f --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/imageGalleryApplicationContext.xml (.../imageGalleryApplicationContext.xml) (revision 324b7c421823a48f491b38eed2470525fd3fc52c) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/imageGalleryApplicationContext.xml (.../imageGalleryApplicationContext.xml) (revision a6641bf9262a01d07740a517643f8fe187ec5b1f) @@ -137,7 +137,7 @@ false - + Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/commonCartridgeApplicationContext.xml =================================================================== diff -u -r324b7c421823a48f491b38eed2470525fd3fc52c -ra6641bf9262a01d07740a517643f8fe187ec5b1f --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/commonCartridgeApplicationContext.xml (.../commonCartridgeApplicationContext.xml) (revision 324b7c421823a48f491b38eed2470525fd3fc52c) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/commonCartridgeApplicationContext.xml (.../commonCartridgeApplicationContext.xml) (revision a6641bf9262a01d07740a517643f8fe187ec5b1f) @@ -111,7 +111,7 @@ false - + Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/kalturaApplicationContext.xml =================================================================== diff -u -r324b7c421823a48f491b38eed2470525fd3fc52c -ra6641bf9262a01d07740a517643f8fe187ec5b1f --- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/kalturaApplicationContext.xml (.../kalturaApplicationContext.xml) (revision 324b7c421823a48f491b38eed2470525fd3fc52c) +++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/kalturaApplicationContext.xml (.../kalturaApplicationContext.xml) (revision a6641bf9262a01d07740a517643f8fe187ec5b1f) @@ -22,7 +22,7 @@ - + Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml =================================================================== diff -u -r324b7c421823a48f491b38eed2470525fd3fc52c -ra6641bf9262a01d07740a517643f8fe187ec5b1f --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml (.../mcApplicationContext.xml) (revision 324b7c421823a48f491b38eed2470525fd3fc52c) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml (.../mcApplicationContext.xml) (revision a6641bf9262a01d07740a517643f8fe187ec5b1f) @@ -64,7 +64,7 @@ - + Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml =================================================================== diff -u -r324b7c421823a48f491b38eed2470525fd3fc52c -ra6641bf9262a01d07740a517643f8fe187ec5b1f --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml (.../qaApplicationContext.xml) (revision 324b7c421823a48f491b38eed2470525fd3fc52c) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml (.../qaApplicationContext.xml) (revision a6641bf9262a01d07740a517643f8fe187ec5b1f) @@ -64,7 +64,7 @@ - + Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml =================================================================== diff -u -r324b7c421823a48f491b38eed2470525fd3fc52c -ra6641bf9262a01d07740a517643f8fe187ec5b1f --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml (.../rsrcApplicationContext.xml) (revision 324b7c421823a48f491b38eed2470525fd3fc52c) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml (.../rsrcApplicationContext.xml) (revision a6641bf9262a01d07740a517643f8fe187ec5b1f) @@ -104,7 +104,7 @@ false - + Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/leaderselectionApplicationContext.xml =================================================================== diff -u -r324b7c421823a48f491b38eed2470525fd3fc52c -ra6641bf9262a01d07740a517643f8fe187ec5b1f --- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/leaderselectionApplicationContext.xml (.../leaderselectionApplicationContext.xml) (revision 324b7c421823a48f491b38eed2470525fd3fc52c) +++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/leaderselectionApplicationContext.xml (.../leaderselectionApplicationContext.xml) (revision a6641bf9262a01d07740a517643f8fe187ec5b1f) @@ -22,7 +22,7 @@ - + Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/mindmapApplicationContext.xml =================================================================== diff -u -r324b7c421823a48f491b38eed2470525fd3fc52c -ra6641bf9262a01d07740a517643f8fe187ec5b1f --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/mindmapApplicationContext.xml (.../mindmapApplicationContext.xml) (revision 324b7c421823a48f491b38eed2470525fd3fc52c) +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/mindmapApplicationContext.xml (.../mindmapApplicationContext.xml) (revision a6641bf9262a01d07740a517643f8fe187ec5b1f) @@ -25,7 +25,7 @@ - + Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/nbApplicationContext.xml =================================================================== diff -u -r324b7c421823a48f491b38eed2470525fd3fc52c -ra6641bf9262a01d07740a517643f8fe187ec5b1f --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/nbApplicationContext.xml (.../nbApplicationContext.xml) (revision 324b7c421823a48f491b38eed2470525fd3fc52c) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/nbApplicationContext.xml (.../nbApplicationContext.xml) (revision a6641bf9262a01d07740a517643f8fe187ec5b1f) @@ -15,7 +15,7 @@ - + Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml =================================================================== diff -u -r324b7c421823a48f491b38eed2470525fd3fc52c -ra6641bf9262a01d07740a517643f8fe187ec5b1f --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml (.../notebookApplicationContext.xml) (revision 324b7c421823a48f491b38eed2470525fd3fc52c) +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml (.../notebookApplicationContext.xml) (revision a6641bf9262a01d07740a517643f8fe187ec5b1f) @@ -21,7 +21,7 @@ - + Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/pixlrApplicationContext.xml =================================================================== diff -u -r324b7c421823a48f491b38eed2470525fd3fc52c -ra6641bf9262a01d07740a517643f8fe187ec5b1f --- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/pixlrApplicationContext.xml (.../pixlrApplicationContext.xml) (revision 324b7c421823a48f491b38eed2470525fd3fc52c) +++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/pixlrApplicationContext.xml (.../pixlrApplicationContext.xml) (revision a6641bf9262a01d07740a517643f8fe187ec5b1f) @@ -22,7 +22,7 @@ - + Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml =================================================================== diff -u -r324b7c421823a48f491b38eed2470525fd3fc52c -ra6641bf9262a01d07740a517643f8fe187ec5b1f --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml (.../submitFilesApplicationContext.xml) (revision 324b7c421823a48f491b38eed2470525fd3fc52c) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml (.../submitFilesApplicationContext.xml) (revision a6641bf9262a01d07740a517643f8fe187ec5b1f) @@ -63,7 +63,7 @@ - + Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml =================================================================== diff -u -r324b7c421823a48f491b38eed2470525fd3fc52c -ra6641bf9262a01d07740a517643f8fe187ec5b1f --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml (.../scratchieApplicationContext.xml) (revision 324b7c421823a48f491b38eed2470525fd3fc52c) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml (.../scratchieApplicationContext.xml) (revision a6641bf9262a01d07740a517643f8fe187ec5b1f) @@ -117,7 +117,7 @@ false - + Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/scribeApplicationContext.xml =================================================================== diff -u -r324b7c421823a48f491b38eed2470525fd3fc52c -ra6641bf9262a01d07740a517643f8fe187ec5b1f --- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/scribeApplicationContext.xml (.../scribeApplicationContext.xml) (revision 324b7c421823a48f491b38eed2470525fd3fc52c) +++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/scribeApplicationContext.xml (.../scribeApplicationContext.xml) (revision a6641bf9262a01d07740a517643f8fe187ec5b1f) @@ -12,7 +12,7 @@ - + Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/spreadsheetApplicationContext.xml =================================================================== diff -u -r324b7c421823a48f491b38eed2470525fd3fc52c -ra6641bf9262a01d07740a517643f8fe187ec5b1f --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/spreadsheetApplicationContext.xml (.../spreadsheetApplicationContext.xml) (revision 324b7c421823a48f491b38eed2470525fd3fc52c) +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/spreadsheetApplicationContext.xml (.../spreadsheetApplicationContext.xml) (revision a6641bf9262a01d07740a517643f8fe187ec5b1f) @@ -94,7 +94,7 @@ false - + Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/surveyApplicationContext.xml =================================================================== diff -u -r324b7c421823a48f491b38eed2470525fd3fc52c -ra6641bf9262a01d07740a517643f8fe187ec5b1f --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/surveyApplicationContext.xml (.../surveyApplicationContext.xml) (revision 324b7c421823a48f491b38eed2470525fd3fc52c) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/surveyApplicationContext.xml (.../surveyApplicationContext.xml) (revision a6641bf9262a01d07740a517643f8fe187ec5b1f) @@ -98,7 +98,7 @@ false - + Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/taskListApplicationContext.xml =================================================================== diff -u -r324b7c421823a48f491b38eed2470525fd3fc52c -ra6641bf9262a01d07740a517643f8fe187ec5b1f --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/taskListApplicationContext.xml (.../taskListApplicationContext.xml) (revision 324b7c421823a48f491b38eed2470525fd3fc52c) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/taskListApplicationContext.xml (.../taskListApplicationContext.xml) (revision a6641bf9262a01d07740a517643f8fe187ec5b1f) @@ -105,7 +105,7 @@ false - + Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/videoRecorderApplicationContext.xml =================================================================== diff -u -r324b7c421823a48f491b38eed2470525fd3fc52c -ra6641bf9262a01d07740a517643f8fe187ec5b1f --- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/videoRecorderApplicationContext.xml (.../videoRecorderApplicationContext.xml) (revision 324b7c421823a48f491b38eed2470525fd3fc52c) +++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/videoRecorderApplicationContext.xml (.../videoRecorderApplicationContext.xml) (revision a6641bf9262a01d07740a517643f8fe187ec5b1f) @@ -22,7 +22,7 @@ - + Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml =================================================================== diff -u -r324b7c421823a48f491b38eed2470525fd3fc52c -ra6641bf9262a01d07740a517643f8fe187ec5b1f --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml (.../voteApplicationContext.xml) (revision 324b7c421823a48f491b38eed2470525fd3fc52c) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml (.../voteApplicationContext.xml) (revision a6641bf9262a01d07740a517643f8fe187ec5b1f) @@ -54,7 +54,7 @@ - + Index: lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/wookieApplicationContext.xml =================================================================== diff -u -r324b7c421823a48f491b38eed2470525fd3fc52c -ra6641bf9262a01d07740a517643f8fe187ec5b1f --- lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/wookieApplicationContext.xml (.../wookieApplicationContext.xml) (revision 324b7c421823a48f491b38eed2470525fd3fc52c) +++ lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/wookieApplicationContext.xml (.../wookieApplicationContext.xml) (revision a6641bf9262a01d07740a517643f8fe187ec5b1f) @@ -22,7 +22,7 @@ - +