Compare commits

...

551 Commits

Author SHA1 Message Date
Fabio Formosa
71bc29df2a released v5.0.1 2026-05-15 01:21:03 +02:00
Fabio Formosa
59a8b39305 added screenshots to be linked to the readme 2026-05-15 00:26:11 +02:00
Fabio Formosa
ab1c3b5606 Merge pull request #140 from fabioformosa/develop
Releasing v5.0.0
2026-05-15 00:21:51 +02:00
Fabio Formosa
1ae381e842 #94 temporary excluded a sonar rule 2026-05-15 00:18:34 +02:00
Fabio Formosa
7677947447 switched to ver 5.0.0-SNAPSHOT 2026-05-14 23:33:38 +02:00
Fabio Formosa
0a62366fa4 updated the README file 2026-05-14 23:25:08 +02:00
Fabio Formosa
cc433bb531 Merge pull request #136 from fabioformosa/feature/#9x_trigger_types
Feature/#9x trigger types
2026-05-14 08:26:03 +02:00
Fabio Formosa
501ef6c062 fixed sonar issues 2026-05-14 08:22:33 +02:00
Fabio Formosa
b6529b453a fixed the coverage 2026-05-14 00:48:08 +02:00
Fabio Formosa
40d8c952a0 fixed the coverage 2026-05-14 00:47:39 +02:00
Fabio Formosa
c1511b54f8 fixed tests and github actions 2026-05-14 00:17:54 +02:00
Fabio Formosa
9a50949fcc fixed tests and github actions 2026-05-14 00:06:34 +02:00
Fabio Formosa
699e661d81 restyled the login page 2026-05-13 22:48:56 +02:00
Fabio Formosa
93990a5994 #90 #91 #92 #93 supported all trigger types 2026-05-12 22:53:11 +02:00
Fabio Formosa
82e684f0a7 #135 added scheduled job management 2026-05-12 22:13:03 +02:00
Fabio Formosa
7d481247bc #132 #133 refactored some existing endpoint and added new ones to manage triggers 2026-05-12 21:41:31 +02:00
Fabio Formosa
e24c5bc62a #134 added the new UI layout and style 2026-05-12 00:59:14 +02:00
Fabio Formosa
29fff2a6cd #130 imported the new version of metamorphosis lib and reverted the conversion service 2026-05-09 15:54:43 +02:00
Fabio Formosa
2a20b930f0 #130 upgraded github actions 2026-05-09 12:06:11 +02:00
Fabio Formosa
b0ba230abe #130 upgraded Spring Boot to 4.0.6 2026-05-09 11:48:39 +02:00
Fabio Formosa
1e48e1803f #130 upgraded Spring Boot to 4.0.6 2026-05-09 11:48:24 +02:00
Fabio Formosa
e90648c027 #131 upgraded Angular to v21 2026-05-09 10:51:18 +02:00
Fabio Formosa
23417fa6a2 Merge branch 'feature/#101_angular15_update' into develop 2026-05-09 00:11:12 +02:00
Fabio Formosa
57d5ebd641 set the new snapshot version 4.1.1-SNAPSHOT 2026-05-08 23:52:34 +02:00
Fabio Formosa
da8c9d5707 Remove Maven Central badge from README
Removed Maven Central badge from README.
2026-05-08 22:53:46 +02:00
Fabio Formosa
6b245c7eec released v4.1.1 2026-05-08 22:36:40 +02:00
Fabio Formosa
d7653dc73e released v4.1.0 2026-05-08 21:50:38 +02:00
Fabio Formosa
e6a7b35f6a released v4.1.0 2026-05-08 21:48:57 +02:00
Fabio Formosa
f6e02ae181 #103 fixed log retrieval through websocket 2026-05-08 21:41:04 +02:00
Fabio Formosa
f6d6cd16e7 Merge branch 'develop' into feature/#101_angular15_update
# Conflicts:
#	quartz-manager-frontend/package-lock.json
#	quartz-manager-frontend/src/app/components/logs-panel/logs-panel.component.html
#	quartz-manager-frontend/src/app/components/progress-panel/progress-panel.component.html
#	quartz-manager-frontend/src/app/components/simple-trigger-config/simple-trigger-config.component.ts
#	quartz-manager-frontend/src/app/views/manager/manager.component.html
#	quartz-manager-frontend/src/app/views/manager/manager.component.ts
2026-05-08 00:59:59 +02:00
Fabio Formosa
87901fe6a7 #103 fixed some font sizes 2026-05-08 00:42:08 +02:00
Fabio Formosa
3088a2fec1 Merge pull request #129 from fabioformosa/develop
Develop for releasing 4.1.0
2026-05-08 00:39:01 +02:00
Fabio Formosa
bdd0caa026 Merge pull request #128 from fabioformosa/feature/#103_multiple_triggers
Feature/#103 multiple triggers
2026-05-06 23:46:02 +02:00
Fabio Formosa
068b0eed34 #103 fixed a test 2026-05-06 23:43:35 +02:00
Fabio Formosa
b2f9692815 #103 fixed a test 2026-05-06 23:41:08 +02:00
Fabio Formosa
5fc6c56409 Merge branch 'develop' into feature/#103_multiple_triggers
# Conflicts:
#	quartz-manager-parent/.gitignore
2026-05-06 23:26:40 +02:00
Fabio Formosa
d7a78c57ae #103 minor enhancements 2026-05-06 23:13:44 +02:00
Fabio Formosa
31658416f5 #103 final step into multi-trigger feature 2026-05-06 01:22:30 +02:00
Fabio Formosa
1d81e88684 Merge remote-tracking branch 'origin/master' into develop 2026-04-27 23:13:05 +02:00
Fabio Formosa
f55a58b100 Add workflow_dispatch trigger to sonar-java.yml
added the workflow_dispatch to the GitHub Action
2026-04-23 23:26:20 +02:00
Fabio Formosa
902542e480 Update sonar-java.yml
added the workflow_dispatch trigger for the sonar action
2026-04-23 22:39:34 +02:00
Fabio Formosa
c198d32bd5 bump to version 4.0.11-SNAPSHOT 2025-05-23 23:06:34 +02:00
Fabio Formosa
56d9f5d94f bump to version 4.0.10 2025-05-23 23:04:28 +02:00
Fabio Formosa
45f66d51fe Merge remote-tracking branch 'origin/master' into develop 2025-05-23 23:00:37 +02:00
Fabio Formosa
95769248a3 migrated to the new maven central repo 2025-05-23 21:52:30 +02:00
Fabio Formosa
dcbf3eb277 migrated to the new maven central repo 2025-05-23 20:10:53 +02:00
Fabio Formosa
fab977fd7d added the staging and prod env to the delivery pipeline 2024-07-27 17:41:31 +02:00
Fabio Formosa
9d2a01ebbe added the staging and prod env to the delivery pipeline 2024-07-27 17:33:31 +02:00
Fabio Formosa
9a0789cab0 minor commit 2024-07-27 17:08:11 +02:00
Fabio Formosa
e5a6b8b32b minor commit 2024-07-27 16:33:24 +02:00
Fabio Formosa
4537c8e304 minor commit 2024-07-18 23:53:27 +02:00
Fabio Formosa
82ac821b34 minor commit 2024-07-17 00:30:49 +02:00
Fabio Formosa
0a4a31ae65 fixed the chart path 2024-07-17 00:21:24 +02:00
Fabio Formosa
3b325536e8 fixed the dev cluster reference 2024-07-17 00:06:58 +02:00
Fabio Formosa
307c6eab98 fixed the docker image in the cloud deploy pipeline 2024-07-16 23:49:38 +02:00
Fabio Formosa
b1ff70265f added verbosity to cloudbuild.yaml 2024-07-16 23:15:54 +02:00
Fabio Formosa
226296737d added verbosity to cloudbuild.yaml 2024-07-16 23:05:34 +02:00
Fabio Formosa
a5750d1d0d duplicated the helm props replacements 2024-07-16 00:24:10 +02:00
Fabio Formosa
f71c9b20ab minor commit 2024-07-16 00:15:05 +02:00
Fabio Formosa
9cc55492dc fixed the pipeline name 2024-07-15 23:58:08 +02:00
Fabio Formosa
6d36e4620c fixed the path of the pipeline file 2024-07-15 23:47:32 +02:00
Fabio Formosa
4d5e8f62c3 added a google deploy pipeline 2024-07-15 23:39:51 +02:00
Fabio Formosa
8ba33f25b4 fixed copy path in the Dockerfile 2024-07-13 16:00:44 +02:00
Fabio Formosa
7a742d5aea fixed copy path in the Dockerfile 2024-07-13 15:52:40 +02:00
Fabio Formosa
abd25d6158 fixed a wrong path in cloudbuild.yaml 2024-07-13 15:33:10 +02:00
Fabio Formosa
9f46e52564 added a logging policy to cloudbuild.yaml and pushed skaffold.yaml 2024-07-13 15:28:24 +02:00
Fabio Formosa
e6927209e5 added a helm chart to the web-showcase module and cloudbuild.yaml and skaffold.yaml 2024-07-13 13:00:12 +02:00
Fabio Formosa
63fbedbdc8 moved the web-showcase from war to jar and added a dockerfile 2024-07-12 00:36:47 +02:00
Fabio Formosa
6ec886686f #101 added smaller fonts for job class and misfire instructions 2024-03-25 23:29:32 +01:00
Fabio Formosa
f96e356c8a Merge branch 'feature/#101_angular15_update' of github.com:fabioformosa/quartz-manager into feature/#101_angular15_update
# Conflicts:
#	.gitignore
#	quartz-manager-frontend/src/styles.css
2024-03-25 22:40:54 +01:00
Fabio Formosa
c646624e45 Merge pull request #122 from ChistaDATA/feature/#101_angular15_update
fix: update footer font size
2024-03-25 22:39:37 +01:00
Fabio Formosa
0148056b1f Update README.md 2024-03-07 23:32:51 +01:00
Midhun A Darvin
e9542352b5 feat: update footer font size 2024-03-04 20:14:34 +05:30
Midhun A Darvin
7cef35517b fix: style regression issues
- add Roboto font face as dependency
- fix font size regression issue in select inputs
- fix scroll regression issue
- fix triggerName not disabled during reschedule
2024-02-19 23:42:37 +01:00
Midhun A Darvin
bc0619a92a feat: update padding & styles
- apply padding fixes
- remove `enableTrigger` variable and directly use `simpleTriggerReactiveForm.enabled`
-  apply default styles of matInput
2024-02-19 23:42:37 +01:00
Midhun A Darvin
2debf6c63f feat: update angular version from 14 to 15
- update package.json dependencies
- npm audit force fix
- add `MatDialogModule` to app module imports
- mat-form-field has appearance property `outline` and `fill` now
- update unit tests
2024-02-19 23:42:32 +01:00
Fabio Formosa
baa01d10cb Merge pull request #121 from ChistaDATA/feature/#101_angular15_update
fix: style regression issues
2024-02-19 23:34:30 +01:00
Midhun A Darvin
adb4864c85 fix: style regression issues
- add Roboto font face as dependency
- fix font size regression issue in select inputs
- fix scroll regression issue
- fix triggerName not disabled during reschedule
2024-02-09 20:23:19 +05:30
Fabio Formosa
c6f10e04eb Merge pull request #114 from ChistaDATA/feature/#101_angular15_update
feat: update padding & styles
2024-02-08 22:56:02 +01:00
Fabio Formosa
ad6a61f3df Update README.md
added a new example for the repo quartz-manager-use-cases
2024-02-07 00:24:21 +01:00
Fabio Formosa
5cb73019de bump version to 4.0.10-SNAPSHOT 2024-02-07 00:19:17 +01:00
Fabio Formosa
8a8e878e47 Update README.md
updated all references to the last release
2024-02-07 00:16:40 +01:00
Fabio Formosa
fae82e1d4e Merge pull request #118 from fabioformosa/develop
Develop to Master
2024-02-07 00:15:44 +01:00
Fabio Formosa
e0011913c2 bump version to 4.0.9 2024-02-06 23:58:07 +01:00
Fabio Formosa
a59b6a6c96 #115 fixed the liquibase DB migration execution 2024-02-06 23:43:54 +01:00
Fabio Formosa
68aaab6ac4 #115 fixed the liquibase DB migration execution 2024-02-06 23:42:38 +01:00
Midhun A Darvin
c75190513a feat: update padding & styles
- apply padding fixes
- remove `enableTrigger` variable and directly use `simpleTriggerReactiveForm.enabled`
-  apply default styles of matInput
2024-02-03 12:00:37 +05:30
Fabio Formosa
1421c52c34 Merge pull request #111 from midhunadarvin/feat/angular-update
feat: update angular version from 14 to 15
2024-02-03 00:11:11 +01:00
Fabio Formosa
b2942737af Merge branch 'feature/#101_angular15_update' into feat/angular-update 2024-02-03 00:07:25 +01:00
Fabio Formosa
a1d8b12e98 Merge pull request #112 from fabioformosa/feature/#109_configure_trigger_job_data
Feature/#109 configure trigger job data
2024-02-02 23:59:20 +01:00
Fabio Formosa
45d6a4c59a Merge branch 'feature/#109_configure_trigger_job_data' of github.com:fabioformosa/quartz-manager into feature/#109_configure_trigger_job_data 2024-02-02 23:54:31 +01:00
Midhun A Darvin
e6f6fb5f06 feat: configure Trigger JobData
- add `jobDataMap` property to SimpleTriggerInputDTO
- update SimpleTriggerCommandDTOToSimpleTrigger converter
- update SimpleTriggerToSimpleTriggerDTO converter
- update unit tests
- add .idea and .iml to .gitignore for ignoring intellij files
2024-02-02 23:43:27 +01:00
Fabio Formosa
13c438d097 Merge branch 'master' into develop 2024-02-02 23:38:22 +01:00
Fabio Formosa
412e455907 #103 step into accomodating the new trigger logic 2024-02-02 22:58:56 +01:00
Fabio Formosa
75d630aad0 Merge pull request #110 from midhunadarvin/feat/configure-trigger-job-data
feat: configure `Trigger` JobDataMap
2024-02-02 22:56:20 +01:00
Midhun A Darvin
2105e289ac feat: update angular version from 14 to 15
- update package.json dependencies
- npm audit force fix
- add `MatDialogModule` to app module imports
- mat-form-field has appearance property `outline` and `fill` now
- update unit tests
2024-02-02 16:05:54 +05:30
Midhun A Darvin
9eddc0b1fd feat: configure Trigger JobData
- add `jobDataMap` property to SimpleTriggerInputDTO
- update SimpleTriggerCommandDTOToSimpleTrigger converter
- update SimpleTriggerToSimpleTriggerDTO converter
- update unit tests
- add .idea and .iml to .gitignore for ignoring intellij files
2024-02-02 13:11:00 +05:30
Fabio Formosa
fa4ede5179 Merge pull request #108 from midhunadarvin/feat/configure-auto-startup
feat: make autoStartup configurable for SchedulerFactoryBean
2024-02-01 00:24:21 +01:00
Fabio Formosa
3aa672031a Updated the sonarcloud.io integration 2024-01-31 23:40:26 +01:00
Midhun A Darvin
82ca186bff feat: make autoStartup configurable for SchedulerFactoryBean
- check property `org.quartz.scheduler.isAutoStartup` and enable autoStartup if it is true
2024-01-31 13:28:15 +05:30
Fabio Formosa
727a11fcea #103 fixed a test 2022-12-21 00:03:39 +01:00
Fabio Formosa
7106dc0fbb #103 clean up 2022-12-21 00:00:29 +01:00
Fabio Formosa
a2c8ecb227 #103 migrated the progress websocket to rx-stomp 2022-12-20 23:59:30 +01:00
Fabio Formosa
e4c771e364 #103 migrated the progress websocket to rx-stomp 2022-12-20 23:58:51 +01:00
Fabio Formosa
261dd8b624 #103 appended the trigger key to the websocket topic 2022-12-20 20:51:10 +01:00
Fabio Formosa
ac63576704 #103 migrated the logs websocket to rx-stomp 2022-12-18 11:58:24 +01:00
Fabio Formosa
a3b92443c4 #103 enabled a dev profile in the angular.json 2022-12-18 11:53:32 +01:00
Fabio Formosa
527ee1200a #103 added some comments 2022-12-11 20:38:55 +01:00
Fabio Formosa
82a60eb651 Update README.md 2022-12-10 16:59:31 +01:00
Fabio Formosa
7fd174b313 bump version to 4.0.9-SNAPSHOT 2022-12-10 16:56:05 +01:00
Fabio Formosa
7c910196e1 upgraded README and CHANGELOG 2022-12-10 16:54:50 +01:00
Fabio Formosa
554e7e5e25 #80 bump version to 4.0.8 2022-12-10 16:39:26 +01:00
Fabio Formosa
8b70319436 #80 upgraded node and npm into the quartz-manager-starter-ui 2022-12-10 16:38:34 +01:00
Fabio Formosa
053f196b6b Merge pull request #100 from fabioformosa/develop
v4.0.7
2022-12-10 16:29:16 +01:00
Fabio Formosa
86f8cc8347 bump version to 4.0.7 2022-12-10 16:25:17 +01:00
Fabio Formosa
e91d02ba9f #80 added moment to the allowed commonJS module 2022-12-10 16:19:39 +01:00
Fabio Formosa
109d2868d9 #80 upgraded to the new linter and added prettier 2022-12-10 16:15:00 +01:00
Fabio Formosa
4673e41fc5 #80 removed unnecessary asterisks 2022-12-10 14:53:35 +01:00
Fabio Formosa
a2122351d6 #80 removed extractCss 2022-12-10 13:31:45 +01:00
Fabio Formosa
375aaf71d3 #80 fixed the build command as angular v14 2022-12-10 13:25:14 +01:00
Fabio Formosa
b752af948d #80 downgraded jest to v28 2022-12-10 13:21:18 +01:00
Fabio Formosa
52ed016073 #80 fixed tests 2022-12-10 12:20:57 +01:00
Fabio Formosa
632288726b #80 upgraded some deps 2022-12-10 11:55:00 +01:00
Fabio Formosa
1dc9bee987 #80 upgraded to angular v14 2022-12-10 11:27:14 +01:00
Fabio Formosa
387c440e06 #80 step into angular v14 2022-12-10 11:20:01 +01:00
Fabio Formosa
136afa0fca #80 step into angular v14 2022-12-10 11:17:39 +01:00
Fabio Formosa
8ba3daa2f0 #80 upgraded angular to v13 2022-12-08 00:15:48 +01:00
Fabio Formosa
b3fe337203 #80 upgraded angular to v13 2022-12-08 00:15:39 +01:00
Fabio Formosa
da7375ea0d #80 first step to angular v13 2022-12-07 00:38:30 +01:00
Fabio Formosa
d9487d1106 #80 completed the migration to angular12 2022-12-07 00:37:25 +01:00
Fabio Formosa
3110496630 #80 completed the migration to angular12 2022-12-07 00:36:59 +01:00
Fabio Formosa
22e90dc7d1 #80 step into angular v12 2022-12-07 00:29:20 +01:00
Fabio Formosa
5943243e62 #80 step into angular v12 2022-12-07 00:27:20 +01:00
Fabio Formosa
1244a64d34 #80 fixes for angular v11 2022-12-07 00:25:50 +01:00
Fabio Formosa
40a6ecd159 #80 fixes for angular v11 2022-12-07 00:24:56 +01:00
Fabio Formosa
9df68dccac #80 first step to angular v11 2022-12-06 23:35:35 +01:00
Fabio Formosa
72bba6f80c #80 reverted deps to angular 10 2022-12-06 23:29:29 +01:00
Fabio Formosa
cf803bb1dd #80 reverted deps to angular 10 2022-12-06 23:29:13 +01:00
Fabio Formosa
13c78ed5d3 #80 removed the package-lock.json 2022-12-06 23:19:08 +01:00
Fabio Formosa
3bd878a978 #80 reverted deps to angular 10 2022-12-06 23:14:45 +01:00
Fabio Formosa
c9d3528f4b #80 reverted deps to angular 10 2022-12-06 23:14:32 +01:00
Fabio Formosa
3b2f8fc780 #80 reverted deps to angular 10 2022-12-06 23:08:17 +01:00
Fabio Formosa
bc3da09d60 #80 step into angular upgrade to v11 2022-12-06 19:33:42 +01:00
Fabio Formosa
284f56302c #80 fixed tests 2022-12-06 01:08:17 +01:00
Fabio Formosa
cdd5047bbc #80 jest setup fix for angular 10 2022-12-06 00:39:45 +01:00
Fabio Formosa
5d3ba95bd9 #80 upgraded angular to v10 2022-12-05 23:42:36 +01:00
Fabio Formosa
ec384113eb angular material upgrade to v4 2022-12-05 23:36:36 +01:00
Fabio Formosa
8b2651876c new package-lock.json 2022-12-05 23:31:55 +01:00
Fabio Formosa
a3852c421e bump version to 4.0.7-SNAPSHOT 2022-12-05 23:09:51 +01:00
Fabio Formosa
e1e1bdbd01 bump version to 4.0.6 2022-12-04 12:15:51 +01:00
Fabio Formosa
6757511de3 #62 added a missing test 2022-12-04 12:07:20 +01:00
Fabio Formosa
f5b717ec36 Update README.md 2022-12-04 11:54:06 +01:00
Fabio Formosa
6b491d9949 Update README.md 2022-12-04 11:52:54 +01:00
Fabio Formosa
cf382db49f Update README.md 2022-12-04 11:52:24 +01:00
Fabio Formosa
ee2f80e582 Update README.md
added a table of contents
2022-12-04 11:49:26 +01:00
Fabio Formosa
4453d62515 Update README.md
Added sonar quality badges
2022-12-04 11:33:47 +01:00
Fabio Formosa
72068818d7 #62 fixed sonar smells 2022-12-04 11:25:21 +01:00
Fabio Formosa
92bb94b9fa #62 added coverage exclusion 2022-12-04 11:15:53 +01:00
Fabio Formosa
7a2098e9ce #62 added coverage exclusion 2022-12-04 11:08:48 +01:00
Fabio Formosa
56b81f4f48 #62 added some exclusion from coverage 2022-12-03 19:54:07 +01:00
Fabio Formosa
82c060c2a7 #62 set jacoco properties 2022-12-03 19:46:14 +01:00
Fabio Formosa
fba35b796d #62 set jacoco properties 2022-12-03 19:42:12 +01:00
Fabio Formosa
5f6fc1fa6f #62 set jacoco properties 2022-12-03 19:16:28 +01:00
Fabio Formosa
a9c227cd05 Merge branch 'develop' 2022-12-03 19:11:49 +01:00
Fabio Formosa
a8330e062f #62 set jacoco properties 2022-12-03 19:07:29 +01:00
Fabio Formosa
30d0cbf6de Merge pull request #97 from fabioformosa/develop
v4.0.6
2022-12-03 17:17:00 +01:00
Fabio Formosa
3063e08eb3 #62 solved a couple of sonar smells 2022-12-03 17:10:34 +01:00
Fabio Formosa
f7054b160f #62 added missing tests 2022-12-03 16:46:27 +01:00
Fabio Formosa
98b5d0e37a #62 fixed the job class name in the TriggerFiredBundleDTO 2022-12-03 16:21:13 +01:00
Fabio Formosa
6348bac11a #62 added missing tests 2022-12-03 12:19:41 +01:00
Fabio Formosa
c2a26c97a8 #62 added some coverage exclusion 2022-12-02 00:37:56 +01:00
Fabio Formosa
cd6e01109b #62 added some coverage exclusion 2022-12-02 00:32:52 +01:00
Fabio Formosa
7553efdc3b #62 added missing tests 2022-12-02 00:21:23 +01:00
Fabio Formosa
6578dc312a #62 added missing tests 2022-12-01 23:52:48 +01:00
Fabio Formosa
c490a7ab28 #62 added missing tests 2022-12-01 23:48:16 +01:00
Fabio Formosa
0969a406c6 #62 fixed a failing test 2022-12-01 00:55:38 +01:00
Fabio Formosa
eed3021373 #62 fixed a failing test 2022-12-01 00:35:40 +01:00
Fabio Formosa
5b33bd4dca #62 added missing tests 2022-12-01 00:30:47 +01:00
Fabio Formosa
6d22207e27 #62 added missing tests 2022-11-29 23:39:14 +01:00
Fabio Formosa
249cf49873 #62 added missing tests 2022-11-29 23:12:54 +01:00
Fabio Formosa
b17d487c8b #62 added missing tests 2022-11-29 20:29:55 +01:00
Fabio Formosa
fedb2b50b6 #62 clean up 2022-11-29 18:44:46 +01:00
Fabio Formosa
4b18313e2d #62 removed unused security filter 2022-11-23 20:54:37 +01:00
Fabio Formosa
8387f587b3 bump version to 4.0.6-SNAPSHOT 2022-11-20 14:02:45 +01:00
Fabio Formosa
c7b64dbdf3 Update README.md 2022-11-20 14:01:24 +01:00
Fabio Formosa
085d61cf29 Merge pull request #95 from fabioformosa/develop
v4.0.5
2022-11-20 14:00:34 +01:00
Fabio Formosa
e6cf2e9390 bump version to 4.0.5 2022-11-20 13:43:07 +01:00
Fabio Formosa
4bcea96789 Merge remote-tracking branch 'origin/master' into develop 2022-11-20 13:42:52 +01:00
Fabio Formosa
866062bdcb #62 added a missing test for the MisfireTestJob 2022-11-20 13:36:25 +01:00
Fabio Formosa
53a54ddbda #62 added a missing test to the UserController 2022-11-20 13:16:42 +01:00
Fabio Formosa
8bdb85b878 Update README.md 2022-11-20 12:50:26 +01:00
Fabio Formosa
9a26be41a8 #78 excluded lombok annotations from the coverage 2022-11-19 18:59:24 +01:00
Fabio Formosa
5cf39b3861 #78 fixed sonar errors 2022-11-19 18:53:13 +01:00
Fabio Formosa
99d87636d2 #78 removed an unused CORS config 2022-11-19 18:45:47 +01:00
Fabio Formosa
bccd50ac4a #78 put a secureRandom value as default value for the JWT token 2022-11-19 18:28:39 +01:00
Fabio Formosa
3bb30accfd #78 fixed some sonar warnings 2022-11-19 16:34:36 +01:00
Fabio Formosa
5d2b71652c #78 fixed 2 sonar warnings 2022-11-19 16:25:53 +01:00
Fabio Formosa
b70af4dafe Merge remote-tracking branch 'origin/master' into develop 2022-11-19 16:21:07 +01:00
Fabio Formosa
a95cf20c6b bump version to 4.0.5-SNAPSHOT 2022-11-19 13:54:25 +01:00
Fabio Formosa
b58a5dbe9f Update README.md 2022-11-19 13:31:52 +01:00
Fabio Formosa
f7222d65ae moved the nexus plugin under the maven profile 2022-11-19 13:29:14 +01:00
Fabio Formosa
ff43103f37 Merge pull request #89 from fabioformosa/develop
v4.0.4
2022-11-19 13:01:44 +01:00
Fabio Formosa
93ab9c55bc bump version to 4.0.4 2022-11-19 13:00:39 +01:00
Fabio Formosa
28715cdf62 enhanced the info message within the UnsupportedMultipleJobsDialog 2022-11-19 12:40:23 +01:00
Fabio Formosa
bd5276116b fixed the redirect to the login in case of security layer enabled 2022-11-19 12:18:36 +01:00
Fabio Formosa
b20fb9e9c3 bump version to 4.0.4-SNAPSHOT 2022-11-19 12:09:41 +01:00
Fabio Formosa
d3a406a382 Update maven-release.yml 2022-11-19 11:38:35 +01:00
Fabio Formosa
c70fe687e1 Update README.md 2022-11-19 11:37:55 +01:00
Fabio Formosa
fc81685044 Update README.md 2022-11-19 11:22:00 +01:00
Fabio Formosa
6e24d7caf5 bump version to 4.0.3 2022-11-19 11:05:57 +01:00
Fabio Formosa
6786cffb4d fixed the maven-release.yml 2022-11-19 11:05:23 +01:00
Fabio Formosa
1805705ff2 bump version to 4.0.2 2022-11-19 10:57:48 +01:00
Fabio Formosa
64fbabba4d fixed the maven-release.yml 2022-11-19 10:55:38 +01:00
Fabio Formosa
0db13872a1 Update maven-release.yml 2022-11-19 10:46:40 +01:00
Fabio Formosa
694e199709 Merge pull request #84 from fabioformosa/develop
v4.0.0
2022-11-19 10:36:20 +01:00
Fabio Formosa
77cf0a06d6 bump version to 4.0.0 2022-11-18 00:34:07 +01:00
Fabio Formosa
d9c7bcaad9 added mvn bin 2022-11-18 00:31:33 +01:00
Fabio Formosa
d9469b7dcc preparing for releasing 2022-11-18 00:24:02 +01:00
Fabio Formosa
1a57a4b04e Update README.md 2022-11-16 23:20:46 +01:00
Fabio Formosa
10d871be2e Update README.md 2022-11-15 00:19:55 +01:00
Fabio Formosa
8b75cc1891 Update README.md 2022-11-15 00:18:40 +01:00
Fabio Formosa
f6522a9a79 Update README.md 2022-11-15 00:15:42 +01:00
Fabio Formosa
96449c8aeb resized the swagger screenshot 2022-11-15 00:15:03 +01:00
Fabio Formosa
1d03027efe Update README.md 2022-11-14 23:01:31 +01:00
Fabio Formosa
69750267f6 Update README.md 2022-11-14 23:01:18 +01:00
Fabio Formosa
2640e91055 added a README file within the multi-module maven proj 2022-11-14 22:59:05 +01:00
Fabio Formosa
9ccefe90ee Update README.md 2022-11-14 20:30:21 +01:00
Fabio Formosa
c538ea95ee fixed some compiler warnings 2022-11-12 20:43:33 +01:00
Fabio Formosa
933975ce70 Update README.md 2022-11-12 17:49:32 +01:00
Fabio Formosa
d189feea87 Update README.md 2022-11-12 17:16:15 +01:00
Fabio Formosa
9637658b89 Update README.md 2022-11-12 16:50:49 +01:00
Fabio Formosa
c3c6265dc6 Update README.md 2022-11-12 16:25:20 +01:00
Fabio Formosa
63f871f649 Update README.md 2022-11-12 16:09:28 +01:00
Fabio Formosa
a9259fd30d Update README.md 2022-11-12 00:11:42 +01:00
Fabio Formosa
43e1fd3f04 Update README.md 2022-11-11 00:21:10 +01:00
Fabio Formosa
8e1e4344e4 Update README.md 2022-11-11 00:19:32 +01:00
Fabio Formosa
2186b0b007 Update README.md 2022-11-11 00:02:43 +01:00
Fabio Formosa
9f7238021b Update README.md 2022-11-11 00:01:12 +01:00
Fabio Formosa
db2a5949dc Update README.md 2022-11-10 23:56:27 +01:00
Fabio Formosa
73293095f6 Update README.md 2022-11-10 23:43:48 +01:00
Fabio Formosa
879fae55ce Update README.md 2022-11-10 20:45:38 +01:00
Fabio Formosa
b2da564469 Update README.md 2022-11-10 00:21:11 +01:00
Fabio Formosa
b52834a2d8 Update README.md 2022-11-10 00:18:59 +01:00
Fabio Formosa
c8c4ad37c8 #64 added the swagger screenshot 2022-11-09 23:03:47 +01:00
Fabio Formosa
6fa7375f13 Update README.md 2022-11-09 20:26:40 +01:00
Fabio Formosa
9127a50433 Update README.md 2022-11-09 19:43:53 +01:00
Fabio Formosa
cabbec3d3b #64 added the new screenshot 2022-11-09 19:40:42 +01:00
Fabio Formosa
e42b26fa73 #78 fixed some smells 2022-11-08 23:53:24 +01:00
Fabio Formosa
018c0f18dc #78 fixed some smells 2022-11-08 23:38:48 +01:00
Fabio Formosa
a4b0a1bafb #78 fixed some smells 2022-11-08 22:59:07 +01:00
Fabio Formosa
6eededed2c #78 fixed some smells 2022-11-08 22:41:24 +01:00
Fabio Formosa
b62455836a #78 fixed a smell 2022-11-08 22:34:50 +01:00
Fabio Formosa
9dfe06e346 #74 added an alert in case of no eligible jobs 2022-11-08 00:35:54 +01:00
Fabio Formosa
461c31e7ea #71 added illustrations for 403 and 404 also 2022-11-06 13:02:40 +01:00
Fabio Formosa
29a1903b21 #71 added an illustration when there a no logs to display 2022-11-05 20:53:55 +01:00
Fabio Formosa
83401a2ecb #71 added a generic error view 2022-11-05 20:28:56 +01:00
Fabio Formosa
3242457cce #57 fixed tests 2022-11-05 17:53:21 +01:00
Fabio Formosa
12f91fa85c #57 enhanced the layout of the trigger form 2022-11-05 17:47:50 +01:00
Fabio Formosa
85ba371b72 #57 enhanced the layout of the trigger form 2022-11-05 17:43:48 +01:00
Fabio Formosa
014c348a89 #57 added custom validations to the trigger form 2022-11-05 17:04:08 +01:00
Fabio Formosa
a44d041e93 #57 attempt to fix the flaky tests 2022-11-05 13:47:07 +01:00
Fabio Formosa
9ea4afcaef #57 attempt to fix the flaky tests 2022-11-05 13:36:39 +01:00
Fabio Formosa
9b32f5e598 #57 attempt to fix the flaky tests 2022-11-05 13:26:35 +01:00
Fabio Formosa
f4dd8519a9 #57 attempt to fix the flaky tests 2022-11-05 13:19:45 +01:00
Fabio Formosa
1b1be180c6 #57 clean up 2022-11-05 13:15:33 +01:00
Fabio Formosa
026bdc6f18 #57 attempt to solve the flaky test 2022-11-04 23:12:55 +01:00
Fabio Formosa
1207a646c7 #57 temporary disabled a flaky assertion 2022-11-04 00:21:42 +01:00
Fabio Formosa
3e90a9b22c #57 fixed a test 2022-11-04 00:18:22 +01:00
Fabio Formosa
459aa136c1 #57 added an error message for required fields 2022-11-03 23:58:17 +01:00
Fabio Formosa
d164cb9363 #57 fixed tests 2022-11-03 23:24:59 +01:00
Fabio Formosa
a8fb990966 #57 fixed tests 2022-11-03 22:11:44 +01:00
Fabio Formosa
121f2e364f #57 converted template-driven form in reactive form 2022-11-02 20:18:50 +01:00
Fabio Formosa
b968329fb3 #57 added new validation checks to the simple trigger input 2022-10-29 11:31:28 +02:00
Fabio Formosa
d9ff379d59 #57 improved some oas captions 2022-10-29 10:29:19 +02:00
Fabio Formosa
5c9a8d21a3 #78 fixed the sonar props 2022-10-29 10:28:52 +02:00
Fabio Formosa
9d24c1587f #78 fixed the sonar props 2022-10-29 00:55:23 +02:00
Fabio Formosa
436821a831 #78 fixed the sonar props 2022-10-29 00:45:01 +02:00
Fabio Formosa
ecb07dc682 #78 fixed the sonar props 2022-10-29 00:35:43 +02:00
Fabio Formosa
8f08927aad #78 fixed sonar smells 2022-10-29 00:24:38 +02:00
Fabio Formosa
e29fd8dc92 #78 fixed sonar smells 2022-10-29 00:18:55 +02:00
Fabio Formosa
3af5eb076e #78 fixed sonar smells 2022-10-29 00:07:15 +02:00
Fabio Formosa
c190c15889 #78 fixed sonar smells 2022-10-29 00:04:48 +02:00
Fabio Formosa
540bdf35a5 #78 fixed sonar smells 2022-10-28 23:53:33 +02:00
Fabio Formosa
33b4d88d52 #57 added validation checks onto the SimpleTrigger 2022-10-28 01:14:53 +02:00
Fabio Formosa
ad3eec4abe #78 fixed a major sonar finding 2022-10-27 23:55:49 +02:00
Fabio Formosa
7b87a9485e #78 fixed a major sonar finding 2022-10-27 23:46:39 +02:00
Fabio Formosa
a8a027ed88 #62 added the jacoco plugin 2022-10-27 23:39:42 +02:00
Fabio Formosa
69b62032b2 #57 #62 fixed an integration tests 2022-10-27 23:36:40 +02:00
Fabio Formosa
f411659ad6 #57 #62 added an integration test to check the mandatory fields in scheduling a simple trigger 2022-10-27 23:29:28 +02:00
Fabio Formosa
0c33eda68c added a test for DateUtils 2022-10-27 22:58:56 +02:00
Fabio Formosa
4013c4c08f added the sonar github action 2022-10-27 20:04:42 +02:00
Fabio Formosa
ae3c2d72a1 added a github action for sonar 2022-10-27 19:57:41 +02:00
Fabio Formosa
5a96f81338 added a github action for sonar 2022-10-27 19:56:33 +02:00
Fabio Formosa
31208f9883 Update README.md
Added the npm github badge to the README
2022-10-27 19:41:56 +02:00
Fabio Formosa
a64a06d663 tuned the npm github action 2022-10-27 19:40:36 +02:00
Fabio Formosa
02a73762b0 added the working directory in the npm github action 2022-10-27 01:26:29 +02:00
Fabio Formosa
2ca24a9aae added the working directory in the npm github action 2022-10-27 01:17:41 +02:00
Fabio Formosa
fc1ea9166c added the working directory in the npm github action 2022-10-27 01:08:56 +02:00
Fabio Formosa
71ee075cfa added the working directory in the npm github action 2022-10-27 01:06:20 +02:00
Fabio Formosa
33f4a7544c added the working directory in the npm github action 2022-10-27 01:04:53 +02:00
Fabio Formosa
d16b681362 added the working directory in the npm github action 2022-10-27 00:59:38 +02:00
Fabio Formosa
5547b7e868 added the working directory in the npm github action 2022-10-27 00:51:16 +02:00
Fabio Formosa
3722d0ca24 removed the package-lock.json from the gitignore 2022-10-27 00:47:28 +02:00
Fabio Formosa
41d11372ce minor commit 2022-10-27 00:45:55 +02:00
Fabio Formosa
3582ef4125 fixed the npm github action 2022-10-27 00:40:44 +02:00
Fabio Formosa
8e32fe531a added npm github action 2022-10-27 00:39:42 +02:00
Fabio Formosa
17201aad08 Update README.md
replace travis badge with github badge
2022-10-27 00:18:42 +02:00
Fabio Formosa
4fb70ac8e8 minor commit 2022-10-26 23:57:19 +02:00
Fabio Formosa
425de89469 fixed the maven github action 2022-10-26 23:54:21 +02:00
Fabio Formosa
5746cb43c3 fixing the maven github action 2022-10-26 23:22:34 +02:00
Fabio Formosa
704f31581f fixing the maven github action 2022-10-26 23:19:46 +02:00
Fabio Formosa
7cb7dde65d added a github action 2022-10-26 23:07:35 +02:00
Fabio Formosa
bdc86b5510 added a missing dep 2022-10-26 23:04:02 +02:00
Fabio Formosa
59816c9693 #48 fixed some tests 2022-10-26 22:02:11 +02:00
Fabio Formosa
4f8b75a8f9 #48 made configurable the misfire instruction 2022-10-26 21:56:02 +02:00
Fabio Formosa
5ea8f2adb1 #58 hidden the progress bar in case of endless repeat count 2022-10-22 20:12:32 +02:00
Fabio Formosa
80cd607d17 #66 made the log panel fixed height 2022-10-22 18:03:05 +02:00
Fabio Formosa
488916bcd7 #66 increased the font size of the logs 2022-10-22 16:13:22 +02:00
Fabio Formosa
b5abeac093 #66 removed the hint in the login page 2022-10-22 16:12:57 +02:00
Fabio Formosa
ed266dea15 removed a dependency from spring security in the module web-showcase 2022-10-22 15:31:36 +02:00
Fabio Formosa
65558c7ee8 #66 fixed a divider 2022-10-22 15:27:19 +02:00
Fabio Formosa
e5d2c33d9a #77 made the oas dependency optional and conditional 2022-10-22 13:56:48 +02:00
Fabio Formosa
7f00f5de99 #77 made the oas dependency optional and conditional 2022-10-22 00:27:29 +02:00
Fabio Formosa
b2906d09f4 #77 added a validation test on the in-memory user props and renamed the username field 2022-10-15 18:03:53 +02:00
Fabio Formosa
3f0d036dad #76 upgraded the java version to 9 2022-10-15 18:03:15 +02:00
Fabio Formosa
9d66cd85f0 #75 renamed the main security config class 2022-10-15 18:02:37 +02:00
Fabio Formosa
0a21920ad9 #75 removed the deprecated WebSecurityConfigurerAdapter 2022-10-15 18:02:17 +02:00
Fabio Formosa
bda37213f8 #75 removed the deprecated WebSecurityConfigurerAdapter 2022-10-15 15:38:44 +02:00
Fabio Formosa
c725871a4e minor refactoring of packages 2022-10-15 15:38:16 +02:00
Fabio Formosa
39a10681bf #75 removed the deprecated WebSecurityConfigurerAdapter 2022-10-14 00:16:44 +02:00
Fabio Formosa
381cfa1486 added a docker-compose.yml file to the web-showcase module 2022-10-12 00:23:08 +02:00
Fabio Formosa
4d4385b7ba #40 customized the quartz.properties file for quartz-manager in managed-quartz.properties 2022-10-08 13:05:01 +02:00
Fabio Formosa
ec7debe8c5 #40 customized the quartz.properties file for quartz-manager in managed-quartz.properties 2022-10-08 12:23:23 +02:00
Fabio Formosa
05591546b3 #67 put a qualifier name to the quartz-scheduler instance 2022-10-07 23:44:35 +02:00
Fabio Formosa
2b0644b495 #67 declouped the basePackageScanning from the schedulerConfig 2022-10-07 23:09:54 +02:00
Fabio Formosa
a30bd9e2c7 #63 temporary commented the ROLE_ADMIN 2022-10-07 22:33:00 +02:00
Fabio Formosa
6eed819364 #63 added a missing log 2022-10-07 22:32:35 +02:00
Fabio Formosa
a1780b1087 #73 made optional the quartz.properties 2022-10-07 22:32:18 +02:00
Fabio Formosa
c70dc3181e #63 fixed a circular spring dependency 2022-10-07 22:31:46 +02:00
Fabio Formosa
8ee0435738 #63 added missing logs 2022-10-07 19:54:06 +02:00
Fabio Formosa
72e1415038 #63 extracted a constant 2022-10-07 19:53:56 +02:00
Fabio Formosa
65c3653494 #63 added a missing js dep 2022-10-07 19:53:31 +02:00
Fabio Formosa
304a1e7f71 #63 renamed the base package of the api module 2022-10-06 23:54:04 +02:00
Fabio Formosa
6972915a5c #63 fixed tests 2022-10-06 22:57:36 +02:00
Fabio Formosa
77ea248457 #63 added sql script to create a local postgresql db 2022-10-06 20:15:50 +02:00
Fabio Formosa
14c1f7ea85 #63 fixed the injection of the quartz properties of the modules 2022-10-06 20:15:24 +02:00
Fabio Formosa
0652a6ec5e #63 fixed the appearance of the login button 2022-10-06 20:14:54 +02:00
Fabio Formosa
cecd30309f #63 replaced some "any" with actual type and conformed the log notifier to the progress notifier 2022-10-06 01:13:33 +02:00
Fabio Formosa
22762d7d84 #66 fixed lint errors 2022-10-05 00:43:18 +02:00
Fabio Formosa
6715665072 #63 clean up 2022-10-04 23:30:09 +02:00
Fabio Formosa
b92d8275db #63 renamed a DTO 2022-10-04 23:26:16 +02:00
Fabio Formosa
b4acc378e3 #63 removed unused app prop 2022-10-04 23:23:36 +02:00
Fabio Formosa
a313d8b19d #63 ui gets 404 calling whoami in case of no sec config 2022-10-04 20:17:57 +02:00
Fabio Formosa
93152f8157 #63 tested the default name assignment to the scheduler instance 2022-10-01 17:29:05 +02:00
Fabio Formosa
1e99602c68 #63 tested the default name assignment to the scheduler instance 2022-10-01 17:20:41 +02:00
Fabio Formosa
1571ab6d12 #63 made as default behaviour the creation of a scheduler instance 2022-10-01 16:12:26 +02:00
Fabio Formosa
44d6854bc5 #63 added security test to test the whitelisted endpoints 2022-10-01 15:48:01 +02:00
Fabio Formosa
727403d420 #63 left the main security config class in the spring.factories 2022-10-01 00:50:24 +02:00
Fabio Formosa
b06b130d20 #63 clean up 2022-10-01 00:45:01 +02:00
Fabio Formosa
94107f2210 #63 removed properties which have a default value from the showcase 2022-10-01 00:40:58 +02:00
Fabio Formosa
adb8e06f0a #63 added mvc tests on security 2022-09-30 23:42:30 +02:00
Fabio Formosa
8cb0ac09e8 #63 removed the app name which has a default value 2022-09-29 19:31:19 +02:00
Fabio Formosa
8935d77d0f #63 extracted a constant for the quartz-manager 2022-09-29 19:28:52 +02:00
Fabio Formosa
0adb8bf94b #59 fixed tests 2022-09-29 00:34:07 +02:00
Fabio Formosa
7e21437dfc #63 #66 clean up 2022-09-29 00:34:07 +02:00
Fabio Formosa
bfba79448b Update README.md 2022-09-24 16:46:21 +02:00
Fabio Formosa
5be49a4090 #59 fixed animation on logs 2022-09-16 23:39:49 +02:00
Fabio Formosa
e0b0378329 #59 changed the layout of the job progress card 2022-09-15 00:37:54 +02:00
Fabio Formosa
5f3ae667b0 #52 removed an unused app property 2022-09-14 20:26:31 +02:00
Fabio Formosa
b14cf64124 #59 reduced the size of the trigger form 2022-09-14 20:26:10 +02:00
Fabio Formosa
d9f9ee96af #52 added the jobClass selection 2022-09-13 23:38:31 +02:00
Fabio Formosa
a644dd6052 #52 made read-only the trigger name of an existing trigger 2022-09-07 20:45:34 +02:00
Fabio Formosa
3e5b25b37a #52 selected a new trigger once created 2022-09-07 20:36:27 +02:00
Fabio Formosa
a693e2aa0c #52 no changes at the trigger list in case of rescheduling of an existing trigger 2022-09-07 00:26:34 +02:00
Fabio Formosa
599b6fb0b4 #52 added the job className to the trigger detail view 2022-09-03 16:30:51 +02:00
Fabio Formosa
9638667368 #52 added the trigger name to the trigger form 2022-09-03 15:50:34 +02:00
Fabio Formosa
21f3f7dca2 #59 highlighted the selected trigger into the list 2022-09-02 00:19:23 +02:00
Fabio Formosa
b4bb16130c #59 added unit tests for the new trigger 2022-08-31 23:46:53 +02:00
Fabio Formosa
f1c9fba68e #56 step into layout revamp 2022-08-04 00:43:53 +02:00
Fabio Formosa
09df7795a9 #56 minor commit 2022-07-05 19:06:21 +02:00
Fabio Formosa
6bb768de59 #56 added a new FE component to schedule a simple trigger 2022-03-05 20:50:23 +01:00
Fabio Formosa
86badb8f41 #56 added the simpleTrigger to the API 2022-03-05 20:49:24 +01:00
Fabio Formosa
54999ce735 #56 added the simpleTrigger to the API 2022-03-05 20:48:53 +01:00
Fabio Formosa
851100b774 added a .editorconfig file 2022-03-05 20:44:04 +01:00
Fabio Formosa
3ba2bafc55 #55 fixed mockMvcTests 2021-12-07 23:56:50 +01:00
Fabio Formosa
cbd3066f57 #55 migrated the API doc from swagger2 to OpenAPI 3 2021-12-04 17:14:06 +01:00
Fabio Formosa
f3506304d9 #44 added the login operation to the OpenApi doc 2021-12-04 17:11:10 +01:00
Fabio Formosa
c9b90478dd #55 migrated swagger2 to openApi specification 3 2021-11-10 01:16:36 +01:00
Fabio Formosa
2ca2ba7ffc #55 migrated swagger2 to openApi specification 3 2021-11-09 23:39:38 +01:00
Fabio Formosa
3df1abd46e #37 added input validation to the trigger rescheduling 2021-11-09 00:14:49 +01:00
Fabio Formosa
34f21a58c9 #37 added input validation to the trigger creation 2021-11-09 00:11:47 +01:00
Fabio Formosa
233b56f282 #37 added some mockMvcTest to TriggerController 2021-11-06 01:17:50 +01:00
Fabio Formosa
1cd7f605e3 upgraded spring boot version to 2.5.6 2021-11-06 01:17:10 +01:00
Fabio Formosa
efee7b575f Merge remote-tracking branch 'origin/master' into develop 2021-11-06 01:14:22 +01:00
Fabio Formosa
870a813c61 Update README.md 2021-11-03 00:09:21 +01:00
Fabio Formosa
24285c7885 Update README.md 2021-11-03 00:01:45 +01:00
Fabio Formosa
69e2ab3977 Merge pull request #50 from fabioformosa/develop
Develop
2021-11-02 23:03:32 +01:00
Fabio Formosa
8218c63bba [maven-release-plugin] prepare for next development iteration 2021-11-01 23:28:05 +01:00
Fabio Formosa
d89a2af1aa [maven-release-plugin] prepare release 3.1.0 2021-11-01 23:28:04 +01:00
Fabio Formosa
09e9b18f96 [maven-release-plugin] rollback the release of quartz-manager-parent-3.1.0 2021-11-01 23:26:06 +01:00
Fabio Formosa
e70bbcff62 [maven-release-plugin] prepare release quartz-manager-parent-3.1.0 2021-11-01 23:25:44 +01:00
Fabio Formosa
085d2f1706 [maven-release-plugin] rollback the release of quartz-manager-parent-3.1.0 2021-11-01 23:24:43 +01:00
Fabio Formosa
4746ba9489 [maven-release-plugin] prepare release quartz-manager-parent-3.1.0 2021-11-01 23:18:00 +01:00
Fabio Formosa
27fab8acca #39 cleanUp 2021-11-01 19:15:25 +01:00
Fabio Formosa
734bb1b087 [maven-release-plugin] rollback the release of quartz-manager-parent-3.1.0 2021-11-01 19:13:23 +01:00
Fabio Formosa
81d9e92450 [maven-release-plugin] prepare for next development iteration 2021-11-01 18:39:34 +01:00
Fabio Formosa
5d794536e3 [maven-release-plugin] prepare release quartz-manager-parent-3.1.0 2021-11-01 18:39:32 +01:00
Fabio Formosa
4f3efc50fc temporary disabled a test 2021-11-01 16:35:49 +01:00
Fabio Formosa
37ad22090c Merge pull request #49 from fabioformosa/feature/#14
Feature/#14
2021-11-01 16:20:23 +01:00
Fabio Formosa
95fa102720 #39 changed the appearance of the fields in the config param form 2021-11-01 16:17:29 +01:00
Fabio Formosa
f37ad1ae58 #37 added the mockMvcTest for the TriggerController 2021-11-01 13:02:31 +01:00
Fabio Formosa
fb2d8da53d #14 cleanup 2021-10-30 16:22:21 +02:00
Fabio Formosa
87ee4bebb3 #14 added a new line to the .gitignore 2021-10-30 00:56:08 +02:00
Fabio Formosa
9bf0871ff6 #14 imported quartz-manager-persistence into the web-showcase 2021-10-30 00:55:24 +02:00
Fabio Formosa
70827393b7 #14 fixed the trigger rescheduling 2021-10-30 00:22:44 +02:00
Fabio Formosa
c4e8eb94d6 #14 clean up 2021-10-26 00:32:38 +02:00
fabio.formosa
e50a48bd4c Changed API and frontend to handle stored triggers and jobs 2021-10-17 13:15:54 +02:00
fabio.formosa
10df1116bd #14 added a new module for persistence 2021-07-24 19:44:24 +02:00
fabio.formosa
03f45346a7 #38 changed misfire instruction 2021-03-05 00:59:02 +01:00
fabio.formosa
6170e8f1ae #38 changed misfire instruction 2021-03-05 00:57:53 +01:00
fabio.formosa
0a718e897b #35 fixes config retrieve 2021-02-27 17:11:53 +01:00
Fabio Formosa
d243c3a8e8 Update README.md 2021-02-07 13:47:20 +01:00
Fabio Formosa
49020d9bd0 Update README.md 2021-02-07 13:42:17 +01:00
Fabio Formosa
1457f3fdea Update README.md 2021-02-07 13:39:52 +01:00
Fabio Formosa
42c63b963f Create CHANGELOG.md 2021-02-07 13:37:20 +01:00
Fabio Formosa
aecc1cab68 Update README.md 2021-02-07 13:22:32 +01:00
Fabio Formosa
4e63e0a833 Create .travis.yml 2021-02-07 13:19:14 +01:00
Fabio Formosa
4540165157 Update README.md 2021-02-07 13:10:59 +01:00
Fabio Formosa
a56f5284d1 Update README.md 2021-02-06 19:33:45 +01:00
Fabio Formosa
eb675f59a3 Update README.md 2021-02-06 19:30:53 +01:00
Fabio Formosa
35f8b6b52a Update README.md 2021-02-06 19:22:31 +01:00
Fabio Formosa
6c76f0a067 Update README.md 2021-02-06 19:12:15 +01:00
Fabio Formosa
48b626c08e Merge pull request #34 from fabioformosa/develop
#32 Renamed modules
2021-02-06 17:14:23 +01:00
fabio.formosa
b2f796cf73 [maven-release-plugin] prepare for next development iteration 2021-02-06 15:56:27 +01:00
fabio.formosa
b01f4b99e4 [maven-release-plugin] prepare release quartz-manager-parent-3.0.1 2021-02-06 15:56:24 +01:00
fabio.formosa
d11089c451 #32 Renamed maven modules 2021-02-06 15:50:27 +01:00
Fabio Formosa
8ecdb4f5a6 Merge pull request #33 from fabioformosa/develop
Released 3.0.0
2021-02-05 00:42:19 +01:00
fabio.formosa
86c2e86a12 [maven-release-plugin] prepare for next development iteration 2021-02-05 00:01:47 +01:00
fabio.formosa
54662a1b8a [maven-release-plugin] prepare release quartz-manager-parent-3.0.0 2021-02-05 00:01:45 +01:00
fabio.formosa
6cdee3ba5d #32 added details to release 2021-02-04 23:42:37 +01:00
fabio.formosa
c6df1e2093 Merge branch 'develop' of git@github.com:fabioformosa/quartz-manager.git into develop 2021-02-04 23:33:27 +01:00
fabio.formosa
663b3f4e09 #32 clean up 2021-02-04 23:33:20 +01:00
Fabio Formosa
2b6dadd5f1 Update README.md 2021-02-03 00:06:47 +01:00
Fabio Formosa
bce1be698c Merge pull request #31 from fabioformosa/develop
Refactored project structure for pluggability
2021-02-03 00:01:46 +01:00
Fabio Formosa
c29af8c593 Update README.md 2021-02-02 23:57:16 +01:00
Fabio Formosa
a7a86f960a Update README.md 2021-02-02 23:55:05 +01:00
Fabio Formosa
56c81caf05 Update README.md 2021-02-02 23:49:20 +01:00
fabio.formosa
8c5b349196 #30 removed all classed moved in quartz-manager-security 2021-02-02 23:41:19 +01:00
fabio.formosa
1f631529d9 #30 moved whoami controller to the quartz-manager-api 2021-02-02 20:35:51 +01:00
fabio.formosa
6f50f45aa8 #30 added new module with all config for a security layer 2021-01-31 20:50:41 +01:00
fabio.formosa
e23343d7ed #30 renamed module quartz-manager-web-showcase 2021-01-30 17:16:07 +01:00
fabio.formosa
ef4ffca2bd #22 Adapted frontend to be wrapped into a webjar 2021-01-30 15:42:37 +01:00
fabio.formosa
382fe244c5 #22 Adapted frontend to be wrapped into a webjar 2021-01-30 15:20:30 +01:00
fabio.formosa
d374be5eee #22 added a maven sub-module to create a webjar for the frontend 2021-01-05 20:59:20 +01:00
fabio.formosa
e28787d29b added new lines to gitignore 2021-01-05 11:37:52 +01:00
Fabio Formosa
b7d152a42a Merge pull request #29 from fabioformosa/develop
Develop
2020-12-26 17:56:56 +01:00
fabio.formosa
79e080ea1f #28 removed quartz-manager from the context-path
To ease the inclusion as library in another project
2020-12-26 12:43:50 +01:00
fabio.formosa
0087488d5f removed unused import 2020-12-07 19:26:47 +01:00
fabio.formosa
e56ac71d60 #27 fixed quartz-manager-api inclusion 2020-12-07 19:26:28 +01:00
fabio.formosa
fc64f07d7f #21 added spring.factories to the quartz-manager API 2020-11-18 00:45:58 +01:00
fabio.formosa
b0868de37b #25 admin guard can activate if API is not under auth 2020-11-18 00:44:43 +01:00
fabio.formosa
d950ff29b2 #26 added redirect to login in case of 401 2020-11-04 00:34:23 +01:00
fabio.formosa
10bea2311e #26 added unit test for api.service.ts 2020-10-27 00:30:39 +01:00
Fabio Formosa
25a5e808f2 Update README.md 2020-10-21 00:02:24 +02:00
fabio.formosa
9d52c880c6 #19 added editorconfig 2020-10-03 00:37:06 +02:00
fabio.formosa
e5adf65f88 #19 clean up 2020-10-03 00:35:32 +02:00
Fabio Formosa
c1b5056bc9 Merge pull request #20 from fabioformosa/develop
Develop
2020-10-03 00:32:33 +02:00
Fabio Formosa
837aef50c3 Update README.md 2020-10-03 00:30:53 +02:00
Fabio Formosa
3446d1bfbc Update README.md 2020-10-03 00:30:16 +02:00
Fabio Formosa
6bea2ac169 Update README.md 2020-10-03 00:26:02 +02:00
Fabio Formosa
c675f4cdb5 Update README.md 2020-10-03 00:25:02 +02:00
Fabio Formosa
be04f20b5b Update README.md 2020-10-03 00:22:12 +02:00
fabio.formosa
101968e2b5 #19 added lines to gitignore 2020-10-03 00:21:01 +02:00
fabio.formosa
67983961ca #19 clean up 2020-10-03 00:04:32 +02:00
fabio.formosa
732c3c5e5c #19 clean up 2020-10-03 00:01:47 +02:00
fabio.formosa
6ebbc62127 #19 clean up 2020-10-03 00:01:01 +02:00
fabio.formosa
bb2ec8aadc #19 clean up 2020-10-03 00:00:04 +02:00
fabio.formosa
b650cff080 #19 renamed projects 2020-10-02 23:55:45 +02:00
fabio.formosa
a81bb20acd #19 split in quartz-manager-core and quartz-manager-api 2020-10-01 00:27:29 +02:00
fabio.formosa
b40e880b70 #19 added new maven parent project 2020-09-29 23:13:45 +02:00
Fabio Formosa
b5b6ccc254 added gitter badge 2020-06-18 20:21:59 +02:00
Fabio Formosa
df417e425a added gitter badge 2020-06-18 20:20:53 +02:00
Fabio Formosa
3e702c6501 Merge pull request #18 from fabioformosa/feature/indent_size_style
Update .editorconfig
2020-06-18 00:37:10 +02:00
Fabio Formosa
ea0b9c07ec Update .editorconfig 2020-06-17 23:49:52 +02:00
Fabio Formosa
c6c5bfa96b Merge pull request #17 from vladimirshefer/feature/editorconfig
Create basic .editorconfig file
2020-06-17 23:43:36 +02:00
Vladimir Shefer
34c569baeb Create basic .editorconfig file 2020-06-17 23:38:21 +03:00
Fabio Formosa
fef99920ed updated roadmap steps 2020-05-19 09:02:23 +02:00
Fabio Formosa
c110e6d0b1 Merge pull request #15 from fabioformosa/#12_jest
#12 jest
2020-05-11 23:33:06 +02:00
fabio.formosa
7687def758 #12 added jest 2020-05-11 23:16:02 +02:00
fabio.formosa
bf276d0073 #12 fixed test 2020-05-10 13:38:26 +02:00
Fabio Formosa
6dea0f1054 Update README.md 2020-05-10 12:44:20 +02:00
Fabio Formosa
061f2dc3e0 Update README.md 2020-05-10 12:42:39 +02:00
Fabio Formosa
8ed3210996 Merge pull request #7 from fabioformosa/#6_security_refactoring
#6 security refactoring
2020-05-08 01:14:40 +02:00
Fabio Formosa
d315699102 Merge pull request #9 from fabioformosa/#8_angular_migration
#8 angular migration
2020-05-08 01:13:53 +02:00
Fabio Formosa
7d2e15a831 Merge pull request #11 from fabioformosa/#6_fix_websocket_with_jwt_header
#6 fix websocket with jwt header
2020-05-08 01:13:26 +02:00
fabio.formosa
25028774d7 #6 fixed websocke with jwt token header 2020-05-08 01:10:10 +02:00
fabio.formosa
1bc52a26b7 minor commit 2020-05-07 23:34:21 +02:00
fabio.formosa
d0f391f539 #8 clean up 2020-05-03 12:03:21 +02:00
fabio.formosa
ca4c8244d5 #8 upgraded angular material 2020-05-02 21:48:47 +02:00
fabio.formosa
25afc76ced #8 upgraded to angular 9 2020-05-02 17:39:17 +02:00
fabio.formosa
f5b046f7eb #8 upgraded to angular 8 2020-05-02 17:22:43 +02:00
fabio.formosa
563257930c #6 fixed authorization header set 2020-05-02 16:52:20 +02:00
fabio.formosa
b8b88a6879 #6 added javadocs and moved packages 2020-05-02 16:48:45 +02:00
fabio.formosa
166244a67b #6 fixed auth header handling 2020-05-01 00:35:21 +02:00
fabio.formosa
f50b0d204e #6 refactoring completed 2020-04-26 21:26:52 +02:00
Fabio Formosa
0db3bea4ef #6 wrapped httpsecurity 2020-04-25 12:27:37 +02:00
fabio.formosa
98e7d651c3 #6 added HttpSecurity wrapper 2020-04-22 23:31:57 +02:00
fabio.formosa
75d4ac9827 #6 added login success strategies 2020-04-22 23:23:46 +02:00
Fabio Formosa
2f3dadc186 #6 extracted login success business logic 2020-04-22 18:37:38 +02:00
fabio.formosa
f7b5753e7d fixed cookie delete with proxy 2020-04-22 00:04:30 +02:00
fabio.formosa
3b51cd5504 #6 step into security refactoring 2020-04-22 00:03:31 +02:00
Fabio Formosa
53a21067e5 Update README.md
Added swagger ref
2020-04-15 00:24:48 +02:00
fabio.formosa
4b7de03050 renaming 2020-04-15 00:02:56 +02:00
fabio.formosa
88c7408276 #4 added javadoc 2019-10-02 00:27:05 +02:00
fabio.formosa
ccdbc58ca8 minor commit 2019-10-01 23:55:13 +02:00
fabio.formosa
d5493be261 Merge branch 'master' of https://github.com/fabioformosa/quartz-manager.git 2019-07-04 00:15:22 +02:00
fabio.formosa
04da4556b1 Refs #2 fix init trigger 2019-07-04 00:14:44 +02:00
Fabio Formosa
17c4a87ad3 Update README.md 2019-07-03 00:54:25 +02:00
fabio.formosa
8440a431d0 Enabled JWT Security Config 2019-07-03 00:30:03 +02:00
fabio.formosa
3334d36105 enabled basic auth to swagger UI 2019-05-18 10:58:31 +02:00
fabio.formosa
77c101e077 Merge branch 'master' of https://github.com/fabioformosa/quartz-manager.git 2019-05-12 19:21:23 +02:00
fabio.formosa
d3967c5dab Added swagger to doc quartz manager Rest API 2019-05-12 19:20:47 +02:00
Fabio Formosa
54766dc3a2 Create LICENSE 2019-05-05 12:29:00 +02:00
Fabio Formosa
8ce79fe5b2 Update README.md 2019-05-04 17:52:32 +02:00
Fabio Formosa
82372886eb Update README.md 2019-05-04 17:51:53 +02:00
fabio.formosa
45b6819d10 Renamed quartz-manager-backend in to quartz-manager-api 2019-05-04 17:43:10 +02:00
fabio.formosa
b1e0638945 Merge branch 'master' of https://github.com/fabioformosa/quartz-manager.git 2019-05-04 17:21:56 +02:00
fabio.formosa
f1e47f36af renamed some folders 2019-05-04 17:21:39 +02:00
fabio.formosa
3bb85c40eb renamed some folders 2019-05-04 17:19:29 +02:00
fabio.formosa
8c37b7509e removed unused components 2019-05-04 16:31:23 +02:00
Fabio Formosa
13c1bf71d1 Update README.md 2019-05-04 00:24:10 +02:00
fabio.formosa
f500844cbe Merge branch 'master' of https://github.com/fabioformosa/quartz-manager.git 2019-05-04 00:20:55 +02:00
fabio.formosa
c5bc1a0b25 Put job classname in application context 2019-05-04 00:20:35 +02:00
Fabio Formosa
8eee065aea Update README.md 2019-05-03 23:48:34 +02:00
fabio.formosa
289ea48588 Merge branch 'master' of https://github.com/fabioformosa/quartz-manager.git 2019-04-26 14:57:17 +02:00
fabio.formosa
f39db9728c removed signup button from menu header 2019-04-26 14:56:53 +02:00
Fabio Formosa
92745495ef Update README.md 2019-04-26 12:34:48 +02:00
fabio.formosa
df59999034 moved admin credentials into application context 2019-04-26 12:31:10 +02:00
fabio.formosa
1e6f89678c minor commit 2019-04-26 12:18:21 +02:00
fabio.formosa
4103779e4e Merge branch 'master' of https://github.com/fabioformosa/quartz-manager.git 2019-04-26 11:53:03 +02:00
fabio.formosa
919393e58c fixed tests 2019-04-26 11:52:48 +02:00
Fabio Formosa
a1f279c161 Update README.md 2019-04-24 17:05:48 +02:00
Fabio Formosa
03a4d68993 Update README.md 2019-04-24 17:05:15 +02:00
fabio.formosa
cb6dd7933a Merge branch 'master' of https://github.com/fabioformosa/quartz-manager.git 2019-04-24 17:02:24 +02:00
fabio.formosa
bcff3ebce7 upgraded frontend to angular ver 7 2019-04-24 17:02:04 +02:00
Fabio Formosa
8ec980763b Update README.md 2019-04-22 20:30:41 +02:00
fabio.formosa
139e6871bf upgraded spring boot to ver 2.x 2019-04-22 20:28:48 +02:00
Fabio Formosa
bde642cf52 improved log pattern 2018-06-22 15:09:46 +02:00
Fabio Formosa
fc8101aa40 Update README.md 2018-06-22 14:40:26 +02:00
Fabio Formosa
8dfd627c23 Update README.md 2018-06-22 14:37:18 +02:00
Fabio Formosa
3199437c8c added screenshot 2018-06-22 14:34:55 +02:00
456 changed files with 41624 additions and 4844 deletions

