Commit Graph

1071 Commits

Author SHA1 Message Date
Asharani
c5541b42dc Added null check for address host
Signed-off-by: Asharani <asharani.murugesh@in.bosch.com>
2016-05-31 17:45:24 +05:30
Kai Zimmermann
e054a171ea Merge branch 'feature_split_repo_into_api_impl' of https://github.com/bsinno/hawkbit.git into feature_split_repo_into_api_impl 2016-05-31 12:29:05 +02:00
Kai Zimmermann
91fd94b356 Migrated MySQL schema creation to test package. Small doc improvements
on testdatafactory.

Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-31 12:28:24 +02:00
Michael Hirsch
1117bbebbb re-add json dependency for tests
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-05-31 11:29:41 +02:00
Michael Hirsch
a8bca3dc12 fix sonar issue unused local variable
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-05-31 11:07:02 +02:00
Michael Hirsch
310071dd62 Merge branch 'feature_split_repo_into_api_impl' of https://github.com/bsinno/hawkbit.git into feature_split_repo_into_api_impl 2016-05-31 11:01:17 +02:00
Michael Hirsch
252f409912 fix generic wildcard
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-05-31 11:01:04 +02:00
SirWayne
965e283f42 Merge branch 'feature_split_repo_into_api_impl' of https://github.com/bsinno/hawkbit.git into feature_split_repo_into_api_impl 2016-05-31 10:56:17 +02:00
SirWayne
f1e3406b97 Move jackson dependendy from repo to rest-core
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-05-31 10:56:10 +02:00
Melanie Retter
cf64d2ffdf css style change
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-05-31 10:53:07 +02:00
Michael Hirsch
32e5d36f10 Merge branch 'feature_split_repo_into_api_impl' of https://github.com/bsinno/hawkbit.git into feature_split_repo_into_api_impl 2016-05-31 10:50:20 +02:00
Michael Hirsch
62a2e2cdb4 introduce own interfaces for registering the currentTenantKeyGenerator
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-05-31 10:50:10 +02:00
SirWayne
b14d3bbd3c Small fixes
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-05-31 10:50:09 +02:00
Michael Hirsch
14cb962f42 fix sonar rule don't use generic wildcard
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-05-31 10:50:09 +02:00
Michael Hirsch
c2cb42df61 add javadoc
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-05-31 10:50:08 +02:00
SirWayne
a0ec726fd0 Small fixes
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-05-31 10:48:56 +02:00
Michael Hirsch
b1a2a583e9 fix mock test by mocking action and target
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-05-31 09:21:40 +02:00
Michael Hirsch
002e0d3048 Merge branch 'feature_split_repo_into_api_impl' of
https://github.com/bsinno/hawkbit.git into
feature_split_repo_into_api_impl

