## 2.3.32

* Issue #317 switch Context is broken
* Issue #318 Broken: http://localhost:8080/taskstate/task/1153/changeorderto/1051
* fixed #319 groovy-all Warning during startup
* fixed #320 warning: SLF4J: Class path contains multiple SLF4J bindings.
* fixed #321 jar is too fat for deployment on heroku

Author: thomaswoehlke

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

@@ -4,17 +4,17 @@
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.SessionAttributes;
-import org.woehlke.simpleworklist.application.breadcrumb.services.BreadcrumbService;
+import org.woehlke.simpleworklist.domain.breadcrumb.BreadcrumbService;
 import org.woehlke.simpleworklist.application.ApplicationProperties;
 import org.woehlke.simpleworklist.domain.context.Context;
 import org.woehlke.simpleworklist.domain.project.Project;
-import org.woehlke.simpleworklist.services.TaskService;
+import org.woehlke.simpleworklist.domain.task.TaskService;
 import org.woehlke.simpleworklist.domain.task.TaskState;
 import org.woehlke.simpleworklist.user.account.UserAccount;
 import org.woehlke.simpleworklist.domain.task.TaskEnergy;
 import org.woehlke.simpleworklist.domain.task.TaskTime;
-import org.woehlke.simpleworklist.services.ContextService;
-import org.woehlke.simpleworklist.services.ProjectService;
+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;

src/main/java/org/woehlke/simpleworklist/application/breadcrumb/services/BreadcrumbService.java renamed to src/main/java/org/woehlke/simpleworklist/domain/breadcrumb/BreadcrumbService.java

@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.application.breadcrumb.services;
+package org.woehlke.simpleworklist.domain.breadcrumb;
 
 import org.woehlke.simpleworklist.domain.breadcrumb.Breadcrumb;
 import org.woehlke.simpleworklist.domain.context.Context;

src/main/java/org/woehlke/simpleworklist/application/breadcrumb/services/BreadcrumbServiceImpl.java renamed to src/main/java/org/woehlke/simpleworklist/domain/breadcrumb/BreadcrumbServiceImpl.java

@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.application.breadcrumb.services;
+package org.woehlke.simpleworklist.domain.breadcrumb;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -7,6 +7,7 @@
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.woehlke.simpleworklist.domain.breadcrumb.Breadcrumb;
+import org.woehlke.simpleworklist.domain.breadcrumb.BreadcrumbService;
 import org.woehlke.simpleworklist.domain.context.Context;
 import org.woehlke.simpleworklist.domain.project.Project;
 import org.woehlke.simpleworklist.domain.task.Task;

src/main/java/org/woehlke/simpleworklist/domain/context/ContextController.java

@@ -8,7 +8,6 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.woehlke.simpleworklist.application.common.AbstractController;
-import org.woehlke.simpleworklist.services.ContextService;
 import org.woehlke.simpleworklist.user.session.UserSessionBean;
 
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/org/woehlke/simpleworklist/services/ContextService.java renamed to src/main/java/org/woehlke/simpleworklist/domain/context/ContextService.java

@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.services;
+package org.woehlke.simpleworklist.domain.context;
 
 import org.woehlke.simpleworklist.domain.context.Context;
 import org.woehlke.simpleworklist.domain.context.NewContextForm;

src/main/java/org/woehlke/simpleworklist/services/ContextServiceImpl.java renamed to src/main/java/org/woehlke/simpleworklist/domain/context/ContextServiceImpl.java

@@ -1,11 +1,12 @@
-package org.woehlke.simpleworklist.services;
+package org.woehlke.simpleworklist.domain.context;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.woehlke.simpleworklist.domain.context.Context;
 import org.woehlke.simpleworklist.domain.context.ContextRepository;
+import org.woehlke.simpleworklist.domain.context.ContextService;
 import org.woehlke.simpleworklist.domain.context.NewContextForm;
 import org.woehlke.simpleworklist.user.account.UserAccount;
 import org.woehlke.simpleworklist.domain.project.ProjectRepository;

src/main/java/org/woehlke/simpleworklist/application/listener/ContextRefreshedListener.java renamed to src/main/java/org/woehlke/simpleworklist/domain/context/listener/ContextRefreshedListener.java

@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.application.listener;
+package org.woehlke.simpleworklist.domain.context.listener;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/org/woehlke/simpleworklist/application/listener/ContextStartedListener.java renamed to src/main/java/org/woehlke/simpleworklist/domain/context/listener/ContextStartedListener.java

@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.application.listener;
+package org.woehlke.simpleworklist.domain.context.listener;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/org/woehlke/simpleworklist/domain/project/ProjectIdController.java

@@ -19,7 +19,7 @@
 import org.woehlke.simpleworklist.domain.task.TaskState;
 import org.woehlke.simpleworklist.domain.task.TaskTime;
 import org.woehlke.simpleworklist.services.TaskProjektService;
-import org.woehlke.simpleworklist.services.TaskService;
+import org.woehlke.simpleworklist.domain.task.TaskService;
 import org.woehlke.simpleworklist.user.account.UserAccount;
 import org.woehlke.simpleworklist.domain.breadcrumb.Breadcrumb;
 import org.woehlke.simpleworklist.user.session.UserSessionBean;

src/main/java/org/woehlke/simpleworklist/domain/project/ProjectRootController.java

@@ -21,7 +21,7 @@
 import org.woehlke.simpleworklist.domain.task.TaskState;
 import org.woehlke.simpleworklist.domain.task.TaskTime;
 import org.woehlke.simpleworklist.services.TaskProjektService;
-import org.woehlke.simpleworklist.services.TaskService;
+import org.woehlke.simpleworklist.domain.task.TaskService;
 import org.woehlke.simpleworklist.user.session.UserSessionBean;
 import org.woehlke.simpleworklist.user.account.UserAccount;
 