2
.dockerignore Normal file
View File

@@ -0,0 +1,2 @@
# .dockerignore
quartz-manager-frontend/node_modules

9
.editorconfig Normal file
View File

@@ -0,0 +1,9 @@
[*]
charset = utf-8
end_of_line = lf
indent_size = 2
indent_style = space
insert_final_newline = true
max_line_length = 120
tab_width = 2
ij_continuation_indent_size = 2

46
.github/workflows/maven-release.yml vendored Normal file
View File

@@ -0,0 +1,46 @@
name: Publish package to the Maven Central Repository
on:
release:
types: [created]
jobs:
publish:
runs-on: ubuntu-latest
permissions:
contents: read
packages: write
steps:
- uses: actions/checkout@v4
- name: Set up Java 21 for publishing to Maven Central Repository
uses: actions/setup-java@v4
with:
java-version: '21'
distribution: 'temurin'
server-id: maven-central-release
server-username: MAVEN_USERNAME
server-password: MAVEN_PASSWORD
gpg-private-key: ${{ secrets.OSSRH_GPG_SECRET_KEY }}
gpg-passphrase: MAVEN_GPG_PASSPHRASE
- name: Build with Maven
run: mvn -B package --file quartz-manager-parent/pom.xml
- name: Publish to maven central
run: mvn deploy --file quartz-manager-parent/pom.xml --batch-mode -P "release-maven-central,build-webjar"
env:
MAVEN_USERNAME: ${{ secrets.MAVEN_CENTRAL_TOKEN_USERNAME }}
MAVEN_PASSWORD: ${{ secrets.MAVEN_CENTRAL_TOKEN_PASSWORD }}
MAVEN_GPG_PASSPHRASE: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}
- name: Set up Java 21 for publishing to GitHub Packages
uses: actions/setup-java@v4
with:
java-version: '21'
distribution: 'temurin'
- name: Publish to GitHub Packages Apache Maven
run: mvn deploy --file quartz-manager-parent/pom.xml -P "deploy-github,build-webjar"
env:
GITHUB_TOKEN: ${{ github.token }}

