deployment

.gitignore

@@ -32,7 +32,6 @@ setenv.cmd
 /etc/pom.xml
 /src/main/java/org/woehlke/simpleworklist/project/x.txt
 /src/main/java/org/woehlke/simpleworklist/task/x.txt
-/src/main/java/org/woehlke/simpleworklist/taskstate/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/search/x.txt
+/src/main/java/org/woehlke/simpleworklist/searchRequest/x.txt

etc/TODO.md

@@ -88,7 +88,13 @@ https://www.baeldung.com/maven-enforcer-plugin
 # 2.3.14
 Fixed #122, Fixed #123, Fixed #127, Fixed #130, Fixed #152, Fixed #153, Fixed #154, Fixed #155, Fixed #156, Fixed #157, Fixed #158, Fixed #159, Fixed #160, Fixed #161, Fixed #162, Fixed #163, Fixed #164, Fixed #165, Fixed #166, Fixed #167
 
-Fixed #129 
-Fixed #126
+
 
 https://developer.okta.com/blog/2019/03/28/test-java-spring-boot-junit5
+
+# 2.3.15
+Fixed #129, Fixed #126, Fixed #168 
+https://github.com/thymeleaf/thymeleaf-testing
+
+# 2.3.16 
+Fixed #169, Fixed #170, Fixed #171, Fixed #172, Fixed #183 

etc/requirements/Requirements.md

@@ -1,55 +1,64 @@
 # Functional Requirements
 
 ## F001 Server Starts
-
 ## F002 Home Page rendered
-
 ## F003 Registration
-
 ## F004 Password Recovery
-
 ## F005 Login
-
 ## F006 Page after first successful Login
 
-## F007 Add first new Task to Inbox
-
-## F008 Add another new Task to Inbox
-
-## F009 Add Task to Project/Root
-
-## F010 Add SubProject to Project/Root
-
-## F011 setFocus of a Task
-
-## F012 unSetFocus of a Task
-
-## F013 show /taskstate/inbox
-
-## F014 show /taskstate/today
-
-## F015 show /taskstate/next
-
-## F016 show /taskstate/waiting
-
-## F017 show /taskstate/scheduled
-
-## F018 show /taskstate/someday
-
-## F019 show /taskstate/focus
-
-## F020 show /taskstate/completed
-
-## F021 show /taskstate/trash
-
-## F022 Task Edit
-
-## F023 Task Edit Form -> change Taskstate via DropDown 
-
-## F024 Task complete 
-
-## F025 Task incomplete
-
-## F026 Task delete 
-
-## F027 Task undelete
+## F010 show /taskstate/inbox
+## F011 show /taskstate/today
+## F012 show /taskstate/next
+## F013 show /taskstate/waiting
+## F014 show /taskstate/scheduled
+## F015 show /taskstate/someday
+## F016 show /taskstate/focus
+## F017 show /taskstate/completed
+## F018 show /taskstate/trash
+
+## F020 Task move to /taskstate/inbox
+## F021 Task move to /taskstate/today
+## F022 Task move to /taskstate/next
+## F023 Task move to /taskstate/waiting
+## F024 Task move to /taskstate/scheduled
+## F025 Task move to /taskstate/someday
+## F026 Task move to /taskstate/focus
+## F027 Task move to /taskstate/completed
+## F028 Task move to /taskstate/trash
+
+## F030 Taskstate: Add Task to Inbox
+## F031 Taskstate: Add Task to Inbox again
+## F032 Taskstate: Task Edit
+## F033 Taskstate: Task Edit Form -> change Taskstate via DropDown
+## F034 Taskstate: Task Edit Form -> transform to Project
+## F035 Taskstate: Task setFocus
+## F036 Taskstate: Task unSetFocus 
+## F037 Taskstate: Task complete
+## F038 Taskstate: Task incomplete
+## F039 Taskstate: Task delete
+## F040 Taskstate: Task undelete
+
+## F050 Project/Root: Add Task
+## F051 Project/Root: Add SubProject
+## F052 Project/Root: Task Edit
+## F053 Project/Root: Task Edit Form -> change Taskstate via DropDown
+## F054 Project/Root: Task Edit Form -> transform to Project
+## F055 Project/Root: Task setFocus
+## F056 Project/Root: Task unSetFocus
+## F057 Project/Root: Task complete
+## F058 Project/Root: Task incomplete
+## F059 Project/Root: Task delete
+## F060 Project/Root: Task undelete
+
+## F070 Project/id: Add Task
+## F071 Project/id: Add SubProject
+## F072 Project/id: Task Edit
+## F073 Project/id: Task Edit Form -> change Taskstate via DropDown
+## F074 Project/id: Task Edit Form -> transform to Project
+## F075 Project/id: Task setFocus
+## F076 Project/id: Task unSetFocus
+## F077 Project/id: Task complete
+## F078 Project/id: Task incomplete
+## F079 Project/id: Task delete 
+## F080 Project/id: Task undelete

