refactoring of java classes

Author: thomaswoehlke

.gitignore

@@ -33,7 +33,7 @@ setenv.cmd
 /src/main/java/org/woehlke/simpleworklist/project/x.txt
 /src/main/java/org/woehlke/simpleworklist/task/x.txt
 /src/main/java/org/woehlke/simpleworklist/context/x.txt
-/src/main/java/org/woehlke/simpleworklist/common/error/x.txt
+/src/main/java/org/woehlke/simpleworklist/application/error/x.txt
 /src/main/java/org/woehlke/simpleworklist/searchRequest/x.txt
 
 /simpleworklist.diff

etc/serialversions/serialversions.txt

@@ -1,28 +1,28 @@
 org.woehlke.simpleworklist.common.language.Language:    private static final long serialVersionUID = 0L;
 org.woehlke.simpleworklist.domain.task.TaskEnergy:    private static final long serialVersionUID = 0L;
-org.woehlke.simpleworklist.domain.task.TaskState:    private static final long serialVersionUID = 0L;
+org.woehlke.simpleworklist.domain.task.state.TaskState:    private static final long serialVersionUID = 0L;
 org.woehlke.simpleworklist.domain.task.TaskTime:    private static final long serialVersionUID = 0L;
-org.woehlke.simpleworklist.user.domain.resetpassword.UserPasswordRecoveryStatus:    private static final long serialVersionUID = 0L;
-org.woehlke.simpleworklist.user.domain.register.UserRegistrationStatus:    private static final long serialVersionUID = 0L;
+org.woehlke.simpleworklist.domain.user.resetpassword.UserPasswordRecoveryStatus:    private static final long serialVersionUID = 0L;
+org.woehlke.simpleworklist.domain.user.register.UserRegistrationStatus:    private static final long serialVersionUID = 0L;
 org.woehlke.simpleworklist.user.domain.account.UserRole:    private static final long serialVersionUID = 0L;
-org.woehlke.simpleworklist.common.domain.AuditModel:    private static final long serialVersionUID = 4399373914714726911L;
+org.woehlke.simpleworklist.application.framework.AuditModel:    private static final long serialVersionUID = 4399373914714726911L;
 org.woehlke.simpleworklist.domain.context.Context:    private static final long serialVersionUID = -5035732370606951871L;
 org.woehlke.simpleworklist.domain.project.Project:    private static final long serialVersionUID = 4566653175832872422L;
 org.woehlke.simpleworklist.domain.task.Task:    private static final long serialVersionUID = 5247710652586269801L;
-org.woehlke.simpleworklist.user.domain.chat.User2UserMessage:    private static final long serialVersionUID = 4263078228257938175L;
+org.woehlke.simpleworklist.domain.user.chat.User2UserMessage:    private static final long serialVersionUID = 4263078228257938175L;
 org.woehlke.simpleworklist.user.domain.account.UserAccount:    private static final long serialVersionUID = 7860692526488291439L;
-org.woehlke.simpleworklist.user.domain.resetpassword.UserPasswordRecovery:    private static final long serialVersionUID = 6860716425733119940L;
-org.woehlke.simpleworklist.user.domain.register.UserRegistration:    private static final long serialVersionUID = -1955967514018161878L;
+org.woehlke.simpleworklist.domain.user.resetpassword.UserPasswordRecovery:    private static final long serialVersionUID = 6860716425733119940L;
+org.woehlke.simpleworklist.domain.user.register.UserRegistration:    private static final long serialVersionUID = -1955967514018161878L;
 org.woehlke.simpleworklist.domain.breadcrumb.BreadcrumbItem:    private static final long serialVersionUID = 8276819198016077167L;
 org.woehlke.simpleworklist.domain.breadcrumb.Breadcrumb:    private static final long serialVersionUID = 7932703111140692689L;
 org.woehlke.simpleworklist.user.login.LoginForm:    private static final long serialVersionUID = 5936886560348238355L;
 org.woehlke.simpleworklist.domain.context.NewContextForm:    private static final long serialVersionUID = -937143305653156981L;
-org.woehlke.simpleworklist.user.domain.chat.User2UserMessageFormBean:    private static final long serialVersionUID = 1576610181966480168L;
+org.woehlke.simpleworklist.domain.user.chat.User2UserMessageFormBean:    private static final long serialVersionUID = 1576610181966480168L;
 org.woehlke.simpleworklist.searchRequest.SearchResult:    private static final long serialVersionUID = 1682809351146047764L;
 org.woehlke.simpleworklist.user.domain.account.UserAccountForm:    private static final long serialVersionUID = 9180383385243540190L;
 org.woehlke.simpleworklist.user.selfservice.UserChangeDefaultContextForm:    private static final long serialVersionUID = -8592295563275083292L;
 org.woehlke.simpleworklist.common.language.UserChangeLanguageForm:    private static final long serialVersionUID = 2201123162578113187L;
 org.woehlke.simpleworklist.user.selfservice.UserChangeNameForm:    private static final long serialVersionUID = 5120488382888268418L;
 org.woehlke.simpleworklist.user.selfservice.UserChangePasswordForm:    private static final long serialVersionUID = 9149342594823222054L;
