deployment

pom.xml

@@ -4,7 +4,7 @@
 
   <groupId>org.woehlke</groupId>
   <artifactId>simpleworklist</artifactId>
-  <version>2.3.58-SNAPSHOT</version>
+  <version>2.3.61-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <parent>
@@ -1259,58 +1259,6 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-site-plugin</artifactId>
           <version>${version.maven-site-plugin}</version>
-          <!--
-          <dependencies>
-              <dependency>
-                  <groupId>org.apache.maven.doxia</groupId>
-                  <artifactId>doxia-module-markdown</artifactId>
-                  <version>${doxia-module.version}</version>
-                  <scope>compile</scope>
-              </dependency>
-              <dependency>
-                  <groupId>org.apache.maven.doxia</groupId>
-                  <artifactId>doxia-module-itext</artifactId>
-                  <version>${doxia-module.version}</version>
-                  <scope>compile</scope>
-              </dependency>
-              <dependency>
-                  <groupId>org.apache.maven.doxia</groupId>
-                  <artifactId>doxia-module-latex</artifactId>
-                  <version>${doxia-module.version}</version>
-                  <scope>compile</scope>
-              </dependency>
-              <dependency>
-                  <groupId>org.apache.maven.doxia</groupId>
-                  <artifactId>doxia-module-rtf</artifactId>
-                  <version>${doxia-module.version}</version>
-                  <scope>compile</scope>
-              </dependency>
-              <dependency>
-                  <groupId>org.apache.maven.doxia</groupId>
-                  <artifactId>doxia-module-xdoc</artifactId>
-                  <version>${doxia-module.version}</version>
-                  <scope>compile</scope>
-              </dependency>
-              <dependency>
-                  <groupId>org.apache.maven.doxia</groupId>
-                  <artifactId>doxia-skin-model</artifactId>
-                  <version>${doxia-module.version}</version>
-                  <scope>compile</scope>
-              </dependency>
-              <dependency>
-                  <groupId>org.apache.maven.doxia</groupId>
-                  <artifactId>doxia-site-renderer</artifactId>
-                  <version>${doxia-module.version}</version>
-                  <scope>compile</scope>
-              </dependency>
-              <dependency>
-                  <groupId>org.apache.maven.doxia</groupId>
-                  <artifactId>doxia-test-docs</artifactId>
-                  <version>${doxia-module.version}</version>
-                  <scope>compile</scope>
-              </dependency>
-          </dependencies>
-          -->
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -1457,6 +1405,7 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
         <executions>
+          <!--
           <execution>
             <id>unpack-dependency-classes-install</id>
             <phase>pre-site</phase>
@@ -1564,6 +1513,7 @@
               <goal>tree</goal>
             </goals>
           </execution>
+          -->
           <execution>
             <id>report</id>
             <phase>site</phase>
@@ -1611,6 +1561,14 @@
               -->
             </configuration>
           </execution>
+          <execution>
+            <id>copy-dependencies</id>
+            <phase>package</phase>
+            <goals><goal>copy-dependencies</goal></goals>
+            <configuration>
+              <includeScope>compile</includeScope>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
       <plugin>

src/main/java/org/woehlke/java/simpleworklist/domain/chat/ChatMessageController.java → 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 → 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/domain/PagesController.java

@@ -0,0 +1,28 @@
+package org.woehlke.java.simpleworklist.domain;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.woehlke.java.simpleworklist.domain.session.UserSessionBean;
+
+import javax.validation.constraints.NotNull;
+import java.util.Locale;
+
+@Slf4j
+@Controller
+@RequestMapping(path = "/")
+public class PagesController {
+
+
+  @RequestMapping(path = "/information", method = RequestMethod.GET)
+  public final String renderPageInformation(
+    @NotNull @ModelAttribute("userSession") UserSessionBean userSession,
+    Locale locale, Model model
+  ) {
+    log.info("addNewTaskToInboxGet");
+    return "pages/information";
+  }
+}

src/main/java/org/woehlke/java/simpleworklist/domain/project/ProjectIdController.java → 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 → 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 → 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 → 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 → 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 → 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 → 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 → 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 → 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 → 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;

