From 426ab62ba6f51410bc1ef683198a623c15c87666 Mon Sep 17 00:00:00 2001
From: Nahuel Soldevilla <nahuel@leafnode.io>
Date: Thu, 16 Aug 2018 18:09:47 -0300
Subject: [PATCH] Make atomikos.transaction.timeout generic

Use the property in GDMS, BreedingManager and Fieldbook

Issue: BMS-4974
Reviewer: None
---
 src/main/resources/applicationContext.xml | 2 +-
 src/main/resources/workbench.properties   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/applicationContext.xml b/src/main/resources/applicationContext.xml
index 36cdc86f08..02a5925198 100644
--- a/src/main/resources/applicationContext.xml
+++ b/src/main/resources/applicationContext.xml
@@ -258,7 +258,7 @@
 	</bean>
 
 	<bean id="atomikosUserTransaction" class="com.atomikos.icatch.jta.J2eeUserTransaction">
-		<property name="transactionTimeout" value="${workbench.atomikos.transaction.timeout}" />
+		<property name="transactionTimeout" value="${atomikos.transaction.timeout}" />
 	</bean>
 
 	<bean id="transactionManager"
diff --git a/src/main/resources/workbench.properties b/src/main/resources/workbench.properties
index f523da8ea4..c47c1b896e 100644
--- a/src/main/resources/workbench.properties
+++ b/src/main/resources/workbench.properties
@@ -33,4 +33,4 @@ institute.logo.path=${institute.logo.path}
 # footer.message=Welcome <br/> to Breeding Platform <br/> This is a Notification area
 footer.message=${footer.message}
 
-workbench.atomikos.transaction.timeout=${workbench.atomikos.transaction.timeout}
+atomikos.transaction.timeout=${atomikos.transaction.timeout}