src/main/java/org/woehlke/simpleworklist/services/ProjectService.java renamed to src/main/java/org/woehlke/simpleworklist/domain/project/ProjectService.java

@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.services;
+package org.woehlke.simpleworklist.domain.project;
 
 import java.util.List;
 

src/main/java/org/woehlke/simpleworklist/services/ProjectServiceImpl.java renamed to src/main/java/org/woehlke/simpleworklist/domain/project/ProjectServiceImpl.java

@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.services;
+package org.woehlke.simpleworklist.domain.project;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -15,6 +15,7 @@
 import org.woehlke.simpleworklist.domain.context.Context;
 import org.woehlke.simpleworklist.domain.project.Project;
 import org.woehlke.simpleworklist.domain.project.ProjectRepository;
+import org.woehlke.simpleworklist.domain.project.ProjectService;
 import org.woehlke.simpleworklist.domain.task.Task;
 import org.woehlke.simpleworklist.domain.task.TaskRepository;
 

src/main/java/org/woehlke/simpleworklist/services/TaskService.java renamed to src/main/java/org/woehlke/simpleworklist/domain/task/TaskService.java

@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.services;
+package org.woehlke.simpleworklist.domain.task;
 
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;

src/main/java/org/woehlke/simpleworklist/services/TaskServiceImpl.java renamed to src/main/java/org/woehlke/simpleworklist/domain/task/TaskServiceImpl.java

@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.services;
+package org.woehlke.simpleworklist.domain.task;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -11,6 +11,7 @@
 import org.woehlke.simpleworklist.domain.project.Project;
 import org.woehlke.simpleworklist.domain.task.Task;
 import org.woehlke.simpleworklist.domain.task.TaskRepository;
+import org.woehlke.simpleworklist.domain.task.TaskService;
 import org.woehlke.simpleworklist.domain.task.TaskState;
 
 import javax.validation.constraints.Min;

src/main/java/org/woehlke/simpleworklist/domain/task/TaskStateTaskController.java

@@ -12,7 +12,6 @@
 import org.woehlke.simpleworklist.domain.context.Context;
 import org.woehlke.simpleworklist.domain.project.Project;
 import org.woehlke.simpleworklist.services.TaskProjektService;
-import org.woehlke.simpleworklist.services.TaskService;
 import org.woehlke.simpleworklist.services.TaskStateControllerService;
 import org.woehlke.simpleworklist.user.session.UserSessionBean;
 

src/main/java/org/woehlke/simpleworklist/services/ProjectControllerServiceImpl.java

@@ -8,10 +8,12 @@
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
 import org.woehlke.simpleworklist.domain.breadcrumb.Breadcrumb;
-import org.woehlke.simpleworklist.application.breadcrumb.services.BreadcrumbService;
+import org.woehlke.simpleworklist.domain.breadcrumb.BreadcrumbService;
 import org.woehlke.simpleworklist.domain.context.Context;
 import org.woehlke.simpleworklist.domain.project.Project;
+import org.woehlke.simpleworklist.domain.project.ProjectService;
 import org.woehlke.simpleworklist.domain.task.Task;
+import org.woehlke.simpleworklist.domain.task.TaskService;
 import org.woehlke.simpleworklist.user.session.UserSessionBean;
 import org.woehlke.simpleworklist.user.account.UserAccount;
 

src/main/java/org/woehlke/simpleworklist/services/TaskProjektServiceImpl.java

@@ -6,7 +6,9 @@
 import org.springframework.stereotype.Service;
 import org.springframework.ui.Model;
 import org.woehlke.simpleworklist.domain.project.Project;
+import org.woehlke.simpleworklist.domain.project.ProjectService;
 import org.woehlke.simpleworklist.domain.task.Task;
+import org.woehlke.simpleworklist.domain.task.TaskService;
 import org.woehlke.simpleworklist.user.session.UserSessionBean;
 
 import javax.validation.constraints.NotNull;

src/main/java/org/woehlke/simpleworklist/services/TaskStateControllerServiceImpl.java

@@ -9,9 +9,10 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.ui.Model;
 import org.woehlke.simpleworklist.domain.breadcrumb.Breadcrumb;
-import org.woehlke.simpleworklist.application.breadcrumb.services.BreadcrumbService;
+import org.woehlke.simpleworklist.domain.breadcrumb.BreadcrumbService;
 import org.woehlke.simpleworklist.domain.context.Context;
 import org.woehlke.simpleworklist.domain.task.Task;
+import org.woehlke.simpleworklist.domain.task.TaskService;
 import org.woehlke.simpleworklist.domain.task.TaskState;
 import org.woehlke.simpleworklist.user.session.UserSessionBean;
 

src/main/resources/application.yml

@@ -92,7 +92,7 @@ spring:
     url: jdbc:postgresql://localdbhost:5432/simpleworklist
   jpa:
     hibernate:
-      #ddl-auto: update
-      ddl-auto: create-drop
+      ddl-auto: update
+      #ddl-auto: create-drop
   profiles:
     active: default

src/test/java/org/woehlke/simpleworklist/application/config/UserAccountTestDataServiceImpl.java

@@ -6,7 +6,7 @@
 import org.springframework.stereotype.Service;
 import org.woehlke.simpleworklist.application.ApplicationProperties;
 import org.woehlke.simpleworklist.domain.context.Context;
-import org.woehlke.simpleworklist.services.ContextService;
+import org.woehlke.simpleworklist.domain.context.ContextService;
 import org.woehlke.simpleworklist.domain.context.NewContextForm;
 import org.woehlke.simpleworklist.application.language.Language;
 import org.woehlke.simpleworklist.user.account.UserAccount;