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

94 Commits

Author SHA1 Message Date
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
SirWayne
b14d3bbd3c Small fixes 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-05-31 10:50:09 +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
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
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
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
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
16350c5e15 Made URL generator configurable. 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-05-03 18:34:16 +02:00
Kai Zimmermann
7c4351faa5 Fixed wrong handling of multi line message status. 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-05-03 15:44:46 +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
Michael Hirsch
9be6aa6e18 remove special coap-auth-token filter for coap-downloads 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-04-28 14:12:07 +02:00
SirWayne
9dd51e7105 Use java 8 duration to calculate ttl 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-04-27 15:37:54 +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
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
SirWayne
30ba98ff8e TTL 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-04-13 17:27:49 +02:00
SirWayne
ee0fc26678 TTL 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-04-13 14:10:28 +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
30e8230b8a correct usage of logging, missing parameters 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-04-12 15:48:19 +02:00
Michael Hirsch
cc8c674341 correct usage of logging, missing parameters 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-04-12 15:47:21 +02:00
Michael Hirsch
369d9da25a source code improvements 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-04-12 14:35:59 +02:00
Michael Hirsch
b11a0bac5d reduce method cyclomatic complexity by extracting security check into 
own method

Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-04-12 12:18:59 +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
Michael Hirsch
c4fd082098 fix the lookup of artifacts with the same lookup key, e.g. SHA1 hash if 
multiple artifacts with key exists for different software modules

Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-04-12 09:39:07 +02:00
Michael Hirsch
4884f18deb remove local variable which is never read only returned 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-04-05 19:06:14 +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
Kai Zimmermann
13c38c1134 Merge pull request #112 from bsinno/fix-log-severity 
Reduced log severity of invalid incoming messages to warning.
 2016-03-31 17:30:33 +02:00
Kai Zimmermann
d84a42e064 Merge pull request #115 from bsinno/BUG/Check_Message_Body 
Check if the message body is empty
 2016-03-31 17:30:20 +02:00
SirWayne
3bbbadd165 Check if the message body is empty 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-03-31 15:53:52 +02:00
Kai Zimmermann
b839fd4925 Log complete message in error case 2016-03-31 14:18:17 +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
Kai Zimmermann
413bb9d814 Reduced log severity of invalid incoming messages to warning. 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-03-30 17:10:47 +02:00
SirWayne
26466c7d6a Before sending a message check if the uri is a amqp uri. 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-03-30 13:05:11 +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
Kai Zimmermann
7473c1b226 Merge pull request #56 from bsinno/feature_MECS-86_tenant_specific_polling_configuration 
Feature: tenant specific polling configuration

Note: @fabnon is member of @michahirsch and my organisation
 2016-03-14 16:37:46 +01:00
SirWayne
0b813a0cc8 Create rabbitTemplate bean with jackson message converter 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-03-14 14:30:14 +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