lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity
336 Commits 1 Branch 0 Tags
ed97031faf68e007dca7e234f2947cbb08a10a39
Commit Graph

336 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
0824499322 Merge branch 'feature_MECS-86_tenant_specific_polling_configuration' of https://github.com/bsinno/hawkbit.git into feature_MECS-86_tenant_specific_polling_configuration 2016-03-09 11:13:09 +01:00
Kai Zimmermann
bc7c7ec87d Merge pull request #77 from bsinno/fix_mgmt_client_startup 
fix mgmt client startup with xml problem and not unique bean exception
 2016-03-08 18:06:54 +01:00
Michael Hirsch
dd7f7d2a9d fix mgmt client startup with xml problem and not unique bean exception 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-03-08 17:39:24 +01:00
Kai Zimmermann
7260de9350 Merge pull request #75 from bsinno/BASEAMQP_SERVICE_TEST 
Looks good, more tests are always welcome 😄
 2016-03-08 13:30:07 +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
e8473928c9 Merge pull request #61 from bsinno/Sonar_issue_Fields_and_methods_have_conflicting_names 
👍 looks good, thx
 2016-03-08 08:42:43 +01:00
Kai Zimmermann
f730c9cee4 Merge pull request #73 from bsinno/Clean_Code 
👍 looks good, thx @SirWayne
 2016-03-07 13:56:57 +01:00
SirWayne
43d01da309 Fix typo after pull request review 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-03-07 13:35:26 +01:00
Jonathan Philip Knoblauch
cf48ef215a Changed names for editRollout boolean and discardRolllout Button 
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
 2016-03-07 13:14:40 +01:00
SirWayne
f4791743ce Add test case description 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-03-07 12:18:18 +01:00
Kai Zimmermann
670ba27ec2 Merge pull request #72 from bsinno/master 
👍 ok
 2016-03-07 10:51:09 +01:00
Jonathan Philip Knoblauch
7fec5c8407 Changed name saveDistributionButton to saveDistributionBtn and discardDistributionButton to discardDistributionBtn for consistency 
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
 2016-03-07 10:07:06 +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
f2fe6270f1 Merge pull request #70 from bsinno/amqp_sender_uses_wrong_method_to_send_to_exchange 
looks good
 2016-03-05 18:13:04 +01:00
Michael Hirsch
da9124cecd use correct method to send the message to rabbitMQ, exchange was not 
used from parameter

Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-03-05 17:43:39 +01:00
Kai Zimmermann
6cfde5f32c Merge pull request #69 from bsinno/remove_component_annotation_from_amqp_properties 
👍 merged
 2016-03-05 14:47:06 +01:00
Michael Hirsch
ff156234fa Annotation component must be removed because bean will otherwise 
registered twice because of EnableAutoConfiguration in the
AmqpConfiguration

Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-03-05 14:11:37 +01:00
Kai Zimmermann
867de9a1e2 Merge pull request #68 from bsinno/update_vaadin_bom_7.6.3 
Looks good
 2016-03-05 11:51:18 +01:00
Michael Hirsch
fb9454d840 update vaadin-bom to 7.6.3 version because 7.5 version is not working 
with updated vaadin 7.6 in hawkbit

Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-03-05 11:21:25 +01:00
Michael Hirsch
d8d8b9d54a Merge pull request #67 from bsinno/remove-broken-css-compress 
👍 ok merging...
 2016-03-04 22:05:42 +01:00
Kai Zimmermann
54b29ea446 Remove broken css compressor 2016-03-04 21:38:57 +01:00
Kai Zimmermann
11d36e4677 Merge pull request #65 from bsinno/upgrade_vaadin_version_to_7.6.3 
👍 merged
 2016-03-04 21:06:46 +01:00
Michael Hirsch
0202bbba50 Merge pull request #50 from bsinno/harmonize-test-documentation 
merging
 2016-03-04 18:35:40 +01:00
Kai Zimmermann
dcea53f4c8 Merge remote-tracking branch 'eclipse/master' into harmonize-test-documentation 2016-03-04 18:14:26 +01:00
Michael Hirsch
c02c630218 Merge pull request #54 from bsinno/cleanup-properties 
ok merging.. 👍
 2016-03-04 18:12:01 +01:00
Nonnenmacher Fabian (INST-ICM/BSV-AS)
9646e1eabc Fixed review findings 2016-03-04 12:34:39 +01:00
Kai Zimmermann
a227ede0e0 Completed merge 2016-03-04 12:21:38 +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
asharani-murugesh
7fe6804045 Upgrade vaadin to version 7.6.3 
Signed-off-by: asharani-murugesh <asharani.murugesh@in.bosch.com>
 2016-03-04 10:05:41 +01:00
Michael Hirsch
ba4e0fa79a Merge pull request #64 from bsinno/mgmtapi-shows-wrong-status-content 
👍 ok merging
 2016-03-04 09:23:46 +01:00
Kai Zimmermann
0fc63a452f Switched to REPORTEDAT to be more consitend with other fields. 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-03-04 08:59:17 +01:00
Kai Zimmermann
3b74db0cac Sleep raised to 10ms as stem.currentMillis is not updated every 
millisecond.

Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-03-04 08:40:47 +01:00
Kai Zimmermann
f17f58f78a Fixed typo. 2016-03-03 21:24:39 +01:00
Kai Zimmermann
71653470dc Merge remote-tracking branch 'eclipse/master' into harmonize-test-documentation 2016-03-03 20:59:15 +01:00
Kai Zimmermann
8c5945badd Fixed sort order in UI 2016-03-03 20:53:54 +01:00
Kai Zimmermann
794db18673 Added comments and changed default sorting for actions. 2016-03-03 20:46:50 +01:00
Kai Zimmermann
e7173aa846 Cleanup messed up actionstatus sorting. We used sort param but had 
hardcoded sorting in the reposirory. I added also reportAt based
sorting.

Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-03-03 18:54:50 +01:00
Kai Zimmermann
19fe7e5a46 Fixed ordering problem. 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-03-03 17:46:14 +01:00
Kai Zimmermann
3e158deb6b Fixed typo. 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-03-03 17:09:09 +01:00
Kai Zimmermann
8b1816f422 Fixed wrong status content generation in mgmt API. 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-03-03 17:06:58 +01:00
Michael Hirsch
f15ba53a28 Merge pull request #60 from bsinno/upgrade-eclipselink-weave 
ok merging.
 2016-03-03 12:04:13 +01:00
Kai Zimmermann
7b0bfe5a0d Merge pull request #62 from bsinno/fix_wrong_amqp_message_converter 
👍 merged
 2016-03-03 11:59:11 +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
Jonathan Philip Knoblauch
e731543313 Fix for sonar rule: Fields and methods should not have conflicting names 
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
 2016-03-03 10:52:55 +01:00
Kai Zimmermann
8c4b7e1750 Upgraded eclipse link weave to 2.6.2 2016-03-03 10:35:09 +01:00
Michael Hirsch
0633ba14bb Merge pull request #57 from bsinno/Multiple_VHost_Connection 
ok merging.
 2016-03-02 15:12:00 +01:00
SirWayne
2082507218 Merge branch 'master' into Multiple_VHost_Connection 2016-03-02 14:47:23 +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
5dc1032a8f Merge remote-tracking branch 'origin/master' into 
Multiple_VHost_Connection
 2016-03-02 13:32:11 +01:00