You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by wi...@apache.org on 2017/06/09 09:18:31 UTC
[11/11] marmotta git commit: MARMOTTA-534: merged pr on github,
closes #28
MARMOTTA-534: merged pr on github, closes #28
Signed-off-by: Sergio Fernández <wi...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/bca3ec30
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/bca3ec30
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/bca3ec30
Branch: refs/heads/develop
Commit: bca3ec30ab95cf9fea12865cfbf50ac09cc5fb21
Parents: 56981f5 6272b26
Author: Sergio Fernández <wi...@apache.org>
Authored: Fri Jun 9 11:17:56 2017 +0200
Committer: Sergio Fernández <wi...@apache.org>
Committed: Fri Jun 9 11:17:56 2017 +0200
----------------------------------------------------------------------
platform/marmotta-user/pom.xml | 57 ++++++++++++++++
.../filters/MarmottaAuthenticationFilter.java | 6 +-
.../platform/user/model/UserAccount.java | 5 ++
.../user/services/AccountServiceImpl.java | 20 +++---
.../services/AuthenticationServiceImpl.java | 4 +-
.../user/services/auth/LMFAuthProviderImpl.java | 49 --------------
.../services/auth/MarmottaAuthProviderImpl.java | 49 ++++++++++++++
.../user/webservices/UserWebService.java | 49 +++++++++++---
.../main/resources/config-defaults.properties | 2 +-
.../main/resources/web/admin/widgets/user.js | 33 ++++------
.../user/services/AccountServiceTest.java | 69 ++++++++++++++++++++
.../user/webservices/UserWebServiceTest.java | 55 ++++++++++++++++
12 files changed, 305 insertions(+), 93 deletions(-)
----------------------------------------------------------------------