-org.woehlke.simpleworklist.user.domain.register.UserRegistrationForm:    private static final long serialVersionUID = 6864871862706880939L;
+org.woehlke.simpleworklist.domain.user.register.UserRegistrationForm:    private static final long serialVersionUID = 6864871862706880939L;
 org.woehlke.simpleworklist.user.session.UserSessionBean:    private static final long serialVersionUID = -6649686058228455825L;

src/main/cmd/getserialversionid.cmd

@@ -17,7 +17,7 @@ echo %CLASSPATH%
 cd target\classes
 serialver org.woehlke.simpleworklist.application.language.Language > ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.domain.task.TaskEnergy >> ..\..\etc\serialversions.txt
-serialver org.woehlke.simpleworklist.domain.task.TaskState >> ..\..\etc\serialversions.txt
+serialver org.woehlke.simpleworklist.domain.task.state.TaskState >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.domain.task.TaskTime >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.user.resetpassword.UserPasswordRecoveryStatus >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.user.register.UserRegistrationStatus >> ..\..\etc\serialversions.txt

src/main/java/org/woehlke/simpleworklist/SimpleworklistApplication.java

@@ -4,7 +4,7 @@
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.woehlke.simpleworklist.application.SimpleworklistProperties;
+import org.woehlke.simpleworklist.config.SimpleworklistProperties;
 import org.woehlke.simpleworklist.config.WebMvcConfig;
 import org.woehlke.simpleworklist.config.WebSecurityConfig;
 

src/main/java/org/woehlke/simpleworklist/common/error/ApplicationErrorController.java renamed to src/main/java/org/woehlke/simpleworklist/application/error/ApplicationErrorController.java

@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.common.error;
+package org.woehlke.simpleworklist.application.error;
 
 
 import lombok.extern.slf4j.Slf4j;

src/main/java/org/woehlke/simpleworklist/common/domain/AbstractController.java renamed to src/main/java/org/woehlke/simpleworklist/application/framework/AbstractController.java

@@ -1,23 +1,23 @@
-package org.woehlke.simpleworklist.common.domain;
+package org.woehlke.simpleworklist.application.framework;
 
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.SessionAttributes;
 import org.woehlke.simpleworklist.domain.breadcrumb.BreadcrumbService;
-import org.woehlke.simpleworklist.application.SimpleworklistProperties;
+import org.woehlke.simpleworklist.config.SimpleworklistProperties;
 import org.woehlke.simpleworklist.domain.context.Context;
 import org.woehlke.simpleworklist.domain.project.Project;
 import org.woehlke.simpleworklist.domain.task.TaskService;
-import org.woehlke.simpleworklist.domain.task.TaskState;
-import org.woehlke.simpleworklist.user.domain.account.UserAccount;
+import org.woehlke.simpleworklist.domain.taskworkflow.TaskState;
+import org.woehlke.simpleworklist.domain.user.account.UserAccount;
 import org.woehlke.simpleworklist.domain.task.TaskEnergy;
 import org.woehlke.simpleworklist.domain.task.TaskTime;
 import org.woehlke.simpleworklist.domain.context.ContextService;
 import org.woehlke.simpleworklist.domain.project.ProjectService;
 import org.woehlke.simpleworklist.user.services.User2UserMessageService;
 import org.woehlke.simpleworklist.user.services.UserAccountService;
-import org.woehlke.simpleworklist.user.session.UserSessionBean;
+import org.woehlke.simpleworklist.application.session.UserSessionBean;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.woehlke.simpleworklist.user.services.UserAccountAccessService;

src/main/java/org/woehlke/simpleworklist/common/domain/AuditModel.java renamed to src/main/java/org/woehlke/simpleworklist/application/framework/AuditModel.java

@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.common.domain;
+package org.woehlke.simpleworklist.application.framework;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.Getter;

src/main/java/org/woehlke/simpleworklist/common/domain/ComparableById.java renamed to src/main/java/org/woehlke/simpleworklist/application/framework/ComparableById.java

@@ -1,4 +1,6 @@
-package org.woehlke.simpleworklist.common.domain;
+package org.woehlke.simpleworklist.application.framework;
+
+import org.woehlke.simpleworklist.application.framework.AuditModel;
 
 public interface ComparableById<T extends AuditModel> {
     boolean equalsById(T otherObject);

src/main/java/org/woehlke/simpleworklist/user/login/LoginForm.java renamed to src/main/java/org/woehlke/simpleworklist/application/login/LoginForm.java

@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.user.login;
+package org.woehlke.simpleworklist.application.login;
 
 import javax.validation.constraints.NotNull;
 

src/main/java/org/woehlke/simpleworklist/user/login/LoginSuccessHandler.java renamed to src/main/java/org/woehlke/simpleworklist/application/login/LoginSuccessHandler.java

@@ -1,12 +1,12 @@
-package org.woehlke.simpleworklist.user.login;
+package org.woehlke.simpleworklist.application.login;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.web.authentication.AuthenticationSuccessHandler;
 import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.LocaleResolver;
-import org.woehlke.simpleworklist.user.domain.account.UserAccount;
+import org.woehlke.simpleworklist.domain.user.account.UserAccount;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.woehlke.simpleworklist.user.services.UserAccountLoginSuccessService;