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

49 Commits

Author SHA1 Message Date
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
SirWayne
f4791743ce Add test case description 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-03-07 12:18:18 +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
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
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
dcea53f4c8 Merge remote-tracking branch 'eclipse/master' into harmonize-test-documentation 2016-03-04 18:14:26 +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
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
Dennis Melzer
d014e81b73 Update AmqpMessageHandlerService.java 2016-03-02 12:50:00 +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
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
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
SirWayne
dbf03dca12 Add the "@Override" annotation 
Add some description to JUnit Tests
Remove unused override comments
Remove unused javadoc on private methode

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-02-25 11:37:56 +01:00
Kai Zimmermann
0b8e693cec Migrated environment aware to property annotation mechanism, documented properties. 2016-02-25 11:36:21 +01:00
Kai Zimmermann
ecdf38b4f9 Fixed typo 2016-02-23 22:12:29 +01:00
Kai Zimmermann
7f2a9d1ed2 Features harmonised, more test descriptions 2016-02-23 09:57:18 +01:00
SirWayne
661d3e2d41 Add JavaDoc 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-02-18 10:27:58 +01:00
SirWayne
031be3e8cb Convert Json List 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-02-18 00:26:45 +01:00
SirWayne
cfaf02779f Convert Json List 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-02-17 23:43:52 +01:00
SirWayne
f42fbe32b3 Add null check in convert methode 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-02-17 15:16:24 +01:00
SirWayne
b4421e7e44 Add JavaDoc, refactor staff for clean code convention and modify unit 
tests

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-02-16 12:24:33 +01:00
SirWayne
be68ad32f5 Add JavaDoc and refactor staff for clean code convention 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-02-16 09:22:54 +01:00
SirWayne
91dfbbd3a6 Extract exchange from URI 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-02-15 16:48:02 +01:00
SirWayne
5d7ade1cf2 Add create tenant 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-02-15 16:20:45 +01:00
SirWayne
c737614e9b Add sender service to customize sending messages 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-02-15 08:55:44 +01:00
Jonathan Philip Knoblauch
88c854f2be Clean code for junit tests … 
- Added messages to JUnit assertions
- Added Description when missing
- Changed to assertThat when assertEquals

Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
 2016-02-12 13:47:53 +01:00
SirWayne
b21f8f5c71 Clean Code Refactoring 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-02-09 13:36:58 +01:00
Michael Hirsch
f18825ce34 Initial Contribution of the rollout-management feature 
- Repository functionality for rollout, rolloutgroup entities
- Rollout scheduler to watch and handle running rollouts and start next
group of rollout
- Vaadin view to administrate rollouts and reflect the current rollout
status
- REST resources to cover rollout creation, updating, starting, pausing
and resuming

Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-02-04 15:10:44 +01:00
Kai Zimmermann
2f0bf6629f Reapplied hawkBit code formatter. 
It seems that from Luna to Mars Eclipse changed how the code formatter
handles lines breaks in certain cases. This is now the “Mars” variant.
 2016-01-27 10:12:11 +01:00
Kai Zimmermann
b1f753b291 Upgrade to 0.2 release train 
0.2. development starts in parallel to the preparation for first
eclipse release 0.1
 2016-01-26 11:34:39 +01:00
SirWayne
77d94377a6 Disable missing queue fatal. 
The queue try to reconnect all time

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-01-22 15:16:33 +01:00
Kai Zimmermann
64deaeea3c Remove swagger and minor feature extensions and bug fixes 
- Various Bug fixes and improvements
- Management API extended
- Swagger removed
- Guava Upgraded to 19
 2016-01-21 13:42:38 +01:00
Kai Zimmermann
7497ab61ed Initial check in accordance with Parallel IP 2016-01-21 13:18:55 +01:00