Merge pull request #216 from IntegratedBreedingPlatform/BMS-4974-extr…

…act-transaction-timeout BMS-4974 extract transaction timeout into properties
IntegratedBreedingPlatform · Aug 23, 2018 · f632b7e · f632b7e
2 parents e2459c9 + 426ab62
commit f632b7e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -35,4 +35,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}