Fixed a merge error.

This commit is contained in:
bdragan 2016-08-09 22:01:43 +02:00
parent ab1a928b1c
commit 60a097624d
1 changed files with 18 additions and 16 deletions

View File

@ -1,18 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<persistence version="2.1" xmlns="http://xmlns.jcp.org/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd"> <persistence version="2.1" xmlns="http://xmlns.jcp.org/xml/ns/persistence"
<persistence-unit name="punit" > xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<class>org.baeldung.persistence.model.Foo</class> xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">
<class>org.baeldung.persistence.model.Bar</class> <persistence-unit name="punit">
<properties> <class>org.baeldung.persistence.model.Foo</class>
<property name="javax.persistence.jdbc.user" value="root"/> <class>org.baeldung.persistence.model.Bar</class>
<property name="javax.persistence.jdbc.driver" value="com.mysql.jdbc.Driver"/> <properties>
<property name="javax.persistence.jdbc.url" value="jdbc:mysql://localhost:3306/HIBERTEST"/> <property name="javax.persistence.jdbc.user" value="root"/>
<property name="javax.persistence.ddl-generation" value="drop-and-create-tables"/> <property name="javax.persistence.jdbc.driver" value="com.mysql.jdbc.Driver"/>
<property name="javax.persistence.logging.level" value="INFO"/> <property name="javax.persistence.jdbc.url" value="jdbc:mysql://localhost:3306/HIBERTEST"/>
<property name = "hibernate.show_sql" value = "true" /> <property name="javax.persistence.ddl-generation" value="drop-and-create-tables"/>
<property name = "hibernate.cache.use_second_level_cache" value = "false" /> <property name="javax.persistence.logging.level" value="INFO"/>
<property name = "hibernate.cache.use_query_cache" value = "false" /> <property name="hibernate.show_sql" value="true"/>
</properties> <property name="hibernate.cache.use_second_level_cache" value="false"/>
<property name="hibernate.cache.use_query_cache" value="false"/>
</persistence-unit> </properties>
</persistence-unit>
</persistence> </persistence>