work

Author: thomaswoehlke

src/main/java/org/woehlke/java/simpleworklist/domain/chat/ChatMessageController.java renamed to src/main/java/org/woehlke/java/simpleworklist/domain/ChatMessageController.java

@@ -1,4 +1,4 @@
-package org.woehlke.java.simpleworklist.domain.chat;
+package org.woehlke.java.simpleworklist.domain;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Page;
@@ -15,6 +15,8 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.woehlke.java.simpleworklist.application.framework.AbstractController;
 import org.woehlke.java.simpleworklist.domain.breadcrumb.Breadcrumb;
+import org.woehlke.java.simpleworklist.domain.chat.ChatMessage;
+import org.woehlke.java.simpleworklist.domain.chat.ChatMessageForm;
 import org.woehlke.java.simpleworklist.domain.context.Context;
 import org.woehlke.java.simpleworklist.domain.user.account.UserAccount;
 import org.woehlke.java.simpleworklist.domain.session.UserSessionBean;

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

@@ -1,4 +1,4 @@
-package org.woehlke.java.simpleworklist.domain.context;
+package org.woehlke.java.simpleworklist.domain;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Controller;
@@ -8,6 +8,8 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.woehlke.java.simpleworklist.application.framework.AbstractController;
+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.springframework.beans.factory.annotation.Autowired;

src/main/java/org/woehlke/java/simpleworklist/application/pages/PagesController.java renamed to src/main/java/org/woehlke/java/simpleworklist/domain/PagesController.java

@@ -1,4 +1,4 @@
-package org.woehlke.java.simpleworklist.application.pages;
+package org.woehlke.java.simpleworklist.domain;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Controller;

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

@@ -1,4 +1,4 @@
-package org.woehlke.java.simpleworklist.domain.project;
+package org.woehlke.java.simpleworklist.domain;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Page;
@@ -14,6 +14,8 @@
 import org.woehlke.java.simpleworklist.application.framework.AbstractController;
 import org.woehlke.java.simpleworklist.domain.breadcrumb.Breadcrumb;
 import org.woehlke.java.simpleworklist.domain.context.Context;
+import org.woehlke.java.simpleworklist.domain.project.Project;
+import org.woehlke.java.simpleworklist.domain.project.ProjectControllerService;
 import org.woehlke.java.simpleworklist.domain.task.Task;
 import org.woehlke.java.simpleworklist.domain.task.TaskEnergy;
 import org.woehlke.java.simpleworklist.domain.task.TaskService;

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

@@ -1,4 +1,4 @@
-package org.woehlke.java.simpleworklist.domain.project;
+package org.woehlke.java.simpleworklist.domain;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,6 +14,8 @@
 import org.springframework.web.bind.annotation.*;
 import org.woehlke.java.simpleworklist.domain.breadcrumb.Breadcrumb;
 import org.woehlke.java.simpleworklist.domain.context.Context;
+import org.woehlke.java.simpleworklist.domain.project.Project;
+import org.woehlke.java.simpleworklist.domain.project.ProjectControllerService;
 import org.woehlke.java.simpleworklist.domain.task.Task;
 import org.woehlke.java.simpleworklist.domain.task.TaskEnergy;
 import org.woehlke.java.simpleworklist.domain.task.TaskService;

src/main/java/org/woehlke/java/simpleworklist/domain/search/SearchController.java renamed to src/main/java/org/woehlke/java/simpleworklist/domain/SearchController.java

@@ -1,4 +1,4 @@
-package org.woehlke.java.simpleworklist.domain.search;
+package org.woehlke.java.simpleworklist.domain;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Controller;
@@ -9,6 +9,7 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.woehlke.java.simpleworklist.application.framework.AbstractController;
 import org.woehlke.java.simpleworklist.domain.context.Context;
+import org.woehlke.java.simpleworklist.domain.search.SearchService;
 import org.woehlke.java.simpleworklist.domain.search.result.SearchResult;
 import org.woehlke.java.simpleworklist.domain.breadcrumb.Breadcrumb;
 import org.woehlke.java.simpleworklist.domain.session.UserSessionBean;

src/main/java/org/woehlke/java/simpleworklist/domain/taskworkflow/TaskStateTabController.java renamed to src/main/java/org/woehlke/java/simpleworklist/domain/TaskStateTabController.java

@@ -1,4 +1,4 @@
-package org.woehlke.java.simpleworklist.domain.taskworkflow;
+package org.woehlke.java.simpleworklist.domain;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
@@ -14,6 +14,9 @@
 import org.woehlke.java.simpleworklist.domain.session.UserSessionBean;
 
 import lombok.extern.slf4j.Slf4j;
+import org.woehlke.java.simpleworklist.domain.taskworkflow.MoveTaskToTaskInTaskstateService;
+import org.woehlke.java.simpleworklist.domain.taskworkflow.TaskState;
+
 import javax.validation.constraints.NotNull;
 import java.util.Locale;
 

src/main/java/org/woehlke/java/simpleworklist/domain/taskworkflow/TaskStateTaskController.java renamed to src/main/java/org/woehlke/java/simpleworklist/domain/TaskStateTaskController.java

