Skip to content

Commit

Permalink
Make atomikos.transaction.timeout generic
Browse files Browse the repository at this point in the history
Use the property in GDMS, BreedingManager and Fieldbook

Issue: BMS-4974
Reviewer: None
  • Loading branch information
nahuel-soldevilla committed Aug 16, 2018
1 parent 200a54e commit 426ab62
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/main/resources/applicationContext.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/workbench.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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}

0 comments on commit 426ab62

Please sign in to comment.