36
.github/workflows/maven.yml vendored Normal file
View File

@@ -0,0 +1,36 @@
# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven
# This workflow uses actions that are not certified by GitHub.
# They are provided by a third-party and are governed by
# separate terms of service, privacy policy, and support
# documentation.
name: Java CI with Maven
on:
push:
branches:
- develop
- master
paths: [ 'quartz-manager-parent/**' ]
pull_request:
branches:
- develop
- master
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
java-version: '21'
distribution: 'temurin'
cache: maven
- name: Build and test with Maven
run: mvn -B package --file quartz-manager-parent/pom.xml

44
.github/workflows/npm.yml vendored Normal file
View File

@@ -0,0 +1,44 @@
# This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-nodejs
name: npm CI
on:
push:
branches:
- develop
- master
paths: [ 'quartz-manager-frontend/**' ]
pull_request:
branches:
- develop
- master
defaults:
run:
working-directory: ./quartz-manager-frontend
jobs:
build:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [22.x]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
steps:
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
cache: 'npm'
cache-dependency-path: ./quartz-manager-frontend/package-lock.json
- name: 'install'
run: npm ci
- name: 'test'
run: npm test
- name: 'build'
run: npm run build --if-present

40
.github/workflows/sonar-java.yml vendored Normal file
View File

@@ -0,0 +1,40 @@
name: SonarCloud Analysis for Java
on:
push:
branches:
- master
- develop
# paths: [ 'quartz-manager-parent/**' ]
pull_request:
types: [opened, synchronize, reopened]
workflow_dispatch:
jobs:
build:
name: Build and analyze
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
java-version: 21
distribution: 'zulu' # Alternative distribution options are available.
- name: Cache SonarCloud packages
uses: actions/cache@v3
with:
path: ~/.sonar/cache
key: ${{ runner.os }}-sonar
restore-keys: ${{ runner.os }}-sonar
- name: Cache Maven packages
uses: actions/cache@v3
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2
- name: Build and analyze
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=fabioformosa_quartz-manager --file quartz-manager-parent/pom.xml

3
.gitignore vendored
View File

@@ -1 +1,4 @@
/.project /.project
.idea
*.iml
.DS_Store

3
.travis.yml Normal file
View File

@@ -0,0 +1,3 @@
language: java
jdk: openjdk8
before_script: cd quartz-manager-parent

58
CHANGELOG.md Normal file
View File

@@ -0,0 +1,58 @@
## **v5.0.1**
### New Features
* Added full job management: list eligible job classes, create stored jobs, update jobs, delete jobs, and trigger jobs on demand.
* Added trigger management APIs and UI flows to inspect, create, reschedule, pause, resume, and unschedule triggers.
* Added support for Quartz trigger types beyond simple triggers: cron, daily time interval, and calendar interval triggers.
* Added Quartz calendar management for annual, cron, daily, holiday, monthly, and weekly calendars.
* Added calendar-aware scheduling support, including calendar assignment to triggers and included-time checks.
* Redesigned the Quartz Manager dashboard with a broader operations view for scheduler, jobs, triggers, calendars, progress, and logs.
* Updated the embedded UI to Angular 21.
* Added support for Spring Boot 4 applications.
### Breaking Changes
* Quartz Manager now requires Java 21+ and Spring Boot 4.x.
* Applications using Quartz Manager APIs must migrate from `javax.*` validation/annotation dependencies to `jakarta.*` equivalents through the Spring Boot 4 stack.
* Scheduler command endpoints now use `POST` operations and clearer action names: `/scheduler/start`, `/scheduler/standby`, `/scheduler/resume`, and `/scheduler/shutdown` replace the previous `GET` command endpoints.
* Simple trigger endpoints now include the trigger group in the path: `/simple-triggers/{group}/{name}`.
* New trigger creation should use the generalized `/triggers/{group}/{name}` API when working with cron, daily time interval, or calendar interval triggers.
### Fixes
* Fixed WebSocket log retrieval for job execution logs.
* Fixed UI style regressions and improved readability in the dashboard, login page, job class display, and misfire instruction display.
* Improved API error handling for missing jobs, missing triggers, missing calendars, unsupported trigger types, and scheduling conflicts.
## **v4.1.1**
**NEW FEATURE** support for multiple triggers
## **v4.0.10**
Migrated to the new maven central repo
## **v4.0.9**
Fixed a bug which prevented to run the liquibase migration scripts in case of usage of quartz-manager-starter-persistence
## **v4.0.8**
Upgraded the frontend to angular v14
## **v4.0.6**
Minor bug fixes
## **v4.0.5**
Fixed potential security issues
## **v4.0.4**
* Conformed the trigger configuration to the Simple Trigger of Quartz
* **BREAKING CHANGE** Changed accordingly the API and the UI
* Made Quartz Manager embeddable in projects with existing quartz instance, security layer, swagger ui.
## **v3.1.0**
* Added a new persistence module to persist the quartz triggers in a postgresql database
## **v3.0.1**
Quartz-Manager is now publicly available into the maven central repo into 3 different packages.
You can import:
* `quartz-manager-starter-api` to have a REST API layer to control your scheduler
* `quartz-manager-starter-ui` to import the UI also, in your spring webapp.
* `quartz-manager-starter-security` if you want to give access to the quartz-manager UI and API only to authenticated users

34
Dockerfile Normal file
View File

