Skip to content

Commit 0a69328

Browse files
Merge pull request #399 from Spring-Framework-Java-Apps/master
Update
2 parents c0fc872 + 3906b9c commit 0a69328

File tree

199 files changed

+4313
-2150
lines changed

Some content is hidden

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

199 files changed

+4313
-2150
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,4 @@ target
4242
/x.txt
4343
/transaction-logs/
4444
/xx.txt
45+
/.factorypath

.idea/compiler.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/dataSources.local.xml

Lines changed: 11 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/dataSources.xml

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/jarRepositories.xml

Lines changed: 50 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

LICENSE renamed to LICENSE.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
12
Apache License
23
Version 2.0, January 2004
3-
http://www.apache.org/licenses/
4+
https://www.apache.org/licenses/
45

56
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
67

@@ -192,7 +193,7 @@
192193
you may not use this file except in compliance with the License.
193194
You may obtain a copy of the License at
194195

195-
http://www.apache.org/licenses/LICENSE-2.0
196+
https://www.apache.org/licenses/LICENSE-2.0
196197

197198
Unless required by applicable law or agreed to in writing, software
198199
distributed under the License is distributed on an "AS IS" BASIS,

README.md

Lines changed: 46 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
[![Java CI with Maven](https://github.com/Spring-Framework-Java-Apps/simpleworklist/workflows/Java%20CI%20with%20Maven/badge.svg)](https://github.com/Spring-Framework-Java-Apps/simpleworklist/actions)
44
[![OSSAR](https://github.com/Spring-Framework-Java-Apps/simpleworklist/workflows/OSSAR/badge.svg)](https://github.com/Spring-Framework-Java-Apps/simpleworklist/actions)
55
[![Travis CI Build Status](https://travis-ci.com/Spring-Framework-Java-Apps/simpleworklist.svg?branch=master)](https://app.travis-ci.com/github/Spring-Framework-Java-Apps/simpleworklist)
6-
[![Maven Project Reports](src/site/resources/img/maven-feather.png)](https://bloodmoneyapp.github.io/simpleworklist/)
6+
[![Maven Project Reports](src/site/resources/img/maven-feather.png)](https://java.woehlke.org/simpleworklist/)
77

88
Your Todo List for Getting Things Done
99

@@ -25,7 +25,7 @@ SimpleWorklist is not affiliated with or endorsed by the David Allen Company.
2525
## Functional Requirements
2626

2727
### Functional Requirements 001 - Start
28-
![Functional Requirements 001 - Start](src/site/plantuml/Simpleworklist__Use_Cases__001__Start.png)
28+
![Functional Requirements 001 - Start](src/site/resources/plantuml/Simpleworklist__Use_Cases__001__Start.png)
2929
#### F001 Server Starts
3030
#### F002 Home Page rendered
3131
#### F003 Registration
@@ -35,7 +35,7 @@ SimpleWorklist is not affiliated with or endorsed by the David Allen Company.
3535
#### F007 Logout
3636

3737
### Functional Requirements 002 - Show TaskstateTab
38-
![Functional Requirements 002 - Show TaskstateTab](src/site/plantuml/Simpleworklist__Use_Cases__002__Show_TaskstateTab.png)
38+
![Functional Requirements 002 - Show TaskstateTab](src/site/resources/plantuml/Simpleworklist__Use_Cases__002__Show_TaskstateTab.png)
3939
#### F010 show /taskstate/inbox
4040
#### F011 show /taskstate/today
4141
#### F012 show /taskstate/next
@@ -47,7 +47,7 @@ SimpleWorklist is not affiliated with or endorsed by the David Allen Company.
4747
#### F018 show /taskstate/trash
4848

4949
### Functional Requirements 003 - TaskstateTab
50-
![Functional Requirements 003 - TaskstateTab](src/site/plantuml/Simpleworklist__Use_Cases__003__TaskstateTab.png)
50+
![Functional Requirements 003 - TaskstateTab](src/site/resources/plantuml/Simpleworklist__Use_Cases__003__TaskstateTab.png)
5151
#### F040 Taskstate: Add Task to Inbox
5252
#### F041 Taskstate: Add Task to Inbox again
5353
#### F042 Taskstate: Task Edit
@@ -62,7 +62,7 @@ SimpleWorklist is not affiliated with or endorsed by the David Allen Company.
6262
#### F051 Taskstate: Task undelete
6363

6464
### Functional Requirements 004 - Project/Root
65-
![Functional Requirements 004 - Project/Root](src/site/plantuml/Simpleworklist__Use_Cases__004__Project_Root.png)
65+
![Functional Requirements 004 - Project/Root](src/site/resources/plantuml/Simpleworklist__Use_Cases__004__Project_Root.png)
6666
#### F060 Project/Root: Add Task
6767
#### F061 Project/Root: Add SubProject
6868
#### F062 Project/Root: Task Edit
@@ -77,7 +77,7 @@ SimpleWorklist is not affiliated with or endorsed by the David Allen Company.
7777
#### F071 Project/Root: Task undelete
7878

7979
### Functional Requirements 005 - Project/id
80-
![Functional Requirements 005 - Project/id](src/site/plantuml/Simpleworklist__Use_Cases__005__Project_id.png)
80+
![Functional Requirements 005 - Project/id](src/site/resources/plantuml/Simpleworklist__Use_Cases__005__Project_id.png)
8181
#### F080 Project/id: Add Task
8282
#### F081 Project/id: Add SubProject
8383
#### F082 Project/id: Task Edit
@@ -92,7 +92,7 @@ SimpleWorklist is not affiliated with or endorsed by the David Allen Company.
9292
#### F091 Project/id: Task undelete
9393

9494
### Functional Requirements 006 - Drag and Drop. Task move to TaskstateTab
95-
![Functional Requirements 006 - Drag and Drop. Task move to TaskstateTab](src/site/plantuml/Simpleworklist__Use_Cases__006__Task_move_to_TaskstateTab.png)
95+
![Functional Requirements 006 - Drag and Drop. Task move to TaskstateTab](src/site/resources/plantuml/Simpleworklist__Use_Cases__006__Task_move_to_TaskstateTab.png)
9696
#### F120 Drag and Drop: Task move to /taskstate/inbox
9797
#### F121 Drag and Drop: Task move to /taskstate/today
9898
#### F122 Drag and Drop: Task move to /taskstate/next
@@ -104,30 +104,57 @@ SimpleWorklist is not affiliated with or endorsed by the David Allen Company.
104104
#### F128 Drag and Drop: Task move to /taskstate/trash
105105

106106
### Functional Requirements 007 - Drag and Drop Move to Project
107-
![Functional Requirements 007 - Drag and Drop Move to Project](src/site/plantuml/Simpleworklist__Use_Cases__007__Move_to_Project.png)
107+
![Functional Requirements 007 - Drag and Drop Move to Project](src/site/resources/plantuml/Simpleworklist__Use_Cases__007__Move_to_Project.png)
108108
#### F129 Drag and Drop: Task move to Project
109109
#### F130 Drag and Drop: Project move to Project
110110

111111
### Functional Requirements 008 - Drag and Drop Move Task to Change Task-Order
112-
![Functional Requirements 008 - Drag and Drop Move Task to Change Task-Order](src/site/plantuml/Simpleworklist__Use_Cases__008__Move_Task_to_Change_Task_Order.png)
112+
![Functional Requirements 008 - Drag and Drop Move Task to Change Task-Order](src/site/resources/plantuml/Simpleworklist__Use_Cases__008__Move_Task_to_Change_Task_Order.png)
113113
#### F131 Drag and Drop: Move Task to Change Task-Order in TaskstateTab
114114
#### F132 Drag and Drop: Move Task to Change Task-Order in Project/Root
115115
#### F133 Drag and Drop: Move Task to Change Task-Order in Project/id
116116

117117
### Functional Requirements 009 - Search
118-
![Functional Requirements 009 - Search](src/site/plantuml/Simpleworklist__Use_Cases__009__Search.png)
118+
![Functional Requirements 009 - Search](src/site/resources/plantuml/Simpleworklist__Use_Cases__009__Search.png)
119119
#### F200 Search Request
120120

121+
## Functional Requirements - User
122+
123+
### Functional Requirements 001 - Start
124+
![Functional Requirements 001 - Start](src/site/resources/plantuml/Simpleworklist__Use_Cases__001__Start.png)
125+
#### F003 Registration
126+
#### F004 Password Recovery
127+
#### F005 Login
128+
#### F007 Logout
129+
130+
### Functional Requirements 010 - User Profile
131+
![Functional Requirements 010 - User Profile](src/site/resources/plantuml/Simpleworklist__Use_Cases__010__User_Profile.png)
132+
#### F200 List of other Users and New Messages received from them
133+
#### F201 Chat Messages shared with one other User
134+
#### F202 Send New Chat Message to one other User
135+
#### F220 Menu Selfservice: Change Username
136+
#### F221 Menu Selfservice: Change Password
137+
#### F222 Menu Selfservice: Change Contexts
138+
#### F223 Menu Selfservice: Set Default Language
139+
#### F224 Menu Selfservice: Create Test Data
140+
141+
### Functional Requirements 011 - On every Page behind Login
142+
![Functional Requirements 012 - User Profile](src/site/resources/plantuml/Simpleworklist__Use_Cases__010__User_Profile.png)
143+
#### F250 Number of new incoming Messages from other Users
144+
145+
121146
### Domain Class Modell
122147
#### Domain Class Modell - Persistent
123-
![Domain_Class_Modell_Persistent](src/site/plantuml/Simpleworklist__Domain_Class_Modell_Persistent.png)
124-
#### Domain Class Modell - Transient ( TODO )
125-
![Domain_Class_Modell_Persistent](src/site/plantuml/Simpleworklist__Domain_Class_Modell_Transient.png)
148+
![Domain_Class_Modell_Persistent](src/site/resources/plantuml/Simpleworklist__Domain_Class_Modell_Persistent.png)
149+
#### Domain Class Modell - Transient
150+
![Domain_Class_Modell_Persistent](src/site/resources/plantuml/Simpleworklist__Domain_Class_Modell_Transient.png)
126151

127152
## Software Design
128-
### Service Classes Controller ( TODO )
129-
![Service_Classes_Controller](src/site/plantuml/Simpleworklist__Service_Classes_Controller.png)
130-
### Service Classes DB ( TODO )
131-
![Service_Classes_DB](src/site/plantuml/Simpleworklist__Service_Classes_DB.png)
132-
### Service Classes Meso ( TODO )
133-
![Service_Classes_Meso](src/site/plantuml/Simpleworklist__Service_Classes_Meso.png)
153+
### Service Classes Controller
154+
![Service_Classes_Controller](src/site/resources/plantuml/Simpleworklist__Service_Classes_Controller.png)
155+
### Service Classes DB data
156+
![Service_Classes_DB](src/site/resources/plantuml/Simpleworklist__Service_Classes_DB_data.png)
157+
### Service Classes DB user
158+
![Service_Classes_DB](src/site/resources/plantuml/Simpleworklist__Service_Classes_DB_user.png)
159+
### Service Classes Meso
160+
![Service_Classes_Meso](src/site/resources/plantuml/Simpleworklist__Service_Classes_Meso.png)
File renamed without changes.

etc/TODO.md

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -88,25 +88,30 @@
8888
* fixed #390 refactor integration tests: One Test class for each Controller Class
8989
* fixed #391 refactor integration tests: One Test class for each Service Class in package meso
9090

91-
9291
## 2.4.10-SNAPSHOT
93-
* #389 apply Database Schema Evolution for: 386 make Project Navigation collapsible
92+
*
9493

9594
## 2.4.11-SNAPSHOT
96-
* #386 make Project Navigation collapsible
95+
* fixed #380 add User Use Cases to UML Documentation
96+
* fixed #393 UML Documentation: Service Classes DB
97+
* fixed #394 UML Documentation: Service Classes Meso
9798

9899
## 2.4.12-SNAPSHOT
99-
* #388 make task.taskstate, task.duedate and taskstate workflow independent to each other
100+
* fixed #388 make task.taskstate, task.duedate and taskstate workflow independent to each other
101+
*
100102

101103
## 2.4.13-SNAPSHOT
102104
* #377 add List of URL (Patterns) to Documentation
103-
* #380 add User Use Cases to UML Documentation
104-
* #393 UML Documentation: Service Classes DB ( TODO )
105-
* #394 UML Documentation: Service Classes Meso ( TODO )
105+
* #392 refactor integration tests: add Unit Tests for Beans and Entities
106+
*
106107

107108
## 2.4.14-SNAPSHOT
108-
* #392 refactor integration tests: add Unit Tests for Beans and Entities
109+
* #386 make Project Navigation collapsible
110+
* #389 apply Database Schema Evolution for: 386 make Project Navigation collapsible
111+
*
109112

110113
## 2.4.15-SNAPSHOT
111114
* #378 Add Search Index and search functionality
112-
*
115+
116+
## 2.4.16-SNAPSHOT
117+
*

0 commit comments

Comments
 (0)