Commit Graph

3579 Commits

Author SHA1 Message Date
Kai Zimmermann
9d6527a3e2 Switched back to Boots default logger: logback
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-18 09:03:58 +02:00
SirWayne
610daed845 Fix header
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-05-18 08:37:31 +02:00
SirWayne
58648cb9b2 Fix header
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-05-18 08:34:31 +02:00
SirWayne
c8d0424706 Fix header
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-05-18 08:34:02 +02:00
SirWayne
677b35ef42 Fix header
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-05-18 08:32:33 +02:00
Asharani
a774412055 Bug fix : During upload the files when changing the selection of the
software module the upload also changes to the new selected software
module

Signed-off-by: Asharani <asharani.murugesh@in.bosch.com>
2016-05-18 11:14:51 +05:30
SirWayne
8125caf118 Fix header
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-05-17 17:25:46 +02:00
SirWayne
e05b1bac59 Fix header
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-05-17 17:24:58 +02:00
SirWayne
a48460ee03 Fix header
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-05-17 17:24:14 +02:00
SirWayne
5c233c628c Fix header
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-05-17 17:02:10 +02:00
Michael Hirsch
e27bc5b32f Merge pull request #175 from bsinno/fix_target_security_permission_check_for_system_code
allow the getTargetSecurityToken can be called as system code
2016-05-17 17:01:50 +02:00
SirWayne
a47f7275eb Fix header
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-05-17 16:43:59 +02:00
SirWayne
eb3f9f6f2d Fix header
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-05-17 16:24:14 +02:00
SirWayne
806a0531f2 Merge branch 'Feature/Add_Rest_Api_with_Java_client' of
https://github.com/bsinno/hawkbit.git into
Feature/Add_Rest_Api_with_Java_client

Conflicts:
	README.md


Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-05-17 16:13:42 +02:00
Asharani
51db4204d2 Bug fix :- During upload the files when changing the selection of the
software module the upload also changes to the new selected software
module

Signed-off-by: Asharani <asharani.murugesh@in.bosch.com>
2016-05-17 17:50:40 +05:30
SirWayne
156da103b5 Modify readme
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-05-17 13:32:50 +02:00
Jonathan Philip Knoblauch
422918d907 Added module docu
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-05-17 13:12:01 +02:00
Jonathan Philip Knoblauch
e658e7dac6 Merged changes from master into ddi-resources
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-05-17 12:49:32 +02:00
Asharani
652f480667 Added liscense header
Signed-off-by: Asharani <asharani.murugesh@in.bosch.com>
2016-05-17 15:01:12 +05:30
SirWayne
354ed91fa7 Merge branch 'master' into Feature/Add_Rest_Api_with_Java_client
Conflicts:
	examples/hawkbit-example-app/src/main/java/org/eclipse/hawkbit/app/Start.java
	examples/hawkbit-mgmt-api-client/pom.xml
	examples/hawkbit-mgmt-api-client/src/main/java/org/eclipse/hawkbit/mgmt/client/resource/builder/DistributionSetBuilder.java
	examples/hawkbit-mgmt-api-client/src/main/java/org/eclipse/hawkbit/mgmt/client/resource/builder/DistributionSetTypeBuilder.java
	examples/hawkbit-mgmt-api-client/src/main/java/org/eclipse/hawkbit/mgmt/client/resource/builder/RolloutBuilder.java
	examples/hawkbit-mgmt-api-client/src/main/java/org/eclipse/hawkbit/mgmt/client/resource/builder/SoftwareModuleBuilder.java
	examples/hawkbit-mgmt-api-client/src/main/java/org/eclipse/hawkbit/mgmt/client/resource/builder/SoftwareModuleTypeBuilder.java
	examples/hawkbit-mgmt-api-client/src/main/java/org/eclipse/hawkbit/mgmt/client/resource/builder/TagBuilder.java
	examples/hawkbit-mgmt-api-client/src/main/java/org/eclipse/hawkbit/mgmt/client/resource/builder/TargetBuilder.java
	hawkbit-rest-resource/src/main/java/org/eclipse/hawkbit/controller/ArtifactStoreController.java
	hawkbit-rest-resource/src/main/java/org/eclipse/hawkbit/controller/DataConversionHelper.java
	hawkbit-rest-resource/src/main/java/org/eclipse/hawkbit/controller/RootController.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/HawkbitEventProvider.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/UiProperties.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/BaseSwModuleBeanQuery.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleAddUpdateWindow.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/CreateUpdateSoftwareTypeLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadHandler.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/AbstractTableDetailsLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/table/AbstractTable.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/table/AbstractTableHeader.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/ProxyTarget.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/SPUIComponentProvider.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/CreateUpdateDistSetTypeLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/ManageDistBeanQuery.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleBeanQuery.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CreateOrUpdateFilterHeader.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CreateOrUpdateFilterTable.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CustomTargetBeanQuery.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/FilterManagementView.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/FilterQueryValidation.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterBeanQuery.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/event/CustomFilterUIEvent.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/login/LoginView.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionAddUpdateWindowLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionBeanQuery.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/CreateUpdateDistributionTagLayoutWindow.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/DistributionTagButtons.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/tag/CreateUpdateTagLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetAddUpdateWindowLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetBeanQuery.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTable.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/CreateUpdateTargetTagLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetTagFilterButtons.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/menu/DashboardMenu.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/AddUpdateRolloutWindowLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/DistributionBeanQuery.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/ProxyRollout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutBeanQuery.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutListGrid.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/ProxyRolloutGroup.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupBeanQuery.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupListGrid.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupsListHeader.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetsBeanQuery.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/AuthenticationConfigurationView.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/HawkbitCommonUtil.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPDateTimeUtil.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPUIComponetIdProvider.java
	hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/common.scss
	hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/others.scss
	hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/rollout.scss
	hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/target-filter-query.scss
	hawkbit-ui/src/main/resources/messages.properties
	hawkbit-ui/src/main/resources/messages_de.properties
	hawkbit-ui/src/main/resources/messages_en.properties


Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-05-17 11:16:18 +02:00
Michael Hirsch
56487ad1b7 remove if-statement and return immediately the instanceof result
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-05-17 10:57:08 +02:00
Asharani
0073fdeb40 Added comments .Removed changes not required.
Signed-off-by: Asharani <asharani.murugesh@in.bosch.com>
2016-05-17 12:48:47 +05:30
Michael Hirsch
885da8764c Merge pull request #166 from bsinno/fix_Consitent_breadcrumb_usage
Consistent breadcrumb usage
2016-05-17 08:37:32 +02:00
Michael Hirsch
5eeac5cb38 remove create breadcumb comment 2016-05-17 08:37:04 +02:00
Michael Hirsch
dcbf27e3ed add junit tests to security of getTargetSecurityToken
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-05-17 08:04:33 +02:00
Asharani
87da60b950 Merge branch 'master' into Minimize_maximize_status_popup 2016-05-16 16:33:04 +05:30
Asharani
eadff47f24 Artifact upload : on discard action interupt the ongoing upload -
reverted the changes