@@ -0,0 +1,34 @@
FROM maven:3.9.8-eclipse-temurin-21 AS build
# Set the working directory
WORKDIR /app
# Copy the pom.xml and download dependencies
COPY quartz-manager-parent/pom.xml ./quartz-manager-parent/
COPY quartz-manager-parent/lombok.config ./quartz-manager-parent/
COPY quartz-manager-parent/quartz-manager-common ./quartz-manager-parent/quartz-manager-common/
COPY quartz-manager-parent/quartz-manager-starter-api ./quartz-manager-parent/quartz-manager-starter-api/
COPY quartz-manager-parent/quartz-manager-starter-persistence ./quartz-manager-parent/quartz-manager-starter-persistence/
COPY quartz-manager-parent/quartz-manager-starter-security ./quartz-manager-parent/quartz-manager-starter-security/
COPY quartz-manager-parent/quartz-manager-starter-ui ./quartz-manager-parent/quartz-manager-starter-ui/
COPY quartz-manager-parent/quartz-manager-web-showcase ./quartz-manager-parent/quartz-manager-web-showcase/
COPY quartz-manager-parent/lombok.config ./quartz-manager-parent/
COPY quartz-manager-frontend ./quartz-manager-frontend/
WORKDIR /app/quartz-manager-parent
RUN mvn clean package -DskipTests -P=build-webjar
# Stage 2: Create the final image
FROM openjdk:11-jre-slim
# Set the working directory
WORKDIR /app
# Copy the JAR file from the build stage
COPY --from=build /app/quartz-manager-parent/quartz-manager-web-showcase/target/*-SNAPSHOT.jar app.jar
# Expose the application port
EXPOSE 8080
# Run the application
ENTRYPOINT ["java", "-jar", "app.jar"]

201
LICENSE Normal file
View File

@@ -0,0 +1,201 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions.
"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.
"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.
"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.
"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.
2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:
(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and
(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and
(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright [yyyy] [name of copyright owner]
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

362
README.md
View File

@@ -1,72 +1,340 @@
#QUARTZ MANAGER <div align="center">
GUI Manager for Quartz Scheduler.
Through this webapp you can launch and control your scheduled job. The GUI Console is composed by a managament panel to set trigger, start/stop scheduler and a log panel with a progress bar to display the job output. # Quartz Manager
## SCREENSHOT **A Spring Boot library and standalone web app that adds REST API and dashboard management to Quartz Scheduler.**
![Alt text](http://www.fabioformosa.it/quartz-manager/quartz-manager-2-screenshot_800.png "Quartz Manager Screenshot")
## HOW IT WORKS [![Java CI with Maven](https://github.com/fabioformosa/quartz-manager/actions/workflows/maven.yml/badge.svg)](https://github.com/fabioformosa/quartz-manager/actions/workflows/maven.yml)
* Set up the trigger into the left sidebar in terms of: daily frequency and and max occurrences. [![npm CI](https://github.com/fabioformosa/quartz-manager/actions/workflows/npm.yml/badge.svg)](https://github.com/fabioformosa/quartz-manager/actions/workflows/npm.yml)
* Press the start button [![Coverage](https://sonarcloud.io/api/project_badges/measure?project=fabioformosa_quartz-manager&metric=coverage)](https://sonarcloud.io/summary/new_code?id=fabioformosa_quartz-manager)
* The GUI manager updates the progress bar and reports all logs of your quartz job. [![Bugs](https://sonarcloud.io/api/project_badges/measure?project=fabioformosa_quartz-manager&metric=bugs)](https://sonarcloud.io/summary/new_code?id=fabioformosa_quartz-manager)
[![Security Rating](https://sonarcloud.io/api/project_badges/measure?project=fabioformosa_quartz-manager&metric=security_rating)](https://sonarcloud.io/summary/new_code?id=fabioformosa_quartz-manager)
[![Maintainability Rating](https://sonarcloud.io/api/project_badges/measure?project=fabioformosa_quartz-manager&metric=sqale_rating)](https://sonarcloud.io/summary/new_code?id=fabioformosa_quartz-manager)
## QUICK START [Choose Your Path](#choose-your-path) • [Features](#features) • [Quick Start](#quick-start) • [REST API](#rest-api) • [Security](#security) • [Persistence](#persistence) • [Roadmap](#roadmap)
**[requirements]** Make sure you have installed
* [Java 8](https://java.com/download/) or greater
* [Maven](https://maven.apache.org/)
* [npm](https://www.npmjs.com/get-npm), [node](https://nodejs.org) and [angular-cli](https://cli.angular.io/)
</div>
[Quartz Scheduler](https://www.quartz-scheduler.org/) is powerful, but it does not ship with a REST API or an operations dashboard. Quartz Manager fills that gap for Spring Boot applications and can also run as a standalone scheduler web app.
Use it to start and stop a scheduler, create jobs, schedule triggers, manage calendars, inspect executions, and monitor job progress from HTTP endpoints or from a browser UI.
![Quartz Manager dashboard](https://github.com/fabioformosa/quartz-manager/blob/master/docs/assets/quartz-manager-dashboard.png)
## Choose Your Path
### 1. Add API And UI To Your Existing App
Use this path when you already have a Spring Boot application and want to add a Quartz management API, an embedded management panel, or both.
Current behavior: Quartz Manager creates and manages its own scheduler bean named `quartzManagerScheduler` by default. It can coexist with other Quartz schedulers in the same application, but it does not automatically take control of an arbitrary existing scheduler instance.
If you want Quartz Manager to manage an existing scheduler today, disable the default scheduler configuration with `quartz-manager.quartz.enabled=false` and provide a compatible bean named `quartzManagerScheduler`. First-class existing-scheduler integration is planned on the roadmap.
Your managed jobs must extend `AbstractQuartzManagerJob` so Quartz Manager can expose them as eligible jobs and stream their execution logs/progress to the UI.
If you also want the browser dashboard, see [Add The UI](#add-the-ui).
### 2. Add A New Scheduler To Your App
Use this path when your Spring Boot application does not have Quartz yet and you want to add a scheduler managed by Quartz Manager.
The easiest setup is to let Quartz Manager import, initialize, and manage a Quartz Scheduler for you. Import the API starter, create jobs extending `AbstractQuartzManagerJob`, configure the package that contains your jobs, and use the REST API or UI to create jobs and triggers.
You can later add optional modules for the embedded UI, JWT security, and PostgreSQL persistence.
If you also want the browser dashboard, see [Add The UI](#add-the-ui).
### 3. Run Quartz Manager As A Standalone App
Use this path when you want a standalone scheduler web application instead of embedding Quartz Manager into an existing product.
The `quartz-manager-web-showcase` application imports Quartz Manager API, UI, and security modules and runs with an embedded Quartz scheduler. It is useful as a ready-to-run management console, as a demo, and as a reference application.
Even in standalone mode, the jobs managed by Quartz Manager must extend `AbstractQuartzManagerJob`.
## Features
- REST API for scheduler, job, trigger, and calendar management.
- Embeddable management UI provided as a webjar: import it as a Maven dependency and open `/quartz-manager-ui` in the browser.
- Scheduler commands: start, standby, resume, and shutdown.
- Job management: list eligible job classes, create stored jobs, update jobs, delete jobs, and trigger jobs manually.
- Trigger management: create, inspect, reschedule, pause, resume, and unschedule triggers.
- Trigger types: simple, cron, daily time interval, and calendar interval.
- Calendar management: annual, cron, daily, holiday, monthly, and weekly calendars.
- Misfire handling for supported trigger types.
- WebSocket updates for job execution progress and logs.
- Optional OpenAPI/Swagger UI documentation.
- Optional JWT-based security with in-memory users.
- Optional PostgreSQL persistence using Quartz JDBC job store and Liquibase-managed schema creation.
In dependency snippets, replace `VERSION` with the version you want to use.
## Requirements
- Java 21+
- Spring Boot 4.x
- Maven 3.9+
- Node.js and npm only if you build the frontend locally
## Modules
| Module | Required | Purpose |
| --- | --- | --- |
| `quartz-manager-starter-api` | Required | REST API, managed scheduler integration, jobs, triggers, calendars, OpenAPI support, and WebSocket updates |
| `quartz-manager-starter-ui` | Optional | Embeddable management UI provided as a webjar |
| `quartz-manager-starter-security` | Optional | JWT authentication for Quartz Manager API and UI |
| `quartz-manager-starter-persistence` | Optional | PostgreSQL-backed Quartz persistence and Liquibase schema setup |
| `quartz-manager-web-showcase` | Optional | Standalone/demo Spring Boot application using the Quartz Manager modules |
## Quick Start
### Path 1: Existing Spring Boot App
Add the API starter:
```xml
<dependency>
<groupId>it.fabioformosa.quartz-manager</groupId>
<artifactId>quartz-manager-starter-api</artifactId>
<version>VERSION</version>
</dependency>
``` ```
#CLONE REPOSITORY
Create jobs by extending `AbstractQuartzManagerJob`:
```java
import it.fabioformosa.quartzmanager.api.jobs.AbstractQuartzManagerJob;
import it.fabioformosa.quartzmanager.api.jobs.entities.LogRecord;
import org.quartz.JobExecutionContext;
public class SampleJob extends AbstractQuartzManagerJob {
@Override
public LogRecord doIt(JobExecutionContext context) {
return new LogRecord(LogRecord.LogType.INFO, "Hello from Quartz Manager");
}
}
```
Configure job discovery:
```properties
quartz-manager.jobClassPackages=com.example.jobs
quartz-manager.oas.enabled=true
```
By default, Quartz Manager creates a dedicated scheduler named `quartz-manager-scheduler`. If your app already has another Quartz scheduler, both can coexist.
Advanced existing-scheduler setup:
```properties
quartz-manager.quartz.enabled=false
```
Then provide a `Scheduler` bean named `quartzManagerScheduler`. This is the current integration point; a more explicit existing-scheduler mode is planned.
To add the browser dashboard to your application, see [Add The UI](#add-the-ui).
### Path 2: New Scheduler In Your App
Use the same API starter setup as Path 1, then let Quartz Manager create its managed scheduler.
Create one or more jobs extending `AbstractQuartzManagerJob`, configure `quartz-manager.jobClassPackages`, then create stored jobs and triggers through the REST API, Swagger UI, or the dashboard.
Default managed Quartz properties:
```properties
org.quartz.scheduler.instanceName=quartz-manager-scheduler
org.quartz.threadPool.threadCount=1
```
To customize the managed scheduler, add `managed-quartz.properties` to your classpath.
To add the browser dashboard to your application, see [Add The UI](#add-the-ui).
### Path 3: Standalone Quartz Manager App
Run the standalone showcase application when you want Quartz Manager as a ready-to-use scheduler web app.
```bash
git clone https://github.com/fabioformosa/quartz-manager.git git clone https://github.com/fabioformosa/quartz-manager.git
cd quartz-manager/quartz-manager-parent
# START QUARTZ-MANAGER-BACKEND mvn install -Pbuild-webjar
cd quartz-manager/quartz-manager-backend cd quartz-manager-web-showcase
mvn spring-boot:run mvn spring-boot:run
# START QUARTZ-MANAGER-FRONTEND
cd quartz-manager/quartz-manager-backend
npm install
npm start
``` ```
1. Open browser at [http://localhost:4200](http://localhost:4200) Open the dashboard:
1. Log in with **default credentials**: `admin/admin`
If you are not confident with maven CLI, you can start it by your IDE. For more details [spring boot ref.](http://docs.spring.io/spring-boot/docs/current/reference/html/using-boot-running-your-application.html) ```text
http://localhost:8080/quartz-manager-ui/index.html
```
## HOW TO RUN YOUR SCHEDULED JOB Open Swagger UI when OpenAPI is enabled:
By default, quartz-manager executes the dummy job that logs "hello world!".
Replace the dummy job (class: `it.fabioformosa.quartzmanager.jobs.SampleJob`) with yours. Follow these steps:
1. Let extend the super class `it.fabioformosa.quartzmanager.jobs.AbstractLoggingJob` ```text
1. Change the scheduler settings, providing the class name of your job. Open class `it.fabioformosa.quartzmanager.configuration.SchedulerConfig` and for the method `jobDetail` replace SampleJob.class with YourJob.class http://localhost:8080/swagger-ui.html
```
## HOW TO CHANGE SETTINGS Default showcase credentials:
* Num of Threads: `/quartz-manager/src/main/resources/quartz.properties`
* Credentials: `it.fabioformosa.quartzmanager.configuration.WebSecurityConfig`
* quartz-manager backend context path (default `/quartz-manager`) and port (default `8080`): `/quartz-manager/src/main/resources/application.properties`
## Tech Overview ```text
admin / admin
```
**Backend Stack** Java 8, Spring Boot 1.5.9 (Spring MVC 4.3.13, Spring Security 4.2.3, Spring AOP 4.3.13), Quartz Scheduler 2.2.2 To plug in your own jobs today, add your job classes inside the cloned repository, rebuild the standalone application, and configure `quartz-manager.jobClassPackages` to include their package.
**Application Server** Tomcat (embedded) A Docker-based standalone distribution is planned. It will provide a supported mechanism to attach external job classes without modifying the cloned repository.
**Frontend** Angular 5.2.0, Web-Socket (stompjs 2.3.3) ## Add The UI
**Style** angular material, FontAwesome 5 Add the UI starter when you want the embedded management panel in your Spring Boot app:
From quartz manager ver 2.x.x, the new structure of project is: ```xml
* REST backend (java based, using [http://www.quartz-scheduler.org/](http://www.quartz-scheduler.org/) <dependency>
* Single Page Application frontend (angular 5) <groupId>it.fabioformosa.quartz-manager</groupId>
<artifactId>quartz-manager-starter-ui</artifactId>
<version>VERSION</version>
</dependency>
```
(The previous version of quartz manager was a monolithic backend that provided also frontend developed with angularjs 1.6.x. You can find it at the branch 1.x.x) The UI is served from:
## Credits ```text
http://localhost:8080/quartz-manager-ui/index.html
```
* this project has been created from [angular-spring-starter](https://github.com/bfwg/angular-spring-starter) ## REST API
Quartz Manager exposes its API under `/quartz-manager`.
| Area | Endpoints |
| --- | --- |
| Scheduler | `GET /quartz-manager/scheduler`, `POST /quartz-manager/scheduler/start`, `POST /quartz-manager/scheduler/standby`, `POST /quartz-manager/scheduler/resume`, `POST /quartz-manager/scheduler/shutdown` |
| Job classes | `GET /quartz-manager/job-classes` |
| Jobs | `GET /quartz-manager/jobs`, `POST /quartz-manager/jobs/{group}/{name}`, `PUT /quartz-manager/jobs/{group}/{name}`, `POST /quartz-manager/jobs/{group}/{name}/trigger`, `DELETE /quartz-manager/jobs/{group}/{name}` |
| Triggers | `GET /quartz-manager/triggers`, `POST /quartz-manager/triggers/{group}/{name}`, `PUT /quartz-manager/triggers/{group}/{name}`, `POST /quartz-manager/triggers/{group}/{name}/pause`, `POST /quartz-manager/triggers/{group}/{name}/resume`, `DELETE /quartz-manager/triggers/{group}/{name}` |
| Calendars | `GET /quartz-manager/calendars`, `POST /quartz-manager/calendars/{name}`, `PUT /quartz-manager/calendars/{name}`, `DELETE /quartz-manager/calendars/{name}`, `POST /quartz-manager/calendars/{name}/included-time-test` |
Enable OpenAPI and Swagger UI with:
```properties
quartz-manager.oas.enabled=true
```
Then open:
```text
http://localhost:8080/swagger-ui.html
```
## Security
Add the security starter when you want Quartz Manager API and UI protected by JWT authentication:
```xml
<dependency>
<groupId>it.fabioformosa.quartz-manager</groupId>
<artifactId>quartz-manager-starter-security</artifactId>
<version>VERSION</version>
</dependency>
```
Example configuration:
```yaml
quartz-manager:
security:
jwt:
secret: "change-me"
expiration-in-sec: 28800
header-strategy:
enabled: true
header: Authorization
cookie-strategy:
enabled: false
cookie: AUTH-TOKEN
accounts:
in-memory:
enabled: true
users:
- username: admin
password: admin
roles:
- ADMIN
```
Security is applied to `/quartz-manager/**`. The UI webjar path is ignored by the security filter chain, while API calls require authentication.
## Persistence
By default, Quartz Manager uses Quartz's in-memory job store. Scheduling data is lost when the application stops.
Add the persistence starter when you want Quartz Manager's managed scheduler to use PostgreSQL-backed Quartz persistence:
```xml
<dependency>
<groupId>it.fabioformosa.quartz-manager</groupId>
<artifactId>quartz-manager-starter-persistence</artifactId>
<version>VERSION</version>
</dependency>
```
Configure the Quartz Manager datasource:
```yaml
quartz-manager:
persistence:
quartz:
datasource:
url: jdbc:postgresql://localhost:5432/quartzmanager
user: quartzmanager
password: quartzmanager
```
The persistence module configures Quartz `JobStoreTX`, uses the PostgreSQL delegate, and creates the required Quartz tables through Liquibase.
## Examples
Example integrations are available in [quartz-manager-use-cases](https://github.com/fabioformosa/quartz-manager-use-cases).
The use cases cover simple Spring applications, secured and unsecured setups, existing application security, existing Quartz scenarios, and persistence.
## Current Limitations
- Quartz Manager creates and manages its own scheduler by default. Automatic discovery and first-class management of an arbitrary existing scheduler is not yet supported.
- Existing applications that want Quartz Manager to manage a pre-existing scheduler must currently provide it as a bean named `quartzManagerScheduler` and disable Quartz Manager's default scheduler creation.
- Persistence currently targets PostgreSQL.
- Cluster mode is not currently documented as a supported production mode.
- Managed jobs must extend `AbstractQuartzManagerJob` to be eligible for job discovery and UI log/progress streaming.
## Roadmap
The next priorities are tracked in the [project roadmap](https://github.com/users/fabioformosa/projects/1).
Planned improvements include:
- First-class support for managing an existing Quartz Scheduler instance.
- Cluster mode support.
- Additional persistence targets beyond PostgreSQL.
- OAuth2 client support.
- Continued UI improvements.
## Development
This repository contains the backend modules and the frontend application.
For local development, repository structure, build commands, and contribution details, see [quartz-manager-parent/README.md](https://github.com/fabioformosa/quartz-manager/blob/develop/quartz-manager-parent/README.md).
## Contributing
Contributions are welcome. Open an issue to discuss bugs, questions, or feature proposals before starting larger changes.
## License
Quartz Manager is released under the [Apache License 2.0](LICENSE).
## Support
If Quartz Manager is useful to you, consider starring the repository to support the project.

45
cloudbuild.yaml Normal file
View File

@@ -0,0 +1,45 @@
substitutions:
_REGION: europe-west8
steps:
# Step 1: Google Cloud Build - Docker build&push
- name: 'gcr.io/k8s-skaffold/skaffold'
entrypoint: 'sh'
args:
- -xe
- -c
- |
# Build and push images
sed -i s/_IMAGE_TAG_POLICY/$SHORT_SHA/g skaffold.yaml
sed -i s/_HELM_APP_VERSION/$SHORT_SHA/g ./quartz-manager-parent/quartz-manager-web-showcase/helm/Chart.yaml
skaffold build --file-output=/workspace/artifacts.json \
--default-repo=${_REGION}-docker.pkg.dev/quartz-manager-test/quartz-manager/quartz-manager-standalone \
--push=true
# Step 2: Google Cloud Deploy - deploy
- name: 'google/cloud-sdk:latest'
entrypoint: 'sh'
args:
- -xe
- -c
- |
sed -i s/_HELM_APP_VERSION/$SHORT_SHA/g ./quartz-manager-parent/quartz-manager-web-showcase/helm/Chart.yaml
gcloud config set deploy/region ${_REGION}
gcloud deploy apply --file ./quartz-manager-parent/quartz-manager-web-showcase/deploy/pipeline.yaml
gcloud deploy apply --file ./quartz-manager-parent/quartz-manager-web-showcase/deploy/dev.yaml
gcloud deploy apply --file ./quartz-manager-parent/quartz-manager-web-showcase/deploy/staging.yaml
gcloud deploy apply --file ./quartz-manager-parent/quartz-manager-web-showcase/deploy/prod.yaml
gcloud deploy releases create rel-${SHORT_SHA} \
--delivery-pipeline quartz-manager-pipeline \
--description "$(git log -1 --pretty='%s')" \
--build-artifacts /workspace/artifacts.json \
--verbosity=debug \
--annotations "commit_ui=https://source.cloud.google.com/$PROJECT_ID/quartz-manager-standalone/+/$COMMIT_SHA"
artifacts:
objects:
location: 'gs://$PROJECT_ID-gcdeploy-artifacts/'
paths:
- '/workspace/artifacts.json'
options:
logging: CLOUD_LOGGING_ONLY

Binary file not shown.

After

Width:  |  Height:  |  Size: 119 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 88 KiB

View File

@@ -1,190 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>it.fabioformosa</groupId>
<artifactId>quartz-manager</artifactId>
<version>2.0.1-SNAPSHOT</version>
<packaging>war</packaging>
<name>quartz-manager</name>
<description>Manager Panel for Quartz Scheduler</description>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.5.9.RELEASE</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
</properties>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-mail</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-devtools</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-websocket</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-messaging</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt</artifactId>
<version>0.9.0</version>
</dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy</artifactId>
</dependency>
<dependency>
<groupId>net.sourceforge.nekohtml</groupId>
<artifactId>nekohtml</artifactId>
</dependency>
<dependency>
<groupId>io.rest-assured</groupId>
<artifactId>spring-mock-mvc</artifactId>
<version>3.0.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
<version>2.2.2</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-io</artifactId>
<version>1.3.2</version>
</dependency>
<!-- Reactor -->
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-core</artifactId>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-net</artifactId>
</dependency>
<dependency>
<groupId>io.projectreactor.spring</groupId>
<artifactId>reactor-spring-context</artifactId>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
<version>4.0.31.Final</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-aop</artifactId>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
</dependency>
</dependencies>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.gmavenplus</groupId>
<artifactId>gmavenplus-plugin</artifactId>
<version>1.5</version>
<executions>
<execution>
<goals>
<goal>addSources</goal>
<goal>addTestSources</goal>
<goal>generateStubs</goal>
<goal>compile</goal>
<goal>testGenerateStubs</goal>
<goal>testCompile</goal>
<goal>removeStubs</goal>
<goal>removeTestStubs</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</pluginManagement>
</build>
</project>

View File

@@ -1,13 +0,0 @@
package it.fabioformosa;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.support.SpringBootServletInitializer;
public class ServletInitializer extends SpringBootServletInitializer {
@Override
protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
return application.sources(QuartManagerApplication.class);
}
}

View File

@@ -1,9 +0,0 @@
package it.fabioformosa.quartzmanager.aspects;
import org.quartz.SchedulerException;
public interface ProgressUpdater {
void update() throws SchedulerException;
}

View File

@@ -1,69 +0,0 @@
package it.fabioformosa.quartzmanager.aspects;
import javax.annotation.Resource;
import org.quartz.DailyTimeIntervalTrigger;
import org.quartz.Scheduler;
import org.quartz.SchedulerException;
import org.quartz.SimpleTrigger;
import org.quartz.Trigger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.messaging.simp.SimpMessageSendingOperations;
import org.springframework.stereotype.Component;
import it.fabioformosa.quartzmanager.dto.TriggerProgress;
import it.fabioformosa.quartzmanager.scheduler.TriggerMonitor;
//@Aspect
@Component
public class ProgressUpdaterImpl implements ProgressUpdater {
@Autowired
private SimpMessageSendingOperations messagingTemplate;
@Resource
private Scheduler scheduler;
@Resource
private TriggerMonitor triggerMonitor;
//@AfterReturning("execution(* logAndSend(..))")
// @Override
// public void updateProgress(JoinPoint joinPoint) {
// log.info("PROGRESS UPDATE!!!");
// }
@Override
public void update() throws SchedulerException {
TriggerProgress progress = new TriggerProgress();
Trigger trigger = scheduler.getTrigger(triggerMonitor.getTrigger().getKey());
progress.setFinalFireTime(trigger.getFinalFireTime());
progress.setNextFireTime(trigger.getNextFireTime());
progress.setPreviousFireTime(trigger.getPreviousFireTime());
int timesTriggered = 0;
int repeatCount = 0;
if (trigger instanceof SimpleTrigger) {
SimpleTrigger simpleTrigger = (SimpleTrigger) trigger;
timesTriggered = simpleTrigger.getTimesTriggered();
repeatCount = simpleTrigger.getRepeatCount();
} else if (trigger instanceof DailyTimeIntervalTrigger) {
DailyTimeIntervalTrigger dailyTrigger = (DailyTimeIntervalTrigger) trigger;
timesTriggered = dailyTrigger.getTimesTriggered();
repeatCount = dailyTrigger.getRepeatCount();
}
Trigger jobTrigger = triggerMonitor.getTrigger();
if (jobTrigger != null && jobTrigger.getJobKey() != null) {
progress.setJobKey(jobTrigger.getJobKey().getName());
progress.setJobClass(jobTrigger.getClass().getSimpleName());
progress.setTimesTriggered(timesTriggered);
progress.setRepeatCount(repeatCount + 1);
}
messagingTemplate.convertAndSend("/topic/progress", progress);
}
}

View File

@@ -1,93 +0,0 @@
package it.fabioformosa.quartzmanager.configuration;
import java.io.IOException;
import java.util.Properties;
import org.quartz.JobDetail;
import org.quartz.SimpleTrigger;
import org.quartz.Trigger;
import org.quartz.spi.JobFactory;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.beans.factory.config.PropertiesFactoryBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.io.ClassPathResource;
import org.springframework.scheduling.quartz.JobDetailFactoryBean;
import org.springframework.scheduling.quartz.SchedulerFactoryBean;
import org.springframework.scheduling.quartz.SimpleTriggerFactoryBean;
import it.fabioformosa.quartzmanager.jobs.myjobs.SampleJob;
import it.fabioformosa.quartzmanager.scheduler.AutowiringSpringBeanJobFactory;
import it.fabioformosa.quartzmanager.scheduler.TriggerMonitor;
import it.fabioformosa.quartzmanager.scheduler.TriggerMonitorImpl;
@Configuration
@ConditionalOnProperty(name = "quartz.enabled")
public class SchedulerConfig {
private static JobDetailFactoryBean createJobDetail(Class<?> jobClass) {
JobDetailFactoryBean factoryBean = new JobDetailFactoryBean();
factoryBean.setJobClass(jobClass);
factoryBean.setDurability(false);
return factoryBean;
}
private static SimpleTriggerFactoryBean createTrigger(JobDetail jobDetail, long pollFrequencyMs,
int repeatCount) {
SimpleTriggerFactoryBean factoryBean = new SimpleTriggerFactoryBean();
factoryBean.setJobDetail(jobDetail);
factoryBean.setStartDelay(0L);
factoryBean.setRepeatInterval(pollFrequencyMs);
factoryBean.setRepeatCount(repeatCount);
factoryBean
.setMisfireInstruction(SimpleTrigger.MISFIRE_INSTRUCTION_RESCHEDULE_NEXT_WITH_EXISTING_COUNT);// in case of misfire, ignore all missed triggers and continue
return factoryBean;
}
@Bean(name = "triggerMonitor")
public TriggerMonitor createTriggerMonitor(@Qualifier("jobTrigger") Trigger trigger) {
TriggerMonitor triggerMonitor = new TriggerMonitorImpl();
triggerMonitor.setTrigger(trigger);
return triggerMonitor;
}
@Bean
public JobDetailFactoryBean jobDetail() {
return createJobDetail(SampleJob.class);
}
@Bean
public JobFactory jobFactory(ApplicationContext applicationContext) {
AutowiringSpringBeanJobFactory jobFactory = new AutowiringSpringBeanJobFactory();
jobFactory.setApplicationContext(applicationContext);
return jobFactory;
}
@Bean
public Properties quartzProperties() throws IOException {
PropertiesFactoryBean propertiesFactoryBean = new PropertiesFactoryBean();
propertiesFactoryBean.setLocation(new ClassPathResource("/quartz.properties"));
propertiesFactoryBean.afterPropertiesSet();
return propertiesFactoryBean.getObject();
}
@Bean(name = "jobTrigger")
public SimpleTriggerFactoryBean sampleJobTrigger(@Qualifier("jobDetail") JobDetail jobDetail,
@Value("${job.frequency}") long frequency, @Value("${job.repeatCount}") int repeatCount) {
return createTrigger(jobDetail, frequency, repeatCount);
}
@Bean(name = "scheduler")
public SchedulerFactoryBean schedulerFactoryBean(JobFactory jobFactory,
@Qualifier("jobTrigger") Trigger sampleJobTrigger) throws IOException {
SchedulerFactoryBean factory = new SchedulerFactoryBean();
factory.setJobFactory(jobFactory);
factory.setQuartzProperties(quartzProperties());
factory.setTriggers(sampleJobTrigger);
factory.setAutoStartup(false);
return factory;
}
}

View File

@@ -1,75 +0,0 @@
package it.fabioformosa.quartzmanager.configuration;
import javax.annotation.Resource;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.annotation.Order;
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.builders.WebSecurity;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
import it.fabioformosa.quartzmanager.security.ComboEntryPoint;
import it.fabioformosa.quartzmanager.security.auth.AuthenticationFailureHandler;
import it.fabioformosa.quartzmanager.security.auth.AuthenticationSuccessHandler;
@Configuration
@EnableWebSecurity
@EnableGlobalMethodSecurity(prePostEnabled = true)
public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
@Configuration
@Order(1)
public static class ApiWebSecurityConfig extends WebSecurityConfigurerAdapter {
@Override
protected void configure(HttpSecurity http) throws Exception {
http.csrf().disable() //
.antMatcher("/notifications").authorizeRequests().anyRequest().hasAnyRole("ADMIN").and()
.httpBasic();
// http.antMatcher("/logs/**").authorizeRequests().anyRequest()
// .permitAll();
}
}
@Configuration
@Order(2)
public static class FormWebSecurityConfig extends WebSecurityConfigurerAdapter {
@Resource
private ComboEntryPoint comboEntryPoint;
@Autowired
private AuthenticationSuccessHandler authenticationSuccessHandler;
@Autowired
private AuthenticationFailureHandler authenticationFailureHandler;
@Override
public void configure(WebSecurity web) throws Exception {
web.ignoring().antMatchers("/css/**", "/js/**", "/img/**", "/lib/**");
}
@Override
protected void configure(HttpSecurity http) throws Exception {
// http.csrf().ignoringAntMatchers("/api/login", "/api/signup").and() //
http.cors().and().csrf().disable()
.exceptionHandling().authenticationEntryPoint(comboEntryPoint).and()//
.authorizeRequests().anyRequest().authenticated().and()//
.formLogin().loginPage("/api/login").successHandler(authenticationSuccessHandler).failureHandler(authenticationFailureHandler).and().logout()
.logoutRequestMatcher(new AntPathRequestMatcher("/api/logout"))
.logoutSuccessUrl("/manager");
}
}
@Autowired
public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
auth.inMemoryAuthentication().withUser("admin").password("admin").roles("ADMIN");
}
}

View File

@@ -1,105 +0,0 @@
package it.fabioformosa.quartzmanager.configuration;
import javax.annotation.Resource;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
import org.springframework.security.config.http.SessionCreationPolicy;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.security.web.authentication.www.BasicAuthenticationFilter;
import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
import org.springframework.web.cors.CorsConfiguration;
import org.springframework.web.cors.CorsConfigurationSource;
import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
import it.fabioformosa.quartzmanager.security.ComboEntryPoint;
import it.fabioformosa.quartzmanager.security.auth.AuthenticationFailureHandler;
import it.fabioformosa.quartzmanager.security.auth.AuthenticationSuccessHandler;
import it.fabioformosa.quartzmanager.security.auth.LogoutSuccess;
import it.fabioformosa.quartzmanager.security.auth.TokenAuthenticationFilter;
import it.fabioformosa.quartzmanager.security.service.impl.CustomUserDetailsService;
/**
* JWT Temporary disabled
*
* @author Fabio.Formosa
*
*/
//@Configuration
//@EnableGlobalMethodSecurity(prePostEnabled = true)
public class WebSecurityConfigJWT extends WebSecurityConfigurerAdapter {
@Value("${jwt.cookie}")
private String TOKEN_COOKIE;
@Autowired
private CustomUserDetailsService jwtUserDetailsService;
// @Autowired
// private RestAuthenticationEntryPoint restAuthenticationEntryPoint;
@Resource
private ComboEntryPoint comboEntryPoint;
@Autowired
private LogoutSuccess logoutSuccess;
@Autowired
private AuthenticationSuccessHandler authenticationSuccessHandler;
@Autowired
private AuthenticationFailureHandler authenticationFailureHandler;
@Bean
@Override
public AuthenticationManager authenticationManagerBean() throws Exception {
return super.authenticationManagerBean();
}
@Autowired
public void configureGlobal(AuthenticationManagerBuilder authenticationManagerBuilder)
throws Exception {
authenticationManagerBuilder.userDetailsService(jwtUserDetailsService)
.passwordEncoder(passwordEncoder());
}
@Bean
public TokenAuthenticationFilter jwtAuthenticationTokenFilter() throws Exception {
return new TokenAuthenticationFilter();
}
@Bean
public PasswordEncoder passwordEncoder() {
return new BCryptPasswordEncoder();
}
@Override
protected void configure(HttpSecurity http) throws Exception {
// http.csrf().ignoringAntMatchers("/api/login", "/api/signup")
// .csrfTokenRepository(CookieCsrfTokenRepository.withHttpOnlyFalse()).and()
http.cors().and().csrf().disable()
.sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS).and()
.exceptionHandling().authenticationEntryPoint(comboEntryPoint).and()
.addFilterBefore(jwtAuthenticationTokenFilter(), BasicAuthenticationFilter.class)
.authorizeRequests().anyRequest().authenticated().and().formLogin().loginPage("/api/login")
.successHandler(authenticationSuccessHandler).failureHandler(authenticationFailureHandler)
.and().logout().logoutRequestMatcher(new AntPathRequestMatcher("/api/logout"))
.logoutSuccessHandler(logoutSuccess).deleteCookies(TOKEN_COOKIE);
}
@Bean
CorsConfigurationSource corsConfigurationSource() {
UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
source.registerCorsConfiguration("/**", new CorsConfiguration().applyPermitDefaultValues());
return source;
}
}