@@ -1,4 +1,4 @@
-package org.woehlke.java.simpleworklist.domain.taskworkflow;
+package org.woehlke.java.simpleworklist.domain;
 
 
 import org.springframework.stereotype.Controller;
@@ -14,6 +14,9 @@
 import org.woehlke.java.simpleworklist.domain.task.TaskEnergy;
 import org.woehlke.java.simpleworklist.domain.task.TaskService;
 import org.woehlke.java.simpleworklist.domain.task.TaskTime;
+import org.woehlke.java.simpleworklist.domain.taskworkflow.MoveTaskToTaskInTaskstateService;
+import org.woehlke.java.simpleworklist.domain.taskworkflow.TaskState;
+import org.woehlke.java.simpleworklist.domain.taskworkflow.TransformTaskIntoProjektService;
 import org.woehlke.java.simpleworklist.domain.user.account.UserAccount;
 import org.woehlke.java.simpleworklist.application.framework.AbstractController;
 import org.woehlke.java.simpleworklist.domain.session.UserSessionBean;

src/main/java/org/woehlke/java/simpleworklist/domain/testdata/TestDataController.java renamed to src/main/java/org/woehlke/java/simpleworklist/domain/TestDataController.java

@@ -1,9 +1,10 @@
-package org.woehlke.java.simpleworklist.domain.testdata;
+package org.woehlke.java.simpleworklist.domain;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.woehlke.java.simpleworklist.domain.testdata.TestDataService;
 import org.woehlke.java.simpleworklist.domain.user.account.UserAccount;
 
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/org/woehlke/java/simpleworklist/domain/user/login/UserLoginController.java renamed to src/main/java/org/woehlke/java/simpleworklist/domain/UserLoginController.java

@@ -1,4 +1,4 @@
-package org.woehlke.java.simpleworklist.domain.user.login;
+package org.woehlke.java.simpleworklist.domain;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,6 +18,8 @@
 import org.springframework.web.bind.support.SessionStatus;
 import org.woehlke.java.simpleworklist.domain.user.access.UserAuthorizationService;
 import org.woehlke.java.simpleworklist.domain.user.account.UserAccount;
+import org.woehlke.java.simpleworklist.domain.user.login.LoginForm;
+import org.woehlke.java.simpleworklist.domain.user.login.UserAccountLoginSuccessService;
 
 @Slf4j
 @Controller

src/main/java/org/woehlke/java/simpleworklist/domain/user/passwordrecovery/UserPasswordRecoveryController.java renamed to src/main/java/org/woehlke/java/simpleworklist/domain/UserPasswordRecoveryController.java

@@ -1,4 +1,4 @@
-package org.woehlke.java.simpleworklist.domain.user.passwordrecovery;
+package org.woehlke.java.simpleworklist.domain;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Controller;
@@ -11,6 +11,8 @@
 import org.woehlke.java.simpleworklist.domain.user.account.UserAccountService;
 import org.woehlke.java.simpleworklist.domain.user.account.UserAccountForm;
 import org.woehlke.java.simpleworklist.domain.user.account.UserAccount;
+import org.woehlke.java.simpleworklist.domain.user.passwordrecovery.UserPasswordRecovery;
+import org.woehlke.java.simpleworklist.domain.user.passwordrecovery.UserPasswordRecoveryService;
 import org.woehlke.java.simpleworklist.domain.user.signup.UserRegistrationForm;
 
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/org/woehlke/java/simpleworklist/domain/user/signup/UserRegistrationController.java renamed to src/main/java/org/woehlke/java/simpleworklist/domain/UserRegistrationController.java

@@ -1,4 +1,4 @@
-package org.woehlke.java.simpleworklist.domain.user.signup;
+package org.woehlke.java.simpleworklist.domain;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -11,6 +11,9 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.woehlke.java.simpleworklist.domain.user.account.UserAccountService;
 import org.woehlke.java.simpleworklist.domain.user.account.UserAccountForm;
+import org.woehlke.java.simpleworklist.domain.user.signup.UserRegistration;
+import org.woehlke.java.simpleworklist.domain.user.signup.UserRegistrationForm;
+import org.woehlke.java.simpleworklist.domain.user.signup.UserRegistrationService;
 
 import javax.validation.Valid;
 

src/main/java/org/woehlke/java/simpleworklist/domain/user/accountselfservice/UserSelfserviceController.java renamed to src/main/java/org/woehlke/java/simpleworklist/domain/UserSelfserviceController.java

@@ -1,4 +1,4 @@
-package org.woehlke.java.simpleworklist.domain.user.accountselfservice;
+package org.woehlke.java.simpleworklist.domain;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,6 +24,9 @@
 import org.woehlke.java.simpleworklist.domain.context.Context;
 import org.woehlke.java.simpleworklist.domain.user.account.UserAccount;
 import org.woehlke.java.simpleworklist.domain.session.UserSessionBean;
+import org.woehlke.java.simpleworklist.domain.user.accountselfservice.UserChangeDefaultContextForm;
+import org.woehlke.java.simpleworklist.domain.user.accountselfservice.UserChangeNameForm;
+import org.woehlke.java.simpleworklist.domain.user.accountselfservice.UserChangePasswordForm;
 
 import javax.validation.Valid;
 import java.util.List;