Commit Graph

57 Commits

Author SHA1 Message Date
Kai Zimmermann
dc16844e5c Merge pull request #210 from bsinno/feature_rollouts_credentials
Refactoring
2016-06-17 11:29:48 +02:00
kaizimmerm
6fc3b2ab94 Immediate return.
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
2016-06-15 12:17:26 +02:00
kaizimmerm
f65ca18bda Set new policy for central executor pool to avoid loosing data.
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
2016-06-15 12:03:55 +02:00
SirWayne
7345855a44 Add line ending
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-06-15 10:49:43 +02:00
SirWayne
1b4d73bd13 Merge branch 'master' into feature_rollouts_credentials
Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadStatusObject.java


Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-06-15 09:53:06 +02:00
Kai Zimmermann
3726aac6db Cleaned up default mismatch.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-06-13 12:38:08 +02:00
Kai Zimmermann
12ce60f72a Rabbit publisherConfirms
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-06-12 08:09:28 +02:00
SirWayne
c0b118d5f9 Move filter chain cause of autowiring problems
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-06-10 16:18:54 +02:00
Kai Zimmermann
0beef57df7 Added rabbit connection heartbeat for DMF.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-06-09 11:57:44 +02:00
Kai Zimmermann
4f23fb1377 Created separate bean for poolexecutor.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-06-08 11:58:59 +02:00
Kai Zimmermann
d9046bb9cc Upgraded Spring AMQP. Added task scheduler. Improved executor shutdown.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-06-07 18:38:39 +02:00
SirWayne
9baf668b31 Fix header and change beand service registration
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-06-06 14:29:39 +02:00
SirWayne
9c7f48ded5 Merge branch 'master' into feature_rollouts_credentials
Conflicts:
	hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/security/SecurityAutoConfiguration.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/RepositoryApplicationConfiguration.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/ArtifactManagement.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/DeploymentManagement.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/DistributionSetManagement.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/ReportManagement.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/RolloutGroupManagement.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/RolloutManagement.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/SoftwareManagement.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/SystemManagement.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/TagManagement.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/TargetFilterQueryManagement.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/TargetManagement.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/TenantConfigurationManagement.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/TenantStatsManagement.java


Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-06-06 10:35:02 +02:00
SirWayne
9bd62d1815 Refactor auto config and detail service
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-06-03 14:36:46 +02:00
Dominic Schabel
3cc6fdc21f Basic auth entry point added, so e.g. a browser shows basic auth pop-up. Also done some clean-up/formatting.
Signed-off-by: Dominic Schabel <dominic.schabel@bosch-si.com>
2016-06-02 18:19:17 +02:00
SirWayne
f8538853ed Add method all permissions
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-06-01 13:12:53 +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
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
f2e13b8d22 Split into separate maven modules.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-25 17:43:57 +02:00
Kai Zimmermann
8b7b24125f Merge remote-tracking branch
'origin/Feature/Add_Rest_Api_with_Java_client' into
feature_split_repo_into_api_impl

# Conflicts:
#	hawkbit-repository/src/test/java/org/eclipse/hawkbit/TestDataUtil.java


Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-20 17:42:55 +02:00
SirWayne
f9ed3b305d Move annotation
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-05-19 18:28:09 +02:00
Kai Zimmermann
3e5330a5e6 Completed management separation.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-19 11:16:26 +02:00
Kai Zimmermann
3c0d5396b0 Removed default implementations as JaCoCo has problems with those. Split
software management.

Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-18 16:16:30 +02:00
SirWayne
5bb24c78ad Remove and Rename modules
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-05-18 13:48:04 +02:00
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
SirWayne
f33c8c05e2 Add download server api
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-05-03 12:52:53 +02:00
SirWayne
5cfb933ca1 Add Rest configuration for test
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-04-25 10:45:48 +02:00
Jonathan Philip Knoblauch
7cae6f877d 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:
	hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/web/ResourceControllerAutoConfiguration.java


Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-04-22 18:19:20 +02:00
SirWayne
c17bc98ecb Add RequestResponseContextHolder which hold the current response and
request.

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-04-22 17:49:33 +02:00
Jonathan Philip Knoblauch
810900eee7 Removed http servlet response and request form method signature
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-04-22 13:36:21 +02:00
SirWayne
c3c405c986 Rename and split rest resources ddi, mgmt and system
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-04-20 17:33:03 +02:00
SirWayne
3c0e34ee41 Rename Ddi classes
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-04-20 13:42:43 +02:00
SirWayne
702decee62 Rename deadletter queue and add ttl
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-04-19 10:42:29 +02:00
Jonathan Philip Knoblauch
3145709824 Move DDI resources and annotation to module hawkbit-ddi-resource
- created module and moved resources

Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-04-18 12:39:28 +02:00
Michael Hirsch
df1d4c5a20 Merge branch 'master' into
Download_server_supports_download_through_HTTP_and_HTTPs

