work in progress

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/error/x.txt
+/src/main/java/org/woehlke/simpleworklist/application/error/x.txt
 /src/main/java/org/woehlke/simpleworklist/searchRequest/x.txt
 /.idea/workspace.xml
 /.idea/misc.xml

etc/TODO.md

@@ -56,7 +56,7 @@ Errorpage - Refer to logfile:
 2020-04-03 14:30:58.586  WARN 2864 --- [nio-8080-exec-8] .w.s.m.s.DefaultHandlerExceptionResolver : Resolved [org.springframework.web.HttpRequestMethodNotSupportedException: Request method 'POST' not supported]
 2020-04-03 14:30:58.586 DEBUG 2864 --- [nio-8080-exec-8] o.s.web.servlet.DispatcherServlet        : Completed 405 METHOD_NOT_ALLOWED
 2020-04-03 14:30:58.590 DEBUG 2864 --- [nio-8080-exec-8] o.s.web.servlet.DispatcherServlet        : "ERROR" dispatch for POST "/fehler", parameters={masked}
-2020-04-03 14:30:58.590 DEBUG 2864 --- [nio-8080-exec-8] s.w.s.m.m.a.RequestMappingHandlerMapping : Mapped to org.woehlke.simpleworklist.error.MyErrorController#handleError(HttpServletRequest, Model)
+2020-04-03 14:30:58.590 DEBUG 2864 --- [nio-8080-exec-8] s.w.s.m.m.a.RequestMappingHandlerMapping : Mapped to org.woehlke.simpleworklist.application.error.MyErrorController#handleError(HttpServletRequest, Model)
 2020-04-03 14:30:58.591  WARN 2864 --- [nio-8080-exec-8] o.w.s.error.MyErrorController            : errorMessage :Request method 'POST' not supported
 2020-04-03 14:30:58.591  WARN 2864 --- [nio-8080-exec-8] o.w.s.error.MyErrorController            : 405Method Not Allowed
 2020-04-03 14:30:58.593 DEBUG 2864 --- [nio-8080-exec-8] o.s.web.servlet.DispatcherServlet        : Exiting from "ERROR" dispatch, status 405

etc/serialversions/getserialversionid.cmd

@@ -15,14 +15,14 @@ set MY_CLASSPATH_APP=%JAVA_HOME%\jre\lib\rt.jar;%CD%\target\classes
 set CLASSPATH=%MY_CLASSPATH_APP%;%MY_CLASSPATH_DEPS%
 echo %CLASSPATH%
 cd target\classes
-serialver org.woehlke.simpleworklist.language.Language > ..\..\etc\serialversions.txt
+serialver org.woehlke.simpleworklist.application.language.Language > ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.task.TaskEnergy >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.task.TaskState >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.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
 serialver org.woehlke.simpleworklist.user.account.UserRole >> ..\..\etc\serialversions.txt
-serialver org.woehlke.simpleworklist.common.AuditModel >> ..\..\etc\serialversions.txt
+serialver org.woehlke.simpleworklist.application.common.AuditModel >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.context.Context  >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.project.Project  >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.task.Task  >> ..\..\etc\serialversions.txt
@@ -38,7 +38,7 @@ serialver org.woehlke.simpleworklist.user.messages.User2UserMessageFormBean >> .
 serialver org.woehlke.simpleworklist.searchRequest.SearchResult >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.user.account.UserAccountForm  >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.context.UserChangeDefaultContextForm >> ..\..\etc\serialversions.txt
-serialver org.woehlke.simpleworklist.language.UserChangeLanguageForm  >> ..\..\etc\serialversions.txt
+serialver org.woehlke.simpleworklist.application.language.UserChangeLanguageForm  >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.user.selfservice.UserChangeNameForm >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.user.selfservice.UserChangePasswordForm >> ..\..\etc\serialversions.txt
 @rem serialver org.woehlke.simpleworklist.user.account.UserDetailsBean >> ..\..\etc\serialversions.txt

etc/serialversions/serialversions.txt

