Commit Graph

552 Commits

Author SHA1 Message Date
Kai Zimmermann
6e85c724bf Removed the method exception from transaction manager as they where not
needed anymore. The bean in systemmanagement should also not open a
transaction.

Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-04-25 14:09:38 +02:00
Kai Zimmermann
cf8e4fd2fd Revert "Fixed condition"
This reverts commit e3de03206d.
2016-04-08 06:50:27 +02:00
Kai Zimmermann
0c800d3149 Fixed condition 2016-04-08 06:13:16 +02:00
Kai Zimmermann
e3de03206d Fixed condition 2016-04-08 05:59:34 +02:00
Kai Zimmermann
a7d0306e75 Removed unnecessary transaction exceptions.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-04-08 05:37:21 +02:00
Michael Hirsch
cadf67ad6c Merge pull request #122 from bsinno/reduce-duplicate-metadata
Reduce duplicate metadata code
2016-04-07 08:34:49 +02:00
Michael Hirsch
747df51f1a Merge pull request #118 from bsinno/Methods_only_called_by_inner_classes_should_move_to_those_classes
Methods only called by inner classes should move to those classes
2016-04-06 13:59:38 +02:00
Kai Zimmermann
f4f9c10186 Optimized equals.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-04-06 10:57:23 +02:00
Michael Hirsch
a2a97a8a30 Merge pull request #120 from bsinno/Download_server_supports_download_through_HTTP_and_HTTPs
DDI supports actifact download through http and anonyomous
2016-04-06 08:12:53 +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
Jonathan Philip Knoblauch
955a40dbaa Merge branch 'master' into Methods_only_called_by_inner_classes_should_move_to_those_classes
Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutListGrid.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupListGrid.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetsListGrid.java


Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-04-05 17:44:36 +02:00
Michael Hirsch
8bb3469b52 Merge branch 'master' into Download_server_supports_download_through_HTTP_and_HTTPs 2016-04-05 15:45:47 +02:00
Kai Zimmermann
dd7006b64a Merge pull request #123 from bsinno/fix_jsoncreator_pagedlist
fix paged list json.
2016-04-05 15:25:47 +02:00
Michael Hirsch
39fc74469f fix paged list json.
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-04-05 15:02:55 +02:00
Michael Hirsch
b568c84838 Merge branch 'Download_server_supports_download_through_HTTP_and_HTTPs' of https://github.com/bsinno/hawkbit.git into Download_server_supports_download_through_HTTP_and_HTTPs 2016-04-05 14:56:42 +02:00
Michael Hirsch
db37bd42df fix license header in pom.xml
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-04-05 14:42:00 +02:00
Kai Zimmermann
f39bfb5666 Merge pull request #119 from bsinno/Reduce_Duplicate_Code
Reduce some duplicate code
2016-04-05 14:10:57 +02:00
Kai Zimmermann
d8268e8b6b Used proper exception 2016-04-05 14:01:09 +02:00
Kai Zimmermann
bf168ffb70 reduced duplicate code. 2016-04-05 14:00:57 +02:00
Kai Zimmermann
7df33be512 Merge pull request #121 from bsinno/fix_jsoncreator_pagedlist
fix json creator for PagedList for creating clients
2016-04-05 13:17:31 +02:00
SirWayne
5c0257adb9 Reduce more code
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-04-05 12:35:01 +02:00
SirWayne
c47c29519d Add missing @PostConstruct
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-04-05 12:23:26 +02:00
Michael Hirsch
9c9bdf6406 fix json creator for PagedList for creating clients
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-04-05 12:20:49 +02:00
Michael Hirsch
421bd9154c fix license header of UrlProtocol enum 2016-04-05 12:13:36 +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
Jonathan Philip Knoblauch
16fff8db97 Refactoring after review
- removed else when not needed
- return the if statement directly in the isDirectory method

Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-04-05 10:50:31 +02:00
Jonathan Philip Knoblauch
87661624ba Refactoring after review
- added new method to HawkbitCommenUtil to reduce duplicated code
- added early return 

Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-04-04 18:02:43 +02:00
Kai Zimmermann
50c9141f77 Merge pull request #117 from bsinno/hawkbit-sandbox
Hawkbit sandbox
2016-04-04 13:48:38 +02:00
SirWayne
044f0bef03 Reduce some duplicate code
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-04-04 12:59:45 +02:00
Kai Zimmermann
a98f91f05e Fixed typos 2016-04-04 12:54:30 +02:00
Jonathan Philip Knoblauch
ef38712729 Merge branch 'Download_server_supports_download_through_HTTP_and_HTTPs' of https://github.com/bsinno/hawkbit.git into Download_server_supports_download_through_HTTP_and_HTTPs 2016-04-04 10:48:33 +02:00
Jonathan Philip Knoblauch
84f543382c Updated javadoc for the getURl method
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-04-04 10:48:14 +02:00
Jonathan Philip Knoblauch
fd3d854bf8 Reseted changes because a bigger refactoring is necessary
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-04-04 10:31:05 +02:00
Kai Zimmermann
5c661cd6a4 Added license header 2016-04-04 08:58:58 +02:00
Michael Hirsch
f4bd947cbd remove unused parameter
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-04-04 08:03:42 +02:00
Kai Zimmermann
19e628aac9 Added sandbox chapter 2016-04-02 22:18:04 +02:00
Kai Zimmermann
36e8949feb Fixed final bugs. Sandbox works now. 2016-04-02 22:13:21 +02:00
Kai Zimmermann
4b95ebc75d Skript for sandbox setup 2016-04-02 21:36:06 +02:00
Kai Zimmermann
171dc46107 Fixed problem that client works only with localhost. 2016-04-02 21:14:41 +02:00
Kai Zimmermann
6d143273f7 Added simulator autostart and cf deployment. 2016-04-02 21:00:34 +02:00
Kai Zimmermann
16e737a716 Merge remote-tracking branch 'eclipse/master' into hawkbit-sandbox 2016-04-02 13:29:45 +02:00
Kai Zimmermann
bd974ef6ab Prepared cloud deployment of hawkbit sandbox 2016-04-02 13:29:40 +02:00
Michael Hirsch
861c92cb9d Merge pull request #116 from bsinno/fix-wrong-ui-call
Fixed wrong call of sw module type. UI uses name and not key.
2016-04-01 16:40:35 +02:00
Kai Zimmermann
0a0c08b700 Fixed wrong call of sw module type. UI uses name and not key.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-04-01 15:55:00 +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
802288c5a1 Merge pull request #113 from bsinno/consolidate-equals-hashcode
Consolidate equals hashcode
2016-03-31 17:30:28 +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
Michael Hirsch
515edbd417 Merge pull request #114 from bsinno/fix-mixed-pollingtime
ok, merging and deleting branch.
2016-03-31 16:56:14 +02:00
Kai Zimmermann
9b11d92b7f Added javadoc.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-03-31 15:56:51 +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