View File

@@ -1,25 +0,0 @@
package it.fabioformosa.quartzmanager.configuration;
import org.springframework.context.annotation.Configuration;
import org.springframework.messaging.simp.config.MessageBrokerRegistry;
import org.springframework.web.socket.config.annotation.AbstractWebSocketMessageBrokerConfigurer;
import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker;
import org.springframework.web.socket.config.annotation.StompEndpointRegistry;
@Configuration
@EnableWebSocketMessageBroker
public class WebsocketConfig extends AbstractWebSocketMessageBrokerConfigurer {
@Override
public void configureMessageBroker(MessageBrokerRegistry config) {
config.enableSimpleBroker("/topic");
config.setApplicationDestinationPrefixes("/job");
}
@Override
public void registerStompEndpoints(StompEndpointRegistry registry) {
registry.addEndpoint("/logs").setAllowedOrigins("/**").withSockJS();
registry.addEndpoint("/progress").setAllowedOrigins("/**").withSockJS();
}
}

View File

@@ -1,82 +0,0 @@
package it.fabioformosa.quartzmanager.controllers;
import java.util.HashMap;
import java.util.Map;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import it.fabioformosa.quartzmanager.security.TokenHelper;
import it.fabioformosa.quartzmanager.security.model.UserTokenState;
import it.fabioformosa.quartzmanager.security.service.impl.CustomUserDetailsService;
/**
* JWT Temporary disabled
*
* @author Fabio.Formosa
*
*/
//@RestController
//@RequestMapping( value = "/api", produces = MediaType.APPLICATION_JSON_VALUE )
public class AuthenticationController {
static class PasswordChanger {
public String oldPassword;
public String newPassword;
}
@Autowired
private CustomUserDetailsService userDetailsService;
@Autowired
TokenHelper tokenHelper;
@Value("${jwt.expires_in}")
private int EXPIRES_IN;
@Value("${jwt.cookie}")
private String TOKEN_COOKIE;
@RequestMapping(value = "/changePassword", method = RequestMethod.POST)
@PreAuthorize("hasRole('USER')")
public ResponseEntity<?> changePassword(@RequestBody PasswordChanger passwordChanger) {
userDetailsService.changePassword(passwordChanger.oldPassword, passwordChanger.newPassword);
Map<String, String> result = new HashMap<>();
result.put( "result", "success" );
return ResponseEntity.accepted().body(result);
}
@RequestMapping(value = "/refresh", method = RequestMethod.GET)
public ResponseEntity<?> refreshAuthenticationToken(HttpServletRequest request, HttpServletResponse response) {
String authToken = tokenHelper.getToken( request );
if (authToken != null && tokenHelper.canTokenBeRefreshed(authToken)) {
// TODO check user password last update
String refreshedToken = tokenHelper.refreshToken(authToken);
Cookie authCookie = new Cookie( TOKEN_COOKIE, refreshedToken );
authCookie.setPath( "/" );
authCookie.setHttpOnly( true );
authCookie.setMaxAge( EXPIRES_IN );
// Add cookie to response
response.addCookie( authCookie );
UserTokenState userTokenState = new UserTokenState(refreshedToken, EXPIRES_IN);
return ResponseEntity.ok(userTokenState);
} else {
UserTokenState userTokenState = new UserTokenState();
return ResponseEntity.accepted().body(userTokenState);
}
}
}

View File

@@ -1,152 +0,0 @@
package it.fabioformosa.quartzmanager.controllers;
import java.util.Collections;
import java.util.Map;
import javax.annotation.Resource;
import org.quartz.Scheduler;
import org.quartz.SchedulerException;
import org.quartz.SimpleScheduleBuilder;
import org.quartz.SimpleTrigger;
import org.quartz.Trigger;
import org.quartz.TriggerBuilder;
import org.quartz.impl.triggers.SimpleTriggerImpl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseStatus;
import org.springframework.web.bind.annotation.RestController;
import it.fabioformosa.quartzmanager.dto.SchedulerConfigParam;
import it.fabioformosa.quartzmanager.dto.TriggerProgress;
import it.fabioformosa.quartzmanager.enums.SchedulerStates;
import it.fabioformosa.quartzmanager.scheduler.TriggerMonitor;
/**
* This controller provides scheduler info about config and status. It provides
* also methods to set new config and start/stop/resume the scheduler.
*
* @author Fabio.Formosa
*
*/
@RestController
@RequestMapping("/scheduler")
public class SchedulerController {
private static final int MILLS_IN_A_DAY = 1000 * 60 * 60 * 24;
private static final int SEC_IN_A_DAY = 60 * 60 * 24;
private final Logger log = LoggerFactory.getLogger(SchedulerController.class);
@Resource
private Scheduler scheduler;
@Resource
private TriggerMonitor triggerMonitor;
@RequestMapping(value = "/config", method = RequestMethod.GET)
public SchedulerConfigParam getConfig() {
log.debug("SCHEDULER - GET CONFIG params");
SimpleTrigger simpleTrigger = (SimpleTrigger) triggerMonitor.getTrigger();
int maxCount = simpleTrigger.getRepeatCount() + 1;
long triggersPerDay = fromMillsIntervalToTriggerPerDay(simpleTrigger.getRepeatInterval());
return new SchedulerConfigParam(triggersPerDay, maxCount);
}
@RequestMapping("/progress")
public TriggerProgress getProgressInfo() throws SchedulerException {
log.trace("SCHEDULER - GET PROGRESS INFO");
TriggerProgress progress = new TriggerProgress();
SimpleTriggerImpl jobTrigger = (SimpleTriggerImpl) scheduler.getTrigger(triggerMonitor.getTrigger().getKey());
if (jobTrigger != null && jobTrigger.getJobKey() != null) {
progress.setJobKey(jobTrigger.getJobKey().getName());
progress.setJobClass(jobTrigger.getClass().getSimpleName());
progress.setTimesTriggered(jobTrigger.getTimesTriggered());
progress.setRepeatCount(jobTrigger.getRepeatCount());
progress.setFinalFireTime(jobTrigger.getFinalFireTime());
progress.setNextFireTime(jobTrigger.getNextFireTime());
progress.setPreviousFireTime(jobTrigger.getPreviousFireTime());
}
return progress;
}
@GetMapping(produces = "application/json")
public Map<String, String> getStatus() throws SchedulerException {
log.trace("SCHEDULER - GET STATUS");
String schedulerState = "";
if (scheduler.isShutdown() || !scheduler.isStarted())
schedulerState = SchedulerStates.STOPPED.toString();
else if (scheduler.isStarted() && scheduler.isInStandbyMode())
schedulerState = SchedulerStates.PAUSED.toString();
else
schedulerState = SchedulerStates.RUNNING.toString();
return Collections.singletonMap("data", schedulerState.toLowerCase());
}
@RequestMapping("/pause")
@ResponseStatus(HttpStatus.NO_CONTENT)
public void pause() throws SchedulerException {
log.info("SCHEDULER - PAUSE COMMAND");
scheduler.standby();
}
@RequestMapping(value = "/config", method = RequestMethod.POST)
public SchedulerConfigParam postConfig(@RequestBody SchedulerConfigParam config) throws SchedulerException {
log.info("SCHEDULER - NEW CONFIG {}", config);
SimpleTrigger trigger = (SimpleTrigger) triggerMonitor.getTrigger();
TriggerBuilder<SimpleTrigger> triggerBuilder = trigger.getTriggerBuilder();
int intervalInMills = fromTriggerPerDayToMillsInterval(config.getTriggerPerDay());
Trigger newTrigger = triggerBuilder.withSchedule(SimpleScheduleBuilder.simpleSchedule()
.withIntervalInMilliseconds(intervalInMills).withRepeatCount(config.getMaxCount() - 1)).build();
scheduler.rescheduleJob(triggerMonitor.getTrigger().getKey(), newTrigger);
triggerMonitor.setTrigger(newTrigger);
return config;
}
@RequestMapping("/resume")
@ResponseStatus(HttpStatus.NO_CONTENT)
public void resume() throws SchedulerException {
log.info("SCHEDULER - RESUME COMMAND");
scheduler.start();
}
@RequestMapping("/run")
@ResponseStatus(HttpStatus.NO_CONTENT)
public void run() throws SchedulerException {
log.info("SCHEDULER - START COMMAND");
scheduler.start();
}
@ResponseStatus(HttpStatus.NO_CONTENT)
@RequestMapping("/stop")
public void stop() throws SchedulerException {
log.info("SCHEDULER - STOP COMMAND");
scheduler.shutdown(true);
}
private long fromMillsIntervalToTriggerPerDay(long repeatIntervalInMills) {
return (int) Math.ceil(MILLS_IN_A_DAY / repeatIntervalInMills);
}
private int fromTriggerPerDayToMillsInterval(long triggerPerDay) {
return (int) Math.ceil(Long.valueOf(MILLS_IN_A_DAY) / triggerPerDay); // with ceil the triggerPerDay is a max value
}
@SuppressWarnings("unused")
private int fromTriggerPerDayToSecInterval(long triggerPerDay) {
return (int) Math.ceil(Long.valueOf(SEC_IN_A_DAY) / triggerPerDay);
}
}

View File

@@ -1,35 +0,0 @@
package it.fabioformosa.quartzmanager.controllers;
import javax.servlet.http.HttpSession;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseStatus;
@Controller
@RequestMapping("/session")
public class SessionController {
private final Logger log = LoggerFactory.getLogger(SessionController.class);
@RequestMapping("/invalidate")
@PreAuthorize("hasAuthority('ADMIN')")
@ResponseStatus(HttpStatus.NO_CONTENT)
public void invalidateSession(HttpSession session) {
session.invalidate();
log.info("Invalidated current session!");
}
@RequestMapping("/refresh")
@PreAuthorize("hasAuthority('ADMIN')")
public HttpEntity<Void> refreshSession(HttpSession session) {
return new ResponseEntity<>(HttpStatus.OK);
}
}

View File

@@ -1,72 +0,0 @@
package it.fabioformosa.quartzmanager.controllers;
import org.springframework.http.MediaType;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping(value = "/api", produces = MediaType.APPLICATION_JSON_VALUE)
public class UserController {
/**
* JWT Temporary disabled
*
* @author Fabio.Formosa
*
*/
// @Autowired
// private UserService userService;
// @RequestMapping(method = POST, value = "/signup")
// public ResponseEntity<?> addUser(@RequestBody UserRequest userRequest,
// UriComponentsBuilder ucBuilder) {
//
// User existUser = this.userService.findByUsername(userRequest.getUsername());
// if (existUser != null)
// throw new ResourceConflictException(userRequest.getId(), "Username already exists");
// User user = this.userService.save(userRequest);
// HttpHeaders headers = new HttpHeaders();
// headers.setLocation(ucBuilder.path("/api/user/{userId}").buildAndExpand(user.getId()).toUri());
// return new ResponseEntity<>(user, HttpStatus.CREATED);
// }
//
// @RequestMapping(method = GET, value = "/user/all")
// public List<User> loadAll() {
// return this.userService.findAll();
// }
//
// @RequestMapping(method = GET, value = "/user/{userId}")
// public User loadById(@PathVariable Long userId) {
// return this.userService.findById(userId);
// }
//
//
// @RequestMapping(method = GET, value = "/user/reset-credentials")
// public ResponseEntity<Map> resetCredentials() {
// this.userService.resetCredentials();
// Map<String, String> result = new HashMap<>();
// result.put("result", "success");
// return ResponseEntity.accepted().body(result);
// }
/*
* We are not using userService.findByUsername here(we could), so it is good that we are making
* sure that the user has role "ROLE_USER" to access this endpoint.
*/
// @RequestMapping("/whoami")
// // @PreAuthorize("hasRole('USER')")
// public User user() {
// return (User) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
// }
@RequestMapping("/whoami")
@PreAuthorize("isAuthenticated()")
public Object user() {
return SecurityContextHolder.getContext().getAuthentication().getPrincipal();
}
}

View File

@@ -1,16 +0,0 @@
package it.fabioformosa.quartzmanager.controllers;
import org.springframework.messaging.handler.annotation.MessageMapping;
import org.springframework.messaging.handler.annotation.SendTo;
import org.springframework.stereotype.Controller;
@Controller
public class WebsocketController {
@MessageMapping({ "/logs", "/progress" })
@SendTo("/topic/logs")
public String subscribe() throws Exception {
return "subscribed";
}
}

View File

@@ -1,40 +0,0 @@
package it.fabioformosa.quartzmanager.dto;
public class SchedulerConfigParam {
public long triggerPerDay;
public int maxCount;
public SchedulerConfigParam() {
super();
}
public SchedulerConfigParam(long triggerPerDay, int maxCount) {
super();
this.triggerPerDay = triggerPerDay;
this.maxCount = maxCount;
}
public int getMaxCount() {
return maxCount;
}
public long getTriggerPerDay() {
return triggerPerDay;
}
public void setMaxCount(int maxCount) {
this.maxCount = maxCount;
}
public void setTriggerPerDay(long triggerPerDay) {
this.triggerPerDay = triggerPerDay;
}
@Override
public String toString() {
return "SchedulerConfigParam [triggerPerDay=" + triggerPerDay
+ ", maxCount=" + maxCount + "]";
}
}

View File

@@ -1,84 +0,0 @@
package it.fabioformosa.quartzmanager.dto;
import java.util.Date;
public class TriggerProgress {
private int timesTriggered;
private int repeatCount;
private Date finalFireTime;
private Date nextFireTime;
private Date previousFireTime;
private String jobKey;
private String jobClass;
public Date getFinalFireTime() {
return finalFireTime;
}
public String getJobClass() {
return jobClass;
}
public String getJobKey() {
return jobKey;
}
public Date getNextFireTime() {
return nextFireTime;
}
public int getPercentage() {
if (this.repeatCount <= 0)
return -1;
return Math.round((float) timesTriggered / (float) this.repeatCount
* 100);
}
public Date getPreviousFireTime() {
return previousFireTime;
}
public int getRepeatCount() {
return repeatCount;
}
public int getTimesTriggered() {
return timesTriggered;
}
public void setFinalFireTime(Date finalFireTime) {
this.finalFireTime = finalFireTime;
}
public void setJobClass(String jobClass) {
this.jobClass = jobClass;
}
public void setJobKey(String jobKey) {
this.jobKey = jobKey;
}
public void setNextFireTime(Date nextFireTime) {
this.nextFireTime = nextFireTime;
}
public void setPreviousFireTime(Date previousFireTime) {
this.previousFireTime = previousFireTime;
}
public void setRepeatCount(int repeatCount) {
this.repeatCount = repeatCount;
}
public void setTimesTriggered(int timesTriggered) {
this.timesTriggered = timesTriggered;
}
}

View File

@@ -1,5 +0,0 @@
package it.fabioformosa.quartzmanager.enums;
public enum SchedulerStates {
RUNNING, STOPPED, PAUSED
}

View File

@@ -1,18 +0,0 @@
package it.fabioformosa.quartzmanager.exceptions;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.ControllerAdvice;
import org.springframework.web.bind.annotation.ExceptionHandler;
@ControllerAdvice
public class ExceptionHandlingController {
@ExceptionHandler(ResourceConflictException.class)
public ResponseEntity<ExceptionResponse> resourceConflict(ResourceConflictException ex) {
ExceptionResponse response = new ExceptionResponse();
response.setErrorCode("Conflict");
response.setErrorMessage(ex.getMessage());
return new ResponseEntity<ExceptionResponse>(response, HttpStatus.CONFLICT);
}
}

View File

@@ -1,25 +0,0 @@
package it.fabioformosa.quartzmanager.exceptions;
public class ExceptionResponse {
private String errorCode;
private String errorMessage;
public ExceptionResponse() {}
public String getErrorCode() {
return errorCode;
}
public void setErrorCode(String errorCode) {
this.errorCode = errorCode;
}
public String getErrorMessage() {
return errorMessage;
}
public void setErrorMessage(String errorMessage) {
this.errorMessage = errorMessage;
}
}