@@ -1,11 +1,11 @@
-org.woehlke.simpleworklist.language.Language:    private static final long serialVersionUID = 0L;
+org.woehlke.simpleworklist.application.language.Language:    private static final long serialVersionUID = 0L;
 org.woehlke.simpleworklist.task.TaskEnergy:    private static final long serialVersionUID = 0L;
 org.woehlke.simpleworklist.task.TaskState:    private static final long serialVersionUID = 0L;
 org.woehlke.simpleworklist.task.TaskTime:    private static final long serialVersionUID = 0L;
 org.woehlke.simpleworklist.user.resetpassword.UserPasswordRecoveryStatus:    private static final long serialVersionUID = 0L;
 org.woehlke.simpleworklist.user.register.UserRegistrationStatus:    private static final long serialVersionUID = 0L;
 org.woehlke.simpleworklist.user.account.UserRole:    private static final long serialVersionUID = 0L;
-org.woehlke.simpleworklist.common.AuditModel:    private static final long serialVersionUID = 4399373914714726911L;
+org.woehlke.simpleworklist.application.common.AuditModel:    private static final long serialVersionUID = 4399373914714726911L;
 org.woehlke.simpleworklist.context.Context:    private static final long serialVersionUID = -5035732370606951871L;
 org.woehlke.simpleworklist.project.Project:    private static final long serialVersionUID = 4566653175832872422L;
 org.woehlke.simpleworklist.task.Task:    private static final long serialVersionUID = 5247710652586269801L;
@@ -21,7 +21,7 @@ org.woehlke.simpleworklist.user.messages.User2UserMessageFormBean:    private st
 org.woehlke.simpleworklist.searchRequest.SearchResult:    private static final long serialVersionUID = 1682809351146047764L;
 org.woehlke.simpleworklist.user.account.UserAccountForm:    private static final long serialVersionUID = 9180383385243540190L;
 org.woehlke.simpleworklist.context.UserChangeDefaultContextForm:    private static final long serialVersionUID = -8592295563275083292L;
-org.woehlke.simpleworklist.language.UserChangeLanguageForm:    private static final long serialVersionUID = 2201123162578113187L;
+org.woehlke.simpleworklist.application.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.register.UserRegistrationForm:    private static final long serialVersionUID = 6864871862706880939L;

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

@@ -4,9 +4,9 @@
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.woehlke.simpleworklist.config.ApplicationProperties;
-import org.woehlke.simpleworklist.config.di.WebMvcConfig;
-import org.woehlke.simpleworklist.config.di.WebSecurityConfig;
+import org.woehlke.simpleworklist.application.config.ApplicationProperties;
+import org.woehlke.simpleworklist.application.config.di.WebMvcConfig;
+import org.woehlke.simpleworklist.application.config.di.WebSecurityConfig;
 
 
 @ImportAutoConfiguration({

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

@@ -1,11 +1,11 @@
-package org.woehlke.simpleworklist.common;
+package org.woehlke.simpleworklist.application.common;
 
 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.breadcrumb.BreadcrumbService;
-import org.woehlke.simpleworklist.config.ApplicationProperties;
+import org.woehlke.simpleworklist.application.config.ApplicationProperties;
 import org.woehlke.simpleworklist.context.Context;
 import org.woehlke.simpleworklist.project.Project;
 import org.woehlke.simpleworklist.task.TaskService;

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

@@ -1,7 +1,6 @@
-package org.woehlke.simpleworklist.common;
+package org.woehlke.simpleworklist.application.common;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import org.hibernate.id.UUIDGenerator;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.LastModifiedDate;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;

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

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

src/main/java/org/woehlke/simpleworklist/config/ApplicationProperties.java renamed to src/main/java/org/woehlke/simpleworklist/application/config/ApplicationProperties.java

@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.config;
+package org.woehlke.simpleworklist.application.config;
 
 import lombok.Getter;
 import lombok.Setter;

src/main/java/org/woehlke/simpleworklist/config/di/WebMvcConfig.java renamed to src/main/java/org/woehlke/simpleworklist/application/config/di/WebMvcConfig.java

@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.config.di;
+package org.woehlke.simpleworklist.application.config.di;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -18,7 +18,7 @@
 import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;
 import org.springframework.web.servlet.i18n.SessionLocaleResolver;
 import org.thymeleaf.dialect.springdata.SpringDataDialect;
-import org.woehlke.simpleworklist.config.ApplicationProperties;
+import org.woehlke.simpleworklist.application.config.ApplicationProperties;
 
 import java.util.Locale;
 import java.util.Properties;