Skip to content

Commit 97d566e

Browse files
thomaswoehlkethomaswoehlke
authored
Merge pull request #237 from Spring-Framework-Java-Apps/master
deployment
2 parents 75e9692 + 75dc8ff commit 97d566e

File tree

107 files changed

+4768
-3672
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+4768
-3672
lines changed

‎.gitignore‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ setenv.cmd
3232
/etc/pom.xml
3333
/src/main/java/org/woehlke/simpleworklist/project/x.txt
3434
/src/main/java/org/woehlke/simpleworklist/task/x.txt
35-
/src/main/java/org/woehlke/simpleworklist/taskstate/x.txt
3635
/src/main/java/org/woehlke/simpleworklist/context/x.txt
3736
/src/main/java/org/woehlke/simpleworklist/error/x.txt
38-
/src/main/java/org/woehlke/simpleworklist/search/x.txt
37+
/src/main/java/org/woehlke/simpleworklist/searchRequest/x.txt

‎etc/TODO.md‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,13 @@ https://www.baeldung.com/maven-enforcer-plugin
8888
# 2.3.14
8989
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
9090

91-
Fixed #129
92-
Fixed #126
91+
9392

9493
https://developer.okta.com/blog/2019/03/28/test-java-spring-boot-junit5
94+
95+
# 2.3.15
96+
Fixed #129, Fixed #126, Fixed #168
97+
https://github.com/thymeleaf/thymeleaf-testing
98+
99+
# 2.3.16
100+
Fixed #169, Fixed #170, Fixed #171, Fixed #172, Fixed #183

‎etc/requirements/Requirements.md‎

Lines changed: 55 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,64 @@
11
# Functional Requirements
22

33
## F001 Server Starts
4-
54
## F002 Home Page rendered
6-
75
## F003 Registration
8-
96
## F004 Password Recovery
10-
117
## F005 Login
12-
138
## F006 Page after first successful Login
149

15-
## F007 Add first new Task to Inbox
16-
17-
## F008 Add another new Task to Inbox
18-
19-
## F009 Add Task to Project/Root
20-
21-
## F010 Add SubProject to Project/Root
22-
23-
## F011 setFocus of a Task
24-
25-
## F012 unSetFocus of a Task
26-
27-
## F013 show /taskstate/inbox
28-
29-
## F014 show /taskstate/today
30-
31-
## F015 show /taskstate/next
32-
33-
## F016 show /taskstate/waiting
34-
35-
## F017 show /taskstate/scheduled
36-
37-
## F018 show /taskstate/someday
38-
39-
## F019 show /taskstate/focus
40-
41-
## F020 show /taskstate/completed
42-
43-
## F021 show /taskstate/trash
44-
45-
## F022 Task Edit
46-
47-
## F023 Task Edit Form -> change Taskstate via DropDown
48-
49-
## F024 Task complete
50-
51-
## F025 Task incomplete
52-
53-
## F026 Task delete
54-
55-
## F027 Task undelete
10+
## F010 show /taskstate/inbox
11+
## F011 show /taskstate/today
12+
## F012 show /taskstate/next
13+
## F013 show /taskstate/waiting
14+
## F014 show /taskstate/scheduled
15+
## F015 show /taskstate/someday
16+
## F016 show /taskstate/focus
17+
## F017 show /taskstate/completed
18+
## F018 show /taskstate/trash
19+
20+
## F020 Task move to /taskstate/inbox
21+
## F021 Task move to /taskstate/today
22+
## F022 Task move to /taskstate/next
23+
## F023 Task move to /taskstate/waiting
24+
## F024 Task move to /taskstate/scheduled
25+
## F025 Task move to /taskstate/someday
26+
## F026 Task move to /taskstate/focus
27+
## F027 Task move to /taskstate/completed
28+
## F028 Task move to /taskstate/trash
29+
30+
## F030 Taskstate: Add Task to Inbox
31+
## F031 Taskstate: Add Task to Inbox again
32+
## F032 Taskstate: Task Edit
33+
## F033 Taskstate: Task Edit Form -> change Taskstate via DropDown
34+
## F034 Taskstate: Task Edit Form -> transform to Project
35+
## F035 Taskstate: Task setFocus
36+
## F036 Taskstate: Task unSetFocus
37+
## F037 Taskstate: Task complete
38+
## F038 Taskstate: Task incomplete
39+
## F039 Taskstate: Task delete
40+
## F040 Taskstate: Task undelete
41+
42+
## F050 Project/Root: Add Task
43+
## F051 Project/Root: Add SubProject
44+
## F052 Project/Root: Task Edit
45+
## F053 Project/Root: Task Edit Form -> change Taskstate via DropDown
46+
## F054 Project/Root: Task Edit Form -> transform to Project
47+
## F055 Project/Root: Task setFocus
48+
## F056 Project/Root: Task unSetFocus
49+
## F057 Project/Root: Task complete
50+
## F058 Project/Root: Task incomplete
51+
## F059 Project/Root: Task delete
52+
## F060 Project/Root: Task undelete
53+
54+
## F070 Project/id: Add Task
55+
## F071 Project/id: Add SubProject
56+
## F072 Project/id: Task Edit
57+
## F073 Project/id: Task Edit Form -> change Taskstate via DropDown
58+
## F074 Project/id: Task Edit Form -> transform to Project
59+
## F075 Project/id: Task setFocus
60+
## F076 Project/id: Task unSetFocus
61+
## F077 Project/id: Task complete
62+
## F078 Project/id: Task incomplete
63+
## F079 Project/id: Task delete
64+
## F080 Project/id: Task undelete

