From 210be2e5737f2992e60cac27e9dc9dc625df5722 Mon Sep 17 00:00:00 2001 From: eugenp Date: Fri, 31 May 2013 23:13:16 +0300 Subject: [PATCH] jpa work --- .../{spring => }/persistence/dao/FooDao.java | 4 +-- .../{spring => }/persistence/dao/IFooDao.java | 4 +-- .../{spring => }/persistence/model/Foo.java | 2 +- .../persistence/service/FooService.java | 6 ++-- .../config => }/HibernateXmlConfig.java | 4 +-- .../config => }/PersistenceConfig.java | 6 ++-- .../src/main/resources/hibernate4Config.xml | 2 +- spring-jpa/src/main/webapp/WEB-INF/web.xml | 30 +++++++++++-------- .../FooServicePersistenceIntegrationTest.java | 7 +++-- 9 files changed, 35 insertions(+), 30 deletions(-) rename spring-jpa/src/main/java/org/baeldung/{spring => }/persistence/dao/FooDao.java (92%) rename spring-jpa/src/main/java/org/baeldung/{spring => }/persistence/dao/IFooDao.java (71%) rename spring-jpa/src/main/java/org/baeldung/{spring => }/persistence/model/Foo.java (97%) rename spring-jpa/src/main/java/org/baeldung/{spring => }/persistence/service/FooService.java (73%) rename spring-jpa/src/main/java/org/baeldung/spring/{persistence/config => }/HibernateXmlConfig.java (75%) rename spring-jpa/src/main/java/org/baeldung/spring/{persistence/config => }/PersistenceConfig.java (94%) rename spring-jpa/src/test/java/org/baeldung/{spring => }/persistence/service/FooServicePersistenceIntegrationTest.java (90%) diff --git a/spring-jpa/src/main/java/org/baeldung/spring/persistence/dao/FooDao.java b/spring-jpa/src/main/java/org/baeldung/persistence/dao/FooDao.java similarity index 92% rename from spring-jpa/src/main/java/org/baeldung/spring/persistence/dao/FooDao.java rename to spring-jpa/src/main/java/org/baeldung/persistence/dao/FooDao.java index f970ade71f..4f37afc9ff 100644 --- a/spring-jpa/src/main/java/org/baeldung/spring/persistence/dao/FooDao.java +++ b/spring-jpa/src/main/java/org/baeldung/persistence/dao/FooDao.java @@ -1,11 +1,11 @@ -package org.baeldung.spring.persistence.dao; +package org.baeldung.persistence.dao; import java.util.List; import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; -import org.baeldung.spring.persistence.model.Foo; +import org.baeldung.persistence.model.Foo; import org.springframework.stereotype.Repository; import com.google.common.base.Preconditions; diff --git a/spring-jpa/src/main/java/org/baeldung/spring/persistence/dao/IFooDao.java b/spring-jpa/src/main/java/org/baeldung/persistence/dao/IFooDao.java similarity index 71% rename from spring-jpa/src/main/java/org/baeldung/spring/persistence/dao/IFooDao.java rename to spring-jpa/src/main/java/org/baeldung/persistence/dao/IFooDao.java index 201fc3e351..f5799522e2 100644 --- a/spring-jpa/src/main/java/org/baeldung/spring/persistence/dao/IFooDao.java +++ b/spring-jpa/src/main/java/org/baeldung/persistence/dao/IFooDao.java @@ -1,8 +1,8 @@ -package org.baeldung.spring.persistence.dao; +package org.baeldung.persistence.dao; import java.util.List; -import org.baeldung.spring.persistence.model.Foo; +import org.baeldung.persistence.model.Foo; public interface IFooDao { diff --git a/spring-jpa/src/main/java/org/baeldung/spring/persistence/model/Foo.java b/spring-jpa/src/main/java/org/baeldung/persistence/model/Foo.java similarity index 97% rename from spring-jpa/src/main/java/org/baeldung/spring/persistence/model/Foo.java rename to spring-jpa/src/main/java/org/baeldung/persistence/model/Foo.java index 8b03df39e7..1e3bcc0131 100644 --- a/spring-jpa/src/main/java/org/baeldung/spring/persistence/model/Foo.java +++ b/spring-jpa/src/main/java/org/baeldung/persistence/model/Foo.java @@ -1,4 +1,4 @@ -package org.baeldung.spring.persistence.model; +package org.baeldung.persistence.model; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/spring-jpa/src/main/java/org/baeldung/spring/persistence/service/FooService.java b/spring-jpa/src/main/java/org/baeldung/persistence/service/FooService.java similarity index 73% rename from spring-jpa/src/main/java/org/baeldung/spring/persistence/service/FooService.java rename to spring-jpa/src/main/java/org/baeldung/persistence/service/FooService.java index 1d3b5c4a02..b07698c438 100644 --- a/spring-jpa/src/main/java/org/baeldung/spring/persistence/service/FooService.java +++ b/spring-jpa/src/main/java/org/baeldung/persistence/service/FooService.java @@ -1,7 +1,7 @@ -package org.baeldung.spring.persistence.service; +package org.baeldung.persistence.service; -import org.baeldung.spring.persistence.dao.IFooDao; -import org.baeldung.spring.persistence.model.Foo; +import org.baeldung.persistence.dao.IFooDao; +import org.baeldung.persistence.model.Foo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/spring-jpa/src/main/java/org/baeldung/spring/persistence/config/HibernateXmlConfig.java b/spring-jpa/src/main/java/org/baeldung/spring/HibernateXmlConfig.java similarity index 75% rename from spring-jpa/src/main/java/org/baeldung/spring/persistence/config/HibernateXmlConfig.java rename to spring-jpa/src/main/java/org/baeldung/spring/HibernateXmlConfig.java index 51fbcd27c1..4c54d150a1 100644 --- a/spring-jpa/src/main/java/org/baeldung/spring/persistence/config/HibernateXmlConfig.java +++ b/spring-jpa/src/main/java/org/baeldung/spring/HibernateXmlConfig.java @@ -1,4 +1,4 @@ -package org.baeldung.spring.persistence.config; +package org.baeldung.spring; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; @@ -7,7 +7,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; @Configuration @EnableTransactionManagement -@ComponentScan({ "org.baeldung.spring.persistence.dao", "org.baeldung.spring.persistence.service" }) +@ComponentScan({ "org.baeldung.persistence.dao", "org.baeldung.persistence.service" }) @ImportResource({ "classpath:hibernate4Config.xml" }) public class HibernateXmlConfig { diff --git a/spring-jpa/src/main/java/org/baeldung/spring/persistence/config/PersistenceConfig.java b/spring-jpa/src/main/java/org/baeldung/spring/PersistenceConfig.java similarity index 94% rename from spring-jpa/src/main/java/org/baeldung/spring/persistence/config/PersistenceConfig.java rename to spring-jpa/src/main/java/org/baeldung/spring/PersistenceConfig.java index 52ee113e17..300579ff41 100644 --- a/spring-jpa/src/main/java/org/baeldung/spring/persistence/config/PersistenceConfig.java +++ b/spring-jpa/src/main/java/org/baeldung/spring/PersistenceConfig.java @@ -1,4 +1,4 @@ -package org.baeldung.spring.persistence.config; +package org.baeldung.spring; import java.util.Properties; @@ -24,7 +24,7 @@ import com.google.common.base.Preconditions; @Configuration @EnableTransactionManagement @PropertySource({ "classpath:persistence-mysql.properties" }) -@ComponentScan({ "org.baeldung.spring.persistence.dao", "org.baeldung.spring.persistence.service" }) +@ComponentScan({ "org.baeldung.persistence" }) public class PersistenceConfig { @Autowired @@ -38,7 +38,7 @@ public class PersistenceConfig { public LocalContainerEntityManagerFactoryBean entityManagerFactoryBean() { final LocalContainerEntityManagerFactoryBean factoryBean = new LocalContainerEntityManagerFactoryBean(); factoryBean.setDataSource(restDataSource()); - factoryBean.setPackagesToScan(new String[] { "org.baeldung.spring.persistence.model" }); + factoryBean.setPackagesToScan(new String[] { "org.baeldung.persistence.model" }); final JpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter(); factoryBean.setJpaVendorAdapter(vendorAdapter); diff --git a/spring-jpa/src/main/resources/hibernate4Config.xml b/spring-jpa/src/main/resources/hibernate4Config.xml index f35de2a4c5..f85811f8ed 100644 --- a/spring-jpa/src/main/resources/hibernate4Config.xml +++ b/spring-jpa/src/main/resources/hibernate4Config.xml @@ -10,7 +10,7 @@ - + ${hibernate.hbm2ddl.auto} diff --git a/spring-jpa/src/main/webapp/WEB-INF/web.xml b/spring-jpa/src/main/webapp/WEB-INF/web.xml index e0de9aefd4..90f2abc2f6 100644 --- a/spring-jpa/src/main/webapp/WEB-INF/web.xml +++ b/spring-jpa/src/main/webapp/WEB-INF/web.xml @@ -1,17 +1,21 @@ - - Spring MVC Application - - contextClass - + + + Spring JPA Application + + + contextClass + org.springframework.web.context.support.AnnotationConfigWebApplicationContext - - - contextConfigLocation - org.baeldung.spring.persistence.config - - - org.springframework.web.context.ContextLoaderListener - + + + contextConfigLocation + org.baeldung.spring + + + org.springframework.web.context.ContextLoaderListener + + \ No newline at end of file diff --git a/spring-jpa/src/test/java/org/baeldung/spring/persistence/service/FooServicePersistenceIntegrationTest.java b/spring-jpa/src/test/java/org/baeldung/persistence/service/FooServicePersistenceIntegrationTest.java similarity index 90% rename from spring-jpa/src/test/java/org/baeldung/spring/persistence/service/FooServicePersistenceIntegrationTest.java rename to spring-jpa/src/test/java/org/baeldung/persistence/service/FooServicePersistenceIntegrationTest.java index 42dbb45f03..06e6193041 100644 --- a/spring-jpa/src/test/java/org/baeldung/spring/persistence/service/FooServicePersistenceIntegrationTest.java +++ b/spring-jpa/src/test/java/org/baeldung/persistence/service/FooServicePersistenceIntegrationTest.java @@ -1,9 +1,10 @@ -package org.baeldung.spring.persistence.service; +package org.baeldung.persistence.service; import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; -import org.baeldung.spring.persistence.config.PersistenceConfig; -import org.baeldung.spring.persistence.model.Foo; +import org.baeldung.persistence.model.Foo; +import org.baeldung.persistence.service.FooService; +import org.baeldung.spring.PersistenceConfig; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired;