You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2014/12/23 21:37:47 UTC
[14/14] incubator-nifi git commit: Merge branch 'NIFI-65' into develop
Merge branch 'NIFI-65' into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/b569a9d7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/b569a9d7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/b569a9d7
Branch: refs/heads/develop
Commit: b569a9d7847c90ce89468a21bdcd0e9ae080f433
Parents: 1374d1d 1a34e75
Author: Matt Gilman <ma...@gmail.com>
Authored: Tue Dec 23 15:36:37 2014 -0500
Committer: Matt Gilman <ma...@gmail.com>
Committed: Tue Dec 23 15:36:37 2014 -0500
----------------------------------------------------------------------
.../apache/nifi/admin/service/UserService.java | 13 +
.../service/action/AuthorizeDownloadAction.java | 54 ++++
.../admin/service/impl/StandardUserService.java | 36 ++-
.../AuthorityProviderFactoryBean.java | 13 +
.../java/org/apache/nifi/user/NiFiUser.java | 10 +
.../impl/NiFiAuthorizationServiceTest.java | 284 -------------------
.../NodeAuthorizationProvider.java | 8 +
.../file-authorization-provider/pom.xml | 2 +-
.../FileAuthorizationProvider.java | 16 ++
.../apache/nifi/web/api/ProvenanceResource.java | 10 +-
.../nifi/web/controller/ControllerFacade.java | 30 ++
.../src/main/resources/nifi-web-api-context.xml | 1 +
.../util/NiFiTestAuthorizationProvider.java | 7 +
.../js/nf/provenance/nf-provenance-table.js | 107 ++++---
.../js/nf/templates/nf-templates-table.js | 2 +-
.../authorization/NiFiAuthorizationService.java | 35 ++-
.../NiFiAuthorizationServiceTest.java | 250 ++++++++++++++++
.../nifi/authorization/AuthorityProvider.java | 19 ++
.../authorization/DownloadAuthorization.java | 86 ++++++
19 files changed, 630 insertions(+), 353 deletions(-)
----------------------------------------------------------------------