‎etc/serialversions/classpath.txt‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎etc/serialversions/getserialversionid.cmd‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ echo %CLASSPATH%
1717
cd target\classes
1818
serialver org.woehlke.simpleworklist.language.Language > ..\..\etc\serialversions.txt
1919
serialver org.woehlke.simpleworklist.task.TaskEnergy >> ..\..\etc\serialversions.txt
20-
serialver org.woehlke.simpleworklist.taskstate.TaskState >> ..\..\etc\serialversions.txt
20+
serialver org.woehlke.simpleworklist.task.TaskState >> ..\..\etc\serialversions.txt
2121
serialver org.woehlke.simpleworklist.task.TaskTime >> ..\..\etc\serialversions.txt
2222
serialver org.woehlke.simpleworklist.user.resetpassword.UserPasswordRecoveryStatus >> ..\..\etc\serialversions.txt
2323
serialver org.woehlke.simpleworklist.user.register.UserRegistrationStatus >> ..\..\etc\serialversions.txt
@@ -35,14 +35,14 @@ serialver org.woehlke.simpleworklist.breadcrumb.Breadcrumb >> ..\..\etc\serialv
3535
serialver org.woehlke.simpleworklist.user.login.LoginForm >> ..\..\etc\serialversions.txt
3636
serialver org.woehlke.simpleworklist.context.NewContextForm >> ..\..\etc\serialversions.txt
3737
serialver org.woehlke.simpleworklist.user.messages.User2UserMessageFormBean >> ..\..\etc\serialversions.txt
38-
serialver org.woehlke.simpleworklist.search.SearchResult >> ..\..\etc\serialversions.txt
38+
serialver org.woehlke.simpleworklist.searchRequest.SearchResult >> ..\..\etc\serialversions.txt
3939
serialver org.woehlke.simpleworklist.user.account.UserAccountForm >> ..\..\etc\serialversions.txt
4040
serialver org.woehlke.simpleworklist.context.UserChangeDefaultContextForm >> ..\..\etc\serialversions.txt
4141
serialver org.woehlke.simpleworklist.language.UserChangeLanguageForm >> ..\..\etc\serialversions.txt
4242
serialver org.woehlke.simpleworklist.user.selfservice.UserChangeNameForm >> ..\..\etc\serialversions.txt
4343
serialver org.woehlke.simpleworklist.user.selfservice.UserChangePasswordForm >> ..\..\etc\serialversions.txt
44-
@rem serialver org.woehlke.simpleworklist.user.UserDetailsBean >> ..\..\etc\serialversions.txt
44+
@rem serialver org.woehlke.simpleworklist.user.account.UserDetailsBean >> ..\..\etc\serialversions.txt
4545
serialver org.woehlke.simpleworklist.user.register.UserRegistrationForm >> ..\..\etc\serialversions.txt
46-
serialver org.woehlke.simpleworklist.user.UserSessionBean >> ..\..\etc\serialversions.txt
46+
serialver org.woehlke.simpleworklist.session.UserSessionBean >> ..\..\etc\serialversions.txt
4747
cd ..\..
4848
echo FINISHED