Conflicts:
	hawkbit-core/src/main/java/org/eclipse/hawkbit/tenancy/configuration/TenantConfigurationKey.java


Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-04-05 11:58:27 +02:00
SirWayne
45f6fb80a3 Fix event provider autowiring
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-03-24 12:59:29 +01:00
SirWayne
7e75b79cbe Add a event provider which hold the repository events which are provided
by the ui.

fix the performance issue. Issue was the selection of targets. The table
needs very long to calculate the scroll position.

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-03-24 12:00:07 +01:00
Michael Hirsch
1cb7519ace add security and filters for anonymous download via http and amqp
requests

Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-03-23 16:17:53 +01:00
Kai Zimmermann
807aaf629c Merge remote-tracking branch 'eclipse/master' into feature_MECS-86_tenant_specific_polling_configuration
# Conflicts:
#
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/Tena
ntConfigurationDashboardView.java
2016-03-14 09:51:00 +01:00
Kai Zimmermann
3f763e7db4 Migrated hardcoded doc links to configurable setup. 2016-03-12 19:08:12 +01:00
SirWayne
ed97031faf Merge branch 'master' into
feature_MECS-86_tenant_specific_polling_configuration

Conflicts:
	hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/security/SecurityManagedConfiguration.java
	hawkbit-core/src/main/java/org/eclipse/hawkbit/tenancy/configuration/TenantConfigurationKey.java
	hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpControllerAuthentfication.java
	hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpControllerAuthentficationTest.java
	hawkbit-repository/src/test/resources/application-test.properties


Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-03-09 13:29:40 +01:00
SirWayne
52be35c7ff Rename deadletter queue and exchange
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-03-07 10:02:00 +01:00
Kai Zimmermann
a227ede0e0 Completed merge 2016-03-04 12:21:38 +01:00
Fabian Nonnenmacher
2be4922615 Added System Security Context as attribute to AbstractControllerAuthenticationFilter
This is necessary, because the tenant configuration methods are only accessable with specific permissions.
With the SystemSecurityContext methods can be executed as SystemRunner and therefor we can set permissions.

* updated the chaine of condtructors to set the context in the filter class
* added SystemRunner permission to TenantConfigurationManagement
* Autowired the system context to AMQP and HTTP controller

Signed-off-by: Nonnenmacher Fabian <fabian.nonnenmacher@bosch-si.com>
2016-02-29 13:18:58 +01:00
Fabian Nonnenmacher
6cef6aed1a Moved tenant configuration functions to new management class
- moved fucntions to TenantConfigurationManagement, for better function capseling
- updated references
- updated references in tests, tests were succesfully

Signed-off-by: Nonnenmacher Fabian <fabian.nonnenmacher@bosch-si.com>
2016-02-29 13:15:40 +01:00
Fabian Nonnenmacher
1eedd3a531 Implemented Buisnesslogic to read and save correct polling configuration
- added min and max values to config files
- updated ControllerPollProperties: added getter and setter of min and max values
- updated PollConfigurationHelper: added getter for different values

Signed-off-by: Nonnenmacher Fabian <fabian.nonnenmacher@bosch-si.com>
2016-02-29 13:13:12 +01:00
Kai Zimmermann
c221da7d64 Removed unnecessary property definitions 2016-02-25 21:26:04 +01:00
Kai Zimmermann
7692a29918 Fixed property bean setup 2016-02-25 20:36:17 +01:00
Kai Zimmermann
ab18e12b69 Completed migration to ConfigurationProperties annotation. Added boot metadata generation to build. 2016-02-25 17:59:46 +01:00
Kai Zimmermann
0b8e693cec Migrated environment aware to property annotation mechanism, documented properties. 2016-02-25 11:36:21 +01:00