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

Merge branch '5.1.x'

Browse Source
This commit is contained in:
Sam Brannen
2019-03-13 15:16:24 +01:00
parent 4bee5073a0 8f7b118701
commit f9e22a0f02
13 changed files with 81 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/docs/asciidoc/integration-appendix.adoc
View File

@@ -44,12 +44,12 @@ The following example shows how to use JNDI to look up a data source without the
[source,xml,indent=0]
[subs="verbatim,quotes"]
----
<bean id="**dataSource**" class="org.springframework.jndi.JndiObjectFactoryBean">
<bean id="dataSource" class="org.springframework.jndi.JndiObjectFactoryBean">
<property name="jndiName" value="jdbc/MyDataSource"/>
</bean>
<bean id="userDao" class="com.foo.JdbcUserDao">
<!-- Spring will do the cast automatically (as usual) -->
<property name="dataSource" ref="**dataSource**"/>
<property name="dataSource" ref="dataSource"/>
</bean>
----
@@ -59,11 +59,11 @@ schema:
[source,xml,indent=0]
[subs="verbatim,quotes"]
----
<jee:jndi-lookup id="**dataSource**" jndi-name="jdbc/MyDataSource"/>
<jee:jndi-lookup id="dataSource" jndi-name="jdbc/MyDataSource"/>
<bean id="userDao" class="com.foo.JdbcUserDao">
<!-- Spring will do the cast automatically (as usual) -->
<property name="dataSource" ref="**dataSource**"/>
<property name="dataSource" ref="dataSource"/>
</bean>
----