View File

@@ -1,21 +0,0 @@
package it.fabioformosa.quartzmanager.exceptions;
public class ResourceConflictException extends RuntimeException {
private static final long serialVersionUID = 1791564636123821405L;
private Long resourceId;
public ResourceConflictException(Long resourceId, String message) {
super(message);
setResourceId(resourceId);
}
public Long getResourceId() {
return resourceId;
}
public void setResourceId(Long resourceId) {
this.resourceId = resourceId;
}
}

View File

@@ -1,57 +0,0 @@
package it.fabioformosa.quartzmanager.jobs;
import javax.annotation.Resource;
import org.quartz.Job;
import org.quartz.JobExecutionContext;
import org.quartz.SchedulerException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.messaging.simp.SimpMessageSendingOperations;
import it.fabioformosa.quartzmanager.aspects.ProgressUpdater;
import it.fabioformosa.quartzmanager.jobs.entities.LogRecord;
/**
* Extends this class to create a job that produces LogRecord to be displayed
* into the GUI panel
*
* @author Fabio.Formosa
*
*/
public abstract class AbstractLoggingJob implements Job {
private static final Logger log = LoggerFactory.getLogger(AbstractLoggingJob.class);
@Autowired
private SimpMessageSendingOperations messagingTemplate;
@Resource
private ProgressUpdater progressUpdater;
/**
*
* @param jobExecutionContext
* @return final log
*/
public abstract LogRecord doIt(JobExecutionContext jobExecutionContext);
@Override
public final void execute(JobExecutionContext jobExecutionContext) {
try {
LogRecord logMsg = doIt(jobExecutionContext);
logAndSend(logMsg);
progressUpdater.update();
} catch (SchedulerException e) {
log.error("Error updating progress " + e.getMessage());
}
}
public void logAndSend(LogRecord logRecord) {
log.info(logRecord.getMessage());
logRecord.setThreadName(Thread.currentThread().getName());
messagingTemplate.convertAndSend("/topic/logs", logRecord);
}
}

View File

@@ -1,67 +0,0 @@
package it.fabioformosa.quartzmanager.jobs.entities;
import java.util.Date;
/**
* Log record produced by a job at the end of each run
*
* @author Fabio.Formosa
*
*/
public class LogRecord {
public enum LogType {
INFO, WARN, ERROR;
}
private Date date;
private LogType type;
private String message;
private String threadName;
public LogRecord(LogType type, String msg) {
super();
this.type = type;
message = msg;
date = new Date();
}
public Date getDate() {
return date;
}
public String getMessage() {
return message;
}
public String getThreadName() {
return threadName;
}
public LogType getType() {
return type;
}
public void setDate(Date date) {
this.date = date;
}
public void setMessage(String msg) {
message = msg;
}
public void setThreadName(String threadName) {
this.threadName = threadName;
}
public void setType(LogType type) {
this.type = type;
}
@Override
public String toString() {
return "LogRecord [date=" + date + ", type=" + type + ", message=" + message + "]";
}
}

View File

@@ -1,16 +0,0 @@
package it.fabioformosa.quartzmanager.jobs.myjobs;
import org.quartz.JobExecutionContext;
import it.fabioformosa.quartzmanager.jobs.AbstractLoggingJob;
import it.fabioformosa.quartzmanager.jobs.entities.LogRecord;
import it.fabioformosa.quartzmanager.jobs.entities.LogRecord.LogType;
public class SampleJob extends AbstractLoggingJob {
@Override
public LogRecord doIt(JobExecutionContext jobExecutionContext) {
return new LogRecord(LogType.INFO, "Hello!");
}
}

View File

@@ -1,37 +0,0 @@
package it.fabioformosa.quartzmanager.jobs.tests;
import org.quartz.JobExecutionContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import it.fabioformosa.quartzmanager.jobs.AbstractLoggingJob;
import it.fabioformosa.quartzmanager.jobs.entities.LogRecord;
import it.fabioformosa.quartzmanager.jobs.entities.LogRecord.LogType;
/**
* This job can be used to test the misfire policy. It pretends to be a long
* processing job (sleeping for a while)
*
* @author Fabio.Formosa
*
*/
public class MisfireTestJob extends AbstractLoggingJob {
private Logger log = LoggerFactory.getLogger(MisfireTestJob.class);
@Override
public LogRecord doIt(JobExecutionContext jobExecutionContext) {
try {
log.info("{} is going to sleep...", Thread.currentThread().getName());
Thread.sleep(10 * 1000);
log.info("{} woke up!", Thread.currentThread().getName());
} catch (InterruptedException e) {
e.printStackTrace();
}
return new LogRecord(LogType.INFO, "Hello!");
}
}

View File

@@ -1,11 +0,0 @@
package it.fabioformosa.quartzmanager.scheduler;
import org.quartz.Trigger;
public interface TriggerMonitor {
void setTrigger(Trigger trigger);
Trigger getTrigger();
}

View File

@@ -1,19 +0,0 @@
package it.fabioformosa.quartzmanager.scheduler;
import org.quartz.Trigger;
public class TriggerMonitorImpl implements TriggerMonitor {
private Trigger trigger;
@Override
public Trigger getTrigger() {
return trigger;
}
@Override
public void setTrigger(Trigger trigger) {
this.trigger = trigger;
}
}

View File

@@ -1,55 +0,0 @@
package it.fabioformosa.quartzmanager.security;
import java.io.IOException;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.core.Authentication;
import org.springframework.security.web.WebAttributes;
import org.springframework.security.web.authentication.AuthenticationSuccessHandler;
import org.springframework.security.web.authentication.SimpleUrlAuthenticationSuccessHandler;
import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
public class AjaxAuthenticationFilter extends UsernamePasswordAuthenticationFilter {
public class AjaxLoginAuthSuccessHandler extends SimpleUrlAuthenticationSuccessHandler
implements AuthenticationSuccessHandler {
@Override
public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response,
Authentication authentication) throws IOException, ServletException {
response.setStatus(HttpServletResponse.SC_OK);
clearAuthenticationAttributes(request);
return;
}
}
public AjaxAuthenticationFilter(AuthenticationManager authenticationManager) {
setAuthenticationManager(authenticationManager);
setUsernameParameter("ajaxUsername");
setPasswordParameter("ajaxPassword");
setPostOnly(true);
setFilterProcessesUrl("/ajaxLogin");
setAuthenticationSuccessHandler(new AjaxLoginAuthSuccessHandler());
}
/**
* Removes temporary authentication-related data which may have been stored
* in the session during the authentication process.
*/
protected final void clearAuthenticationAttributes(HttpServletRequest request) {
HttpSession session = request.getSession(false);
if (session == null)
return;
session.removeAttribute(WebAttributes.AUTHENTICATION_EXCEPTION);
}
}

View File

@@ -1,33 +0,0 @@
package it.fabioformosa.quartzmanager.security;
import java.io.IOException;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.springframework.security.core.AuthenticationException;
import org.springframework.security.web.authentication.LoginUrlAuthenticationEntryPoint;
import org.springframework.stereotype.Component;
@Component
public class ComboEntryPoint extends LoginUrlAuthenticationEntryPoint {
private static final String LOGIN_FORM_URL = "/login";
public ComboEntryPoint() {
super(LOGIN_FORM_URL);
}
@Override
public void commence(HttpServletRequest request, HttpServletResponse response,
AuthenticationException authException) throws IOException, ServletException {
if (RESTRequestMatcher.isRestRequest(request)
|| WebsocketRequestMatcher.isWebsocketConnectionRequest(request))
response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "Unauthorized");
else
super.commence(request, response, authException);
}
}

View File

@@ -1,26 +0,0 @@
package it.fabioformosa.quartzmanager.security;
import javax.servlet.http.HttpServletRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.security.web.util.matcher.ELRequestMatcher;
import org.springframework.security.web.util.matcher.RequestMatcher;
public class RESTRequestMatcher {
static private final Logger log = LoggerFactory.getLogger(RESTRequestMatcher.class);
static public RequestMatcher matcherRequestedWith = new ELRequestMatcher(
"hasHeader('X-Requested-With','XMLHttpRequest')");
static public RequestMatcher matcherAccept = new ELRequestMatcher(
"hasHeader('accept','application/json, text/plain, */*')");
static public boolean isRestRequest(HttpServletRequest request) {
log.trace("Detecting if it's an AJAX Request: " + request.getRequestURL() + " accept: "
+ request.getHeader("accept") + " " + " X-Requested-With: "
+ request.getHeader("X-Requested-With"));
return matcherRequestedWith.matches(request) || matcherAccept.matches(request);
}
}

View File

@@ -1,161 +0,0 @@
package it.fabioformosa.quartzmanager.security;
import java.util.Date;
import java.util.Map;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import org.joda.time.DateTime;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.core.userdetails.UserDetailsService;
import io.jsonwebtoken.Claims;
import io.jsonwebtoken.Jwts;
import io.jsonwebtoken.SignatureAlgorithm;
/**
* JWT Temporary disabled
*
* @author Fabio.Formosa
*
*/
//@Component
public class TokenHelper {
@Value("${app.name}")
private String APP_NAME;
@Value("${jwt.secret}")
private String SECRET;
@Value("${jwt.expires_in}")
private int EXPIRES_IN;
@Value("${jwt.header}")
private String AUTH_HEADER;
@Value("${jwt.cookie}")
private String AUTH_COOKIE;
@Autowired
UserDetailsService userDetailsService;
private SignatureAlgorithm SIGNATURE_ALGORITHM = SignatureAlgorithm.HS512;
public Boolean canTokenBeRefreshed(String token) {
try {
final Date expirationDate = getClaimsFromToken(token).getExpiration();
// String username = getUsernameFromToken(token);
// UserDetails userDetails = userDetailsService.loadUserByUsername(username);
return expirationDate.compareTo(generateCurrentDate()) > 0;
} catch (Exception e) {
return false;
}
}
public String generateToken(String username) {
return Jwts.builder()
.setIssuer( APP_NAME )
.setSubject(username)
.setIssuedAt(generateCurrentDate())
.setExpiration(generateExpirationDate())
.signWith( SIGNATURE_ALGORITHM, SECRET )
.compact();
}
/**
* Find a specific HTTP cookie in a request.
*
* @param request
* The HTTP request object.
* @param name
* The cookie name to look for.
* @return The cookie, or <code>null</code> if not found.
*/
public Cookie getCookieValueByName(HttpServletRequest request, String name) {
if (request.getCookies() == null)
return null;
for (int i = 0; i < request.getCookies().length; i++)
if (request.getCookies()[i].getName().equals(name))
return request.getCookies()[i];
return null;
}
public String getToken( HttpServletRequest request ) {
/**
* Getting the token from Cookie store
*/
Cookie authCookie = getCookieValueByName( request, AUTH_COOKIE );
if ( authCookie != null )
return authCookie.getValue();
/**
* Getting the token from Authentication header
* e.g Bearer your_token
*/
String authHeader = request.getHeader(AUTH_HEADER);
if ( authHeader != null && authHeader.startsWith("Bearer "))
return authHeader.substring(7);
return null;
}
public String getUsernameFromToken(String token) {
String username;
try {
final Claims claims = getClaimsFromToken(token);
username = claims.getSubject();
} catch (Exception e) {
username = null;
}
return username;
}
public String refreshToken(String token) {
String refreshedToken;
try {
final Claims claims = getClaimsFromToken(token);
claims.setIssuedAt(generateCurrentDate());
refreshedToken = generateToken(claims);
} catch (Exception e) {
refreshedToken = null;
}
return refreshedToken;
}
private Date generateCurrentDate() {
return new Date(getCurrentTimeMillis());
}
private Date generateExpirationDate() {
return new Date(getCurrentTimeMillis() + EXPIRES_IN * 1000);
}
private Claims getClaimsFromToken(String token) {
Claims claims;
try {
claims = Jwts.parser()
.setSigningKey(SECRET)
.parseClaimsJws(token)
.getBody();
} catch (Exception e) {
claims = null;
}
return claims;
}
private long getCurrentTimeMillis() {
return DateTime.now().getMillis();
}
String generateToken(Map<String, Object> claims) {
return Jwts.builder()
.setClaims(claims)
.setExpiration(generateExpirationDate())
.signWith( SIGNATURE_ALGORITHM, SECRET )
.compact();
}
}

View File

@@ -1,18 +0,0 @@
package it.fabioformosa.quartzmanager.security;
import javax.servlet.http.HttpServletRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class WebsocketRequestMatcher {
static private final Logger log = LoggerFactory.getLogger(WebsocketRequestMatcher.class);
static public boolean isWebsocketConnectionRequest(HttpServletRequest request) {
log.trace("Detecting if it's a Websocket Connection Request: " + request.getRequestURL());
return request.getServletPath().equals("/progress/info")
|| request.getServletPath().equals("/logs/info");
}
}

View File

@@ -1,22 +0,0 @@
package it.fabioformosa.quartzmanager.security.auth;
import java.io.IOException;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.springframework.security.core.AuthenticationException;
import org.springframework.security.web.authentication.SimpleUrlAuthenticationFailureHandler;
import org.springframework.stereotype.Component;
@Component
public class AuthenticationFailureHandler extends SimpleUrlAuthenticationFailureHandler {
@Override
public void onAuthenticationFailure(HttpServletRequest request, HttpServletResponse response,
AuthenticationException exception) throws IOException, ServletException {
super.onAuthenticationFailure(request, response, exception);
}
}

View File

@@ -1,65 +0,0 @@
package it.fabioformosa.quartzmanager.security.auth;
import java.io.IOException;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.Authentication;
import org.springframework.security.web.authentication.SimpleUrlAuthenticationSuccessHandler;
import org.springframework.stereotype.Component;
import com.fasterxml.jackson.databind.ObjectMapper;
@Component
public class AuthenticationSuccessHandler extends SimpleUrlAuthenticationSuccessHandler {
// @Value("${jwt.expires_in}")
// private int EXPIRES_IN;
//
// @Value("${jwt.cookie}")
// private String TOKEN_COOKIE;
//
// @Autowired
// TokenHelper tokenHelper;
//
@Autowired
ObjectMapper objectMapper;
//
// @Override
// public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response,
// Authentication authentication ) throws IOException, ServletException {
// clearAuthenticationAttributes(request);
// User user = (User)authentication.getPrincipal();
//
// String jws = tokenHelper.generateToken( user.getUsername() );
//
// // Create token auth Cookie
// Cookie authCookie = new Cookie( TOKEN_COOKIE, jws );
//
// authCookie.setHttpOnly( true );
//
// authCookie.setMaxAge( EXPIRES_IN );
//
// authCookie.setPath( "/" );
// // Add cookie to response
// response.addCookie( authCookie );
//
// // JWT is also in the response
// UserTokenState userTokenState = new UserTokenState(jws, EXPIRES_IN);
// String jwtResponse = objectMapper.writeValueAsString( userTokenState );
// response.setContentType("application/json");
// response.getWriter().write( jwtResponse );
//
// }
@Override
public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response,
Authentication authentication ) throws IOException, ServletException {
// clearAuthenticationAttributes(request);
response.setContentType("application/json");
response.getWriter().write( objectMapper.writeValueAsString("OK"));
}
}

View File

@@ -1,35 +0,0 @@
package it.fabioformosa.quartzmanager.security.auth;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.Authentication;
import org.springframework.security.web.authentication.logout.LogoutSuccessHandler;
import org.springframework.stereotype.Component;
import com.fasterxml.jackson.databind.ObjectMapper;
@Component
public class LogoutSuccess implements LogoutSuccessHandler {
@Autowired
ObjectMapper objectMapper;
@Override
public void onLogoutSuccess(HttpServletRequest httpServletRequest, HttpServletResponse response, Authentication authentication)
throws IOException, ServletException {
Map<String, String> result = new HashMap<>();
result.put( "result", "success" );
response.setContentType("application/json");
response.getWriter().write( objectMapper.writeValueAsString( result ) );
response.setStatus(HttpServletResponse.SC_OK);
}
}

View File

@@ -1,91 +0,0 @@
package it.fabioformosa.quartzmanager.security.auth;
import java.io.IOException;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
import javax.servlet.FilterChain;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
import org.springframework.security.web.util.matcher.OrRequestMatcher;
import org.springframework.security.web.util.matcher.RequestMatcher;
import org.springframework.util.Assert;
import org.springframework.web.filter.OncePerRequestFilter;
import it.fabioformosa.quartzmanager.security.TokenHelper;
public class TokenAuthenticationFilter extends OncePerRequestFilter {
/*
* The below paths will get ignored by the filter
*/
public static final String ROOT_MATCHER = "/";
public static final String FAVICON_MATCHER = "/favicon.ico";
public static final String HTML_MATCHER = "/**/*.html";
public static final String CSS_MATCHER = "/**/*.css";
public static final String JS_MATCHER = "/**/*.js";
public static final String IMG_MATCHER = "/images/*";
public static final String LOGIN_MATCHER = "/auth/login";
public static final String LOGOUT_MATCHER = "/auth/logout";
private final Log logger = LogFactory.getLog(this.getClass());
@Autowired
TokenHelper tokenHelper;
@Autowired
UserDetailsService userDetailsService;
private List<String> pathsToSkip = Arrays.asList(
ROOT_MATCHER,
HTML_MATCHER,
FAVICON_MATCHER,
CSS_MATCHER,
JS_MATCHER,
IMG_MATCHER,
LOGIN_MATCHER,
LOGOUT_MATCHER
);
@Override
public void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain) throws IOException, ServletException {
String authToken = tokenHelper.getToken(request);
if (authToken != null && !skipPathRequest(request, pathsToSkip))
// get username from token
try {
String username = tokenHelper.getUsernameFromToken(authToken);
// get user
UserDetails userDetails = userDetailsService.loadUserByUsername(username);
// create authentication
TokenBasedAuthentication authentication = new TokenBasedAuthentication(userDetails);
authentication.setToken(authToken);
SecurityContextHolder.getContext().setAuthentication(authentication);
} catch (Exception e) {
SecurityContextHolder.getContext().setAuthentication(new AnonAuthentication());
}
else
SecurityContextHolder.getContext().setAuthentication(new AnonAuthentication());
chain.doFilter(request, response);
}
private boolean skipPathRequest(HttpServletRequest request, List<String> pathsToSkip ) {
Assert.notNull(pathsToSkip, "path cannot be null.");
List<RequestMatcher> m = pathsToSkip.stream().map(path -> new AntPathRequestMatcher(path)).collect(Collectors.toList());
OrRequestMatcher matchers = new OrRequestMatcher(m);
return matchers.matches(request);
}
}

View File

@@ -1,40 +0,0 @@
package it.fabioformosa.quartzmanager.security.auth;
import org.springframework.security.authentication.AbstractAuthenticationToken;
import org.springframework.security.core.userdetails.UserDetails;
public class TokenBasedAuthentication extends AbstractAuthenticationToken {
private String token;
private final UserDetails principle;
public TokenBasedAuthentication( UserDetails principle ) {
super( principle.getAuthorities() );
this.principle = principle;
}
@Override
public Object getCredentials() {
return token;
}
@Override
public UserDetails getPrincipal() {
return principle;
}
public String getToken() {
return token;
}
@Override
public boolean isAuthenticated() {
return true;
}
public void setToken( String token ) {
this.token = token;
}
}

View File

@@ -1,55 +0,0 @@
package it.fabioformosa.quartzmanager.security.model;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
import org.springframework.security.core.GrantedAuthority;
import com.fasterxml.jackson.annotation.JsonIgnore;
/**
* Temporary enabled only inMemoryAuthentication
*
* @author Fabio.Formosa
*
*/
@Entity
@Table(name="Authority")
public class Authority implements GrantedAuthority {
@Id
@Column(name="id")
@GeneratedValue(strategy = GenerationType.IDENTITY)
Long id;
@Column(name="name")
String name;
@Override
public String getAuthority() {
return name;
}
@JsonIgnore
public Long getId() {
return id;
}
@JsonIgnore
public String getName() {
return name;
}
public void setId(Long id) {
this.id = id;
}
public void setName(String name) {
this.name = name;
}
}

View File

@@ -1,135 +0,0 @@
package it.fabioformosa.quartzmanager.security.model;
import java.io.Serializable;
import java.util.Collection;
import java.util.List;
import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.JoinTable;
import javax.persistence.ManyToMany;
import javax.persistence.Table;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.userdetails.UserDetails;
import com.fasterxml.jackson.annotation.JsonIgnore;
/**
* Temporary enabled only inMemoryAuthentication
*
* @author Fabio.Formosa
*
*/
@Entity
@Table(name = "USER")
public class User implements UserDetails, Serializable {
@Id
@Column(name = "id")
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;
@Column(name = "username")
private String username;
@JsonIgnore
@Column(name = "password")
private String password;
@Column(name = "firstname")
private String firstname;
@Column(name = "lastname")
private String lastname;
@ManyToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
@JoinTable(name = "user_authority",
joinColumns = @JoinColumn(name = "user_id", referencedColumnName = "id"),
inverseJoinColumns = @JoinColumn(name = "authority_id", referencedColumnName = "id"))
private List<Authority> authorities;
@Override
public Collection<? extends GrantedAuthority> getAuthorities() {
return authorities;
}
public String getFirstname() {
return firstname;
}
public Long getId() {
return id;
}
public String getLastname() {
return lastname;
}
@Override
public String getPassword() {
return password;
}
@Override
public String getUsername() {
return username;
}
// We can add the below fields in the users table.
// For now, they are hardcoded.
@JsonIgnore
@Override
public boolean isAccountNonExpired() {
return true;
}
@JsonIgnore
@Override
public boolean isAccountNonLocked() {
return true;
}
@JsonIgnore
@Override
public boolean isCredentialsNonExpired() {
return true;
}
@JsonIgnore
@Override
public boolean isEnabled() {
return true;
}
public void setAuthorities(List<Authority> authorities) {
this.authorities = authorities;
}
public void setFirstname(String firstname) {
this.firstname = firstname;
}
public void setId(Long id) {
this.id = id;
}
public void setLastname(String lastname) {
this.lastname = lastname;
}
public void setPassword(String password) {
this.password = password;
}
public void setUsername(String username) {
this.username = username;
}
}

View File

@@ -1,56 +0,0 @@
package it.fabioformosa.quartzmanager.security.model;
public class UserRequest {
private Long id;
private String username;
private String password;
private String firstname;
private String lastname;
public String getUsername() {
return username;
}
public void setUsername(String username) {
this.username = username;
}
public String getPassword() {
return password;
}
public void setPassword(String password) {
this.password = password;
}
public String getFirstname() {
return firstname;
}
public void setFirstname(String firstname) {
this.firstname = firstname;
}
public String getLastname() {
return lastname;
}
public void setLastname(String lastname) {
this.lastname = lastname;
}
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
}

View File

@@ -1,32 +0,0 @@
package it.fabioformosa.quartzmanager.security.model;
public class UserTokenState {
private String access_token;
private Long expires_in;
public UserTokenState() {
this.access_token = null;
this.expires_in = null;
}
public UserTokenState(String access_token, long expires_in) {
this.access_token = access_token;
this.expires_in = expires_in;
}
public String getAccess_token() {
return access_token;
}
public Long getExpires_in() {
return expires_in;
}
public void setAccess_token(String access_token) {
this.access_token = access_token;
}
public void setExpires_in(Long expires_in) {
this.expires_in = expires_in;
}
}

View File

@@ -1,9 +0,0 @@
package it.fabioformosa.quartzmanager.security.repository;
import org.springframework.data.jpa.repository.JpaRepository;
import it.fabioformosa.quartzmanager.security.model.Authority;
public interface AuthorityRepository extends JpaRepository<Authority, Long> {
Authority findByName(String name);
}

View File

@@ -1,10 +0,0 @@
package it.fabioformosa.quartzmanager.security.repository;
import org.springframework.data.jpa.repository.JpaRepository;
import it.fabioformosa.quartzmanager.security.model.User;
public interface UserRepository extends JpaRepository<User, Long> {
User findByUsername( String username );
}

View File

@@ -1,12 +0,0 @@
package it.fabioformosa.quartzmanager.security.service;
import java.util.List;
import it.fabioformosa.quartzmanager.security.model.Authority;
public interface AuthorityService {
List<Authority> findById(Long id);
List<Authority> findByname(String name);
}

View File

@@ -1,18 +0,0 @@
package it.fabioformosa.quartzmanager.security.service;
import java.util.List;
import it.fabioformosa.quartzmanager.security.model.User;
import it.fabioformosa.quartzmanager.security.model.UserRequest;
public interface UserService {
List<User> findAll();
User findById(Long id);
User findByUsername(String username);
void resetCredentials();
User save(UserRequest user);
}

View File

