root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge branch '1.5.x'

This commit is contained in:
Stephane Nicoll 2018-03-27 16:15:11 +02:00
parent 006decea2a 4d4b91a51e
commit d9beafa45f
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spring-boot-project/spring-boot-docs/src/main/asciidoc/howto.adoc
View File

@ -1930,10 +1930,9 @@ as shown in the following example:
[[howto-use-traditional-persistence-xml]]
=== Use a Traditional `persistence.xml` File
Spring does not require the use of XML to configure the JPA provider, and Spring Boot
assumes you want to take advantage of that feature. If you prefer to use
`persistence.xml`, you need to define your own `@Bean` of type
`LocalEntityManagerFactoryBean` (with an ID of '`entityManagerFactory`') and set the
Spring Boot will not search for or use a `META-INF/persistence.xml` by default. If you
prefer to use a traditional `persistence.xml`, you need to define your own `@Bean` of
type `LocalEntityManagerFactoryBean` (with an ID of '`entityManagerFactory`') and set the
persistence unit name there.
See