Commit Graph

1071 Commits

Author SHA1 Message Date
SirWayne
51a00c4165 Merge branch 'Bug/Show_User_Information' of https://github.com/bsinno/hawkbit into Bug/Show_User_Information 2016-04-21 17:58:32 +02:00
SirWayne
9e6a26d482 Merge branch 'master' into Bug/Show_User_Information
Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutBeanQuery.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupBeanQuery.java


Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-04-21 17:55:07 +02:00
SirWayne
ef46062df3 Merge branch 'eclipse/master' of local repository 2016-04-21 17:46:37 +02:00
SirWayne
f7b30a59ba Signed-off-by: SirWayne <dennis.melzer@bosch-si.com> 2016-04-21 16:58:08 +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
e8c8b4d1a6 remove springfox and add spring-plugin-core
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-04-21 16:00:08 +02:00
SirWayne
0c85f2bf82 remove springfox and add spring-plugin-core
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-04-21 15:59:39 +02:00
SirWayne
8995195e44 Add springfox
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-04-21 15:53:02 +02:00
SirWayne
5d30ea3d09 Rename Mgmt MetaData
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-04-21 14:36:00 +02:00
SirWayne
b7b0d9635e Merge branch 'origin/Extend_end-2-end_tests_for_full_DDI_roundtrip_with_Java_client' of local repository into Extend_end-2-end_tests_for_full_DDI_roundtrip_with_Java_client 2016-04-21 14:12:21 +02:00
SirWayne
2b6f7665e0 Add signature from interface to the concret class, because of Spring MVC
and parameter inheritance.
"also actually doesn’t work with Spring MVC in its current form (method
parameter mapping is not inherited"

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-04-21 14:11:11 +02:00
Jonathan Philip Knoblauch
4f336e05c1 Added slash to test
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-04-21 13:35:17 +02:00
Jonathan Philip Knoblauch
f33cb18a11 Added method signature form interface to implementation
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-04-21 13:22:55 +02:00
SirWayne
2b3d978978 Add signature from interface to the concret class, because of Spring MVC
and parameter inheritance.
"also actually doesn’t work with Spring MVC in its current form (method
parameter mapping is not inherited"

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-04-21 13:00:54 +02:00
SirWayne
ffd3373b34 Signed-off-by: SirWayne <dennis.melzer@bosch-si.com> 2016-04-21 11:53:54 +02:00
SirWayne
bb0fb5da8d Add name of @PathVariable
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-04-21 11:29:56 +02:00
SirWayne
3fa9105428 Add test dependencies
Add name of @PathVariable

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-04-21 10:02:03 +02:00
Michael Hirsch
d120d7b7f0 Merge pull request #149 from bsinno/fix_rollout_renderer
fix rollout renderer, using wrong itemd ID property naming
2016-04-21 08:47:19 +02:00
Michael Hirsch
d561ad99de fix rollout renderer, using wrong itemd ID property naming
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-04-21 08:06:10 +02:00
SirWayne
2538d12785 Remove duplicate test util classes
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-04-20 17:55:54 +02:00
SirWayne
e4aa7fddfd Merge branch 'origin/Extend_end-2-end_tests_for_full_DDI_roundtrip_with_Java_client' of local repository into Extend_end-2-end_tests_for_full_DDI_roundtrip_with_Java_client 2016-04-20 17:42:27 +02:00
SirWayne
c3c405c986 Rename and split rest resources ddi, mgmt and system
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-04-20 17:33:03 +02:00
Jonathan Philip Knoblauch
1220b490f8 Small fix since checkbox was using wrong item for enabling
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-04-20 16:15:03 +02:00
Jonathan Philip Knoblauch
a5fcd1eeb6 Merge branch 'Extend_end-2-end_tests_for_full_DDI_roundtrip_with_Java_client' of https://github.com/bsinno/hawkbit.git into Extend_end-2-end_tests_for_full_DDI_roundtrip_with_Java_client
Conflicts:
	hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/api/RootControllerDdiApi.java


Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-04-20 15:29:03 +02:00
Jonathan Philip Knoblauch
8d34170515 DDI client implementation validation
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-04-20 15:02:44 +02:00
Michael Hirsch
b1291679b2 Merge pull request #142 from bsinno/Rollout_Management_issues_refactor
Rollout management issues refactor
2016-04-20 14:13:51 +02:00
SirWayne
8a22ea3df3 Rename Ddi classes
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-04-20 13:47:09 +02:00
SirWayne
3c0e34ee41 Rename Ddi classes
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-04-20 13:42:43 +02:00
Dennis Melzer
5027b36c59 Update SPDateTimeUtil.java 2016-04-20 12:49:50 +02:00
Dennis Melzer
681a23e51d Update UserDetailsFormatter.java 2016-04-20 12:31:32 +02:00
SirWayne
3c454bfb9b Modfiy username formatting
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-04-19 11:27:33 +02:00
venu1278
86e313fc29 Rollout management issues
Signed-off-by: venu1278 <venugopal.boodidadinne@in.bosch.com>
2016-04-19 14:47:31 +05:30
SirWayne
5437f36c75 Rename deadletter queue and add ttl
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-04-19 10:42:56 +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
Jonathan Philip Knoblauch
12cca669fe Added missing javadoc to DDI resources
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-04-19 09:29:55 +02:00
Jonathan Philip Knoblauch
97f099d194 Move DDI resources and annotation to module hawkbit-ddi-resource
- added missing pathVaraible
- added port to download urls and adjusted tests
- extended feign management API client
- fixed pom test artifacts dependencies


Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-04-19 09:10:27 +02:00
venu1278
5b0da33c2c Merge branch 'master' into Rollout_Management_issues_refactor 2016-04-18 20:13:28 +05:30
venu1278
f290eb78e5 Rollout management issues
Signed-off-by: venu1278 <venugopal.boodidadinne@in.bosch.com>
2016-04-18 20:12:30 +05:30
SirWayne
d49546e71f Add tooltip for username
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-04-18 16:17:28 +02:00
Jonathan Philip Knoblauch
cd2db4e36e Updated pom to receive correct dependencies
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-04-18 14:01:59 +02:00
Jonathan Philip Knoblauch
abe6dc223f Created hawkbit-example-ddi-client example maven module
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-04-18 12:51:57 +02:00
Jonathan Philip Knoblauch
3145709824 Move DDI resources and annotation to module hawkbit-ddi-resource
- created module and moved resources

Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-04-18 12:39:28 +02:00
Michael Hirsch
c76ab23dc5 Merge pull request #133 from bsinno/Client_side_debug_added_documentation
Added documentation for client side debugging
2016-04-18 08:37:15 +02:00
Michael Hirsch
c7c641ddf6 Merge pull request #136 from bsinno/ddi-sim-only
Send DMF message only in case of DMF sim.
2016-04-18 08:02:42 +02:00
Michael Hirsch
878c5c869c adapt hawkBit user interface sentence
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-04-18 07:54:38 +02:00
Michael Hirsch
8eac737219 update javadoc and remove author from it
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-04-18 07:47:23 +02:00
Michael Hirsch
fd7fb7bd01 make use of the existencechecking annotation for targetrolloutgroup
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-04-18 07:41:33 +02:00
Michael Hirsch
5fd220a5e3 change transaction handling of creating groups and check running
Rollouts

Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-04-16 10:42:26 +02:00
SirWayne
2462c7b6bf Add javadoc
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-04-15 17:47:02 +02:00
SirWayne
536098c4c7 Load and format the user details by a user detail formatter
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-04-15 17:40:03 +02:00