lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity
2,017 Commits 1 Branch 0 Tags
607cf92a9e80cb82f1db2656bb78e86c9f2896ae
Commit Graph

95 Commits

Author SHA1 Message Date
Kai Zimmermann
1a6ab123e3 Introduce new permission structure for rollout management. (#624) 
* Introduce new permission structure for rollout management.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* JavaDocs

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Add target read check for filters.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2018-02-07 12:39:20 +01:00
Kai Zimmermann
df41fc0e4e Fix on some minor UI glitches and improvements (#619) 
* Fix small UI glitches.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Improved look and feel logout menue.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Gravatar icon disabled by default.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Non text.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Remove duplicate code.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Provide collections with more useful interface.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* i18n for menu items.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Code readibility.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Fix code glitches.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Fix logout query param.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Remove unused field.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Fix after change to optional.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Remove dead code.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2018-01-12 09:58:25 +01:00
Kai Zimmermann
5d774dc70a Anonymous download activated does not result in general DDI anonymous (#616) 
* Fix unintended anonymous access in DDI API.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Fix test.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Fix ant matcher.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2017-12-19 17:53:17 +01:00
Kai Zimmermann
66feae2756 DosFilter can be disabled. (#561) 
* DosFilter can be disabled.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Moved filters our of security core.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Move caffeine dependency.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2017-07-13 12:52:00 +02:00
Kai Zimmermann
8d17d21259 ArtifactRepository tenant aware. (#539) 
* ArtifactRepository tenant aware.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* No need to have this protected. Updated event to boot > 1.3

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Remove conditional.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Remove Debug log.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Cleanup

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Missing validation and readability.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Fix test after change.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Fix computation is DosFilter

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Fix session state on RESTful APIs.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Performance improvement controllermanagement

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Added cross tenant test.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Typos.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2017-06-14 19:07:52 +02:00
Kai Zimmermann
352bfcff24 New repository quota on messages per ActionStatus (#531) 
* New quotaexception for repository quota hit on DDI. Added actionstatus
messages quota.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Remove special log handling on the quota exception.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Raise time for slow machines.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Update allure to get rid of log spam in unit tests.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Typos fixed.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2017-06-08 06:34:47 +02:00
Kai Zimmermann
4709f4374c Fix to many request filter usage in DDI (#526) 
* Fix DOS filter usage in DDI

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Add optional CSP definition.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Fix for empty case.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* readability and ensure that manual enforcement is also possible in
timeforced active but no hit yet.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Class order to bean order.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Fix exception propagation.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2017-06-07 16:32:52 +02:00
Kai Zimmermann
67a4677ef6 Split repository API for module and DS management. Refactor utility usage (#524) 
* Split DS management and reduce util usage.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Split sw module and type management.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Sonar issues.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Make sonar listen to the exception!

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Register both beans.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Split JPA implementations.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Revert user details change.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Fix compilation errors.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Fix bean queries. Fix image path.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Document preferred utility usage.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Fix exmaples and revert unintended checkin.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Code cleanup.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Typos, readibility.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Remove unused reference.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Rollouts cache delete aware.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Fix rolloutgroup delete event.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Add new RolloutGroupDeletedEvent event

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2017-06-01 06:28:59 +02:00
kaizimmerm
28765b168c Fix to many request filter URL configuration, order and added a config 
for the UI.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2017-05-17 17:46:07 +02:00
Kai Zimmermann
c18e9f515e Remove unlimited collections from the repository API (#496) 
* Started to get rid of unlimited collections

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Align API usage.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* fix compile issues.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Fix tests.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Remove comments

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Performance optimizations.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Remove dead code.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Allign method names

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Wait until the action update event is processed

Conflicts:
	hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/integration/AmqpMessageHandlerServiceIntegrationTest.java

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>

* Started new tag APIs

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Quotas into central interface. Tag tests added. Event names fixed.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Simplified consumer run for every tenant.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* remove unused fields.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Alligned beans.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Deprecated client methods for old resources.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Fix new foreach method.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Fix transaction for foreach.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Extended DS creating to handle larger volumes. Fix on Readme.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Fixed simulator bug and cleaned up tests.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Fix in sorting.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Remove configuration processor.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Fix wrong usage of sanitize.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Missing brackets.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Fix README API compatability.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Fix misinterpretation of pessimistic locking exceptions.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Fix stability sentence.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Code cleanup.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Fixed page calculation

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2017-05-09 16:40:49 +02:00
Dennis Melzer
f608f49db0 Create dmf test module (#493) 
* Add DMF parent module + submodules

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>

* Fix sonar issue

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>

* Refactor Test Module 

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>

* - Fix tenant is empty
- Small refactoring

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>

* Remove org.springframework.context.annotation.Description

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>

* Configure rabbit test template

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>

* Fix header

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>

* tenant should not be empty

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>

* Increase time out

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>

* Increase 3 to sec.

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>

* Fix comments

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>

* Add port 

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>

* Fix test config

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2017-04-26 10:36:21 +02:00
Kai Zimmermann
6d2a108549 Preparations for release 0.2.0 (#461) 
* Promote update server to runtime

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Current status

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* More CQs

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Complete CQs

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Updatesd documentation

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Enable test modules

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Re add examples and extensions

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Fixes and roadmap extended

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Add release issue link

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Add works with CQ.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Documented CQs for #459

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Fix shell script

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Fix CQ table and runtime parent.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Fix repo entries.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Cleaned up docs.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2017-03-30 08:46:31 +02:00
Kai Zimmermann
602fb78168 Remove TargetInfo entity (#453) 
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2017-03-17 12:18:43 +01:00
Kai Zimmermann
67d17fe661 Upgrade sonar to new 6.2 installation (#456) 
* Upgrade to new sonar instance. Fix new identified issues.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2017-03-14 10:06:56 +01:00
Kai Zimmermann
804522f966 hawkBit repository uses Optional on single entity find/get requests (#435) 
* Repo returns optionals.
* Improved exception handling for collection usage in repo queries.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2017-02-16 10:09:14 +01:00
Kai Zimmermann
feb3369858 Custom Tenant configuration. (#395) 
* Tenant configuration configurable.
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2016-12-23 07:19:46 +01:00
Kai Zimmermann
92dd6a1a0e Modular hawkBit (#378) 
* Cleaned up component scan
* More flexibility for hawkBit micro services
* Introduce spring boot starters
* Eclipse Jetty as hawkBit default
* Fixed links as prep for wiki removal

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2016-12-13 12:29:21 +01:00
Marcel Mager
23eb0c3c73 Upgrade vaadin from 7.6.8 -> 7.7.3: (#339) 
* Upgrade vaadin from 7.6.8 -> 7.7.3:

upgrade vaadin.spring       from 1.0.0 -> 1.0.2
upgrade flexibleoptiongroup from 2.2.0 -> 2.3.0
upgrade dbar-addon          from 1.2.0 -> 2.0.0
exclude gwt-elemental for example app

Signed-off-by: Marcel Mager (INST-IOT/ESB) <Marcel.Mager@bosch-si.com>

* Change Maven scope for javax.servlet-api to provided

Signed-off-by: Marcel Mager (INST-IOT/ESB) <Marcel.Mager@bosch-si.com>

* Fix problem with locale for formatting distribution-bar width value

- Set fix locale to Locale.ENGLISH

Signed-off-by: Marcel Mager (INST-IOT/ESB) <Marcel.Mager@bosch-si.com>
 2016-11-10 14:10:33 +01:00
Dennis Melzer
866bc72114 Feature horizontal scalability (#305) 
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2016-11-03 15:53:53 +01:00
Michael Hirsch
a0f98529e6 fix determination of current tenant security context (#333) 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-10-31 23:43:00 +01:00
Michael Hirsch
3b869e215e fix current tenant when not an UserPrincipal 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-10-31 15:46:52 +01:00
Michael Hirsch
22272ba3c1 Feature hawkbit uaa extension (#317) 
* use UserPrincipal to determine tenant at runtime

Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>

* add hawkbit-uaa extension

Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>

* adapt WithSpringAuthorityRule with UserPrincipal for determine tenant

Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>

* fix String principal in DDI download resource

Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>

* merge the email to the UserPrincipal from the master manually

Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>

* Fixed some grammar issues and typos

Signed-off-by: Dominic Schabel <dominic.schabel@bosch-si.com>
 2016-10-31 13:16:03 +01:00
Kai Zimmermann
84ddb340d7 Download gravatar if email is known. (#320) 
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2016-10-20 12:49:08 +02:00
Kai Zimmermann
5c53bef164 Configurable download URL generation (#296) 
Configurable download URL generation.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2016-09-28 09:18:03 +02:00
kaizimmerm
00539ea49c Merges with master 
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2016-08-24 10:58:03 +02:00
kaizimmerm
ff500d3bd7 Started migration for Boot 1.3 and Security 4.1 
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2016-08-24 09:38:53 +02:00
Dominic Schabel
3accac9ade Minor code improvements 
Signed-off-by: Dominic Schabel dominic.schabel@bosch-si.com
 2016-08-15 13:17:37 +02:00
Dominic Schabel
9c7db25197 Merge branch 'master' into Feature_Improve_Code_Quality 
Signed-off-by: Dominic Schabel <dominic.schabel@bosch-si.com>

# Conflicts:
#	hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/WithSpringAuthorityRule.java
 2016-08-08 16:40:00 +02:00
SirWayne
5f20066cff Fix sonar issue 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-08-05 15:55:49 +02:00
Michael Hirsch
2ba9fd135d Add missing PreAuthorize annotation to secure methods and write unit 
test

Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-08-03 09:08:03 +02:00
Michael Hirsch
2f263faca0 suppress warning for multiple checked exception declaration 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-07-25 12:01:28 +02:00
Michael Hirsch
227267af88 avoid more than 3 nested if/switch/try blocks 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-07-25 11:18:05 +02:00
Michael Hirsch
40a12c0321 remove unnecessary IOException from method signature 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-07-25 11:16:37 +02:00
Michael Hirsch
82fa485ddc suppress warning squid:S2221 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-07-25 10:13:07 +02:00
Michael Hirsch
f3b472bcd2 Merge branch 'master' into Feature_Improve_Code_Quality 
Conflicts:
	hawkbit-core/src/main/java/org/eclipse/hawkbit/api/ArtifactUrlHandlerProperties.java
	hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpMessageHandlerService.java
	hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpMessageHandlerServiceTest.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/eventbus/CacheFieldEntityListener.java
	hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/SystemSecurityContext.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/details/ArtifactBeanQuery.java


Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-07-25 10:08:24 +02:00
Michael Hirsch
d1c889bf16 don't return null on isAuthenticated method is boolean 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-07-19 15:51:22 +02:00
Michael Hirsch
3b5bcd46d8 add javadoc 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-07-18 12:57:54 +02:00
Michael Hirsch
d2cd13996a fix initial creation of tenant when no current tenant and caching fix 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-07-18 12:48:50 +02:00
Michael Hirsch
d0cf8a40bd fix javadoc link 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-07-08 13:32:02 +02:00
Michael Hirsch
c3586b0230 remove double ended semicolon 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-07-08 10:20:37 +02:00
Michael Hirsch
21bd2c33ac Add IS_SYSTEM_CODE to all springEvalExpr and remove explicit usage 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-07-07 16:45:07 +02:00
Michael Hirsch
a5d84a47e0 code beautify 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-06-24 14:58:26 +02:00
Michael Hirsch
2150f45bde use SecurityContext as thread local because it's delegated throug 
threads

Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-06-24 14:51:18 +02:00
Kai Zimmermann
7857107b46 Merge pull request #217 from bsinno/feature_configurable_mgmt_sim_scenario 
Feature configurable mgmt sim scenario
 2016-06-23 10:08:21 +02:00
Michael Hirsch
27005b1ae7 fix test 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-06-22 17:33:09 +02:00
Michael Hirsch
a11d2bc7f5 Merge branch 'master' into feature_security_adaptions 2016-06-22 15:49:14 +02:00
Michael Hirsch
11f2232247 add prefixed ROLE_ to granted authorities to work with out-of-the-box 
spring security

Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-06-22 15:47:38 +02:00
Michael Hirsch
9226f514d2 add spring security eval expression for system_monitor permission 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-06-22 13:36:22 +02:00
kaizimmerm
aee106b9a9 Merge branch 'master' into feature_configurable_mgmt_sim_scenario 
Conflicts:
	hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/RepositoryApplicationConfiguration.java


Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2016-06-21 12:18:32 +02:00
SirWayne
c76bca3c41 Add Javadoc and fix typo 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-06-15 13:12:59 +02:00