‎etc/serialversions/getserialversionid.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ echo "CLASSPATH $CLASSPATH"
2929
cd $CLASSES_PATH
3030
serialver org.woehlke.simpleworklist.language.Language > $SERIALVERSIONS_FILE
3131
serialver org.woehlke.simpleworklist.task.TaskEnergy >> $SERIALVERSIONS_FILE
32-
serialver org.woehlke.simpleworklist.taskstate.TaskState >> $SERIALVERSIONS_FILE
32+
serialver org.woehlke.simpleworklist.task.TaskState >> $SERIALVERSIONS_FILE
3333
serialver org.woehlke.simpleworklist.task.TaskTime >> $SERIALVERSIONS_FILE
3434
serialver org.woehlke.simpleworklist.user.resetpassword.UserPasswordRecoveryStatus >> $SERIALVERSIONS_FILE
3535
serialver org.woehlke.simpleworklist.user.register.UserRegistrationStatus >> $SERIALVERSIONS_FILE
@@ -53,7 +53,7 @@ serialver org.woehlke.simpleworklist.context.UserChangeDefaultContextForm >> $SE
5353
serialver org.woehlke.simpleworklist.language.UserChangeLanguageForm >> $SERIALVERSIONS_FILE
5454
serialver org.woehlke.simpleworklist.user.selfservice.UserChangeNameForm >> $SERIALVERSIONS_FILE
5555
serialver org.woehlke.simpleworklist.user.selfservice.UserChangePasswordForm >> $SERIALVERSIONS_FILE
56-
#serialver org.woehlke.simpleworklist.user.UserDetailsBean >> $SERIALVERSIONS_FILE
56+
#serialver org.woehlke.simpleworklist.user.account.UserDetailsBean >> $SERIALVERSIONS_FILE
5757
serialver org.woehlke.simpleworklist.user.register.UserRegistrationForm >> $SERIALVERSIONS_FILE
5858
serialver org.woehlke.simpleworklist.user.UserSessionBean >> $SERIALVERSIONS_FILE
5959
cd $PROJECT_PATH

‎etc/serialversions/serialversions.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
org.woehlke.simpleworklist.language.Language: private static final long serialVersionUID = 0L;
22
org.woehlke.simpleworklist.task.TaskEnergy: private static final long serialVersionUID = 0L;
3-
org.woehlke.simpleworklist.taskstate.TaskState: private static final long serialVersionUID = 0L;
3+
org.woehlke.simpleworklist.task.TaskState: private static final long serialVersionUID = 0L;
44
org.woehlke.simpleworklist.task.TaskTime: private static final long serialVersionUID = 0L;
55
org.woehlke.simpleworklist.user.resetpassword.UserPasswordRecoveryStatus: private static final long serialVersionUID = 0L;
66
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
1818
org.woehlke.simpleworklist.user.login.LoginForm: private static final long serialVersionUID = 5936886560348238355L;
1919
org.woehlke.simpleworklist.context.NewContextForm: private static final long serialVersionUID = -937143305653156981L;
2020
org.woehlke.simpleworklist.user.messages.User2UserMessageFormBean: private static final long serialVersionUID = 1576610181966480168L;
21-
org.woehlke.simpleworklist.search.SearchResult: private static final long serialVersionUID = 1682809351146047764L;
21+
org.woehlke.simpleworklist.searchRequest.SearchResult: private static final long serialVersionUID = 1682809351146047764L;
2222
org.woehlke.simpleworklist.user.account.UserAccountForm: private static final long serialVersionUID = 9180383385243540190L;
2323
org.woehlke.simpleworklist.context.UserChangeDefaultContextForm: private static final long serialVersionUID = -8592295563275083292L;
2424
org.woehlke.simpleworklist.language.UserChangeLanguageForm: private static final long serialVersionUID = 2201123162578113187L;
2525
org.woehlke.simpleworklist.user.selfservice.UserChangeNameForm: private static final long serialVersionUID = 5120488382888268418L;
2626
org.woehlke.simpleworklist.user.selfservice.UserChangePasswordForm: private static final long serialVersionUID = 9149342594823222054L;
2727
org.woehlke.simpleworklist.user.register.UserRegistrationForm: private static final long serialVersionUID = 6864871862706880939L;
28-
org.woehlke.simpleworklist.user.UserSessionBean: private static final long serialVersionUID = -6649686058228455825L;
28+
org.woehlke.simpleworklist.session.UserSessionBean: private static final long serialVersionUID = -6649686058228455825L;

0 commit comments

Comments
 (0)