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

61 Commits

Author SHA1 Message Date
Kai Zimmermann
8d6526ae8f Fixed fail messages. 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-06-29 17:01:24 +02:00
Kai Zimmermann
0c4d88a8f4 Fixed test. 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-06-29 15:15:06 +02:00
kaizimmerm
06b6b254b5 Merge remote-tracking branch 'origin/fix_resend_dmf_with_null_target_sec_token' into fix_executor_and_exchange 2016-06-24 14:02:19 +02:00
kaizimmerm
23cb62b9d9 Fix scheduled executor, auth exchange and simulator poll. 
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2016-06-24 13:59:19 +02:00
Michael Hirsch
128585c95e fix test 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-06-24 12:38:46 +02:00
kaizimmerm
7cb3b2f2ff Added storage of clients correlation ID in action history. 
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2016-06-21 18:05:20 +02:00
kaizimmerm
cc1dc09516 Configurable prefetch and consumer pool. 
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2016-06-19 20:43:12 +02:00
Kai Zimmermann
f532a0907c Merge branch 'eclipsemaster' into feature_asynchronous_health 
Conflicts:
	pom.xml


Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-06-13 12:51:26 +02:00
Kai Zimmermann
00013a7f36 Added executor config to tests. 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-06-09 13:00:47 +02:00
Kai Zimmermann
def8eafd92 Changed package name of test utils to allow sonar exclusion. 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-06-05 16:17:58 +02:00
Kai Zimmermann
13f9791891 Removed JPA dependencies from runtime. Test only now. 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-05-31 20:50:22 +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
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
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
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
dc74ec8889 Some rework for the pull request 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-05-24 15:08:07 +02:00
Kai Zimmermann
9301de096c Worked on the interfaces and documentation. 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-05-22 08:48:47 +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
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
Kai Zimmermann
fd6de4496d Improved simulator download case a bit. Added missing test asserts for 
target token in DMF.

Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-05-18 09:05:01 +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
Kai Zimmermann
c2413ebd61 Added tests for md5 has gen in download messages. 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-05-09 11:23:42 +02:00
Kai Zimmermann
85263e475d use correct term for token. Similar to mgmt API. 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-05-03 09:48:55 +02:00
Kai Zimmermann
dbc70ae374 Added targetToken to DMF update message. 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-05-03 09:25:07 +02:00
SirWayne
e45306eafb Fix Default Port for PopertyHandler 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-04-21 16:43:38 +02:00
Michael Hirsch
d903be57b7 use correct mock parameters to ensure test 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-04-12 15:50:48 +02:00
Michael Hirsch
0b5286299c fix unit tests after changing the lookup way 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-04-12 10:03:19 +02:00
Jonathan Philip Knoblauch
b03fa5eec8 Verify all download URLs generated by SP-server (e.g. DDI and DMF API) 
- the get artifact request for the DDI API know contains https links
- additional there where http links added
- section for creating download urls based on patters was moved to hawkbit-core
- tests where adapted and extended

Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
 2016-03-31 13:17:08 +02: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
Michael Hirsch
cdac7185c4 fix typo of class TenantSecurityToken and handle authentication message 
based on FileResource not only on SHA1 hash

Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-03-23 10:23:35 +01:00
SirWayne
a4cc3df092 Fix test properties 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-03-09 15:36:59 +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
6c74c1186d Create unit test for the json amqp message conversion 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-03-08 12:23:31 +01:00
Kai Zimmermann
dcea53f4c8 Merge remote-tracking branch 'eclipse/master' into harmonize-test-documentation 2016-03-04 18:14:26 +01:00
Kai Zimmermann
25832e7e16 Merge remote-tracking branch 'eclipse/master' into cleanup-properties 
# Conflicts:
#
hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpProperties.j
ava
 2016-03-04 12:11:35 +01:00
Kai Zimmermann
71653470dc Merge remote-tracking branch 'eclipse/master' into harmonize-test-documentation 2016-03-03 20:59:15 +01:00
Michael Hirsch
74731d39ce fix retrieving the wrong message converter for converting messages over 
amqp

Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-03-03 10:57:57 +01:00
SirWayne
052d50e98d Merge branch 'Clean_Code' into Multiple_VHost_Connection 
Conflicts:
	hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpMessageHandlerServiceTest.java


Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-03-02 14:14:09 +01:00
SirWayne
5973413cbe Add Javadoc and remove message converter from base class 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-03-01 08:37:50 +01:00
SirWayne
c9c36ea435 Add description for asserts in test cases 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-02-29 15:34:07 +01:00
Michael Hirsch
4ca1bdf9ef fix tests by setting the SystemSecurityContext to prevent NPE in tests 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-02-29 13:19:08 +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
07fce42469 Changed return type of SystemManagement.getConfigurationValue() 
* changed Return type to wrapper object, adding additional meta data stored in the database
* updated all calls of this method
* updated function calls in tests
* verified correct execution of correspending tests

Signed-off-by: Nonnenmacher Fabian <fabian.nonnenmacher@bosch-si.com>
 2016-02-29 13:15:03 +01:00
SirWayne
895a78fee8 Merge branch 'master' into Multiple_VHost_Connection 
Conflicts:
	hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpMessageHandlerServiceTest.java
	hawkbit-security-core/src/test/java/org/eclipse/hawkbit/util/IpUtilTest.java


Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-02-29 12:41:52 +01:00
Kai Zimmermann
e95acec956 Merge pull request #52 from bsinno/REFACTORING_CLEAN_CODE_PART_2 
👍 merged
 2016-02-26 09:50:43 +01:00
Kai Zimmermann
7692a29918 Fixed property bean setup 2016-02-25 20:36:17 +01:00
Kai Zimmermann
3eaab83014 Merge remote-tracking branch 'eclipse/master' into cleanup-properties 2016-02-25 18:01:56 +01:00
Kai Zimmermann
ab18e12b69 Completed migration to ConfigurationProperties annotation. Added boot metadata generation to build. 2016-02-25 17:59:46 +01:00
Michael Hirsch
f969d6f4c2 clean code refactorings 
- add description to assertions in unit tests
- make inner classes static
- remove out-commented code

Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-02-25 14:38:25 +01:00