Signed-off-by: Asharani <asharani.murugesh@in.bosch.com>
2016-05-16 16:26:24 +05:30
Asharani
cb81c78b69 Artifact upload : on discard action interupt the ongoing upload
Signed-off-by: Asharani <asharani.murugesh@in.bosch.com>
2016-05-16 14:56:23 +05:30
Michael Hirsch
7a281a8236 allow the getTargetSecurityToken can be called as system code
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-05-13 15:38:52 +02:00
Melanie Retter
3ea1278239 Merge branch 'master' into
fix_introduce_consistent_button_position_in_change_dialogs

Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionAddUpdateWindowLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/tag/CreateUpdateTagLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/AddUpdateRolloutWindowLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutListGrid.java


Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-05-13 09:45:44 +02:00
Michael Hirsch
27ffb4c4a7 Merge pull request #172 from bsinno/fix_actionlogentry_add_mysql_profile
Fix actionlogentry add mysql profile
2016-05-13 09:30:55 +02:00
Michael Hirsch
33a4ed1175 fix typo of MariaDB 2016-05-13 09:30:22 +02:00
Kai Zimmermann
6654d71969 Started with #100 by means of splitting the management services into API
and Jpa implementation.

Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-13 08:44:34 +02:00
Kai Zimmermann
8b7f24e202 Add mysql profile 2016-05-12 11:58:16 +02:00
Kai Zimmermann
2c49fc8f77 Fix action message. 2016-05-12 11:55:25 +02:00
Asharani
8fc1f74f80 Refactored UploadHandler.java to update upload status using eventing
Signed-off-by: Asharani <asharani.murugesh@in.bosch.com>
2016-05-12 15:16:41 +05:30
Melanie Retter
f4a85c8271 Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com> 2016-05-12 11:03:21 +02:00
Melanie Retter
589c60cedf Create a parent class for all dialogs
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-05-11 16:28:16 +02:00
Michael Hirsch
02e2608b40 Merge pull request #164 from bsinno/fix_reflect_tag_color_change_immediatly_after_popup_is_closed
Reflect tag colour change immediatly after popup is closed.
2016-05-11 14:09:51 +02:00
Michael Hirsch
68a87490c6 Merge pull request #170 from bsinno/fix_remove_special_coap_auth_token
remove special coap-auth-token filter for coap-downloads
2016-05-11 14:09:18 +02:00
Melanie Retter
613a3f7257 Merge remote-tracking branch 'origin/master' into
fix_reflect_tag_color_change_immediatly_after_popup_is_closed

Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/HawkbitEventProvider.java


Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-05-11 11:13:16 +02:00
Melanie Retter
6404c9ba82 Provide a class for the help icon. The class is added to the layout in
every pop-up-window.

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-05-11 10:24:04 +02:00
Michael Hirsch
cd96916d67 Merge pull request #163 from bsinno/fix_filter_icon_not_centered
Filter icon (succes/error) not centered
2016-05-11 09:15:16 +02:00
Kai Zimmermann
130c018cb7 Merge pull request #171 from bsinno/fix_device_simulator
Fixed auth problem in device simulator. Fixed equals ignore case in MD5 check.
2016-05-10 14:32:33 +02:00
Kai Zimmermann
a9283b402a Improved code readability.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-10 13:21:53 +02:00
Kai Zimmermann
1236f65d9d Improved sha1 gen performance by using buffered streams.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-10 13:12:19 +02:00
Kai Zimmermann
bc37ea9b23 Improved hiding for small tokens.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-10 12:08:29 +02:00
Kai Zimmermann
5443f6e419 Fixed auth problem in device simulator. Fixed equals ignore case in sha1
check.

Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-10 12:01:55 +02:00
Melanie Retter
f89b7e4beb Update AbstractTableDetailsLayout.java
use capital F for float value
2016-05-10 10:24:53 +02:00
Melanie Retter
7d81054d4c remove methods and use the constant name.
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-05-10 10:21:40 +02:00