lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity
2,437 Commits 1 Branch 0 Tags
39ccf65f2e0ea2113cf98cd1308e80de92ffe87f
Commit Graph

2437 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kaizimmerm
09dc3b00f1 Merge branch 'master' into feature_boot_13_sec_41 2016-08-26 09:17:39 +02:00
Kai Zimmermann
f779b3aba7 removed unneeded override 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-08-26 09:15:08 +02:00
Melanie Retter
171f96f309 Remove DB migration skripts 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-08-25 17:27:18 +02:00
Kai Zimmermann
0b0503a77f Fixed locale problem on non EN systems 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-08-25 15:19:53 +02:00
kaizimmerm
9eee1985e2 Upgrade jackson. 
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2016-08-25 14:55:13 +02:00
Melanie Retter
1620385e35 Insert empty row in header 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-08-25 10:59:37 +02:00
Melanie Retter
34daea319c Rename constant WHITESPACE 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-08-25 10:39:50 +02:00
Melanie Retter
d84365e3d2 Refactor 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-08-25 09:51:16 +02:00
Melanie Retter
61ebcc89ff Fix typo 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-08-24 17:40:23 +02:00
Melanie Retter
d437d86f26 Correct test description 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-08-24 16:55:17 +02:00
Melanie Retter
d323f67648 Refactor ConstraintViolationException 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-08-24 16:38:18 +02:00
Melanie Retter
fbe29a8a87 Merge branch 'master' into 
fix_dialog_window_must_not_close_after_save_if_duplicate_exists

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-08-24 14:46:23 +02:00
Melanie Retter
4d47a86285 Fix typo 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-08-24 14:26:46 +02:00
Melanie Retter
50a86cdb7b ConstraintViolationException can contain mulitple violation messages 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-08-24 13:48:18 +02:00
Melanie Retter
679f465db1 Insert custom constraintViolationException 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-08-24 13:07:37 +02:00
Kai Zimmermann
8ded4a29d2 Merge pull request #277 from bsinno/fix_unhandled_ConstraintViolationException 
Fix unhandled constraint violation exception
 2016-08-24 11:46:43 +02:00
Kai Zimmermann
2e0208f054 Fixed test after merge 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-08-24 11:35:02 +02:00
Kai Zimmermann
d9b83a75d0 Merges with master 
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
Signed-off-by:
 2016-08-24 11:03:16 +02:00
kaizimmerm
00539ea49c Merges with master 
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2016-08-24 10:58:03 +02:00
Melanie Retter
3ac8dc93a3 Add Test for SoftwareManagement#createSoftwareModuleType 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-08-24 09:49:05 +02:00
kaizimmerm
aff2350186 Fix simulator log config. 
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2016-08-24 09:41:30 +02:00
Kai Zimmermann
4469576779 Upgarde boot and sec to newest patch version. 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-08-24 09:41:30 +02:00
kaizimmerm
7a38e212b6 Fixed license header and entity scan. 
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2016-08-24 09:40:36 +02:00
kaizimmerm
2153f627c6 Using same plugin for weave and metamodel 
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2016-08-24 09:40:36 +02:00
kaizimmerm
05c45d70d9 Removed enable auto configure from repo config 
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2016-08-24 09:40:35 +02:00
kaizimmerm
17a8f01d84 Fixed tests. 
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2016-08-24 09:40:11 +02:00
kaizimmerm
ff500d3bd7 Started migration for Boot 1.3 and Security 4.1 
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2016-08-24 09:38:53 +02:00
Kai Zimmermann
b3db6e4ae2 Merge pull request #276 from bsinno/fix_remove_unnecessary_save 
Removed unnecessary target info startus persistence.
 2016-08-24 09:05:26 +02:00
Melanie Retter
693eaad977 Delete SP_REPO_CONSTRAINT_VIOLATION 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-08-23 17:32:07 +02:00
Melanie Retter
9f5a2ea3d5 Delete ConstraintViolationException, correct db migration script 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-08-23 17:11:33 +02:00
Melanie Retter
8f35f5495d Add db migration skripts 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-08-23 16:43:18 +02:00
Melanie Retter
2ae08ffaef Add constraint to the database column maxAssignment 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-08-23 16:10:27 +02:00
Melanie Retter
42b21d6308 Extend test for invalid assignment of SoftwareModuleType 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-08-23 13:35:03 +02:00
Melanie Retter
d2693e2f49 MaxAssignment smaller than 0 is not allowed -> BadRequest Status code 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-08-23 11:29:24 +02:00
Melanie Retter
75a404c95f Fix typo 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-08-22 15:00:21 +02:00
Melanie Retter
4e292d48b7 Fix typo 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-08-22 14:57:46 +02:00
SirWayne
7bd8b6554c Add javadoc 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-08-22 09:30:33 +02:00
SirWayne
ef8436d945 Merge branch 'fix_dialog_window_must_not_close_after_save_if_duplicate_exists' of https://github.com/bsinno/hawkbit.git into fix_dialog_window_must_not_close_after_save_if_duplicate_exists 2016-08-19 18:26:45 +02:00
SirWayne
0856b6db8c Merge branch 'fix_dialog_window_must_not_close_after_save_if_duplicate_exists' of https://github.com/bsinno/hawkbit.git into fix_dialog_window_must_not_close_after_save_if_duplicate_exists 2016-08-19 18:26:11 +02:00
SirWayne
9f9277d3ee Fix save and close order for common window dialog. Close the window 
after the save action, because after the close action there is no UI
anymore. So an error cannot shown on the UI.

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-08-19 18:25:50 +02:00
Gaurav
e7f5ae048a Fixed Sonar issue. 
Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
 2016-08-19 18:25:43 +02:00
Gaurav
86111ac70c Fixed sonar issues. 
Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
 2016-08-19 18:08:34 +02:00
SirWayne
fe113a4bc6 Fix save and close order for common window dialog. Close the window 
after the save action, because after the close action there is no UI
anymore. So an error cannot shown on the UI.

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-08-19 17:44:23 +02:00
Gaurav
6babfe3603 Merge branch 'fix_dialog_window_must_not_close_after_save_if_duplicate_exists' of https://github.com/bsinno/hawkbit/ into fix_dialog_window_must_not_close_after_save_if_duplicate_exists 2016-08-19 17:25:50 +02:00
Gaurav
f7f73ae12c Fixed the sonar issues. 
Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
 2016-08-19 17:25:35 +02:00
Melanie Retter
4c143cf9d2 Add javaDoc, remove unused method parameter 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-08-19 16:23:53 +02:00
Gaurav
381254fa67 Fixed Sonar issues. 
Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
 2016-08-19 15:34:29 +02:00
SirWayne
84c9296a70 Merge branch 'eclipse/master' into 
fix_unhandled_ConstraintViolationException

Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTable.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTable.java


Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-08-19 14:38:28 +02:00
Melanie Retter
36fb2f2b54 Merge branch 'master' into 
fix_dialog_window_must_not_close_after_save_if_duplicate_exists

Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleAddUpdateWindow.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/CommonDialogWindow.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/decorators/SPUIWindowDecorator.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/layouts/AbstractCreateUpdateTagLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/layouts/CreateUpdateTypeLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionAddUpdateWindowLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetAddUpdateWindowLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/AddUpdateRolloutWindowLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/HawkbitCommonUtil.java


Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
 2016-08-19 14:29:15 +02:00
kaizimmerm
276792d005 Fix simulator log config. 
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2016-08-19 14:22:43 +02:00