You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ma...@apache.org on 2015/10/30 21:03:05 UTC
[3/3] nifi git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/nifi
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/nifi
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/ba72452f
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/ba72452f
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/ba72452f
Branch: refs/heads/master
Commit: ba72452f669b926c2af63ccd5684e0c2b793f405
Parents: a3d43d2 1d97876
Author: Mark Payne <ma...@hotmail.com>
Authored: Fri Oct 30 16:02:15 2015 -0400
Committer: Mark Payne <ma...@hotmail.com>
Committed: Fri Oct 30 16:02:15 2015 -0400
----------------------------------------------------------------------
.../java/org/apache/nifi/action/Action.java | 50 ++++
.../java/org/apache/nifi/action/Component.java | 34 +++
.../java/org/apache/nifi/action/Operation.java | 37 +++
.../component/details/ComponentDetails.java | 26 ++
.../component/details/ExtensionDetails.java | 26 ++
.../details/RemoteProcessGroupDetails.java | 26 ++
.../nifi/action/details/ActionDetails.java | 26 ++
.../nifi/action/details/ConfigureDetails.java | 30 ++
.../nifi/action/details/ConnectDetails.java | 40 +++
.../apache/nifi/action/details/MoveDetails.java | 30 ++
.../nifi/action/details/PurgeDetails.java | 28 ++
.../org/apache/nifi/reporting/EventAccess.java | 13 +
.../org/apache/nifi/util/MockEventAccess.java | 27 ++
.../org/apache/nifi/admin/dao/ActionDAO.java | 12 +-
.../java/org/apache/nifi/admin/dao/UserDAO.java | 3 +-
.../nifi/admin/dao/impl/StandardActionDAO.java | 93 +++---
.../nifi/admin/dao/impl/StandardUserDAO.java | 4 +-
.../apache/nifi/admin/service/AuditService.java | 18 +-
.../admin/service/action/AddActionsAction.java | 3 +-
.../service/action/PurgeActionsAction.java | 3 +-
.../service/impl/StandardAuditService.java | 24 +-
.../resources/nifi-administration-context.xml | 2 +-
.../manager/impl/ClusteredEventAccess.java | 21 +-
.../cluster/manager/impl/WebClusterManager.java | 2 +-
.../apache/nifi/controller/FlowController.java | 136 +++++----
.../nifi/spring/FlowControllerFactoryBean.java | 8 +
.../src/main/resources/nifi-context.xml | 1 +
.../controller/StandardFlowServiceTest.java | 5 +-
.../nifi-framework/nifi-user-actions/pom.xml | 7 +
.../java/org/apache/nifi/action/Action.java | 121 --------
.../java/org/apache/nifi/action/Component.java | 34 ---
.../apache/nifi/action/FlowChangeAction.java | 130 +++++++++
.../java/org/apache/nifi/action/Operation.java | 37 ---
.../component/details/ComponentDetails.java | 26 --
.../component/details/ExtensionDetails.java | 34 ---
.../details/FlowChangeExtensionDetails.java | 35 +++
.../FlowChangeRemoteProcessGroupDetails.java | 35 +++
.../details/RemoteProcessGroupDetails.java | 34 ---
.../nifi/action/details/ActionDetails.java | 26 --
.../nifi/action/details/ConfigureDetails.java | 52 ----
.../nifi/action/details/ConnectDetails.java | 90 ------
.../details/FlowChangeConfigureDetails.java | 55 ++++
.../details/FlowChangeConnectDetails.java | 97 +++++++
.../action/details/FlowChangeMoveDetails.java | 65 +++++
.../action/details/FlowChangePurgeDetails.java | 46 +++
.../apache/nifi/action/details/MoveDetails.java | 61 ----
.../nifi/action/details/PurgeDetails.java | 45 ---
.../apache/nifi/audit/ControllerAuditor.java | 27 +-
.../nifi/audit/ControllerServiceAuditor.java | 43 +--
.../org/apache/nifi/audit/FunnelAuditor.java | 7 +-
.../java/org/apache/nifi/audit/NiFiAuditor.java | 25 +-
.../java/org/apache/nifi/audit/PortAuditor.java | 27 +-
.../apache/nifi/audit/ProcessGroupAuditor.java | 25 +-
.../org/apache/nifi/audit/ProcessorAuditor.java | 25 +-
.../apache/nifi/audit/RelationshipAuditor.java | 18 +-
.../nifi/audit/RemoteProcessGroupAuditor.java | 35 +--
.../apache/nifi/audit/ReportingTaskAuditor.java | 25 +-
.../org/apache/nifi/audit/SnippetAuditor.java | 26 +-
.../nifi/web/StandardNiFiServiceFacade.java | 9 +-
.../StandardNiFiWebConfigurationContext.java | 13 +-
.../apache/nifi/web/StandardNiFiWebContext.java | 13 +-
.../nifi/web/api/ApplicationResource.java | 5 +-
.../org/apache/nifi/web/api/dto/DtoFactory.java | 20 +-
.../nifi-pcap-processors/.gitignore | 1 -
.../processors/standard/AttributesToJSON.java | 242 ++++++++++++++++
.../org.apache.nifi.processor.Processor | 1 +
.../standard/TestAttributesToJSON.java | 282 +++++++++++++++++++
67 files changed, 1781 insertions(+), 846 deletions(-)
----------------------------------------------------------------------