src/main/java/org/woehlke/java/simpleworklist/domain/breadcrumb/BreadcrumbService.java

@@ -2,7 +2,6 @@
 
 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.taskworkflow.TaskState;
 import org.woehlke.java.simpleworklist.domain.session.UserSessionBean;
 
@@ -16,12 +15,6 @@ public interface BreadcrumbService {
 
     Breadcrumb getBreadcrumbForTaskstate(TaskState taskstate, Locale locale, UserSessionBean userSession);
 
-    Breadcrumb getBreadcrumbForTaskstateAll(Locale locale, UserSessionBean userSession);
-
-    Breadcrumb getBreadcrumbForTaskInTaskstate(String taskstate, Task task, Locale locale, UserSessionBean userSession);
-
-    Breadcrumb getBreadcrumbForTaskInProject(Project thisProject, Task task, Locale local, UserSessionBean userSession);
-
     Breadcrumb getBreadcrumbForUserProfileAndMenu(Locale locale,UserSessionBean userSession);
 
     Breadcrumb getBreadcrumbForUserChangeName(Locale locale, UserSessionBean userSession);

src/main/java/org/woehlke/java/simpleworklist/domain/breadcrumb/BreadcrumbServiceImpl.java

@@ -85,37 +85,6 @@ public Breadcrumb getBreadcrumbForTaskstate(
         return breadcrumb;
     }
 
-    @Override
-    public Breadcrumb getBreadcrumbForTaskInTaskstate(String taskstate, Task task, Locale locale, UserSessionBean userSession) {
-        log.info("getBreadcrumbForTaskInTaskstate");
-        Optional<Context> context = contextService.getContextFor(userSession);
-        Breadcrumb breadcrumb = new Breadcrumb(locale, context.get());
-        breadcrumb.addTaskstate(taskstate);
-        breadcrumb.addTask(task);
-        return breadcrumb;
-    }
-
-    @Override
-    public Breadcrumb getBreadcrumbForTaskstateAll(Locale locale, UserSessionBean userSession) {
-        log.info("getBreadcrumbForTaskstateAll");
-        Optional<Context> context = contextService.getContextFor(userSession);
-        Breadcrumb breadcrumb = new Breadcrumb(locale, context.get());
-        String code="layout.page.all";
-        String name= messageSource.getMessage(code,null,locale);
-        String url="/taskstate/all";
-        breadcrumb.addPage(name,url);
-        return breadcrumb;
-    }
-
-    @Override
-    public Breadcrumb getBreadcrumbForTaskInProject(Project thisProject, Task task, Locale locale, UserSessionBean userSession) {
-        log.info("getBreadcrumbForTaskInProject");
-        Breadcrumb breadcrumb = new Breadcrumb(locale,thisProject.getContext());
-        breadcrumb.addProject(thisProject);
-        breadcrumb.addTask(task);
-        return breadcrumb;
-    }
-
     @Override
     public Breadcrumb getBreadcrumbForUserProfileAndMenu(Locale locale, UserSessionBean userSession) {
         log.info("getBreadcrumbForUserProfileAndMenu");

src/main/java/org/woehlke/java/simpleworklist/domain/chat/ChatMessage.java

@@ -47,7 +47,6 @@ public class ChatMessage extends AuditModel implements Serializable {
     )
     private Long id;
 
-    //@SafeHtml(whitelistType= SafeHtml.WhiteListType.SIMPLE_TEXT)
     @NotBlank
     @Length(min=1,max=65535)
     @Column(name="message_text", nullable = false, length = 65535, columnDefinition="text")

src/main/java/org/woehlke/java/simpleworklist/domain/chat/ChatMessageForm.java

@@ -3,7 +3,6 @@
 
 import lombok.*;
 import org.hibernate.validator.constraints.Length;
-//import org.hibernate.validator.constraints.SafeHtml;
 
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
@@ -18,7 +17,6 @@ public class ChatMessageForm implements Serializable {
 
     private static final long serialVersionUID = 1576610181966480168L;
 
-    //@SafeHtml(whitelistType= SafeHtml.WhiteListType.SIMPLE_TEXT)
     @NotBlank
     @Length(min=1,max=65535)
     private String messageText;