Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '5.2.x'

Browse Source
This commit is contained in:
Sam Brannen
2020-05-08 19:26:00 +02:00
parent 1e64ffa7ba 0f22a5e409
commit 8f7debc769
6 changed files with 35 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/docs/asciidoc/data-access.adoc
View File

@@ -1160,7 +1160,7 @@ the default transactional configuration, you could write the following:
</tx:attributes>
</tx:advice>
<!-- other transaction infrastructure beans such as a PlatformTransactionManager omitted... -->
<!-- other transaction infrastructure beans such as a TransactionManager omitted... -->
</beans>
----
@@ -1216,7 +1216,7 @@ transactional settings:
</tx:attributes>
</tx:advice>
<!-- other transaction infrastructure beans such as a PlatformTransactionManager omitted... -->
<!-- other transaction infrastructure beans such as a TransactionManager omitted... -->
</beans>
----
@@ -1385,7 +1385,7 @@ In XML configuration, the `<tx:annotation-driven/>` tag provides similar conveni
<bean id="fooService" class="x.y.service.DefaultFooService"/>
<!-- enable the configuration of transactional behavior based on annotations -->
<tx:annotation-driven transaction-manager="txManager"/><!-- a PlatformTransactionManager is still required --> <1>
<tx:annotation-driven transaction-manager="txManager"/><!-- a TransactionManager is still required --> <1>
<bean id="txManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
<!-- (this dependency is defined somewhere else) -->