@@ -1,37 +0,0 @@
package it.fabioformosa.quartzmanager.security.service.impl;
import java.util.ArrayList;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import it.fabioformosa.quartzmanager.security.model.Authority;
import it.fabioformosa.quartzmanager.security.repository.AuthorityRepository;
import it.fabioformosa.quartzmanager.security.service.AuthorityService;
//@Service
public class AuthorityServiceImpl implements AuthorityService {
@Autowired
private AuthorityRepository authorityRepository;
@Override
public List<Authority> findById(Long id) {
// TODO Auto-generated method stub
Authority auth = this.authorityRepository.findOne(id);
List<Authority> auths = new ArrayList<>();
auths.add(auth);
return auths;
}
@Override
public List<Authority> findByname(String name) {
// TODO Auto-generated method stub
Authority auth = this.authorityRepository.findByName(name);
List<Authority> auths = new ArrayList<>();
auths.add(auth);
return auths;
}
}

View File

@@ -1,66 +0,0 @@
package it.fabioformosa.quartzmanager.security.service.impl;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.security.core.userdetails.UsernameNotFoundException;
import org.springframework.security.crypto.password.PasswordEncoder;
import it.fabioformosa.quartzmanager.security.model.User;
import it.fabioformosa.quartzmanager.security.repository.UserRepository;
//@Service
public class CustomUserDetailsService implements UserDetailsService {
protected final Log LOGGER = LogFactory.getLog(getClass());
@Autowired
private UserRepository userRepository;
@Autowired
private PasswordEncoder passwordEncoder;
@Autowired
private AuthenticationManager authenticationManager;
public void changePassword(String oldPassword, String newPassword) {
Authentication currentUser = SecurityContextHolder.getContext().getAuthentication();
String username = currentUser.getName();
if (authenticationManager != null) {
LOGGER.debug("Re-authenticating user '"+ username + "' for password change request.");
authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(username, oldPassword));
} else {
LOGGER.debug("No authentication manager set. can't change Password!");
return;
}
LOGGER.debug("Changing password for user '"+ username + "'");
User user = (User) loadUserByUsername(username);
user.setPassword(passwordEncoder.encode(newPassword));
userRepository.save(user);
}
@Override
public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
User user = userRepository.findByUsername(username);
if (user == null)
throw new UsernameNotFoundException(String.format("No user found with username '%s'.", username));
else
return user;
}
}

View File

@@ -1,73 +0,0 @@
package it.fabioformosa.quartzmanager.security.service.impl;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.AccessDeniedException;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.security.core.userdetails.UsernameNotFoundException;
import org.springframework.security.crypto.password.PasswordEncoder;
import it.fabioformosa.quartzmanager.security.model.Authority;
import it.fabioformosa.quartzmanager.security.model.User;
import it.fabioformosa.quartzmanager.security.model.UserRequest;
import it.fabioformosa.quartzmanager.security.repository.UserRepository;
import it.fabioformosa.quartzmanager.security.service.AuthorityService;
import it.fabioformosa.quartzmanager.security.service.UserService;
//@Service
public class UserServiceImpl implements UserService {
@Autowired
private UserRepository userRepository;
@Autowired
private PasswordEncoder passwordEncoder;
@Autowired
private AuthorityService authService;
@Override
@PreAuthorize("hasRole('ADMIN')")
public List<User> findAll() throws AccessDeniedException {
List<User> result = userRepository.findAll();
return result;
}
@Override
@PreAuthorize("hasRole('ADMIN')")
public User findById(Long id) throws AccessDeniedException {
User u = userRepository.findOne(id);
return u;
}
@Override
// @PreAuthorize("hasRole('USER')")
public User findByUsername(String username) throws UsernameNotFoundException {
User u = userRepository.findByUsername(username);
return u;
}
@Override
public void resetCredentials() {
List<User> users = userRepository.findAll();
for (User user : users) {
user.setPassword(passwordEncoder.encode("123"));
userRepository.save(user);
}
}
@Override
public User save(UserRequest userRequest) {
User user = new User();
user.setUsername(userRequest.getUsername());
user.setPassword(passwordEncoder.encode(userRequest.getPassword()));
user.setFirstname(userRequest.getFirstname());
user.setLastname(userRequest.getLastname());
List<Authority> auth = authService.findByname("ROLE_USER");
user.setAuthorities(auth);
this.userRepository.save(user);
return user;
}
}

View File

@@ -1,30 +0,0 @@
server:
context-path: /quartz-manager
port: 8080
session.timeout : 28800
spring:
thymeleaf:
cache: false
mode: LEGACYHTML5
quartz:
enabled: true
job:
frequency: 4000
repeatCount: 19
logging:
level:
org.springframework.web: WARN
it.fabioformosa: INFO
app:
name: quartz-manager
jwt:
header: Authorization
expires_in: 600 # 10 minutes
secret: queenvictoria
cookie: AUTH-TOKEN

View File

@@ -1,11 +0,0 @@
-- the password hash is generated by BCrypt Calculator Generator(https://www.dailycred.com/article/bcrypt-calculator)
INSERT INTO user (id, username, password, firstname, lastname) VALUES (1, 'user', '$2a$04$Vbug2lwwJGrvUXTj6z7ff.97IzVBkrJ1XfApfGNl.Z695zqcnPYra', 'John', 'Doe');
INSERT INTO user (id, username, password, firstname, lastname) VALUES (2, 'admin', '$2a$04$Vbug2lwwJGrvUXTj6z7ff.97IzVBkrJ1XfApfGNl.Z695zqcnPYra', 'Admin', 'Admin');
INSERT INTO authority (id, name) VALUES (1, 'ROLE_USER');
INSERT INTO authority (id, name) VALUES (2, 'ROLE_ADMIN');
INSERT INTO user_authority (user_id, authority_id) VALUES (1, 1);
INSERT INTO user_authority (user_id, authority_id) VALUES (2, 1);
INSERT INTO user_authority (user_id, authority_id) VALUES (2, 2);

View File

@@ -1,3 +0,0 @@
org.quartz.scheduler.instanceName=example
org.quartz.scheduler.instanceId=AUTO
org.quartz.threadPool.threadCount=1

View File

@@ -1,18 +0,0 @@
package it.fabioformosa;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.web.WebAppConfiguration;
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(classes = QuartManagerApplication.class)
@WebAppConfiguration
public class QuartManagerApplicationTests {
@Test
public void contextLoads() {
}
}

View File

@@ -1,57 +0,0 @@
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"project": {
"name": "angular-spring-starter"
},
"apps": [
{
"root": "src",
"outDir": "../server/src/main/resources/static",
"assets": [
"assets",
"favicon.ico"
],
"index": "index.html",
"main": "main.ts",
"polyfills": "polyfills.ts",
"test": "test.ts",
"tsconfig": "tsconfig.app.json",
"testTsconfig": "tsconfig.spec.json",
"prefix": "app",
"styles": [
"styles.css"
],
"scripts": [],
"environmentSource": "environments/environment.ts",
"environments": {
"dev": "environments/environment.ts",
"prod": "environments/environment.prod.ts"
}
}
],
"e2e": {
"protractor": {
"config": "./protractor.conf.js"
}
},
"lint": [
{
"project": "src/tsconfig.app.json"
},
{
"project": "src/tsconfig.spec.json"
},
{
"project": "e2e/tsconfig.e2e.json"
}
],
"test": {
"karma": {
"config": "./karma.conf.js"
}
},
"defaults": {
"styleExt": "css",
"component": {}
}
}

View File

@@ -0,0 +1,12 @@
# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
# For additional information regarding the format and rule options, please see:
# https://github.com/browserslist/browserslist#queries
# You can see what browsers were selected by your queries by running:
# npx browserslist
last 2 Chrome versions
last 2 Firefox versions
last 2 Edge versions
last 2 Safari versions
last 2 iOS versions

View File

@@ -0,0 +1,178 @@
/*
👋 Hi! This file was autogenerated by tslint-to-eslint-config.
https://github.com/typescript-eslint/tslint-to-eslint-config
It represents the closest reasonable ESLint configuration to this
project's original TSLint configuration.
We recommend eventually switching this configuration to extend from
the recommended rulesets in typescript-eslint.
https://github.com/typescript-eslint/tslint-to-eslint-config/blob/master/docs/FAQs.md
Happy linting! 💖
*/
{
"env": {
"browser": true,
"es6": true,
"node": true
},
"extends": [
"prettier"
],
"parser": "@typescript-eslint/parser",
"parserOptions": {
"project": "tsconfig.json",
"sourceType": "module"
},
"plugins": [
"eslint-plugin-import",
"@angular-eslint/eslint-plugin",
"@typescript-eslint"
],
"root": true,
"rules": {
"@angular-eslint/component-class-suffix": "off",
"@angular-eslint/component-selector": "off",
"@angular-eslint/directive-class-suffix": "error",
"@angular-eslint/directive-selector": [
"error",
{
"type": "attribute",
"prefix": "app",
"style": "camelCase"
}
],
"@angular-eslint/no-input-rename": "error",
"@angular-eslint/no-inputs-metadata-property": "error",
"@angular-eslint/no-output-rename": "error",
"@angular-eslint/no-outputs-metadata-property": "error",
"@angular-eslint/use-lifecycle-interface": "error",
"@angular-eslint/use-pipe-transform-interface": "error",
"@typescript-eslint/consistent-type-definitions": "error",
"@typescript-eslint/dot-notation": "off",
"@typescript-eslint/explicit-member-accessibility": [
"off",
{
"accessibility": "explicit"
}
],
"@typescript-eslint/indent": "off",
"@typescript-eslint/member-delimiter-style": [
"off",
{
"multiline": {
"delimiter": "none",
"requireLast": true
},
"singleline": {
"delimiter": "semi",
"requireLast": false
}
}
],
"@typescript-eslint/member-ordering": "off",
"@typescript-eslint/naming-convention": "off",
"@typescript-eslint/no-empty-function": "off",
"@typescript-eslint/no-empty-interface": "error",
"@typescript-eslint/no-inferrable-types": [
"error",
{
"ignoreParameters": true
}
],
"@typescript-eslint/no-shadow": [
"error",
{
"hoist": "all"
}
],
"@typescript-eslint/no-unused-expressions": "error",
"@typescript-eslint/prefer-function-type": "error",
"@typescript-eslint/semi": [
"off",
null
],
"@typescript-eslint/type-annotation-spacing": "off",
"@typescript-eslint/unified-signatures": "error",
"brace-style": [
"error",
"1tbs"
],
"curly": "error",
"dot-notation": "off",
"eol-last": "off",
"eqeqeq": [
"error",
"smart"
],
"guard-for-in": "error",
"id-denylist": "off",
"id-match": "off",
"import/no-deprecated": "warn",
"indent": "off",
"max-len": [
"error",
{
"code": 140
}
],
"no-bitwise": "error",
"no-caller": "error",
"no-console": [
"error",
{
"allow": [
"log",
"warn",
"dir",
"timeLog",
"assert",
"clear",
"count",
"countReset",
"group",
"groupEnd",
"table",
"dirxml",
"error",
"groupCollapsed",
"Console",
"profile",
"profileEnd",
"timeStamp",
"context"
]
}
],
"no-debugger": "error",
"no-empty": "off",
"no-empty-function": "off",
"no-eval": "error",
"no-fallthrough": "error",
"no-new-wrappers": "error",
"no-redeclare": "error",
"no-restricted-imports": "error",
"no-shadow": "off",
"no-throw-literal": "error",
"no-trailing-spaces": "off",
"no-underscore-dangle": "off",
"no-unused-expressions": "off",
"no-unused-labels": "error",
"no-var": "error",
"prefer-const": "error",
"quotes": "off",
"radix": "error",
"semi": "off",
"spaced-comment": [
"error",
"always",
{
"markers": [
"/"
]
}
],
"valid-typeof": "error"
}
}

View File

@@ -0,0 +1,19 @@
{
"env": {
"browser": true,
"es6": true,
"node": true
},
"extends": [
"plugin:sonarjs/recommended"
],
"parser": "@typescript-eslint/parser",
"parserOptions": {
"project": "tsconfig.json",
"sourceType": "module"
},
"plugins": [
"sonarjs"
],
"root": true
}

View File

@@ -40,6 +40,4 @@ testem.log
# System Files # System Files
.DS_Store .DS_Store
Thumbs.db Thumbs.db
/.angular/
#package-lock.json
package-lock.json

View File

@@ -0,0 +1,47 @@
src/polyfills.ts
src/typings.d.ts
_test.ts
# See http://help.github.com/ignore-files/ for more about ignoring files.
# compiled output
/dist
/tmp
/out-tsc
# dependencies
/node_modules
# IDEs and editors
/.idea
.project
.classpath
.c9/
*.launch
.settings/
*.sublime-workspace
# IDE - VSCode
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
# misc
/.sass-cache
/connect.lock
/coverage
/libpeerconnection.log
npm-debug.log
testem.log
/typings
# e2e
/e2e/*.js
/e2e/*.map
# System Files
.DS_Store
Thumbs.db
/.angular/

View File

@@ -0,0 +1,11 @@
{
"tabWidth": 2,
"useTabs": false,
"singleQuote": true,
"semi": true,
"bracketSpacing": true,
"arrowParens": "avoid",
"trailingComma": "es5",
"bracketSameLine": true,
"printWidth": 80
}

View File

@@ -0,0 +1,126 @@
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"version": 1,
"newProjectRoot": "projects",
"projects": {
"quartz-manager-ui": {
"root": "",
"prefix": "qrzmng",
"sourceRoot": "src",
"projectType": "application",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"aot": true,
"outputPath": "dist",
"index": "src/index.html",
"main": "src/main.ts",
"tsConfig": "src/tsconfig.app.json",
"polyfills": "src/polyfills.ts",
"allowedCommonJsDependencies": [
"@stomp/stompjs", "stompjs", "sockjs-client", "angular2-uuid"
],
"assets": [
"src/assets",
"src/favicon.ico"
],
"styles": [
"src/styles.css",
"node_modules/roboto-fontface/css/roboto/roboto-fontface.css"
],
"scripts": []
},
"configurations": {
"development": {
"buildOptimizer": false,
"optimization": false,
"vendorChunk": true,
"extractLicenses": false,
"sourceMap": true,
"namedChunks": true
},
"production": {
"budgets": [
{
"type": "anyComponentStyle",
"maximumWarning": "6kb"
}
],
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true,
"fileReplacements": [
{
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.prod.ts"
}
]
}
}
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"buildTarget": "quartz-manager-ui:build:development"
},
"configurations": {
"production": {
"buildTarget": "quartz-manager-ui:build:production"
}
}
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"buildTarget": "quartz-manager-ui:build"
}
},
"lint": {
"builder": "@angular-eslint/builder:lint",
"options": {
"eslintConfig": ".eslintrc.json",
"lintFilePatterns": ["**/*.spec.ts", "**/*.ts"]
}
}
}
}
},
"schematics": {
"@schematics/angular:component": {
"prefix": "qrzmng",
"style": "css",
"type": "component"
},
"@schematics/angular:directive": {
"prefix": "qrzmng",
"type": "directive"
},
"@schematics/angular:service": {
"type": "service"
},
"@schematics/angular:guard": {
"typeSeparator": "."
},
"@schematics/angular:interceptor": {
"typeSeparator": "."
},
"@schematics/angular:module": {
"typeSeparator": "."
},
"@schematics/angular:pipe": {
"typeSeparator": "."
},
"@schematics/angular:resolver": {
"typeSeparator": "."
}
},
"cli": {
"analytics": false
}
}

View File

@@ -0,0 +1,30 @@
import sonarjs from 'eslint-plugin-sonarjs';
import tsParser from '@typescript-eslint/parser';
export default [
{
files: ['src/**/*.ts'],
languageOptions: {
parser: tsParser,
parserOptions: {
project: 'tsconfig.json',
sourceType: 'module'
}
},
plugins: {
sonarjs
},
rules: {
...sonarjs.configs.recommended.rules,
'sonarjs/deprecation': 'off',
'sonarjs/no-commented-code': 'off',
'sonarjs/no-dead-store': 'off',
'sonarjs/no-incomplete-assertions': 'off',
'sonarjs/no-primitive-wrappers': 'off',
'sonarjs/no-unused-vars': 'off',
'sonarjs/prefer-promise-shorthand': 'off',
'sonarjs/todo-tag': 'off',
'sonarjs/unused-import': 'off'
}
}
];

View File

@@ -0,0 +1,20 @@
const {createEsmPreset} = require('jest-preset-angular/presets');
module.exports = {
...createEsmPreset({
tsconfig: '<rootDir>/tsconfig.spec.json',
stringifyContentPathRegex: '\\.(html|svg)$'
}),
moduleNameMapper: {
'^tslib$': '<rootDir>/node_modules/tslib/tslib.es6.mjs',
'^rxjs$': '<rootDir>/node_modules/rxjs/dist/cjs/index.js',
'^rxjs/operators$': '<rootDir>/node_modules/rxjs/dist/cjs/operators/index.js',
'^rxjs/(.*)$': '<rootDir>/node_modules/rxjs/dist/cjs/$1',
'^@fortawesome/fontawesome$': '<rootDir>/node_modules/@fortawesome/fontawesome/index.js',
'^@fortawesome/fontawesome-free-solid$': '<rootDir>/node_modules/@fortawesome/fontawesome-free-solid/index.js'
},
setupFilesAfterEnv: ['<rootDir>/jest.setup.ts'],
transformIgnorePatterns: [
'node_modules/(?!(@angular|@fortawesome|@stomp/rx-stomp|@stomp/stompjs|.*\\.mjs$)/)'
]
};

View File

@@ -0,0 +1,3 @@
import {setupZoneTestEnv} from 'jest-preset-angular/setup-env/zone/index.mjs';
setupZoneTestEnv();

View File

@@ -1,44 +0,0 @@
// Karma configuration file, see link for more information
// https://karma-runner.github.io/0.13/config/configuration-file.html
module.exports = function (config) {
config.set({
basePath: '',
frameworks: ['jasmine', '@angular/cli'],
plugins: [
require('karma-jasmine'),
require('karma-chrome-launcher'),
require('karma-jasmine-html-reporter'),
require('karma-coverage-istanbul-reporter'),
require('@angular/cli/plugins/karma')
],
client:{
clearContext: false // leave Jasmine Spec Runner output visible in browser
},
files: [
{ pattern: './src/test.ts', watched: false }
],
preprocessors: {
'./src/test.ts': ['@angular/cli']
},
mime: {
'text/x-typescript': ['ts','tsx']
},
coverageIstanbulReporter: {
reports: [ 'html', 'lcovonly' ],
fixWebpackSourcePaths: true
},
angularCli: {
environment: 'dev'
},
reporters: config.angularCli && config.angularCli.codeCoverage
? ['progress', 'coverage-istanbul']
: ['progress', 'kjhtml'],
port: 9876,
colors: true,
logLevel: config.LOG_INFO,
autoWatch: true,
browsers: ['Chrome'],
singleRun: false
});
};

23059
quartz-manager-frontend/package-lock.json generated Normal file

File diff suppressed because it is too large Load Diff

View File

@@ -5,57 +5,69 @@
"scripts": { "scripts": {
"ng": "ng", "ng": "ng",
"start": "ng serve --proxy-config proxy.conf.json", "start": "ng serve --proxy-config proxy.conf.json",
"build": "ng build", "build": "ng build --configuration production",
"test": "ng test", "test": "node --experimental-vm-modules node_modules/jest/bin/jest.js",
"lint": "ng lint", "lint": "ng lint",
"e2e": "ng e2e" "lint:sonar": "eslint -c eslint.sonar.config.mjs \"src/**/*.ts\"",
"lint:sonar:fix": "eslint -c eslint.sonar.config.mjs \"src/**/*.ts\" --fix"
}, },
"private": true, "private": true,
"dependencies": { "dependencies": {
"@angular/animations": "5.2.8", "@angular/animations": "21.2.12",
"@angular/cdk": "5.2.4", "@angular/cdk": "21.2.10",
"@angular/common": "5.2.8", "@angular/common": "21.2.12",
"@angular/compiler": "5.2.8", "@angular/compiler": "21.2.12",
"@angular/core": "5.2.8", "@angular/core": "21.2.12",
"@angular/flex-layout": "5.0.0-beta.13", "@angular/forms": "21.2.12",
"@angular/forms": "5.2.8", "@angular/material": "21.2.10",
"@angular/http": "5.2.8", "@angular/platform-browser": "21.2.12",
"@angular/material": "5.2.4", "@angular/platform-browser-dynamic": "21.2.12",
"@angular/platform-browser": "5.2.8", "@angular/platform-server": "21.2.12",
"@angular/platform-browser-dynamic": "5.2.8", "@angular/router": "21.2.12",
"@angular/platform-server": "5.2.8", "@auth0/angular-jwt": "5.2.0",
"@angular/router": "5.2.8", "@danielmoncada/angular-datetime-picker": "21.0.0",
"@fortawesome/fontawesome": "^1.1.4", "@fortawesome/fontawesome": "^1.1.4",
"@fortawesome/fontawesome-free-regular": "^5.0.8", "@fortawesome/fontawesome-free-regular": "^5.0.8",
"@fortawesome/fontawesome-free-solid": "^5.0.8", "@fortawesome/fontawesome-free-solid": "^5.0.8",
"@stomp/ng2-stompjs": "^0.6.3", "@stomp/rx-stomp": "2.4.0",
"core-js": "2.5.1", "@stomp/stompjs": "^7.2.0",
"hammerjs": "2.0.8", "hammerjs": "2.0.8",
"rxjs": "5.5.2", "roboto-fontface": "^0.10.0",
"rxjs": "^7.8.2",
"sockjs-client": "^1.1.1",
"stompjs": "^2.3.3", "stompjs": "^2.3.3",
"zone.js": "0.8.18" "tslib": "^2.8.1",
"uuid": "^13.0.0",
"zone.js": "~0.16.0"
}, },
"devDependencies": { "devDependencies": {
"@angular-devkit/core": "^0.2.0", "@angular-devkit/build-angular": "^21.2.10",
"@angular/cli": "1.5.3", "@angular-devkit/core": "^21.2.10",
"@angular/compiler-cli": "5.2.8", "@angular-eslint/builder": "21.3.1",
"@angular/language-service": "5.2.8", "@angular-eslint/eslint-plugin": "21.3.1",
"@angular-eslint/eslint-plugin-template": "21.3.1",
"@angular-eslint/schematics": "21.3.1",
"@angular-eslint/template-parser": "21.3.1",
"@angular/cli": "^21.2.10",
"@angular/compiler-cli": "21.2.12",
"@angular/language-service": "21.2.12",
"@types/hammerjs": "2.0.34", "@types/hammerjs": "2.0.34",
"@types/jasmine": "2.5.54", "@types/jasmine": "^5.1.13",
"@types/jasminewd2": "2.0.3", "@types/jest": "^30.0.0",
"@types/node": "6.0.90", "@types/node": "^22.13.14",
"codelyzer": "4.2.1", "@typescript-eslint/eslint-plugin": "^8.48.1",
"jasmine-core": "2.6.4", "@typescript-eslint/parser": "^8.48.1",
"jasmine-spec-reporter": "4.1.1", "eslint": "^9.39.1",
"karma": "1.7.1", "eslint-config-prettier": "^10.1.8",
"karma-chrome-launcher": "2.1.1", "eslint-plugin-import": "^2.26.0",
"karma-cli": "1.0.1", "eslint-plugin-prettier": "^4.2.1",
"karma-coverage-istanbul-reporter": "1.3.0", "eslint-plugin-sonarjs": "^4.0.3",
"karma-jasmine": "1.1.0", "jest": "30.4.1",
"karma-jasmine-html-reporter": "0.2.2", "jest-environment-jsdom": "^30.2.0",
"protractor": "5.1.2", "jest-preset-angular": "^16.1.5",
"ts-node": "3.0.6", "jsdom": "^27.3.0",
"tslint": "5.7.0", "prettier": "^2.8.1",
"typescript": "2.4.2" "prettier-eslint": "^15.0.1",
"typescript": "5.9.3"
} }
} }

View File

@@ -2,6 +2,7 @@
"/quartz-manager": { "/quartz-manager": {
"target": "http://localhost:8080", "target": "http://localhost:8080",
"secure": false, "secure": false,
"cookiePathRewrite": "/",
"ws":true "ws":true
} }
} }

File diff suppressed because one or more lines are too long

View File

