Skip to content

Commit be10e6b

Browse files
thomaswoehlkethomaswoehlke
authored
Merge pull request #179 from Spring-Framework-Java-Apps/master
next deployment
2 parents 1dbcab3 + 7ed13d7 commit be10e6b

File tree

130 files changed

+3357
-3102
lines changed

Some content is hidden

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

130 files changed

+3357
-3102
lines changed

‎.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,9 @@ docs/deploying-spring-boot-apps/
3030
setenv.sh
3131
setenv.cmd
3232
/etc/pom.xml
33+
/src/main/java/org/woehlke/simpleworklist/project/x.txt
34+
/src/main/java/org/woehlke/simpleworklist/task/x.txt
35+
/src/main/java/org/woehlke/simpleworklist/taskstate/x.txt
36+
/src/main/java/org/woehlke/simpleworklist/context/x.txt
37+
/src/main/java/org/woehlke/simpleworklist/error/x.txt
38+
/src/main/java/org/woehlke/simpleworklist/search/x.txt

‎README.md

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,9 @@ Your Todo List for Getting Things Done
88
GTD® and Getting Things Done® are registered trademarks of the David Allen Company.
99
SimpleWorklist is not affiliated with or endorsed by the David Allen Company.
1010

11-
## Up and Running
12-
A Java Web App, which can easily be deployed to Heroku.
13-
14-
[![Deploy to Heroku](https://www.herokucdn.com/deploy/button.png)](https://heroku.com/deploy)
15-
16-
## URLs
17-
### Development
18-
* Heroku Deployment: [simpleworklist.herokuapp.com/](https://simpleworklist.herokuapp.com/)
19-
* For Developers: [localhost:5000](http://localhost:5000/)
20-
### Info
21-
* [spring-framework-java-apps.github.io/simpleworklist](http://spring-framework-java-apps.github.io/simpleworklist/)
11+
## Requirements
12+
* [Functional Requirements](etc/requirements/Requirements.md)
13+
* [Nonfunctional Requirements](etc/requirements/Nonfunctional_Requirements.md)
2214

2315
### Github Shortcuts
2416
* [Projects](https://github.com/Spring-Framework-Java-Apps/simpleworklist/projects)
@@ -27,14 +19,19 @@ A Java Web App, which can easily be deployed to Heroku.
2719
* [Releases](https://github.com/Spring-Framework-Java-Apps/simpleworklist/releases)
2820
* [Branches](https://github.com/Spring-Framework-Java-Apps/simpleworklist/branches)
2921
* [CI](https://github.com/Spring-Framework-Java-Apps/simpleworklist/actions)
22+
* [spring-framework-java-apps.github.io/simpleworklist](http://spring-framework-java-apps.github.io/simpleworklist/)
3023

31-
## Requirements
32-
33-
### Functional Requirements
34-
[Functional Requirements](etc/requirements/Requirements.md)
24+
## Development
25+
* [Requirements](etc/requirements/Requirements.md)
26+
* [Nonfunctional_Requirements](etc/requirements/Nonfunctional_Requirements.md)
27+
* [HOWTO](etc/development/HOWTO.md)
28+
* [Maven_Plugins](etc/development/Maven_Plugins.md)
29+
* [Primesfaces_JSF](etc/development/Primesfaces_JSF.md)
3530

36-
### Nonfunctional Requirements
37-
[Nonfunctional Requirements](etc/requirements/Nonfunctional_Requirements.md)
31+
## URLs:
32+
* Heroku Deployment: [simpleworklist.herokuapp.com/](https://simpleworklist.herokuapp.com/)
33+
* For Developers: [localhost:5000](http://localhost:5000/)
3834

39-
## Development
40-
* [Changelog](etc/Changelog.md)
35+
## Up and Running - Deployment
36+
* A Java Web App, which can easily be deployed to Heroku.
37+
* [![Deploy to Heroku](https://www.herokucdn.com/deploy/button.png)](https://heroku.com/deploy)

‎etc/TODO.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,3 +72,21 @@ Fixed #106, Fixed #109, Fixed #110
7272

7373
Deployment to heroku
7474

75+
# Maven Config:
76+
## maven-changes-plugin
77+
https://maven.apache.org/plugins/maven-changes-plugin/examples/configuring-github-report.html
78+
79+
## maven-enforcer-plugin
80+
http://maven.apache.org/enforcer/maven-enforcer-plugin/plugin-info.html
81+
http://maven.apache.org/enforcer/enforcer-rules/
82+
https://maven.apache.org/enforcer/enforcer-rules/requireFilesExist.html
83+
https://maven.apache.org/enforcer/enforcer-rules/requireEnvironmentVariable.html
84+
https://maven.apache.org/enforcer/enforcer-rules/requireActiveProfile.html
85+
https://maven.apache.org/enforcer/enforcer-rules/dependencyConvergence.html
86+
https://www.baeldung.com/maven-enforcer-plugin
87+
88+
# 2.3.14
89+
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
90+
91+
Fixed #129
92+
Fixed #126

‎etc/development/application.properties_sample.txt renamed to ‎etc/config/application.properties_sample.txt

File renamed without changes.

‎etc/development/application.properties_test_sample.txt renamed to ‎etc/config/application.properties_test_sample.txt

File renamed without changes.

‎etc/development/db-createdb-and-user-linux.sql renamed to ‎etc/db/db-createdb-and-user-linux.sql

File renamed without changes.

‎etc/development/db-createdb-and-user-win10.sql renamed to ‎etc/db/db-createdb-and-user-win10.sql

File renamed without changes.

‎etc/development/HOWTO.md

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,5 @@
1-
Howto Reminder
1+
# HOWTO
22

3-
## github
4-
* [Issues](https://github.com/BloodMoneyApp/bloodmoney/issues)
5-
* [Projects](https://github.com/BloodMoneyApp/bloodmoney/projects)
6-
* [Milestones](https://github.com/BloodMoneyApp/bloodmoney/milestones)
7-
* [Releases](https://github.com/BloodMoneyApp/bloodmoney/releases)
8-
9-
## Development
10-
* [Changelog](etc/RELEASES.md)
11-
* [Todo](etc/TODO.md)
12-
* [Howto](etc/HOWTO.md)
13-
14-
15-
## 3rd Party Software
163
### Howto
174
* [Spring dependency-management-plugin](https://docs.spring.io/dependency-management-plugin/docs/current/reference/html/)
185
* [Example on github: heroku and Gradle](https://github.com/heroku/gradle-getting-started/blob/master/build.gradle)
@@ -46,6 +33,7 @@
4633
* [liquibase-gradle-plugin](https://github.com/liquibase/liquibase-gradle-plugin)
4734

4835
## Database and JPA
36+
4937
### DB Datatypes
5038
* [H2 Datatypes](http://www.h2database.com/html/datatypes.html)
5139
* [PostgreSQL Datatypes](https://www.postgresql.org/docs/11/datatype.html)

‎etc/development/Maven_Plugins.md

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
# Maven Plugins
2+
3+
| Plugin Page | mvnrepository.com | git repo | latest Version | Release Date of latest Version |
4+
|-------------|-------------------|----------|----------------|--------------------------------|
5+
| [apache-rat-plugin](http://creadur.apache.org/rat/apache-rat-plugin/) |   |   |   |   |
6+
| [maven-enforcer-plugin](http://maven.apache.org/enforcer/maven-enforcer-plugin/) |   |   |   |   |
7+
| [maven-jxr-plugin](http://maven.apache.org/jxr/maven-jxr-plugin/) |   |   |   |   |
8+
| [maven-release-plugin](http://maven.apache.org/maven-release/maven-release-plugin/) |   |   |   |   |
9+
| [maven-clean-plugin](http://maven.apache.org/plugins/maven-clean-plugin/) |   |   |   |   |
10+
| [maven-dependency-plugin](http://maven.apache.org/plugins/maven-dependency-plugin/) |   |   |   |   |
11+
| [maven-deploy-plugin](http://maven.apache.org/plugins/maven-deploy-plugin/) |   |   |   |   |
12+
| [maven-docck-plugin](http://maven.apache.org/plugins/maven-docck-plugin/) |   |   |   |   |
13+
| [maven-install-plugin](http://maven.apache.org/plugins/maven-install-plugin/) |   |   |   |   |
14+
| [maven-jarsigner-plugin](http://maven.apache.org/plugins/maven-jarsigner-plugin/) |   |   |   |   |
15+
| [maven-project-info-reports-plugin](http://maven.apache.org/plugins/maven-project-info-reports-plugin/) |   |   |   |   |
16+
| [maven-remote-resources-plugin](http://maven.apache.org/plugins/maven-remote-resources-plugin/) |   |   |   |   |
17+
| [maven-shade-plugin](http://maven.apache.org/plugins/maven-shade-plugin/) |   |   |   |   |
18+
| [maven-toolchains-plugin](http://maven.apache.org/plugins/maven-toolchains-plugin/) |   |   |   |   |
19+
| [maven-scm-plugin](http://maven.apache.org/scm/maven-scm-plugin/) |   |   |   |   |
20+
| [maven-failsafe-plugin](http://maven.apache.org/surefire/maven-failsafe-plugin/) |   |   |   |   |
21+
| [maven-surefire-plugin](http://maven.apache.org/surefire/maven-surefire-plugin/) |   |   |   |   |
22+
| [maven-surefire-report-plugin](http://maven.apache.org/surefire/maven-surefire-report-plugin/) |   |   |   |   |
23+
| [maven-changes-plugin](https://maven.apache.org/plugins/maven-changes-plugin/) |   |   |   |   |
24+
| [maven-checkstyle-plugin](https://maven.apache.org/plugins/maven-checkstyle-plugin/) |   |   |   |   |
25+
| [maven-compiler-plugin](https://maven.apache.org/plugins/maven-compiler-plugin/) |   |   |   |   |
26+
| [maven-invoker-plugin](https://maven.apache.org/plugins/maven-invoker-plugin/) |   |   |   |   |
27+
| [maven-jar-plugin](https://maven.apache.org/plugins/maven-jar-plugin/) |   |   |   |   |
28+
| [maven-javadoc-plugin](https://maven.apache.org/plugins/maven-javadoc-plugin/) |   |   |   |   |
29+
| [maven-pmd-plugin](https://maven.apache.org/plugins/maven-pmd-plugin/) |   |   |   |   |
30+
| [maven-resources-plugin](https://maven.apache.org/plugins/maven-resources-plugin/) |   |   |   |   |
31+
| [maven-scm-publish-plugin](https://maven.apache.org/plugins/maven-scm-publish-plugin/) |   |   |   |   |
32+
| [maven-site-plugin](https://maven.apache.org/plugins/maven-site-plugin/) |   |   |   |   |
33+
| [maven-source-plugin](https://maven.apache.org/plugins/maven-source-plugin/) |   |   |   |   |
34+
| [maven-plugin-plugin](https://maven.apache.org/plugin-tools/maven-plugin-plugin/) |   |   |   |   |

‎etc/development/Primesfaces_JSF.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Primesfaces JSF
2+

‎etc/development/db-createdb-and-user.sql

Lines changed: 0 additions & 45 deletions
This file was deleted.

‎docker-start.sh renamed to ‎etc/docker-start.sh

File renamed without changes.

‎docker-stop.sh renamed to ‎etc/docker-stop.sh

File renamed without changes.

‎etc/java/set_java11.cmd

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
subst /D J:
2+
subst J: "C:\Program Files\Java\*********"

‎etc/set_java13.cmd renamed to ‎etc/java/set_java13.cmd

File renamed without changes.

‎etc/java/set_java14.cmd

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
subst /D J:
2+
subst J: "C:\Program Files\Java\*********"

‎etc/set_java1_8.cmd renamed to ‎etc/java/set_java1_8.cmd

File renamed without changes.

‎etc/java/set_java_windows10.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Set java on Windows10
2+
3+

‎psql.sh renamed to ‎etc/psql.sh

File renamed without changes.

‎etc/requirements/Nonfunctional_Requirements.odt

-8.18 KB
Binary file not shown.

‎etc/requirements/Requirements.md

Lines changed: 31 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,44 @@
1212

1313
## F006 Page after first successful Login
1414

15-
## F007 Add first new Task from Inbox
15+
## F007 Add first new Task to Inbox
1616

17-
## F008 Add first new Project
17+
## F008 Add another new Task to Inbox
1818

19-
## F009 Add another new Task from Inbox
20-
INBOX -> add new task -> Form -> save -> INBOX ( -> OK )
21-
-> add new task -> Form -> save -> Project (-> NOK )
19+
## F009 Add Task to Project/Root
2220

23-
BUG: after saving to db app should show Inbox, but shows ProjectView for RootProject
21+
## F010 Add SubProject to Project/Root
2422

25-
URLpaths:
26-
http://localhost:5000/taskstate/inbox
27-
http://localhost:5000/task/addtoproject/0
28-
http://localhost:5000/project/0/?listTaskTime=MIN5&listTaskTime=MIN10&listTaskTime=MIN15&listTaskTime=MIN30&listTaskTime=MIN45&listTaskTime=HOUR1&listTaskTime=HOUR2&listTaskTime=HOUR3&listTaskTime=HOUR4&listTaskTime=HOUR6&listTaskTime=HOUR8&listTaskTime=MORE&listTaskTime=NONE&numberOfNewIncomingMessages=0&listTaskEnergy=LOW&listTaskEnergy=MEDIUM&listTaskEnergy=HIGH&listTaskEnergy=NONE&context=Work&refreshMessages=false
23+
## F011 setFocus of a Task
2924

25+
## F012 unSetFocus of a Task
3026

27+
## F013 show /taskstate/inbox
3128

29+
## F014 show /taskstate/today
3230

31+
## F015 show /taskstate/next
3332

33+
## F016 show /taskstate/waiting
3434

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

‎etc/requirements/Requirements.odt

-8.18 KB
Binary file not shown.

‎etc/classpath.txt renamed to ‎etc/serialversions/classpath.txt

File renamed without changes.

‎etc/getserialversionid.cmd renamed to ‎etc/serialversions/getserialversionid.cmd

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ 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.task.TaskState >> ..\..\etc\serialversions.txt
20+
serialver org.woehlke.simpleworklist.taskstate.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
24-
serialver org.woehlke.simpleworklist.user.UserRole >> ..\..\etc\serialversions.txt
24+
serialver org.woehlke.simpleworklist.user.account.UserRole >> ..\..\etc\serialversions.txt
2525
serialver org.woehlke.simpleworklist.common.AuditModel >> ..\..\etc\serialversions.txt
2626
serialver org.woehlke.simpleworklist.context.Context >> ..\..\etc\serialversions.txt
2727
serialver org.woehlke.simpleworklist.project.Project >> ..\..\etc\serialversions.txt
@@ -34,7 +34,7 @@ serialver org.woehlke.simpleworklist.breadcrumb.BreadcrumbItem >> ..\..\etc\ser
3434
serialver org.woehlke.simpleworklist.breadcrumb.Breadcrumb >> ..\..\etc\serialversions.txt
3535
serialver org.woehlke.simpleworklist.user.login.LoginForm >> ..\..\etc\serialversions.txt
3636
serialver org.woehlke.simpleworklist.context.NewContextForm >> ..\..\etc\serialversions.txt
37-
serialver org.woehlke.simpleworklist.user.messages.NewUser2UserMessage >> ..\..\etc\serialversions.txt
37+
serialver org.woehlke.simpleworklist.user.messages.User2UserMessageFormBean >> ..\..\etc\serialversions.txt
3838
serialver org.woehlke.simpleworklist.search.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

‎etc/getserialversionid.sh renamed to ‎etc/serialversions/getserialversionid.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ 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.task.TaskState >> $SERIALVERSIONS_FILE
32+
serialver org.woehlke.simpleworklist.taskstate.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
36-
serialver org.woehlke.simpleworklist.user.UserRole >> $SERIALVERSIONS_FILE
36+
serialver org.woehlke.simpleworklist.user.account.UserRole >> $SERIALVERSIONS_FILE
3737
serialver org.woehlke.simpleworklist.common.AuditModel >> $SERIALVERSIONS_FILE
3838
serialver org.woehlke.simpleworklist.context.Context >> $SERIALVERSIONS_FILE
3939
serialver org.woehlke.simpleworklist.project.Project >> $SERIALVERSIONS_FILE
@@ -46,7 +46,7 @@ serialver org.woehlke.simpleworklist.breadcrumb.BreadcrumbItem >> $SERIALVERSIO
4646
serialver org.woehlke.simpleworklist.breadcrumb.Breadcrumb >> $SERIALVERSIONS_FILE
4747
serialver org.woehlke.simpleworklist.user.login.LoginForm >> $SERIALVERSIONS_FILE
4848
serialver org.woehlke.simpleworklist.context.NewContextForm >> $SERIALVERSIONS_FILE
49-
serialver org.woehlke.simpleworklist.user.messages.NewUser2UserMessage >> $SERIALVERSIONS_FILE
49+
serialver org.woehlke.simpleworklist.user.messages.User2UserMessageFormBean >> $SERIALVERSIONS_FILE
5050
serialver org.woehlke.simpleworklist.search.SearchResult >> $SERIALVERSIONS_FILE
5151
serialver org.woehlke.simpleworklist.user.account.UserAccountForm >> $SERIALVERSIONS_FILE
5252
serialver org.woehlke.simpleworklist.context.UserChangeDefaultContextForm >> $SERIALVERSIONS_FILE

‎etc/serialversions.txt renamed to ‎etc/serialversions/serialversions.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
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.task.TaskState: private static final long serialVersionUID = 0L;
3+
org.woehlke.simpleworklist.taskstate.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;
7-
org.woehlke.simpleworklist.user.UserRole: private static final long serialVersionUID = 0L;
7+
org.woehlke.simpleworklist.user.account.UserRole: private static final long serialVersionUID = 0L;
88
org.woehlke.simpleworklist.common.AuditModel: private static final long serialVersionUID = 4399373914714726911L;
99
org.woehlke.simpleworklist.context.Context: private static final long serialVersionUID = -5035732370606951871L;
1010
org.woehlke.simpleworklist.project.Project: private static final long serialVersionUID = 4566653175832872422L;
@@ -17,7 +17,7 @@ org.woehlke.simpleworklist.breadcrumb.BreadcrumbItem: private static final lo
1717
org.woehlke.simpleworklist.breadcrumb.Breadcrumb: private static final long serialVersionUID = 7932703111140692689L;
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;
20-
org.woehlke.simpleworklist.user.messages.NewUser2UserMessage: private static final long serialVersionUID = 1576610181966480168L;
20+
org.woehlke.simpleworklist.user.messages.User2UserMessageFormBean: private static final long serialVersionUID = 1576610181966480168L;
2121
org.woehlke.simpleworklist.search.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;

‎setenv-sample.cmd renamed to ‎etc/setenv-sample.cmd

File renamed without changes.

‎setenv-sample.sh renamed to ‎etc/setenv-sample.sh

File renamed without changes.

0 commit comments

Comments
 (0)