Merge pull request #363 from Spring-Framework-Java-Apps/RENAME_TABLES

Rename tables

Author: thomaswoehlke

.idea/dataSources.local.xml

@@ -19,10 +19,8 @@
     value = {"rowCreatedAt", "rowUpdatedAt"},
     allowGetters = true
 )
-//@ToString
 @Getter
 @Setter
-//@EqualsAndHashCode(callSuper=false)
 public class AuditModel extends Object implements Serializable {
 
     private static final long serialVersionUID = 4399373914714726911L;

src/main/java/org/woehlke/java/simpleworklist/application/framework/AuditModel.java

@@ -6,7 +6,7 @@
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.event.ContextRefreshedEvent;
 import org.springframework.stereotype.Component;
-import org.woehlke.java.simpleworklist.domain.search.SearchService;
+import org.woehlke.java.simpleworklist.domain.db.search.service.SearchService;
 
 
 /**

src/main/java/org/woehlke/java/simpleworklist/application/listener/ApplicationContextRefreshedListener.java

@@ -5,7 +5,7 @@
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.event.ContextStartedEvent;
 import org.springframework.stereotype.Component;
-import org.woehlke.java.simpleworklist.domain.search.SearchService;
+import org.woehlke.java.simpleworklist.domain.db.search.service.SearchService;
 
 import org.springframework.beans.factory.annotation.Autowired;
 

src/main/java/org/woehlke/java/simpleworklist/application/listener/ApplicationContextStartedListener.java

@@ -20,7 +20,7 @@
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
-import org.woehlke.java.simpleworklist.domain.user.access.ApplicationUserDetailsService;
+import org.woehlke.java.simpleworklist.domain.security.access.ApplicationUserDetailsService;
 
 
 @Configuration

src/main/java/org/woehlke/java/simpleworklist/config/WebSecurityConfig.java

@@ -4,33 +4,33 @@
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.SessionAttributes;
-import org.woehlke.java.simpleworklist.domain.session.UserSessionBean;
-import org.woehlke.java.simpleworklist.domain.breadcrumb.BreadcrumbService;
+import org.woehlke.java.simpleworklist.domain.db.data.Project;
+import org.woehlke.java.simpleworklist.domain.db.data.project.ProjectService;
+import org.woehlke.java.simpleworklist.domain.meso.session.UserSessionBean;
+import org.woehlke.java.simpleworklist.domain.meso.breadcrumb.BreadcrumbService;
 import org.woehlke.java.simpleworklist.config.SimpleworklistProperties;
-import org.woehlke.java.simpleworklist.domain.context.Context;
-import org.woehlke.java.simpleworklist.domain.project.Project;
-import org.woehlke.java.simpleworklist.domain.task.Task;
-import org.woehlke.java.simpleworklist.domain.task.TaskService;
-import org.woehlke.java.simpleworklist.domain.taskworkflow.TaskState;
-import org.woehlke.java.simpleworklist.domain.user.account.UserAccount;
-import org.woehlke.java.simpleworklist.domain.task.TaskEnergy;
-import org.woehlke.java.simpleworklist.domain.task.TaskTime;
-import org.woehlke.java.simpleworklist.domain.context.ContextService;
-import org.woehlke.java.simpleworklist.domain.project.ProjectService;
-import org.woehlke.java.simpleworklist.domain.chat.ChatMessageService;
-import org.woehlke.java.simpleworklist.domain.user.account.UserAccountService;
+import org.woehlke.java.simpleworklist.domain.db.data.Context;
+import org.woehlke.java.simpleworklist.domain.db.data.Task;
+import org.woehlke.java.simpleworklist.domain.db.data.task.TaskService;
+import org.woehlke.java.simpleworklist.domain.meso.taskworkflow.TaskState;
+import org.woehlke.java.simpleworklist.domain.db.user.UserAccount;
+import org.woehlke.java.simpleworklist.domain.db.data.task.TaskEnergy;
+import org.woehlke.java.simpleworklist.domain.db.data.task.TaskTime;
+import org.woehlke.java.simpleworklist.domain.db.data.context.ContextService;
+import org.woehlke.java.simpleworklist.domain.db.user.chat.ChatMessageService;
+import org.woehlke.java.simpleworklist.domain.db.user.account.UserAccountService;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.woehlke.java.simpleworklist.domain.user.access.UserAuthorizationService;
-import org.woehlke.java.simpleworklist.domain.user.login.UserAccountLoginSuccessService;
+import org.woehlke.java.simpleworklist.domain.security.access.UserAuthorizationService;
+import org.woehlke.java.simpleworklist.domain.security.login.LoginSuccessService;
 
 import javax.validation.constraints.NotNull;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 
 import static java.util.Locale.GERMAN;
-import static org.woehlke.java.simpleworklist.domain.taskworkflow.TaskState.*;
+import static org.woehlke.java.simpleworklist.domain.meso.taskworkflow.TaskState.*;
 
 /**
  * Created by tw on 14.02.16.
@@ -57,7 +57,7 @@ public abstract class AbstractController {
     protected ChatMessageService chatMessageService;
 
     @Autowired
-    protected UserAccountLoginSuccessService userAccountLoginSuccessService;
+    protected LoginSuccessService loginSuccessService;
 
     @Autowired
     protected ContextService contextService;
@@ -150,7 +150,7 @@ public final boolean refreshMessagePage(){
     }
 
     protected UserAccount getUser() {
-        return this.userAccountLoginSuccessService.retrieveCurrentUser();
+        return this.loginSuccessService.retrieveCurrentUser();
     }
 
     protected Context getContext(@NotNull final UserSessionBean userSession){

src/main/java/org/woehlke/java/simpleworklist/domain/AbstractController.java

@@ -1,4 +1,4 @@
-package org.woehlke.java.simpleworklist.domain;
+package org.woehlke.java.simpleworklist.domain.db;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Controller;
@@ -7,9 +7,10 @@
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.woehlke.java.simpleworklist.domain.context.Context;
-import org.woehlke.java.simpleworklist.domain.context.ContextService;
-import org.woehlke.java.simpleworklist.domain.session.UserSessionBean;
+import org.woehlke.java.simpleworklist.domain.AbstractController;
+import org.woehlke.java.simpleworklist.domain.db.data.Context;
+import org.woehlke.java.simpleworklist.domain.db.data.context.ContextService;
+import org.woehlke.java.simpleworklist.domain.meso.session.UserSessionBean;
 
 import org.springframework.beans.factory.annotation.Autowired;