Conflicts:
	hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/Constants.java


Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-05-31 08:54:51 +02:00
Michael Hirsch
b369369c2c add javadoc
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-05-31 08:52:09 +02:00
Kai Zimmermann
7a98c58407 refactored test data generation. Refactored entity factor methods.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-31 08:51:49 +02:00
Michael Hirsch
2d90900f37 fix javadoc
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-05-31 08:48:06 +02:00
Melanie Retter
05e1347292 Merge branch 'fix_introduce_consistent_button_position_in_change_dialogs' of https://github.com/bsinno/hawkbit.git into fix_introduce_consistent_button_position_in_change_dialogs 2016-05-30 18:27:04 +02:00
Melanie Retter
2dfda701b5 add license text
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-05-30 18:26:52 +02:00
Melanie Retter
b4e1839b3d add license text
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-05-30 18:08:52 +02:00
Melanie Retter
f1533a7f1e Merge branch 'fix_introduce_consistent_button_position_in_change_dialogs' of https://github.com/bsinno/hawkbit.git into fix_introduce_consistent_button_position_in_change_dialogs 2016-05-30 17:50:19 +02:00
Melanie Retter
0b1782e946 add default value for optionGroup; optimize UI
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-05-30 17:50:03 +02:00
Michael Hirsch
fc5a22302b read credentials from URL path to add to the textfield directly
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-05-30 15:00:11 +02:00
venu1278
85b8e1ffe0 Merge branch 'master' into fix_introduce_consistent_button_position_in_change_dialogs 2016-05-30 17:59:31 +05:30
venu1278
d3f7b9de9c Displaying Metadata details of DistributionSet & SoftwareModule
Signed-off-by: venu1278 <venugopal.boodidadinne@in.bosch.com>
2016-05-30 17:57:40 +05:30
Melanie Retter
8e597203ae Correct Typo
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-05-30 13:49:15 +02:00
Melanie Retter
6fd24416ae substitute VerticalLayout for FormLayout
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-05-30 12:37:39 +02:00
Melanie Retter
2d474c17ee Merge remote-tracking branch 'origin/master' into fix_introduce_consistent_button_position_in_change_dialogs 2016-05-30 12:35:12 +02:00
Kai Zimmermann
a4e0fc2457 Fixed a broken query.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-27 16:04:37 +02:00
Kai Zimmermann
53156cb16f Javadoc, sonar issue, package cycles.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-27 15:25:08 +02:00
Kai Zimmermann
e6ff96dc5a Completed maven module split.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-27 13:30:18 +02:00
Kai Zimmermann
eeee57fbc4 Refactored package names.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-26 14:03:14 +02:00
Kai Zimmermann
2a6b531bff Merge remote-tracking branch 'origin/master' 2016-05-26 10:41:09 +02:00
venu1278
f1a1538177 Merge branch 'master' into fix_introduce_consistent_button_position_in_change_dialogs 2016-05-26 12:06:12 +05:30
Melanie Retter
3abfe388a4 optimize CommonDialogWindow
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-05-25 18:55:43 +02:00
Kai Zimmermann
f2e13b8d22 Split into separate maven modules.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-25 17:43:57 +02:00
Melanie Retter
6c7f0482b4 Insert helpLink next to the action buttons on the right side
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-05-25 13:28:58 +02:00
Michael Hirsch
7b20122f09 Merge pull request #189 from bsinno/fix_widgetset_clean_recompilation
move widgetset to src/main/resources and remove cleaning of widgeset
2016-05-25 12:22:46 +02:00
Kai Zimmermann
cf450dabfa Merge remote-tracking branch 'eclipse/master' into
feature_split_repo_into_api_impl

# Conflicts:
#	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/DeploymentManagement.java
#	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/model/Target.java


Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-24 21:51:59 +02:00
Kai Zimmermann
608ffcecf4 Merge pull request #162 from bsinno/fix_create_filter_has_different_layout_than_rollout_and_the_other_widgets
Create filter has different layout than rollout and the other widgets
2016-05-24 18:08:09 +02:00
Kai Zimmermann
1e91643b83 Adapted repo scan 2016-05-24 18:04:09 +02:00
Melanie Retter
96baddeaee optimize commonDialogWindow.
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-05-24 17:21:51 +02:00
Kai Zimmermann
d59ebaebd8 Merge pull request #181 from bsinno/Feature/Add_Rest_Api_with_Java_client
Feature/add rest api with java client
2016-05-24 16:11:25 +02:00
SirWayne
c06c2e546e Merge branch 'Feature/Add_Rest_Api_with_Java_client' of https://github.com/bsinno/hawkbit.git into Feature/Add_Rest_Api_with_Java_client 2016-05-24 15:08:33 +02:00
SirWayne
dc74ec8889 Some rework for the pull request
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-05-24 15:08:07 +02:00
Asharani
693c678377 Do not log the exception trace when upload fails by user abort action
Signed-off-by: Asharani <asharani.murugesh@in.bosch.com>
2016-05-24 14:38:06 +05:30