Merge branch 'NIFI-250' of http://git-wip-us.apache.org/repos/asf/incubator-nifi into NIFI-250
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/81d84546 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/81d84546 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/81d84546 Branch: refs/heads/NIFI-250 Commit: 81d84546e7b456ae55cefe8892ddfb71a729bac9 Parents: 2ac6432 fac6cd7 Author: Mark Payne <[email protected]> Authored: Thu Feb 19 10:38:22 2015 -0500 Committer: Mark Payne <[email protected]> Committed: Thu Feb 19 10:38:22 2015 -0500 ---------------------------------------------------------------------- .../web/api/entity/ReportingTaskEntity.java | 45 ++ .../web/api/entity/ReportingTasksEntity.java | 46 ++ .../nifi/audit/ControllerServiceAuditor.java | 2 + .../org/apache/nifi/web/NiFiServiceFacade.java | 68 ++- .../nifi/web/StandardNiFiServiceFacade.java | 111 +++- .../nifi/web/api/ControllerServiceResource.java | 21 +- .../nifi/web/api/ReportingTaskResource.java | 578 +++++++++++++++++++ .../org/apache/nifi/web/api/dto/DtoFactory.java | 5 + .../nifi/web/dao/ControllerServiceDAO.java | 7 +- .../apache/nifi/web/dao/ReportingTaskDAO.java | 88 +++ .../dao/impl/StandardControllerServiceDAO.java | 32 +- .../web/dao/impl/StandardReportingTaskDAO.java | 230 ++++++++ .../WEB-INF/partials/canvas/canvas-header.jsp | 2 +- .../disable-controller-service-dialog.jsp | 7 + .../src/main/webapp/js/nf/canvas/nf-actions.js | 26 +- .../main/webapp/js/nf/canvas/nf-canvas-utils.js | 4 + .../js/nf/canvas/nf-controller-service.js | 62 +- 17 files changed, 1291 insertions(+), 43 deletions(-) ----------------------------------------------------------------------
