From c1ecbf57100c5909c6860a41304ea4f992ae7f60 Mon Sep 17 00:00:00 2001 From: Doha2012 Date: Sun, 26 Nov 2017 09:40:54 +0200 Subject: [PATCH] move spring-jpa to persistence-modules (#3134) * move security content from spring-security-rest-full * swagger update * move query language to new module * rename spring-security-rest-full to spring-rest-full * group persistence modules * group testing modules * try fix conflict * cleanup * group and cleanup * add readme to grouping modules * move spring-jpa to persistence-modules --- {spring-jpa => persistence-modules/spring-jpa}/.gitignore | 0 {spring-jpa => persistence-modules/spring-jpa}/README.md | 0 {spring-jpa => persistence-modules/spring-jpa}/pom.xml | 1 + .../main/java/org/baeldung/config/PersistenceJNDIConfig.java | 0 .../src/main/java/org/baeldung/config/PersistenceJPAConfig.java | 0 .../java/org/baeldung/config/PersistenceJPAConfigL2Cache.java | 0 .../main/java/org/baeldung/config/PersistenceJPAConfigXml.java | 0 .../src/main/java/org/baeldung/config/ProductConfig.java | 0 .../src/main/java/org/baeldung/config/SpringWebConfig.java | 0 .../src/main/java/org/baeldung/config/StudentJPAH2Config.java | 0 .../src/main/java/org/baeldung/config/StudentJpaConfig.java | 0 .../src/main/java/org/baeldung/config/UserConfig.java | 0 .../src/main/java/org/baeldung/config/WebInitializer.java | 0 .../src/main/java/org/baeldung/dsrouting/ClientDao.java | 0 .../java/org/baeldung/dsrouting/ClientDataSourceRouter.java | 0 .../src/main/java/org/baeldung/dsrouting/ClientDatabase.java | 0 .../org/baeldung/dsrouting/ClientDatabaseContextHolder.java | 0 .../src/main/java/org/baeldung/dsrouting/ClientService.java | 0 .../baeldung/extended/persistence/dao/ExtendedRepository.java | 0 .../extended/persistence/dao/ExtendedRepositoryImpl.java | 0 .../extended/persistence/dao/ExtendedStudentRepository.java | 0 .../baeldung/inmemory/persistence/dao/StudentRepository.java | 0 .../java/org/baeldung/inmemory/persistence/model/Student.java | 0 .../main/java/org/baeldung/persistence/dao/AbstractJpaDAO.java | 0 .../src/main/java/org/baeldung/persistence/dao/FooDao.java | 0 .../src/main/java/org/baeldung/persistence/dao/IFooDao.java | 0 .../src/main/java/org/baeldung/persistence/model/Bar.java | 0 .../src/main/java/org/baeldung/persistence/model/Foo.java | 0 .../persistence/multiple/dao/product/ProductRepository.java | 0 .../persistence/multiple/dao/user/PossessionRepository.java | 0 .../baeldung/persistence/multiple/dao/user/UserRepository.java | 0 .../baeldung/persistence/multiple/model/product/Product.java | 0 .../baeldung/persistence/multiple/model/user/Possession.java | 0 .../java/org/baeldung/persistence/multiple/model/user/User.java | 0 .../main/java/org/baeldung/persistence/service/FooService.java | 0 .../src/main/java/org/baeldung/sqlfiles/Country.java | 0 .../src/main/java/org/baeldung/web/MainController.java | 0 .../spring-jpa}/src/main/resources/context.xml | 0 .../spring-jpa}/src/main/resources/logback.xml | 0 .../spring-jpa}/src/main/resources/persistence-h2.properties | 0 .../spring-jpa}/src/main/resources/persistence-jndi.properties | 0 .../src/main/resources/persistence-multiple-db.properties | 0 .../spring-jpa}/src/main/resources/persistence-mysql.properties | 0 .../src/main/resources/persistence-student-h2.properties | 0 .../src/main/resources/persistence-student.properties | 0 .../spring-jpa}/src/main/resources/persistence.xml | 0 .../spring-jpa}/src/main/resources/server.xml | 0 .../spring-jpa}/src/main/resources/sqlfiles.properties | 0 .../spring-jpa}/src/main/webapp/WEB-INF/views/jsp/index.jsp | 0 .../spring-jpa}/src/test/java/META-INF/persistence.xml | 0 .../baeldung/dsrouting/DataSourceRoutingIntegrationTest.java | 0 .../baeldung/dsrouting/DataSourceRoutingTestConfiguration.java | 0 .../deletion/config/PersistenceJPAConfigDeletion.java | 0 .../test/java/org/baeldung/persistence/deletion/model/Bar.java | 0 .../test/java/org/baeldung/persistence/deletion/model/Baz.java | 0 .../test/java/org/baeldung/persistence/deletion/model/Foo.java | 0 .../repository/ExtendedStudentRepositoryIntegrationTest.java | 0 .../persistence/repository/InMemoryDBIntegrationTest.java | 0 .../baeldung/persistence/service/DeletionIntegrationTest.java | 0 .../service/FooPaginationPersistenceIntegrationTest.java | 0 .../service/FooServicePersistenceIntegrationTest.java | 0 .../persistence/service/FooServiceSortingIntegrationTest.java | 0 .../service/FooServiceSortingWitNullsManualIntegrationTest.java | 0 .../persistence/service/JpaMultipleDBIntegrationTest.java | 0 .../org/baeldung/persistence/service/PersistenceTestSuite.java | 0 .../persistence/service/SecondLevelCacheIntegrationTest.java | 0 .../spring-jpa}/src/test/resources/.gitignore | 0 .../spring-jpa}/src/test/resources/dsrouting-db.sql | 0 .../src/test/resources/persistence-student.properties | 0 pom.xml | 2 +- 70 files changed, 2 insertions(+), 1 deletion(-) rename {spring-jpa => persistence-modules/spring-jpa}/.gitignore (100%) rename {spring-jpa => persistence-modules/spring-jpa}/README.md (100%) rename {spring-jpa => persistence-modules/spring-jpa}/pom.xml (99%) rename {spring-jpa => persistence-modules/spring-jpa}/src/main/java/org/baeldung/config/PersistenceJNDIConfig.java (100%) rename {spring-jpa => persistence-modules/spring-jpa}/src/main/java/org/baeldung/config/PersistenceJPAConfig.java (100%) rename {spring-jpa => persistence-modules/spring-jpa}/src/main/java/org/baeldung/config/PersistenceJPAConfigL2Cache.java (100%) rename {spring-jpa => persistence-modules/spring-jpa}/src/main/java/org/baeldung/config/PersistenceJPAConfigXml.java (100%) rename {spring-jpa => persistence-modules/spring-jpa}/src/main/java/org/baeldung/config/ProductConfig.java (100%) rename {spring-jpa => persistence-modules/spring-jpa}/src/main/java/org/baeldung/config/SpringWebConfig.java (100%) rename {spring-jpa => persistence-modules/spring-jpa}/src/main/java/org/baeldung/config/StudentJPAH2Config.java (100%) rename {spring-jpa => persistence-modules/spring-jpa}/src/main/java/org/baeldung/config/StudentJpaConfig.java (100%) rename {spring-jpa => persistence-modules/spring-jpa}/src/main/java/org/baeldung/config/UserConfig.java (100%) rename {spring-jpa => persistence-modules/spring-jpa}/src/main/java/org/baeldung/config/WebInitializer.java (100%) rename {spring-jpa => persistence-modules/spring-jpa}/src/main/java/org/baeldung/dsrouting/ClientDao.java (100%) rename {spring-jpa => persistence-modules/spring-jpa}/src/main/java/org/baeldung/dsrouting/ClientDataSourceRouter.java (100%) rename {spring-jpa => persistence-modules/spring-jpa}/src/main/java/org/baeldung/dsrouting/ClientDatabase.java (100%) rename {spring-jpa => persistence-modules/spring-jpa}/src/main/java/org/baeldung/dsrouting/ClientDatabaseContextHolder.java (100%) rename {spring-jpa => persistence-modules/spring-jpa}/src/main/java/org/baeldung/dsrouting/ClientService.java (100%) rename {spring-jpa => persistence-modules/spring-jpa}/src/main/java/org/baeldung/extended/persistence/dao/ExtendedRepository.java (100%) rename {spring-jpa => persistence-modules/spring-jpa}/src/main/java/org/baeldung/extended/persistence/dao/ExtendedRepositoryImpl.java (100%) rename {spring-jpa => persistence-modules/spring-jpa}/src/main/java/org/baeldung/extended/persistence/dao/ExtendedStudentRepository.java (100%) rename {spring-jpa => persistence-modules/spring-jpa}/src/main/java/org/baeldung/inmemory/persistence/dao/StudentRepository.java (100%) rename {spring-jpa => persistence-modules/spring-jpa}/src/main/java/org/baeldung/inmemory/persistence/model/Student.java (100%) rename {spring-jpa => persistence-modules/spring-jpa}/src/main/java/org/baeldung/persistence/dao/AbstractJpaDAO.java (100%) rename {spring-jpa => persistence-modules/spring-jpa}/src/main/java/org/baeldung/persistence/dao/FooDao.java (100%) rename {spring-jpa => persistence-modules/spring-jpa}/src/main/java/org/baeldung/persistence/dao/IFooDao.java (100%) rename {spring-jpa => persistence-modules/spring-jpa}/src/main/java/org/baeldung/persistence/model/Bar.java (100%) rename {spring-jpa => persistence-modules/spring-jpa}/src/main/java/org/baeldung/persistence/model/Foo.java (100%) rename {spring-jpa => persistence-modules/spring-jpa}/src/main/java/org/baeldung/persistence/multiple/dao/product/ProductRepository.java (100%) rename {spring-jpa => persistence-modules/spring-jpa}/src/main/java/org/baeldung/persistence/multiple/dao/user/PossessionRepository.java (100%) rename {spring-jpa => persistence-modules/spring-jpa}/src/main/java/org/baeldung/persistence/multiple/dao/user/UserRepository.java (100%) rename {spring-jpa => persistence-modules/spring-jpa}/src/main/java/org/baeldung/persistence/multiple/model/product/Product.java (100%) rename {spring-jpa => persistence-modules/spring-jpa}/src/main/java/org/baeldung/persistence/multiple/model/user/Possession.java (100%) rename {spring-jpa => persistence-modules/spring-jpa}/src/main/java/org/baeldung/persistence/multiple/model/user/User.java (100%) rename {spring-jpa => persistence-modules/spring-jpa}/src/main/java/org/baeldung/persistence/service/FooService.java (100%) rename {spring-jpa => persistence-modules/spring-jpa}/src/main/java/org/baeldung/sqlfiles/Country.java (100%) rename {spring-jpa => persistence-modules/spring-jpa}/src/main/java/org/baeldung/web/MainController.java (100%) rename {spring-jpa => persistence-modules/spring-jpa}/src/main/resources/context.xml (100%) rename {spring-jpa => persistence-modules/spring-jpa}/src/main/resources/logback.xml (100%) rename {spring-jpa => persistence-modules/spring-jpa}/src/main/resources/persistence-h2.properties (100%) rename {spring-jpa => persistence-modules/spring-jpa}/src/main/resources/persistence-jndi.properties (100%) rename {spring-jpa => persistence-modules/spring-jpa}/src/main/resources/persistence-multiple-db.properties (100%) rename {spring-jpa => persistence-modules/spring-jpa}/src/main/resources/persistence-mysql.properties (100%) rename {spring-jpa => persistence-modules/spring-jpa}/src/main/resources/persistence-student-h2.properties (100%) rename {spring-jpa => persistence-modules/spring-jpa}/src/main/resources/persistence-student.properties (100%) rename {spring-jpa => persistence-modules/spring-jpa}/src/main/resources/persistence.xml (100%) rename {spring-jpa => persistence-modules/spring-jpa}/src/main/resources/server.xml (100%) rename {spring-jpa => persistence-modules/spring-jpa}/src/main/resources/sqlfiles.properties (100%) rename {spring-jpa => persistence-modules/spring-jpa}/src/main/webapp/WEB-INF/views/jsp/index.jsp (100%) rename {spring-jpa => persistence-modules/spring-jpa}/src/test/java/META-INF/persistence.xml (100%) rename {spring-jpa => persistence-modules/spring-jpa}/src/test/java/org/baeldung/dsrouting/DataSourceRoutingIntegrationTest.java (100%) rename {spring-jpa => persistence-modules/spring-jpa}/src/test/java/org/baeldung/dsrouting/DataSourceRoutingTestConfiguration.java (100%) rename {spring-jpa => persistence-modules/spring-jpa}/src/test/java/org/baeldung/persistence/deletion/config/PersistenceJPAConfigDeletion.java (100%) rename {spring-jpa => persistence-modules/spring-jpa}/src/test/java/org/baeldung/persistence/deletion/model/Bar.java (100%) rename {spring-jpa => persistence-modules/spring-jpa}/src/test/java/org/baeldung/persistence/deletion/model/Baz.java (100%) rename {spring-jpa => persistence-modules/spring-jpa}/src/test/java/org/baeldung/persistence/deletion/model/Foo.java (100%) rename {spring-jpa => persistence-modules/spring-jpa}/src/test/java/org/baeldung/persistence/repository/ExtendedStudentRepositoryIntegrationTest.java (100%) rename {spring-jpa => persistence-modules/spring-jpa}/src/test/java/org/baeldung/persistence/repository/InMemoryDBIntegrationTest.java (100%) rename {spring-jpa => persistence-modules/spring-jpa}/src/test/java/org/baeldung/persistence/service/DeletionIntegrationTest.java (100%) rename {spring-jpa => persistence-modules/spring-jpa}/src/test/java/org/baeldung/persistence/service/FooPaginationPersistenceIntegrationTest.java (100%) rename {spring-jpa => persistence-modules/spring-jpa}/src/test/java/org/baeldung/persistence/service/FooServicePersistenceIntegrationTest.java (100%) rename {spring-jpa => persistence-modules/spring-jpa}/src/test/java/org/baeldung/persistence/service/FooServiceSortingIntegrationTest.java (100%) rename {spring-jpa => persistence-modules/spring-jpa}/src/test/java/org/baeldung/persistence/service/FooServiceSortingWitNullsManualIntegrationTest.java (100%) rename {spring-jpa => persistence-modules/spring-jpa}/src/test/java/org/baeldung/persistence/service/JpaMultipleDBIntegrationTest.java (100%) rename {spring-jpa => persistence-modules/spring-jpa}/src/test/java/org/baeldung/persistence/service/PersistenceTestSuite.java (100%) rename {spring-jpa => persistence-modules/spring-jpa}/src/test/java/org/baeldung/persistence/service/SecondLevelCacheIntegrationTest.java (100%) rename {spring-jpa => persistence-modules/spring-jpa}/src/test/resources/.gitignore (100%) rename {spring-jpa => persistence-modules/spring-jpa}/src/test/resources/dsrouting-db.sql (100%) rename {spring-jpa => persistence-modules/spring-jpa}/src/test/resources/persistence-student.properties (100%) diff --git a/spring-jpa/.gitignore b/persistence-modules/spring-jpa/.gitignore similarity index 100% rename from spring-jpa/.gitignore rename to persistence-modules/spring-jpa/.gitignore diff --git a/spring-jpa/README.md b/persistence-modules/spring-jpa/README.md similarity index 100% rename from spring-jpa/README.md rename to persistence-modules/spring-jpa/README.md diff --git a/spring-jpa/pom.xml b/persistence-modules/spring-jpa/pom.xml similarity index 99% rename from spring-jpa/pom.xml rename to persistence-modules/spring-jpa/pom.xml index 960dcbc588..04c64fafc3 100644 --- a/spring-jpa/pom.xml +++ b/persistence-modules/spring-jpa/pom.xml @@ -13,6 +13,7 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT + ../ diff --git a/spring-jpa/src/main/java/org/baeldung/config/PersistenceJNDIConfig.java b/persistence-modules/spring-jpa/src/main/java/org/baeldung/config/PersistenceJNDIConfig.java similarity index 100% rename from spring-jpa/src/main/java/org/baeldung/config/PersistenceJNDIConfig.java rename to persistence-modules/spring-jpa/src/main/java/org/baeldung/config/PersistenceJNDIConfig.java diff --git a/spring-jpa/src/main/java/org/baeldung/config/PersistenceJPAConfig.java b/persistence-modules/spring-jpa/src/main/java/org/baeldung/config/PersistenceJPAConfig.java similarity index 100% rename from spring-jpa/src/main/java/org/baeldung/config/PersistenceJPAConfig.java rename to persistence-modules/spring-jpa/src/main/java/org/baeldung/config/PersistenceJPAConfig.java diff --git a/spring-jpa/src/main/java/org/baeldung/config/PersistenceJPAConfigL2Cache.java b/persistence-modules/spring-jpa/src/main/java/org/baeldung/config/PersistenceJPAConfigL2Cache.java similarity index 100% rename from spring-jpa/src/main/java/org/baeldung/config/PersistenceJPAConfigL2Cache.java rename to persistence-modules/spring-jpa/src/main/java/org/baeldung/config/PersistenceJPAConfigL2Cache.java diff --git a/spring-jpa/src/main/java/org/baeldung/config/PersistenceJPAConfigXml.java b/persistence-modules/spring-jpa/src/main/java/org/baeldung/config/PersistenceJPAConfigXml.java similarity index 100% rename from spring-jpa/src/main/java/org/baeldung/config/PersistenceJPAConfigXml.java rename to persistence-modules/spring-jpa/src/main/java/org/baeldung/config/PersistenceJPAConfigXml.java diff --git a/spring-jpa/src/main/java/org/baeldung/config/ProductConfig.java b/persistence-modules/spring-jpa/src/main/java/org/baeldung/config/ProductConfig.java similarity index 100% rename from spring-jpa/src/main/java/org/baeldung/config/ProductConfig.java rename to persistence-modules/spring-jpa/src/main/java/org/baeldung/config/ProductConfig.java diff --git a/spring-jpa/src/main/java/org/baeldung/config/SpringWebConfig.java b/persistence-modules/spring-jpa/src/main/java/org/baeldung/config/SpringWebConfig.java similarity index 100% rename from spring-jpa/src/main/java/org/baeldung/config/SpringWebConfig.java rename to persistence-modules/spring-jpa/src/main/java/org/baeldung/config/SpringWebConfig.java diff --git a/spring-jpa/src/main/java/org/baeldung/config/StudentJPAH2Config.java b/persistence-modules/spring-jpa/src/main/java/org/baeldung/config/StudentJPAH2Config.java similarity index 100% rename from spring-jpa/src/main/java/org/baeldung/config/StudentJPAH2Config.java rename to persistence-modules/spring-jpa/src/main/java/org/baeldung/config/StudentJPAH2Config.java diff --git a/spring-jpa/src/main/java/org/baeldung/config/StudentJpaConfig.java b/persistence-modules/spring-jpa/src/main/java/org/baeldung/config/StudentJpaConfig.java similarity index 100% rename from spring-jpa/src/main/java/org/baeldung/config/StudentJpaConfig.java rename to persistence-modules/spring-jpa/src/main/java/org/baeldung/config/StudentJpaConfig.java diff --git a/spring-jpa/src/main/java/org/baeldung/config/UserConfig.java b/persistence-modules/spring-jpa/src/main/java/org/baeldung/config/UserConfig.java similarity index 100% rename from spring-jpa/src/main/java/org/baeldung/config/UserConfig.java rename to persistence-modules/spring-jpa/src/main/java/org/baeldung/config/UserConfig.java diff --git a/spring-jpa/src/main/java/org/baeldung/config/WebInitializer.java b/persistence-modules/spring-jpa/src/main/java/org/baeldung/config/WebInitializer.java similarity index 100% rename from spring-jpa/src/main/java/org/baeldung/config/WebInitializer.java rename to persistence-modules/spring-jpa/src/main/java/org/baeldung/config/WebInitializer.java diff --git a/spring-jpa/src/main/java/org/baeldung/dsrouting/ClientDao.java b/persistence-modules/spring-jpa/src/main/java/org/baeldung/dsrouting/ClientDao.java similarity index 100% rename from spring-jpa/src/main/java/org/baeldung/dsrouting/ClientDao.java rename to persistence-modules/spring-jpa/src/main/java/org/baeldung/dsrouting/ClientDao.java diff --git a/spring-jpa/src/main/java/org/baeldung/dsrouting/ClientDataSourceRouter.java b/persistence-modules/spring-jpa/src/main/java/org/baeldung/dsrouting/ClientDataSourceRouter.java similarity index 100% rename from spring-jpa/src/main/java/org/baeldung/dsrouting/ClientDataSourceRouter.java rename to persistence-modules/spring-jpa/src/main/java/org/baeldung/dsrouting/ClientDataSourceRouter.java diff --git a/spring-jpa/src/main/java/org/baeldung/dsrouting/ClientDatabase.java b/persistence-modules/spring-jpa/src/main/java/org/baeldung/dsrouting/ClientDatabase.java similarity index 100% rename from spring-jpa/src/main/java/org/baeldung/dsrouting/ClientDatabase.java rename to persistence-modules/spring-jpa/src/main/java/org/baeldung/dsrouting/ClientDatabase.java diff --git a/spring-jpa/src/main/java/org/baeldung/dsrouting/ClientDatabaseContextHolder.java b/persistence-modules/spring-jpa/src/main/java/org/baeldung/dsrouting/ClientDatabaseContextHolder.java similarity index 100% rename from spring-jpa/src/main/java/org/baeldung/dsrouting/ClientDatabaseContextHolder.java rename to persistence-modules/spring-jpa/src/main/java/org/baeldung/dsrouting/ClientDatabaseContextHolder.java diff --git a/spring-jpa/src/main/java/org/baeldung/dsrouting/ClientService.java b/persistence-modules/spring-jpa/src/main/java/org/baeldung/dsrouting/ClientService.java similarity index 100% rename from spring-jpa/src/main/java/org/baeldung/dsrouting/ClientService.java rename to persistence-modules/spring-jpa/src/main/java/org/baeldung/dsrouting/ClientService.java diff --git a/spring-jpa/src/main/java/org/baeldung/extended/persistence/dao/ExtendedRepository.java b/persistence-modules/spring-jpa/src/main/java/org/baeldung/extended/persistence/dao/ExtendedRepository.java similarity index 100% rename from spring-jpa/src/main/java/org/baeldung/extended/persistence/dao/ExtendedRepository.java rename to persistence-modules/spring-jpa/src/main/java/org/baeldung/extended/persistence/dao/ExtendedRepository.java diff --git a/spring-jpa/src/main/java/org/baeldung/extended/persistence/dao/ExtendedRepositoryImpl.java b/persistence-modules/spring-jpa/src/main/java/org/baeldung/extended/persistence/dao/ExtendedRepositoryImpl.java similarity index 100% rename from spring-jpa/src/main/java/org/baeldung/extended/persistence/dao/ExtendedRepositoryImpl.java rename to persistence-modules/spring-jpa/src/main/java/org/baeldung/extended/persistence/dao/ExtendedRepositoryImpl.java diff --git a/spring-jpa/src/main/java/org/baeldung/extended/persistence/dao/ExtendedStudentRepository.java b/persistence-modules/spring-jpa/src/main/java/org/baeldung/extended/persistence/dao/ExtendedStudentRepository.java similarity index 100% rename from spring-jpa/src/main/java/org/baeldung/extended/persistence/dao/ExtendedStudentRepository.java rename to persistence-modules/spring-jpa/src/main/java/org/baeldung/extended/persistence/dao/ExtendedStudentRepository.java diff --git a/spring-jpa/src/main/java/org/baeldung/inmemory/persistence/dao/StudentRepository.java b/persistence-modules/spring-jpa/src/main/java/org/baeldung/inmemory/persistence/dao/StudentRepository.java similarity index 100% rename from spring-jpa/src/main/java/org/baeldung/inmemory/persistence/dao/StudentRepository.java rename to persistence-modules/spring-jpa/src/main/java/org/baeldung/inmemory/persistence/dao/StudentRepository.java diff --git a/spring-jpa/src/main/java/org/baeldung/inmemory/persistence/model/Student.java b/persistence-modules/spring-jpa/src/main/java/org/baeldung/inmemory/persistence/model/Student.java similarity index 100% rename from spring-jpa/src/main/java/org/baeldung/inmemory/persistence/model/Student.java rename to persistence-modules/spring-jpa/src/main/java/org/baeldung/inmemory/persistence/model/Student.java diff --git a/spring-jpa/src/main/java/org/baeldung/persistence/dao/AbstractJpaDAO.java b/persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/dao/AbstractJpaDAO.java similarity index 100% rename from spring-jpa/src/main/java/org/baeldung/persistence/dao/AbstractJpaDAO.java rename to persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/dao/AbstractJpaDAO.java diff --git a/spring-jpa/src/main/java/org/baeldung/persistence/dao/FooDao.java b/persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/dao/FooDao.java similarity index 100% rename from spring-jpa/src/main/java/org/baeldung/persistence/dao/FooDao.java rename to persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/dao/FooDao.java diff --git a/spring-jpa/src/main/java/org/baeldung/persistence/dao/IFooDao.java b/persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/dao/IFooDao.java similarity index 100% rename from spring-jpa/src/main/java/org/baeldung/persistence/dao/IFooDao.java rename to persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/dao/IFooDao.java diff --git a/spring-jpa/src/main/java/org/baeldung/persistence/model/Bar.java b/persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/model/Bar.java similarity index 100% rename from spring-jpa/src/main/java/org/baeldung/persistence/model/Bar.java rename to persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/model/Bar.java diff --git a/spring-jpa/src/main/java/org/baeldung/persistence/model/Foo.java b/persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/model/Foo.java similarity index 100% rename from spring-jpa/src/main/java/org/baeldung/persistence/model/Foo.java rename to persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/model/Foo.java diff --git a/spring-jpa/src/main/java/org/baeldung/persistence/multiple/dao/product/ProductRepository.java b/persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/multiple/dao/product/ProductRepository.java similarity index 100% rename from spring-jpa/src/main/java/org/baeldung/persistence/multiple/dao/product/ProductRepository.java rename to persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/multiple/dao/product/ProductRepository.java diff --git a/spring-jpa/src/main/java/org/baeldung/persistence/multiple/dao/user/PossessionRepository.java b/persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/multiple/dao/user/PossessionRepository.java similarity index 100% rename from spring-jpa/src/main/java/org/baeldung/persistence/multiple/dao/user/PossessionRepository.java rename to persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/multiple/dao/user/PossessionRepository.java diff --git a/spring-jpa/src/main/java/org/baeldung/persistence/multiple/dao/user/UserRepository.java b/persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/multiple/dao/user/UserRepository.java similarity index 100% rename from spring-jpa/src/main/java/org/baeldung/persistence/multiple/dao/user/UserRepository.java rename to persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/multiple/dao/user/UserRepository.java diff --git a/spring-jpa/src/main/java/org/baeldung/persistence/multiple/model/product/Product.java b/persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/multiple/model/product/Product.java similarity index 100% rename from spring-jpa/src/main/java/org/baeldung/persistence/multiple/model/product/Product.java rename to persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/multiple/model/product/Product.java diff --git a/spring-jpa/src/main/java/org/baeldung/persistence/multiple/model/user/Possession.java b/persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/multiple/model/user/Possession.java similarity index 100% rename from spring-jpa/src/main/java/org/baeldung/persistence/multiple/model/user/Possession.java rename to persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/multiple/model/user/Possession.java diff --git a/spring-jpa/src/main/java/org/baeldung/persistence/multiple/model/user/User.java b/persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/multiple/model/user/User.java similarity index 100% rename from spring-jpa/src/main/java/org/baeldung/persistence/multiple/model/user/User.java rename to persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/multiple/model/user/User.java diff --git a/spring-jpa/src/main/java/org/baeldung/persistence/service/FooService.java b/persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/service/FooService.java similarity index 100% rename from spring-jpa/src/main/java/org/baeldung/persistence/service/FooService.java rename to persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/service/FooService.java diff --git a/spring-jpa/src/main/java/org/baeldung/sqlfiles/Country.java b/persistence-modules/spring-jpa/src/main/java/org/baeldung/sqlfiles/Country.java similarity index 100% rename from spring-jpa/src/main/java/org/baeldung/sqlfiles/Country.java rename to persistence-modules/spring-jpa/src/main/java/org/baeldung/sqlfiles/Country.java diff --git a/spring-jpa/src/main/java/org/baeldung/web/MainController.java b/persistence-modules/spring-jpa/src/main/java/org/baeldung/web/MainController.java similarity index 100% rename from spring-jpa/src/main/java/org/baeldung/web/MainController.java rename to persistence-modules/spring-jpa/src/main/java/org/baeldung/web/MainController.java diff --git a/spring-jpa/src/main/resources/context.xml b/persistence-modules/spring-jpa/src/main/resources/context.xml similarity index 100% rename from spring-jpa/src/main/resources/context.xml rename to persistence-modules/spring-jpa/src/main/resources/context.xml diff --git a/spring-jpa/src/main/resources/logback.xml b/persistence-modules/spring-jpa/src/main/resources/logback.xml similarity index 100% rename from spring-jpa/src/main/resources/logback.xml rename to persistence-modules/spring-jpa/src/main/resources/logback.xml diff --git a/spring-jpa/src/main/resources/persistence-h2.properties b/persistence-modules/spring-jpa/src/main/resources/persistence-h2.properties similarity index 100% rename from spring-jpa/src/main/resources/persistence-h2.properties rename to persistence-modules/spring-jpa/src/main/resources/persistence-h2.properties diff --git a/spring-jpa/src/main/resources/persistence-jndi.properties b/persistence-modules/spring-jpa/src/main/resources/persistence-jndi.properties similarity index 100% rename from spring-jpa/src/main/resources/persistence-jndi.properties rename to persistence-modules/spring-jpa/src/main/resources/persistence-jndi.properties diff --git a/spring-jpa/src/main/resources/persistence-multiple-db.properties b/persistence-modules/spring-jpa/src/main/resources/persistence-multiple-db.properties similarity index 100% rename from spring-jpa/src/main/resources/persistence-multiple-db.properties rename to persistence-modules/spring-jpa/src/main/resources/persistence-multiple-db.properties diff --git a/spring-jpa/src/main/resources/persistence-mysql.properties b/persistence-modules/spring-jpa/src/main/resources/persistence-mysql.properties similarity index 100% rename from spring-jpa/src/main/resources/persistence-mysql.properties rename to persistence-modules/spring-jpa/src/main/resources/persistence-mysql.properties diff --git a/spring-jpa/src/main/resources/persistence-student-h2.properties b/persistence-modules/spring-jpa/src/main/resources/persistence-student-h2.properties similarity index 100% rename from spring-jpa/src/main/resources/persistence-student-h2.properties rename to persistence-modules/spring-jpa/src/main/resources/persistence-student-h2.properties diff --git a/spring-jpa/src/main/resources/persistence-student.properties b/persistence-modules/spring-jpa/src/main/resources/persistence-student.properties similarity index 100% rename from spring-jpa/src/main/resources/persistence-student.properties rename to persistence-modules/spring-jpa/src/main/resources/persistence-student.properties diff --git a/spring-jpa/src/main/resources/persistence.xml b/persistence-modules/spring-jpa/src/main/resources/persistence.xml similarity index 100% rename from spring-jpa/src/main/resources/persistence.xml rename to persistence-modules/spring-jpa/src/main/resources/persistence.xml diff --git a/spring-jpa/src/main/resources/server.xml b/persistence-modules/spring-jpa/src/main/resources/server.xml similarity index 100% rename from spring-jpa/src/main/resources/server.xml rename to persistence-modules/spring-jpa/src/main/resources/server.xml diff --git a/spring-jpa/src/main/resources/sqlfiles.properties b/persistence-modules/spring-jpa/src/main/resources/sqlfiles.properties similarity index 100% rename from spring-jpa/src/main/resources/sqlfiles.properties rename to persistence-modules/spring-jpa/src/main/resources/sqlfiles.properties diff --git a/spring-jpa/src/main/webapp/WEB-INF/views/jsp/index.jsp b/persistence-modules/spring-jpa/src/main/webapp/WEB-INF/views/jsp/index.jsp similarity index 100% rename from spring-jpa/src/main/webapp/WEB-INF/views/jsp/index.jsp rename to persistence-modules/spring-jpa/src/main/webapp/WEB-INF/views/jsp/index.jsp diff --git a/spring-jpa/src/test/java/META-INF/persistence.xml b/persistence-modules/spring-jpa/src/test/java/META-INF/persistence.xml similarity index 100% rename from spring-jpa/src/test/java/META-INF/persistence.xml rename to persistence-modules/spring-jpa/src/test/java/META-INF/persistence.xml diff --git a/spring-jpa/src/test/java/org/baeldung/dsrouting/DataSourceRoutingIntegrationTest.java b/persistence-modules/spring-jpa/src/test/java/org/baeldung/dsrouting/DataSourceRoutingIntegrationTest.java similarity index 100% rename from spring-jpa/src/test/java/org/baeldung/dsrouting/DataSourceRoutingIntegrationTest.java rename to persistence-modules/spring-jpa/src/test/java/org/baeldung/dsrouting/DataSourceRoutingIntegrationTest.java diff --git a/spring-jpa/src/test/java/org/baeldung/dsrouting/DataSourceRoutingTestConfiguration.java b/persistence-modules/spring-jpa/src/test/java/org/baeldung/dsrouting/DataSourceRoutingTestConfiguration.java similarity index 100% rename from spring-jpa/src/test/java/org/baeldung/dsrouting/DataSourceRoutingTestConfiguration.java rename to persistence-modules/spring-jpa/src/test/java/org/baeldung/dsrouting/DataSourceRoutingTestConfiguration.java diff --git a/spring-jpa/src/test/java/org/baeldung/persistence/deletion/config/PersistenceJPAConfigDeletion.java b/persistence-modules/spring-jpa/src/test/java/org/baeldung/persistence/deletion/config/PersistenceJPAConfigDeletion.java similarity index 100% rename from spring-jpa/src/test/java/org/baeldung/persistence/deletion/config/PersistenceJPAConfigDeletion.java rename to persistence-modules/spring-jpa/src/test/java/org/baeldung/persistence/deletion/config/PersistenceJPAConfigDeletion.java diff --git a/spring-jpa/src/test/java/org/baeldung/persistence/deletion/model/Bar.java b/persistence-modules/spring-jpa/src/test/java/org/baeldung/persistence/deletion/model/Bar.java similarity index 100% rename from spring-jpa/src/test/java/org/baeldung/persistence/deletion/model/Bar.java rename to persistence-modules/spring-jpa/src/test/java/org/baeldung/persistence/deletion/model/Bar.java diff --git a/spring-jpa/src/test/java/org/baeldung/persistence/deletion/model/Baz.java b/persistence-modules/spring-jpa/src/test/java/org/baeldung/persistence/deletion/model/Baz.java similarity index 100% rename from spring-jpa/src/test/java/org/baeldung/persistence/deletion/model/Baz.java rename to persistence-modules/spring-jpa/src/test/java/org/baeldung/persistence/deletion/model/Baz.java diff --git a/spring-jpa/src/test/java/org/baeldung/persistence/deletion/model/Foo.java b/persistence-modules/spring-jpa/src/test/java/org/baeldung/persistence/deletion/model/Foo.java similarity index 100% rename from spring-jpa/src/test/java/org/baeldung/persistence/deletion/model/Foo.java rename to persistence-modules/spring-jpa/src/test/java/org/baeldung/persistence/deletion/model/Foo.java diff --git a/spring-jpa/src/test/java/org/baeldung/persistence/repository/ExtendedStudentRepositoryIntegrationTest.java b/persistence-modules/spring-jpa/src/test/java/org/baeldung/persistence/repository/ExtendedStudentRepositoryIntegrationTest.java similarity index 100% rename from spring-jpa/src/test/java/org/baeldung/persistence/repository/ExtendedStudentRepositoryIntegrationTest.java rename to persistence-modules/spring-jpa/src/test/java/org/baeldung/persistence/repository/ExtendedStudentRepositoryIntegrationTest.java diff --git a/spring-jpa/src/test/java/org/baeldung/persistence/repository/InMemoryDBIntegrationTest.java b/persistence-modules/spring-jpa/src/test/java/org/baeldung/persistence/repository/InMemoryDBIntegrationTest.java similarity index 100% rename from spring-jpa/src/test/java/org/baeldung/persistence/repository/InMemoryDBIntegrationTest.java rename to persistence-modules/spring-jpa/src/test/java/org/baeldung/persistence/repository/InMemoryDBIntegrationTest.java diff --git a/spring-jpa/src/test/java/org/baeldung/persistence/service/DeletionIntegrationTest.java b/persistence-modules/spring-jpa/src/test/java/org/baeldung/persistence/service/DeletionIntegrationTest.java similarity index 100% rename from spring-jpa/src/test/java/org/baeldung/persistence/service/DeletionIntegrationTest.java rename to persistence-modules/spring-jpa/src/test/java/org/baeldung/persistence/service/DeletionIntegrationTest.java diff --git a/spring-jpa/src/test/java/org/baeldung/persistence/service/FooPaginationPersistenceIntegrationTest.java b/persistence-modules/spring-jpa/src/test/java/org/baeldung/persistence/service/FooPaginationPersistenceIntegrationTest.java similarity index 100% rename from spring-jpa/src/test/java/org/baeldung/persistence/service/FooPaginationPersistenceIntegrationTest.java rename to persistence-modules/spring-jpa/src/test/java/org/baeldung/persistence/service/FooPaginationPersistenceIntegrationTest.java diff --git a/spring-jpa/src/test/java/org/baeldung/persistence/service/FooServicePersistenceIntegrationTest.java b/persistence-modules/spring-jpa/src/test/java/org/baeldung/persistence/service/FooServicePersistenceIntegrationTest.java similarity index 100% rename from spring-jpa/src/test/java/org/baeldung/persistence/service/FooServicePersistenceIntegrationTest.java rename to persistence-modules/spring-jpa/src/test/java/org/baeldung/persistence/service/FooServicePersistenceIntegrationTest.java diff --git a/spring-jpa/src/test/java/org/baeldung/persistence/service/FooServiceSortingIntegrationTest.java b/persistence-modules/spring-jpa/src/test/java/org/baeldung/persistence/service/FooServiceSortingIntegrationTest.java similarity index 100% rename from spring-jpa/src/test/java/org/baeldung/persistence/service/FooServiceSortingIntegrationTest.java rename to persistence-modules/spring-jpa/src/test/java/org/baeldung/persistence/service/FooServiceSortingIntegrationTest.java diff --git a/spring-jpa/src/test/java/org/baeldung/persistence/service/FooServiceSortingWitNullsManualIntegrationTest.java b/persistence-modules/spring-jpa/src/test/java/org/baeldung/persistence/service/FooServiceSortingWitNullsManualIntegrationTest.java similarity index 100% rename from spring-jpa/src/test/java/org/baeldung/persistence/service/FooServiceSortingWitNullsManualIntegrationTest.java rename to persistence-modules/spring-jpa/src/test/java/org/baeldung/persistence/service/FooServiceSortingWitNullsManualIntegrationTest.java diff --git a/spring-jpa/src/test/java/org/baeldung/persistence/service/JpaMultipleDBIntegrationTest.java b/persistence-modules/spring-jpa/src/test/java/org/baeldung/persistence/service/JpaMultipleDBIntegrationTest.java similarity index 100% rename from spring-jpa/src/test/java/org/baeldung/persistence/service/JpaMultipleDBIntegrationTest.java rename to persistence-modules/spring-jpa/src/test/java/org/baeldung/persistence/service/JpaMultipleDBIntegrationTest.java diff --git a/spring-jpa/src/test/java/org/baeldung/persistence/service/PersistenceTestSuite.java b/persistence-modules/spring-jpa/src/test/java/org/baeldung/persistence/service/PersistenceTestSuite.java similarity index 100% rename from spring-jpa/src/test/java/org/baeldung/persistence/service/PersistenceTestSuite.java rename to persistence-modules/spring-jpa/src/test/java/org/baeldung/persistence/service/PersistenceTestSuite.java diff --git a/spring-jpa/src/test/java/org/baeldung/persistence/service/SecondLevelCacheIntegrationTest.java b/persistence-modules/spring-jpa/src/test/java/org/baeldung/persistence/service/SecondLevelCacheIntegrationTest.java similarity index 100% rename from spring-jpa/src/test/java/org/baeldung/persistence/service/SecondLevelCacheIntegrationTest.java rename to persistence-modules/spring-jpa/src/test/java/org/baeldung/persistence/service/SecondLevelCacheIntegrationTest.java diff --git a/spring-jpa/src/test/resources/.gitignore b/persistence-modules/spring-jpa/src/test/resources/.gitignore similarity index 100% rename from spring-jpa/src/test/resources/.gitignore rename to persistence-modules/spring-jpa/src/test/resources/.gitignore diff --git a/spring-jpa/src/test/resources/dsrouting-db.sql b/persistence-modules/spring-jpa/src/test/resources/dsrouting-db.sql similarity index 100% rename from spring-jpa/src/test/resources/dsrouting-db.sql rename to persistence-modules/spring-jpa/src/test/resources/dsrouting-db.sql diff --git a/spring-jpa/src/test/resources/persistence-student.properties b/persistence-modules/spring-jpa/src/test/resources/persistence-student.properties similarity index 100% rename from spring-jpa/src/test/resources/persistence-student.properties rename to persistence-modules/spring-jpa/src/test/resources/persistence-student.properties diff --git a/pom.xml b/pom.xml index 20f7c4ffad..9b1f50f05e 100644 --- a/pom.xml +++ b/pom.xml @@ -177,7 +177,7 @@ spring-jmeter-jenkins spring-jms spring-jooq - spring-jpa + persistence-modules/spring-jpa spring-kafka spring-katharsis spring-ldap