@@ -1,15 +1,13 @@
import { NgModule } from '@angular/core'; import {NgModule} from '@angular/core';
import { Routes, RouterModule } from '@angular/router'; import {RouterModule, Routes} from '@angular/router';
import { AppComponent } from './app.component'; import {LoginComponent} from './views/login';
import { LoginComponent } from './login'; import {AdminGuard, GuestGuard} from './guards';
import { LoginGuard } from './guard'; import {NotFoundComponent} from './views/not-found';
import { GuestGuard, AdminGuard } from './guard'; import {ForbiddenComponent} from './views/forbidden';
import { NotFoundComponent } from './not-found';
import { ChangePasswordComponent } from './change-password'; import {ManagerComponent} from './views/manager';
import { ForbiddenComponent } from './forbidden'; import {GenericErrorComponent} from './views/error/genericError.component';
import { ManagerComponent } from './manager';
export const routes: Routes = [ export const routes: Routes = [
{ {
path: '', path: '',
@@ -28,11 +26,6 @@ export const routes: Routes = [
component: LoginComponent, component: LoginComponent,
canActivate: [GuestGuard] canActivate: [GuestGuard]
}, },
// {
// path: 'change-password',
// component: ChangePasswordComponent,
// canActivate: [LoginGuard]
// },
{ {
path: '404', path: '404',
component: NotFoundComponent component: NotFoundComponent
@@ -41,6 +34,10 @@ export const routes: Routes = [
path: '403', path: '403',
component: ForbiddenComponent component: ForbiddenComponent
}, },
{
path: 'error',
component: GenericErrorComponent
},
{ {
path: '**', path: '**',
redirectTo: '/404' redirectTo: '/404'
@@ -48,7 +45,9 @@ export const routes: Routes = [
]; ];
@NgModule({ @NgModule({
imports: [RouterModule.forRoot(routes)], imports: [RouterModule.forRoot(routes, {
initialNavigation: 'disabled'
})],
exports: [RouterModule], exports: [RouterModule],
providers: [] providers: []
}) })

View File

@@ -1,5 +1,11 @@
<app-header></app-header> @if (isOperationsConsoleRoute()) {
<div class="content">
<router-outlet></router-outlet> <router-outlet></router-outlet>
</div> } @else {
<app-footer></app-footer> <div class="app-shell flex flex-column justify-space-between h-100">
<app-header class="flex-none"></app-header>
<div class="content flex h-100">
<router-outlet></router-outlet>
</div>
<app-footer class="flex-none"></app-footer>
</div>
}

View File

@@ -2,20 +2,10 @@
display: block; display: block;
color: rgba(0,0,0,.54); color: rgba(0,0,0,.54);
font-family: Roboto,"Helvetica Neue"; font-family: Roboto,"Helvetica Neue";
min-height: 100%;
} }
.content { .content {
margin: 50px 70px; padding: 20px;
} max-height: calc(100vh - 169px);
@media screen and (min-width: 600px) and (max-width: 1279px) {
.content {
margin: 20px 30px;
}
}
@media screen and (max-width: 599px) {
.content {
margin: 8px 12px;
}
} }

View File

@@ -1,38 +1,24 @@
import { TestBed, async } from '@angular/core/testing'; import {TestBed, waitForAsync} from '@angular/core/testing';
import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
import { RouterTestingModule } from '@angular/router/testing'; import { RouterTestingModule } from '@angular/router/testing';
import { AppComponent } from './app.component'; import { AppComponent } from './app.component';
import { HomeComponent } from './home'; import { MockApiService } from './services/mocks/api.service.mock';
import { ManagerComponent } from './manager';
import { LoginComponent } from './login';
import { MockApiService } from './service/mocks/api.service.mock';
import { LoginGuard } from './guard'; import { FooterComponent} from './components';
import { NotFoundComponent } from './not-found';
import {
ApiCardComponent,
FooterComponent,
GithubComponent,
} from './component';
import { import {MatIconRegistry} from '@angular/material/icon';
MatToolbarModule, import {MatToolbarModule} from '@angular/material/toolbar';
MatIconRegistry
} from '@angular/material';
import { import {
ApiService, ApiService,
AuthService, AuthService,
UserService, UserService,
FooService,
ConfigService ConfigService
} from './service'; } from './services';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
describe('AppComponent', () => { describe('AppComponent', () => {
beforeEach(async(() => { beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
declarations: [ declarations: [
AppComponent, AppComponent,
@@ -50,14 +36,13 @@ describe('AppComponent', () => {
}, },
AuthService, AuthService,
UserService, UserService,
FooService,
ConfigService ConfigService
], ],
schemas: [CUSTOM_ELEMENTS_SCHEMA] schemas: [CUSTOM_ELEMENTS_SCHEMA]
}).compileComponents(); }).compileComponents();
})); }));
it('should create the app', async(() => { it('should create the app', waitForAsync(() => {
const fixture = TestBed.createComponent(AppComponent); const fixture = TestBed.createComponent(AppComponent);
const app = fixture.debugElement.componentInstance; const app = fixture.debugElement.componentInstance;
expect(app).toBeTruthy(); expect(app).toBeTruthy();

View File

@@ -1,15 +1,31 @@
import {Component} from '@angular/core'; import {Component} from '@angular/core';
import {Router} from '@angular/router';
// I remove temporary fontawesome5 and downgrade to fontawesome4 import fontawesome from '@fortawesome/fontawesome';
import fontawesome from '@fortawesome/fontawesome'; import {
import solid from '@fortawesome/fontawesome-free-solid/'; faCheckCircle,
fontawesome.library.add(solid); faExclamationCircle,
faExclamationTriangle,
faPause,
faPlay,
faTimesCircle
} from '@fortawesome/fontawesome-free-solid';
fontawesome.library.add(faCheckCircle, faExclamationCircle, faExclamationTriangle, faPause, faPlay, faTimesCircle);
@Component({ @Component({
selector: 'app-root', selector: 'app-root',
templateUrl: './app.component.html', templateUrl: './app.component.html',
styleUrls: ['./app.component.scss'] styleUrls: ['./app.component.scss'],
standalone: false
}) })
export class AppComponent { export class AppComponent {
} constructor(private router: Router) {
}
isOperationsConsoleRoute(): boolean {
const url = this.router.url || '/';
return url === '/' || url.startsWith('/manager');
}
}

View File

@@ -1,146 +1,149 @@
import { BrowserModule } from '@angular/platform-browser'; import { BrowserModule } from '@angular/platform-browser';
import { NgModule, APP_INITIALIZER} from '@angular/core'; import { NgModule, APP_INITIALIZER} from '@angular/core';
import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { HttpModule } from '@angular/http'; import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
import { HttpClientModule } from '@angular/common/http';
import {JWT_OPTIONS, JwtModule} from '@auth0/angular-jwt';
// material // material
import { import {MatIconRegistry} from '@angular/material/icon';
MatButtonModule, import {MatInputModule} from '@angular/material/input';
MatMenuModule, import {MatChipsModule} from '@angular/material/chips';
MatIconModule, import {MatTooltipModule} from '@angular/material/tooltip';
MatToolbarModule, import {MatProgressBarModule} from '@angular/material/progress-bar';
MatTooltipModule, import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
MatCardModule, import {MatMenuModule} from '@angular/material/menu';
MatChipsModule, import {MatToolbarModule} from '@angular/material/toolbar';
MatInputModule, import {MatIconModule} from '@angular/material/icon';
MatIconRegistry, import {MatButtonModule} from '@angular/material/button';
MatProgressSpinnerModule, import {MatCardModule} from '@angular/material/card';
MatProgressBarModule, import {MatSelectModule} from '@angular/material/select';
} from '@angular/material'; import {MatListModule} from '@angular/material/list';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import {MatSidenavModule} from '@angular/material/sidenav';
import { FlexLayoutModule } from '@angular/flex-layout'; import {MatDialogModule} from '@angular/material/dialog';
import {OwlDateTimeModule, OwlNativeDateTimeModule} from '@danielmoncada/angular-datetime-picker';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { AppComponent } from './app.component'; import { AppComponent } from './app.component';
import { AppRoutingModule } from './app-routing.module'; import { AppRoutingModule } from './app-routing.module';
import { ManagerComponent } from './manager'; import { ManagerComponent } from './views/manager';
import { LoginComponent } from './login'; import { LoginComponent } from './views/login';
import { LoginGuard, GuestGuard, AdminGuard } from './guard'; import { LoginGuard, GuestGuard, AdminGuard } from './guards';
import { NotFoundComponent } from './not-found'; import { NotFoundComponent } from './views/not-found';
import { AccountMenuComponent } from './component/header/account-menu/account-menu.component'; import { AccountMenuComponent } from './components/header/account-menu/account-menu.component';
import { import {
HeaderComponent, HeaderComponent,
FooterComponent, FooterComponent,
GithubComponent, GithubComponent,
SchedulerConfigComponent,
SchedulerControlComponent, SchedulerControlComponent,
LogsPanelComponent, LogsPanelComponent,
ProgressPanelComponent ProgressPanelComponent,
} from './component'; TriggerListComponent,
SimpleTriggerConfigComponent
} from './components';
import { import {
ApiService, ApiService,
AuthService, AuthService,
UserService, UserService,
FooService,
SchedulerService, SchedulerService,
ConfigService, ConfigService,
ProgressWebsocketService, getHtmlBaseUrl,
LogsWebsocketService LogsRxWebsocketService,
} from './service'; ProgressRxWebsocketService,
import { ChangePasswordComponent } from './change-password/change-password.component'; TriggerService,
import { ForbiddenComponent } from './forbidden/forbidden.component'; CalendarService
} from './services';
import { ForbiddenComponent } from './views/forbidden/forbidden.component';
import { APP_BASE_HREF } from '@angular/common';
import JobService from './services/job.service';
import {GenericErrorComponent} from './views/error/genericError.component';
export function initUserFactory(userService: UserService) { export function initUserFactory(userService: UserService) {
return () => userService.jsessionInitUser(); return () => userService.fetchLoggedUser();
} }
// const stompConfig: StompConfig = { export function jwtOptionsFactory(apiService: ApiService) {
// // Which server? return {
// url: 'ws://localhost:8080/quartz-manager/progress', tokenGetter: () => {
return apiService.getToken();
},
allowedDomains: ['localhost:8080', 'localhost:4200']
}
}
// // Headers @NgModule({ declarations: [
// // Typical keys: login, passcode, host AppComponent,
// headers: { HeaderComponent,
// login: 'admin', FooterComponent,
// passcode: 'admin' ManagerComponent,
// }, GithubComponent,
LoginComponent,
// // How often to heartbeat? NotFoundComponent,
// // Interval in milliseconds, set to 0 to disable AccountMenuComponent,
// heartbeat_in: 0, // Typical value 0 - disabled SimpleTriggerConfigComponent,
// heartbeat_out: 20000, // Typical value 20000 - every 20 seconds SchedulerControlComponent,
// // Wait in milliseconds before attempting auto reconnect LogsPanelComponent,
// // Set to 0 to disable ProgressPanelComponent,
// // Typical value 5000 (5 seconds) ForbiddenComponent,
// reconnect_delay: 5000, GenericErrorComponent,
TriggerListComponent
// // Will log diagnostics on console ],
// debug: true bootstrap: [AppComponent], imports: [BrowserAnimationsModule,
// }; BrowserModule,
FormsModule,
@NgModule({ ReactiveFormsModule,
declarations: [ AppRoutingModule,
AppComponent, JwtModule.forRoot({
HeaderComponent, jwtOptionsProvider: {
FooterComponent, provide: JWT_OPTIONS,
ManagerComponent, useFactory: jwtOptionsFactory,
GithubComponent, deps: [ApiService]
LoginComponent, }
NotFoundComponent, }),
AccountMenuComponent, MatDialogModule,
SchedulerConfigComponent, MatMenuModule,
SchedulerControlComponent, MatTooltipModule,
LogsPanelComponent, MatButtonModule,
ProgressPanelComponent, MatChipsModule,
ChangePasswordComponent, MatIconModule,
ForbiddenComponent MatInputModule,
], MatSelectModule,
imports: [ MatToolbarModule,
BrowserAnimationsModule, MatCardModule,
BrowserModule, MatListModule,
FormsModule, MatProgressSpinnerModule,
ReactiveFormsModule, MatProgressBarModule,
HttpModule, OwlDateTimeModule,
HttpClientModule, OwlNativeDateTimeModule,
AppRoutingModule, MatSidenavModule,
MatMenuModule, ], providers: [
MatTooltipModule, {
MatButtonModule, provide: APP_BASE_HREF,
MatChipsModule, useValue: getHtmlBaseUrl()
MatIconModule, },
MatInputModule, {
MatToolbarModule, 'provide': APP_INITIALIZER,
MatCardModule, 'useFactory': initUserFactory,
MatProgressSpinnerModule, 'deps': [UserService],
MatProgressBarModule, 'multi': true
FlexLayoutModule },
], LoginGuard,
providers: [ GuestGuard,
LoginGuard, AdminGuard,
GuestGuard, SchedulerService,
AdminGuard, JobService,
FooService, TriggerService,
SchedulerService, CalendarService,
ProgressWebsocketService, ProgressRxWebsocketService,
LogsWebsocketService, LogsRxWebsocketService,
AuthService, AuthService,
ApiService, ApiService,
UserService, UserService,
ConfigService, ConfigService,
MatIconRegistry, MatIconRegistry,
{ provideHttpClient(withInterceptorsFromDi())
'provide': APP_INITIALIZER, ] })
'useFactory': initUserFactory,
'deps': [UserService],
'multi': true
}
// StompService,
// ServerSocket
// {
// provide: StompConfig,
// useValue: stompConfig
// }
],
bootstrap: [AppComponent]
})
export class AppModule { } export class AppModule { }

View File

@@ -1,18 +0,0 @@
<div class="content" fxLayout="row" fxLayoutAlign="center">
<mat-card elevation="5" fxFlex>
<mat-card-subtitle>Change Your Password</mat-card-subtitle>
<p [class]="notification.msgType" *ngIf="notification">{{notification.msgBody}}</p>
<mat-card-content>
<form *ngIf="!submitted" [formGroup]="form" (ngSubmit)="onSubmit()" #changePasswordForm="ngForm">
<mat-input-container>
<input matInput formControlName="oldPassword" required type="password" placeholder="old password">
</mat-input-container>
<mat-input-container>
<input matInput formControlName="newPassword" required type="password" placeholder="new password">
</mat-input-container>
<button type="submit" [disabled]="!changePasswordForm.form.valid" mat-raised-button color="primary">Change Password</button>
</form>
<mat-spinner *ngIf="submitted" mode="indeterminate"></mat-spinner>
</mat-card-content>
</mat-card>
</div>

View File

@@ -1,45 +0,0 @@
.content {
width: 100%;
}
mat-card {
max-width: 350px;
text-align: center;
animation: fadein 1s;
-o-animation: fadein 1s; /* Opera */
-moz-animation: fadein 1s; /* Firefox */
-webkit-animation: fadein 1s; /* Safari and Chrome */
}
mat-input-container {
width: 100%;
}
mat-spinner {
width: 25px;
height: 25px;
margin: 20px auto 0 auto;
}
.error {
color: #D50000;
}
.success {
color: #8BC34A;
}
@media screen and (max-width: 599px) {
.content {
/* https://github.com/angular/flex-layout/issues/295 */
display: block !important;
}
mat-card {
/* https://github.com/angular/flex-layout/issues/295 */
display: block !important;
max-width: 999px;
}
}

View File

@@ -1,52 +0,0 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
import { RouterTestingModule } from '@angular/router/testing';
import {
ApiService,
AuthService,
UserService,
ConfigService
} from '../service';
import { MockApiService } from '../service/mocks';
import { ChangePasswordComponent } from './change-password.component';
describe('ChangePasswordComponent', () => {
let component: ChangePasswordComponent;
let fixture: ComponentFixture<ChangePasswordComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
imports: [
RouterTestingModule,
FormsModule,
ReactiveFormsModule
],
declarations: [
ChangePasswordComponent
],
providers: [
{
provide: ApiService,
useClass: MockApiService
},
AuthService,
UserService,
ConfigService
],
schemas: [CUSTOM_ELEMENTS_SCHEMA]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(ChangePasswordComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should be created', () => {
expect(component).toBeTruthy();
});
});

View File

@@ -1,65 +0,0 @@
import { Component, OnInit } from '@angular/core';
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { AuthService } from 'app/service';
import { Router } from '@angular/router';
import { DisplayMessage } from '../shared/models/display-message';
@Component({
selector: 'app-change-password',
templateUrl: './change-password.component.html',
styleUrls: ['./change-password.component.scss']
})
export class ChangePasswordComponent implements OnInit {
form: FormGroup;
/**
* Boolean used in telling the UI
* that the form has been submitted
* and is awaiting a response
*/
submitted = false;
/**
* Diagnostic message from received
* form request error
*/
notification: DisplayMessage;
constructor(
private authService: AuthService,
private router: Router,
private formBuilder: FormBuilder
) {
}
ngOnInit() {
this.form = this.formBuilder.group({
oldPassword: ['', Validators.compose([Validators.required, Validators.minLength(3), Validators.maxLength(64)])],
newPassword: ['', Validators.compose([Validators.required, Validators.minLength(3), Validators.maxLength(32)])]
});
}
onSubmit() {
/**
* Innocent until proven guilty
*/
this.notification = undefined;
this.submitted = true;
this.authService.changePassowrd(this.form.value)
// show me the animation
.delay(1000)
.mergeMap(() => this.authService.logout())
.subscribe(() => {
this.router.navigate(['/login', { msgType: 'success', msgBody: 'Success! Please sign in with your new password.'}]);
}, error => {
this.submitted = false;
this.notification = { msgType: 'error', msgBody: 'Invalid old password.'};
});
}
}

View File

@@ -1 +0,0 @@
export * from './change-password.component';

View File

@@ -1,7 +0,0 @@
<p style="margin: 0px auto; padding: 0px; color: rgba(255, 255, 255, 0.541176); max-width: 356px;">
Hand crafted with love by
<a href="https://github.com/fabioformosa" style="color: rgba(255, 255, 255, 0.870588);">Fabio Formosa</a>
</p>
<a style="margin-top: 22px;" mat-icon-button href="https://github.com/fabioformosa/quartz-manager">
<img src="assets/image/github.png"/>
</a>

View File

@@ -1,2 +0,0 @@
<button mat-menu-item [routerLink]="['/change-password']">CHANGE PASSWORD</button>
<button mat-menu-item (click)="logout()">SIGN OUT</button>

View File

@@ -1,40 +0,0 @@
<mat-toolbar color="primary" class="app-navbar">
<button mat-button mat-ripple routerLink="/">
<img alt="Quartz Manager" class="app-angular-logo" src="assets/image/angular-white-transparent.svg">
<span>Quartz Manager</span>
</button>
<div class="right">
<div fxFlex="1 1 auto" fxLayout="row" fxLayoutAlign="flex-end center">
<button *ngIf="!hasSignedIn()" routerLink="/signup" mat-button mat-ripple>
<span>Sign up</span>
</button>
<button *ngIf="!hasSignedIn()" routerLink="/login" mat-button mat-ripple>
<span>Login</span>
</button>
<button
class="greeting-button"
*ngIf="hasSignedIn()"
mat-button mat-ripple
[matMenuTriggerFor]="accountMenu">
<span>Hi, {{userName()}}</span>
</button>
<button
class="greeting-hamburger"
*ngIf="hasSignedIn()"
mat-icon-button mat-ripple
[matMenuTriggerFor]="accountMenu">
<mat-icon>menu</mat-icon>
</button>
<mat-menu #accountMenu
class="app-header-accountMenu"
yposition="below"
[overlapTrigger]="false">
<app-account-menu ></app-account-menu>
</mat-menu>
</div>
</div>
</mat-toolbar>

View File

@@ -1,29 +0,0 @@
<mat-card>
<mat-card-header>
<mat-card-title><b>JOB LOGS</b></mat-card-title>
</mat-card-header>
<mat-card-content>
<div id="logs">
<div *ngFor = "let log of logs" fxLayout="row" fxLayout.xs="column">
<div fxFlex="1 1 20%">
<span [ngClass]="{'animated zoomIn firstLog': $first}"> [{{log.time|date:'medium'}}]</span>
</div>
<div fxFlex="1 1 10%">
<span [ngClass]="{'animated zoomIn firstLog': $first}">
<i class = "fas" [ngClass]="{'fa-check-circle green': log.type == 'INFO',
'fa-exclamation-triangle yellow': log.type == 'WARN',
'fa-times-circle red': log.type == 'ERROR'}"></i>
</span>
</div>
<div fxFlex="1 1 20%">
<span [ngClass]="{'animated zoomIn firstLog': $first}">
{{log.threadName}}
</span>
</div>
<div fxFlex="1 1 50%">
<span [ngClass]="{'animated zoomIn firstLog': $first}"> {{log.msg}}</span>
</div>
</div>
</div>
</mat-card-content>
</mat-card>

View File

@@ -1,10 +0,0 @@
.red{
color: red;
}
.green{
color: green;
}
.yellow{
color: gold;
}

View File

@@ -1,53 +0,0 @@
import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
import { LogsWebsocketService, ApiService } from '../../service';
import { Observable } from 'rxjs/Observable';
@Component({
selector: 'logs-panel',
templateUrl: './logs-panel.component.html',
styleUrls: ['./logs-panel.component.scss']
})
export class LogsPanelComponent implements OnInit {
MAX_LOGS : number = 20;
logs : Array<any> = new Array();
constructor(
private logsWebsocketService: LogsWebsocketService,
private apiService : ApiService
) { }
ngOnInit() {
let obs = this.logsWebsocketService.getObservable()
obs.subscribe({
'next' : this.onNewLogMsg,
'error' : (err) => {console.log(err)}
});
}
onNewLogMsg = (receivedMsg) => {
if(receivedMsg.type == 'SUCCESS')
this._showNewLog(receivedMsg.message);
else if(receivedMsg.type == 'ERROR')
this._refreshSession(); //if websocket has been closed for session expiration, try to refresh it
};
_showNewLog = (logRecord) => {
if(this.logs.length > this.MAX_LOGS)
this.logs.pop();
this.logs.unshift({
time : logRecord.date,
type : logRecord.type,
msg : logRecord.message,
threadName : logRecord.threadName
});
}
_refreshSession = () => {
this.apiService.get('/quartz-manager/session/refresh')
}
}

View File

@@ -1,36 +0,0 @@
<!-- <div class="progress" [hidden]="progress.percentage < 0">
<div class="progress-bar"
role="progressbar"
[ngStyle]="{width: percentageStr}">
{{percentageStr}}
</div>
</div> -->
<mat-card>
<mat-card-header>
<mat-card-title><b>JOB PROGRESS</b></mat-card-title>
</mat-card-header>
<mat-card-content>
<div>
<mat-progress-bar mode="determinate" value="{{progress.percentage}}"></mat-progress-bar>
{{percentageStr}}
</div>
<br>
<div>
<mat-chip>counter</mat-chip>&nbsp;
<span class="animated pulse">{{progress.timesTriggered}}</span> <span ng-show="progress.repeatCount > 0">/ {{progress.repeatCount}} </span>
<br/><br/>
<mat-chip>job key</mat-chip> <span class="animated pulse">{{progress.jobKey}}</span><br>
<mat-chip>job class</mat-chip> <span class="animated pulse">{{progress.jobClass}}</span><br/>
<br/>
<mat-chip>prev fire time</mat-chip> <span class="animated pulse">{{progress.previousFireTime|date:'dd-MM-yyyy HH:mm:ss'}}</span><br/>
<mat-chip>next fire time</mat-chip> <span class="animated pulse">{{progress.nextFireTime|date:'dd-MM-yyyy HH:mm:ss'}}</span><br/>
<mat-chip>final fire time</mat-chip> <span class="animated pulse">{{progress.finalFireTime|date:'dd-MM-yyyy HH:mm:ss'}}</span><br/>
</div>
</mat-card-content>
</mat-card>

View File

@@ -1,85 +0,0 @@
import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core'
import { ProgressWebsocketService } from '../../service';
import { Observable } from 'rxjs/Observable';
// import {Message} from '@stomp/stompjs';
// import { Subscription } from 'rxjs/Subscription';
// import {StompService} from '@stomp/ng2-stompjs';
// import { QueueingSubject } from 'queueing-subject'
// import websocketConnect from 'rxjs-websockets'
// import 'rxjs/add/operator/share'
// import {ServerSocket} from '../../service/qz.socket.service'
@Component({
selector: 'progress-panel',
templateUrl: './progress-panel.component.html',
styleUrls: ['./progress-panel.component.scss']
})
export class ProgressPanelComponent implements OnInit {
progress : any = {}
percentageStr : string
// // Stream of messages
// private subscription: Subscription;
// public messages: Observable<Message>;
// // Subscription status
// public subscribed: boolean;
// // Array of historic message (bodies)
// public mq: Array<string> = [];
// private socketSubscription
constructor(
private progressWebsocketService: ProgressWebsocketService,
// private _stompService: StompService,
// private serverSocket : ServerSocket
) { }
onNewProgressMsg = (receivedMsg) => {
if (receivedMsg.type == 'SUCCESS') {
var newStatus = receivedMsg.message;
this.progress = newStatus;
this.percentageStr = this.progress.percentage + '%';
}
}
ngOnInit() {
let obs = this.progressWebsocketService.getObservable()
obs.subscribe({
'next' : this.onNewProgressMsg,
'error' : (err) => {console.log(err)}
});
// this.subscribed = false;
// this.subscribe();
// this.serverSocket.connect()
// this.socketSubscription = this.serverSocket.messages.subscribe((message: string) => {
// console.log('received message from server: ', message)
// })
}
// public subscribe() {
// if (this.subscribed) {
// return;
// }
// // Stream of messages
// this.messages = this._stompService.subscribe('/topic/progress');
// // Subscribe a function to be run on_next message
// this.subscription = this.messages.subscribe(this.on_next);
// this.subscribed = true;
// }
// public on_next = (message: Message) => {
// this.mq.push(message.body + '\n');
// console.log(message);
// }
}

Some files were not shown because too many files have changed in this diff Show More