From ff3d29a8f30b44c9ff16e4b6e0fba96711412dea Mon Sep 17 00:00:00 2001
From: Loredana Crusoveanu <loredana.crusoveanu@yahoo.com>
Date: Sun, 4 Sep 2016 19:44:26 +0300
Subject: [PATCH] fix conflict with existing tests

---
 .../baeldung/custom/config/PersistenceDerbyJPAConfig.java    | 2 +-
 .../java/org/baeldung/custom/config/SecSecurityConfig.java   | 2 +-
 .../java/org/baeldung/security/MyUserDetailsService.java     | 2 +-
 .../src/main/java/org/baeldung/security/UserController.java  | 2 +-
 .../multiple/dao/user => user/dao}/MyUserDAO.java            | 2 +-
 .../{persistence => user}/service/MyUserService.java         | 4 ++--
 .../src/main/webapp/WEB-INF/mvc-dispatcher-servlet.xml       | 2 +-
 spring-jpa/src/main/webapp/WEB-INF/web.xml                   | 5 +++--
 8 files changed, 11 insertions(+), 10 deletions(-)
 rename spring-jpa/src/main/java/org/baeldung/{persistence/multiple/dao/user => user/dao}/MyUserDAO.java (95%)
 rename spring-jpa/src/main/java/org/baeldung/{persistence => user}/service/MyUserService.java (93%)

diff --git a/spring-jpa/src/main/java/org/baeldung/custom/config/PersistenceDerbyJPAConfig.java b/spring-jpa/src/main/java/org/baeldung/custom/config/PersistenceDerbyJPAConfig.java
index 19bf952e70..812709111d 100644
--- a/spring-jpa/src/main/java/org/baeldung/custom/config/PersistenceDerbyJPAConfig.java
+++ b/spring-jpa/src/main/java/org/baeldung/custom/config/PersistenceDerbyJPAConfig.java
@@ -5,7 +5,7 @@ import java.util.Properties;
 import javax.persistence.EntityManagerFactory;
 import javax.sql.DataSource;
 
-import org.baeldung.persistence.multiple.dao.user.MyUserDAO;
+import org.baeldung.user.dao.MyUserDAO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/spring-jpa/src/main/java/org/baeldung/custom/config/SecSecurityConfig.java b/spring-jpa/src/main/java/org/baeldung/custom/config/SecSecurityConfig.java
index d20674844a..44df02980f 100644
--- a/spring-jpa/src/main/java/org/baeldung/custom/config/SecSecurityConfig.java
+++ b/spring-jpa/src/main/java/org/baeldung/custom/config/SecSecurityConfig.java
@@ -1,7 +1,7 @@
 package org.baeldung.custom.config;
 
-import org.baeldung.persistence.service.MyUserService;
 import org.baeldung.security.MyUserDetailsService;
+import org.baeldung.user.service.MyUserService;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
diff --git a/spring-jpa/src/main/java/org/baeldung/security/MyUserDetailsService.java b/spring-jpa/src/main/java/org/baeldung/security/MyUserDetailsService.java
index 0299d7cdcf..21e3985bac 100644
--- a/spring-jpa/src/main/java/org/baeldung/security/MyUserDetailsService.java
+++ b/spring-jpa/src/main/java/org/baeldung/security/MyUserDetailsService.java
@@ -4,7 +4,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 
 import org.baeldung.persistence.model.MyUser;
-import org.baeldung.persistence.multiple.dao.user.MyUserDAO;
+import org.baeldung.user.dao.MyUserDAO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
diff --git a/spring-jpa/src/main/java/org/baeldung/security/UserController.java b/spring-jpa/src/main/java/org/baeldung/security/UserController.java
index 8664816a32..b1c96e72c0 100644
--- a/spring-jpa/src/main/java/org/baeldung/security/UserController.java
+++ b/spring-jpa/src/main/java/org/baeldung/security/UserController.java
@@ -2,7 +2,7 @@ package org.baeldung.security;
 
 import javax.annotation.Resource;
 
-import org.baeldung.persistence.service.MyUserService;
+import org.baeldung.user.service.MyUserService;
 import org.baeldung.web.MyUserDto;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
diff --git a/spring-jpa/src/main/java/org/baeldung/persistence/multiple/dao/user/MyUserDAO.java b/spring-jpa/src/main/java/org/baeldung/user/dao/MyUserDAO.java
similarity index 95%
rename from spring-jpa/src/main/java/org/baeldung/persistence/multiple/dao/user/MyUserDAO.java
rename to spring-jpa/src/main/java/org/baeldung/user/dao/MyUserDAO.java
index 1de8c61442..5741d19bf2 100644
--- a/spring-jpa/src/main/java/org/baeldung/persistence/multiple/dao/user/MyUserDAO.java
+++ b/spring-jpa/src/main/java/org/baeldung/user/dao/MyUserDAO.java
@@ -1,4 +1,4 @@
-package org.baeldung.persistence.multiple.dao.user;
+package org.baeldung.user.dao;
 
 import java.util.List;
 
diff --git a/spring-jpa/src/main/java/org/baeldung/persistence/service/MyUserService.java b/spring-jpa/src/main/java/org/baeldung/user/service/MyUserService.java
similarity index 93%
rename from spring-jpa/src/main/java/org/baeldung/persistence/service/MyUserService.java
rename to spring-jpa/src/main/java/org/baeldung/user/service/MyUserService.java
index a382e92664..866ac88f29 100644
--- a/spring-jpa/src/main/java/org/baeldung/persistence/service/MyUserService.java
+++ b/spring-jpa/src/main/java/org/baeldung/user/service/MyUserService.java
@@ -1,9 +1,9 @@
-package org.baeldung.persistence.service;
+package org.baeldung.user.service;
 
 import javax.transaction.Transactional;
 
 import org.baeldung.persistence.model.MyUser;
-import org.baeldung.persistence.multiple.dao.user.MyUserDAO;
+import org.baeldung.user.dao.MyUserDAO;
 import org.baeldung.web.MyUserDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.password.PasswordEncoder;
diff --git a/spring-jpa/src/main/webapp/WEB-INF/mvc-dispatcher-servlet.xml b/spring-jpa/src/main/webapp/WEB-INF/mvc-dispatcher-servlet.xml
index 2b33a1384a..47082453b9 100644
--- a/spring-jpa/src/main/webapp/WEB-INF/mvc-dispatcher-servlet.xml
+++ b/spring-jpa/src/main/webapp/WEB-INF/mvc-dispatcher-servlet.xml
@@ -40,7 +40,7 @@
     </bean>
     
    <context:component-scan base-package="org.baeldung.security"></context:component-scan>
-   <context:component-scan base-package="org.baeldung.persistence"></context:component-scan>
+   <context:component-scan base-package="org.baeldung.user"></context:component-scan>
    
    <bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
         <property name="prefix">
diff --git a/spring-jpa/src/main/webapp/WEB-INF/web.xml b/spring-jpa/src/main/webapp/WEB-INF/web.xml
index 2eb6e88c31..b526774179 100644
--- a/spring-jpa/src/main/webapp/WEB-INF/web.xml
+++ b/spring-jpa/src/main/webapp/WEB-INF/web.xml
@@ -6,7 +6,8 @@
 
     <display-name>Spring MVC Application</display-name>
 
-    <!-- Spring root -->
+
+    <!-- 
     <context-param>
         <param-name>contextClass</param-name>
         <param-value>
@@ -21,7 +22,7 @@
     <listener>
         <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
     </listener>
-
+-->
     <!-- Spring child -->
     <servlet>
         <servlet-name>mvc-dispatcher</servlet-name>