Commit Graph

275 Commits

Author SHA1 Message Date
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
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
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
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
Kai Zimmermann
762183ae12 Merge pull request #58 from bsinno/Clean_Code
👍 merged
2016-03-02 13:05:12 +01:00
Kai Zimmermann
fbff46c7bd Removed component 2016-03-02 12:57:51 +01:00
Kai Zimmermann
f1cdd122e2 Merge pull request #59 from bsinno/event_push_strategy
👍 merged
2016-03-02 12:54:21 +01:00
Dennis Melzer
d014e81b73 Update AmqpMessageHandlerService.java 2016-03-02 12:50:00 +01:00
Michael Hirsch
d28ea67e89 remove author tag from javadoc
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-03-02 11:25:43 +01:00
Kai Zimmermann
22f94da9eb Commented new factorypath entry 2016-03-02 10:22:27 +01:00
Kai Zimmermann
6f39769692 Removed out commented code.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-03-02 10:20:47 +01:00
Michael Hirsch
5efcc295bc clean code do early return.
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-03-02 09:00:10 +01:00
Michael Hirsch
229e7c54af introduce a push strategy to the HawkbitUI and a delayed push
implementation to avoid UI freezes when too many events are dispatched
to the UI

Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-03-02 07:33:22 +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
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
7e2ad9fc4a Merge pull request #53 from bsinno/Artifiact_upload_directory_upload
👍 merged
2016-02-27 15:35:40 +01:00
asharani-murugesh
80366b03be Review comments addresses
Signed-off-by: asharani-murugesh <asharani.murugesh@in.bosch.com>
2016-02-27 09:24:18 +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
asharani-murugesh
92811f1a22 review comment addressed
Signed-off-by: asharani-murugesh <asharani.murugesh@in.bosch.com>
2016-02-26 08:47:21 +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
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
asharani-murugesh
b8ed510e8a reset the has directory flag
Signed-off-by: asharani-murugesh <asharani.murugesh@in.bosch.com>
2016-02-25 17:54:50 +01:00
asharani-murugesh
0b5c0673b1 fix
Signed-off-by: asharani-murugesh <asharani.murugesh@in.bosch.com>
2016-02-25 17:43:28 +01:00
asharani-murugesh
e3862cee74 Merge branch 'master' into Artifiact_upload_directory_upload 2016-02-25 17:07:20 +01:00
Michael Hirsch
07bf7e65bb Merge pull request #51 from bsinno/REFACTORING_CLEAN_CODE
ok this refactorings are aligned with the hawkbit sonar ruleset, merging.
2016-02-25 17:06:33 +01:00
Michael Hirsch
62d96a4ac6 remove static modifier from inner class
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-02-25 14:51:45 +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