From 5fc81e081e9b2c90d1a9ebc27db1956afdf356ee Mon Sep 17 00:00:00 2001
From: eugenp <hanriseldon@gmail.com>
Date: Fri, 31 May 2013 23:57:15 +0300
Subject: [PATCH] xml configuration working as well

---
 .../baeldung/spring/PersistenceJPAConfig.java | 21 +++++++-------
 .../spring/PersistenceJPAConfigXml.java       |  3 +-
 spring-jpa/src/main/resources/jpaConfig.xml   | 28 ++++++++++++-------
 3 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/spring-jpa/src/main/java/org/baeldung/spring/PersistenceJPAConfig.java b/spring-jpa/src/main/java/org/baeldung/spring/PersistenceJPAConfig.java
index 29494084b1..dac41e182b 100644
--- a/spring-jpa/src/main/java/org/baeldung/spring/PersistenceJPAConfig.java
+++ b/spring-jpa/src/main/java/org/baeldung/spring/PersistenceJPAConfig.java
@@ -7,13 +7,11 @@ import javax.sql.DataSource;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.core.env.Environment;
 import org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor;
 import org.springframework.jdbc.datasource.DriverManagerDataSource;
 import org.springframework.orm.jpa.JpaTransactionManager;
-import org.springframework.orm.jpa.JpaVendorAdapter;
 import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
 import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
 import org.springframework.transaction.PlatformTransactionManager;
@@ -21,7 +19,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 import com.google.common.base.Preconditions;
 
-@Configuration
+// @Configuration
 @EnableTransactionManagement
 @PropertySource({ "classpath:persistence-mysql.properties" })
 @ComponentScan({ "org.baeldung.persistence" })
@@ -36,19 +34,20 @@ public class PersistenceJPAConfig {
 
     @Bean
     public LocalContainerEntityManagerFactoryBean entityManagerFactoryBean() {
-        final LocalContainerEntityManagerFactoryBean factoryBean = new LocalContainerEntityManagerFactoryBean();
-        factoryBean.setDataSource(restDataSource());
-        factoryBean.setPackagesToScan(new String[] { "org.baeldung.persistence.model" });
+        final LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
+        em.setDataSource(dataSource());
+        em.setPackagesToScan(new String[] { "org.baeldung.persistence.model" });
 
-        final JpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
-        factoryBean.setJpaVendorAdapter(vendorAdapter);
-        factoryBean.setJpaProperties(additionalProperties());
+        final HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
+        // vendorAdapter.set
+        em.setJpaVendorAdapter(vendorAdapter);
+        em.setJpaProperties(additionalProperties());
 
-        return factoryBean;
+        return em;
     }
 
     @Bean
-    public DataSource restDataSource() {
+    public DataSource dataSource() {
         final DriverManagerDataSource dataSource = new DriverManagerDataSource();
         dataSource.setDriverClassName(Preconditions.checkNotNull(env.getProperty("jdbc.driverClassName")));
         dataSource.setUrl(Preconditions.checkNotNull(env.getProperty("jdbc.url")));
diff --git a/spring-jpa/src/main/java/org/baeldung/spring/PersistenceJPAConfigXml.java b/spring-jpa/src/main/java/org/baeldung/spring/PersistenceJPAConfigXml.java
index e85510a0c4..98f4f47249 100644
--- a/spring-jpa/src/main/java/org/baeldung/spring/PersistenceJPAConfigXml.java
+++ b/spring-jpa/src/main/java/org/baeldung/spring/PersistenceJPAConfigXml.java
@@ -1,10 +1,11 @@
 package org.baeldung.spring;
 
 import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.ImportResource;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
-// @Configuration
+@Configuration
 @EnableTransactionManagement
 @ComponentScan({ "org.baeldung.persistence" })
 @ImportResource({ "classpath:jpaConfig.xml" })
diff --git a/spring-jpa/src/main/resources/jpaConfig.xml b/spring-jpa/src/main/resources/jpaConfig.xml
index f85811f8ed..31df8d69da 100644
--- a/spring-jpa/src/main/resources/jpaConfig.xml
+++ b/spring-jpa/src/main/resources/jpaConfig.xml
@@ -1,17 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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"
-   xsi:schemaLocation="
+<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"
+    xmlns:tx="http://www.springframework.org/schema/tx"
+    xsi:schemaLocation="
       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
+      http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.2.xsd
       http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.2.xsd">
 
     <context:property-placeholder location="classpath:persistence-mysql.properties" />
-    
-    <bean id="sessionFactory" class="org.springframework.orm.hibernate4.LocalSessionFactoryBean">
+
+    <bean id="myEmf" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
         <property name="dataSource" ref="dataSource" />
         <property name="packagesToScan" value="org.baeldung.persistence.model" />
-        <property name="hibernateProperties">
+        <property name="jpaVendorAdapter">
+            <bean class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter" />
+            <!-- <bean class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter" />
+                <property name="generateDdl" value="${jpa.generateDdl}" />
+                <property name="databasePlatform" value="${persistence.dialect}" />
+            </bean> -->
+        </property>
+        <property name="jpaProperties">
             <props>
                 <prop key="hibernate.hbm2ddl.auto">${hibernate.hbm2ddl.auto}</prop>
                 <prop key="hibernate.dialect">${hibernate.dialect}</prop>
@@ -26,10 +33,11 @@
         <property name="password" value="${jdbc.pass}" />
     </bean>
 
-    <bean id="txManager" class="org.springframework.orm.hibernate4.HibernateTransactionManager">
-        <property name="sessionFactory" ref="sessionFactory" />
+    <bean id="transactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
+        <property name="entityManagerFactory" ref="myEmf" />
     </bean>
-    
+    <tx:annotation-driven />
+
     <bean id="persistenceExceptionTranslationPostProcessor" class="org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor" />
 
 </beans>
\ No newline at end of file