Skip to content

Commit 5fc81e0

Browse files
author
eugenp
committed
xml configuration working as well
1 parent 9d86ea2 commit 5fc81e0

File tree

3 files changed

+30
-22
lines changed

3 files changed

+30
-22
lines changed

spring-jpa/src/main/java/org/baeldung/spring/PersistenceJPAConfig.java

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,19 @@
77
import org.springframework.beans.factory.annotation.Autowired;
88
import org.springframework.context.annotation.Bean;
99
import org.springframework.context.annotation.ComponentScan;
10-
import org.springframework.context.annotation.Configuration;
1110
import org.springframework.context.annotation.PropertySource;
1211
import org.springframework.core.env.Environment;
1312
import org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor;
1413
import org.springframework.jdbc.datasource.DriverManagerDataSource;
1514
import org.springframework.orm.jpa.JpaTransactionManager;
16-
import org.springframework.orm.jpa.JpaVendorAdapter;
1715
import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
1816
import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
1917
import org.springframework.transaction.PlatformTransactionManager;
2018
import org.springframework.transaction.annotation.EnableTransactionManagement;
2119

2220
import com.google.common.base.Preconditions;
2321

24-
@Configuration
22+
// @Configuration
2523
@EnableTransactionManagement
2624
@PropertySource({ "classpath:persistence-mysql.properties" })
2725
@ComponentScan({ "org.baeldung.persistence" })
@@ -36,19 +34,20 @@ public PersistenceJPAConfig() {
3634

3735
@Bean
3836
public LocalContainerEntityManagerFactoryBean entityManagerFactoryBean() {
39-
final LocalContainerEntityManagerFactoryBean factoryBean = new LocalContainerEntityManagerFactoryBean();
40-
factoryBean.setDataSource(restDataSource());
41-
factoryBean.setPackagesToScan(new String[] { "org.baeldung.persistence.model" });
37+
final LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
38+
em.setDataSource(dataSource());
39+
em.setPackagesToScan(new String[] { "org.baeldung.persistence.model" });
4240

43-
final JpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
44-
factoryBean.setJpaVendorAdapter(vendorAdapter);
45-
factoryBean.setJpaProperties(additionalProperties());
41+
final HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
42+
// vendorAdapter.set
43+
em.setJpaVendorAdapter(vendorAdapter);
44+
em.setJpaProperties(additionalProperties());
4645

47-
return factoryBean;
46+
return em;
4847
}
4948

5049
@Bean
51-
public DataSource restDataSource() {
50+
public DataSource dataSource() {
5251
final DriverManagerDataSource dataSource = new DriverManagerDataSource();
5352
dataSource.setDriverClassName(Preconditions.checkNotNull(env.getProperty("jdbc.driverClassName")));
5453
dataSource.setUrl(Preconditions.checkNotNull(env.getProperty("jdbc.url")));

spring-jpa/src/main/java/org/baeldung/spring/PersistenceJPAConfigXml.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
package org.baeldung.spring;
22

33
import org.springframework.context.annotation.ComponentScan;
4+
import org.springframework.context.annotation.Configuration;
45
import org.springframework.context.annotation.ImportResource;
56
import org.springframework.transaction.annotation.EnableTransactionManagement;
67

7-
// @Configuration
8+
@Configuration
89
@EnableTransactionManagement
910
@ComponentScan({ "org.baeldung.persistence" })
1011
@ImportResource({ "classpath:jpaConfig.xml" })
Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,24 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<beans xmlns="http://www.springframework.org/schema/beans"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xmlns:context="http://www.springframework.org/schema/context"
5-
xsi:schemaLocation="
2+
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
3+
xmlns:tx="http://www.springframework.org/schema/tx"
4+
xsi:schemaLocation="
65
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
6+
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.2.xsd
77
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.2.xsd">
88

99
<context:property-placeholder location="classpath:persistence-mysql.properties" />
10-
11-
<bean id="sessionFactory" class="org.springframework.orm.hibernate4.LocalSessionFactoryBean">
10+
11+
<bean id="myEmf" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
1212
<property name="dataSource" ref="dataSource" />
1313
<property name="packagesToScan" value="org.baeldung.persistence.model" />
14-
<property name="hibernateProperties">
14+
<property name="jpaVendorAdapter">
15+
<bean class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter" />
16+
<!-- <bean class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter" />
17+
<property name="generateDdl" value="${jpa.generateDdl}" />
18+
<property name="databasePlatform" value="${persistence.dialect}" />
19+
</bean> -->
20+
</property>
21+
<property name="jpaProperties">
1522
<props>
1623
<prop key="hibernate.hbm2ddl.auto">${hibernate.hbm2ddl.auto}</prop>
1724
<prop key="hibernate.dialect">${hibernate.dialect}</prop>
@@ -26,10 +33,11 @@
2633
<property name="password" value="${jdbc.pass}" />
2734
</bean>
2835

29-
<bean id="txManager" class="org.springframework.orm.hibernate4.HibernateTransactionManager">
30-
<property name="sessionFactory" ref="sessionFactory" />
36+
<bean id="transactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
37+
<property name="entityManagerFactory" ref="myEmf" />
3138
</bean>
32-
39+
<tx:annotation-driven />
40+
3341
<bean id="persistenceExceptionTranslationPostProcessor" class="org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor" />
3442

3543
</beans>

0 commit comments

Comments
 (0)