From 829521b212b2a84adb156b2dc802c71c0d151e9d Mon Sep 17 00:00:00 2001
From: eugenp <hanriseldon@gmail.com>
Date: Fri, 31 May 2013 23:15:06 +0300
Subject: [PATCH] jpa work

---
 ...rsistenceConfig.java => PersistenceJPAConfig.java} |  4 ++--
 ...ateXmlConfig.java => PersistenceJPAConfigXml.java} | 11 +++++------
 .../resources/{hibernate4Config.xml => jpaConfig.xml} |  0
 .../service/FooServicePersistenceIntegrationTest.java |  4 ++--
 4 files changed, 9 insertions(+), 10 deletions(-)
 rename spring-jpa/src/main/java/org/baeldung/spring/{PersistenceConfig.java => PersistenceJPAConfig.java} (97%)
 rename spring-jpa/src/main/java/org/baeldung/spring/{HibernateXmlConfig.java => PersistenceJPAConfigXml.java} (50%)
 rename spring-jpa/src/main/resources/{hibernate4Config.xml => jpaConfig.xml} (100%)

diff --git a/spring-jpa/src/main/java/org/baeldung/spring/PersistenceConfig.java b/spring-jpa/src/main/java/org/baeldung/spring/PersistenceJPAConfig.java
similarity index 97%
rename from spring-jpa/src/main/java/org/baeldung/spring/PersistenceConfig.java
rename to spring-jpa/src/main/java/org/baeldung/spring/PersistenceJPAConfig.java
index 300579ff41..29494084b1 100644
--- a/spring-jpa/src/main/java/org/baeldung/spring/PersistenceConfig.java
+++ b/spring-jpa/src/main/java/org/baeldung/spring/PersistenceJPAConfig.java
@@ -25,12 +25,12 @@ import com.google.common.base.Preconditions;
 @EnableTransactionManagement
 @PropertySource({ "classpath:persistence-mysql.properties" })
 @ComponentScan({ "org.baeldung.persistence" })
-public class PersistenceConfig {
+public class PersistenceJPAConfig {
 
     @Autowired
     private Environment env;
 
-    public PersistenceConfig() {
+    public PersistenceJPAConfig() {
         super();
     }
 
diff --git a/spring-jpa/src/main/java/org/baeldung/spring/HibernateXmlConfig.java b/spring-jpa/src/main/java/org/baeldung/spring/PersistenceJPAConfigXml.java
similarity index 50%
rename from spring-jpa/src/main/java/org/baeldung/spring/HibernateXmlConfig.java
rename to spring-jpa/src/main/java/org/baeldung/spring/PersistenceJPAConfigXml.java
index 4c54d150a1..e85510a0c4 100644
--- a/spring-jpa/src/main/java/org/baeldung/spring/HibernateXmlConfig.java
+++ b/spring-jpa/src/main/java/org/baeldung/spring/PersistenceJPAConfigXml.java
@@ -1,17 +1,16 @@
 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.dao", "org.baeldung.persistence.service" })
-@ImportResource({ "classpath:hibernate4Config.xml" })
-public class HibernateXmlConfig {
+@ComponentScan({ "org.baeldung.persistence" })
+@ImportResource({ "classpath:jpaConfig.xml" })
+public class PersistenceJPAConfigXml {
 
-    public HibernateXmlConfig() {
+    public PersistenceJPAConfigXml() {
         super();
     }
 
diff --git a/spring-jpa/src/main/resources/hibernate4Config.xml b/spring-jpa/src/main/resources/jpaConfig.xml
similarity index 100%
rename from spring-jpa/src/main/resources/hibernate4Config.xml
rename to spring-jpa/src/main/resources/jpaConfig.xml
diff --git a/spring-jpa/src/test/java/org/baeldung/persistence/service/FooServicePersistenceIntegrationTest.java b/spring-jpa/src/test/java/org/baeldung/persistence/service/FooServicePersistenceIntegrationTest.java
index 06e6193041..e6c9d8ff18 100644
--- a/spring-jpa/src/test/java/org/baeldung/persistence/service/FooServicePersistenceIntegrationTest.java
+++ b/spring-jpa/src/test/java/org/baeldung/persistence/service/FooServicePersistenceIntegrationTest.java
@@ -4,7 +4,7 @@ import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
 
 import org.baeldung.persistence.model.Foo;
 import org.baeldung.persistence.service.FooService;
-import org.baeldung.spring.PersistenceConfig;
+import org.baeldung.spring.PersistenceJPAConfig;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,7 +15,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.support.AnnotationConfigContextLoader;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = { PersistenceConfig.class }, loader = AnnotationConfigContextLoader.class)
+@ContextConfiguration(classes = { PersistenceJPAConfig.class }, loader = AnnotationConfigContextLoader.class)
 public class FooServicePersistenceIntegrationTest {
 
     @Autowired