etc/serialversions/getserialversionid.cmd

@@ -17,7 +17,7 @@ echo %CLASSPATH%
 cd target\classes
 serialver org.woehlke.simpleworklist.language.Language > ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.task.TaskEnergy >> ..\..\etc\serialversions.txt
-serialver org.woehlke.simpleworklist.taskstate.TaskState >> ..\..\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
@@ -35,14 +35,14 @@ serialver org.woehlke.simpleworklist.breadcrumb.Breadcrumb  >> ..\..\etc\serialv
 serialver org.woehlke.simpleworklist.user.login.LoginForm >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.context.NewContextForm >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.user.messages.User2UserMessageFormBean >> ..\..\etc\serialversions.txt
-serialver org.woehlke.simpleworklist.search.SearchResult >> ..\..\etc\serialversions.txt
+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.user.selfservice.UserChangeNameForm >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.user.selfservice.UserChangePasswordForm >> ..\..\etc\serialversions.txt
-@rem serialver org.woehlke.simpleworklist.user.UserDetailsBean >> ..\..\etc\serialversions.txt
+@rem serialver org.woehlke.simpleworklist.user.account.UserDetailsBean >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.user.register.UserRegistrationForm >> ..\..\etc\serialversions.txt
-serialver org.woehlke.simpleworklist.user.UserSessionBean >> ..\..\etc\serialversions.txt
+serialver org.woehlke.simpleworklist.session.UserSessionBean >> ..\..\etc\serialversions.txt
 cd ..\..
 echo FINISHED

etc/serialversions/getserialversionid.sh

@@ -29,7 +29,7 @@ echo "CLASSPATH $CLASSPATH"
 cd $CLASSES_PATH
 serialver org.woehlke.simpleworklist.language.Language > $SERIALVERSIONS_FILE
 serialver org.woehlke.simpleworklist.task.TaskEnergy >> $SERIALVERSIONS_FILE
-serialver org.woehlke.simpleworklist.taskstate.TaskState >> $SERIALVERSIONS_FILE
+serialver org.woehlke.simpleworklist.task.TaskState >> $SERIALVERSIONS_FILE
 serialver org.woehlke.simpleworklist.task.TaskTime >> $SERIALVERSIONS_FILE
 serialver org.woehlke.simpleworklist.user.resetpassword.UserPasswordRecoveryStatus >> $SERIALVERSIONS_FILE
 serialver org.woehlke.simpleworklist.user.register.UserRegistrationStatus >> $SERIALVERSIONS_FILE
@@ -53,7 +53,7 @@ serialver org.woehlke.simpleworklist.context.UserChangeDefaultContextForm >> $SE
 serialver org.woehlke.simpleworklist.language.UserChangeLanguageForm  >> $SERIALVERSIONS_FILE
 serialver org.woehlke.simpleworklist.user.selfservice.UserChangeNameForm >> $SERIALVERSIONS_FILE
 serialver org.woehlke.simpleworklist.user.selfservice.UserChangePasswordForm >> $SERIALVERSIONS_FILE
-#serialver org.woehlke.simpleworklist.user.UserDetailsBean >> $SERIALVERSIONS_FILE
+#serialver org.woehlke.simpleworklist.user.account.UserDetailsBean >> $SERIALVERSIONS_FILE
 serialver org.woehlke.simpleworklist.user.register.UserRegistrationForm >> $SERIALVERSIONS_FILE
 serialver org.woehlke.simpleworklist.user.UserSessionBean >> $SERIALVERSIONS_FILE
 cd $PROJECT_PATH

etc/serialversions/serialversions.txt

@@ -1,6 +1,6 @@
 org.woehlke.simpleworklist.language.Language:    private static final long serialVersionUID = 0L;
 org.woehlke.simpleworklist.task.TaskEnergy:    private static final long serialVersionUID = 0L;
-org.woehlke.simpleworklist.taskstate.TaskState:    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;
@@ -18,11 +18,11 @@ org.woehlke.simpleworklist.breadcrumb.Breadcrumb:    private static final long s
 org.woehlke.simpleworklist.user.login.LoginForm:    private static final long serialVersionUID = 5936886560348238355L;
 org.woehlke.simpleworklist.context.NewContextForm:    private static final long serialVersionUID = -937143305653156981L;
 org.woehlke.simpleworklist.user.messages.User2UserMessageFormBean:    private static final long serialVersionUID = 1576610181966480168L;
-org.woehlke.simpleworklist.search.SearchResult:    private static final long serialVersionUID = 1682809351146047764L;
+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.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;
-org.woehlke.simpleworklist.user.UserSessionBean:    private static final long serialVersionUID = -6649686058228455825L;
+org.woehlke.simpleworklist.session.UserSessionBean:    private static final long serialVersionUID = -6649686058228455825L;