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/03/04 21:51:02 UTC

[2/2] incubator-nifi git commit: Merge branch 'NIFI-250' of http://git-wip-us.apache.org/repos/asf/incubator-nifi into NIFI-250

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/883c4ac9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/883c4ac9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/883c4ac9

Branch: refs/heads/NIFI-250
Commit: 883c4ac9d7a1cdbd6989fb1312624a752c490461
Parents: 83eff8d 2d4aebf
Author: Mark Payne <ma...@hotmail.com>
Authored: Wed Mar 4 15:50:58 2015 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Wed Mar 4 15:50:58 2015 -0500

----------------------------------------------------------------------
 .../nifi/admin/dao/impl/StandardActionDAO.java  |   4 +-
 ...ontrollerServiceReferencingComponentDTO.java |  26 +-
 .../nifi/web/api/dto/ReportingTaskDTO.java      |  27 +-
 .../nifi/controller/FlowFromDOMFactory.java     |   2 +-
 .../controller/StandardFlowSynchronizer.java    |  14 +-
 .../java/org/apache/nifi/action/Component.java  |   3 +-
 .../nifi/audit/ControllerServiceAuditor.java    |  27 +-
 .../apache/nifi/audit/ReportingTaskAuditor.java | 353 +++++++++++
 .../org/apache/nifi/web/NiFiServiceFacade.java  |  21 +-
 .../nifi/web/StandardNiFiServiceFacade.java     |  11 +-
 .../apache/nifi/web/api/ControllerResource.java |  12 +-
 .../nifi/web/api/ControllerServiceResource.java |  52 +-
 .../apache/nifi/web/api/HistoryResource.java    |  31 +
 .../org/apache/nifi/web/api/dto/DtoFactory.java |  77 ++-
 .../nifi/web/dao/ControllerServiceDAO.java      |  17 +-
 .../dao/impl/StandardControllerServiceDAO.java  |  91 +--
 .../web/dao/impl/StandardReportingTaskDAO.java  |   3 +-
 .../src/main/resources/nifi-web-api-context.xml |  17 +-
 .../nifi-framework/nifi-web/nifi-web-ui/pom.xml |   3 +
 .../main/resources/filters/canvas.properties    |   1 +
 .../src/main/webapp/WEB-INF/pages/canvas.jsp    |   2 +
 .../canvas/controller-service-configuration.jsp |   2 +-
 .../canvas/new-reporting-task-dialog.jsp        |  53 ++
 .../canvas/reporting-task-configuration.jsp     |  63 ++
 .../nifi-web-ui/src/main/webapp/css/canvas.css  |   2 +
 .../src/main/webapp/css/controller-service.css  |   7 -
 .../webapp/css/new-reporting-task-dialog.css    | 152 +++++
 .../src/main/webapp/css/reporting-task.css      |  80 +++
 .../src/main/webapp/js/nf/canvas/nf-canvas.js   |   1 +
 .../js/nf/canvas/nf-controller-service.js       | 240 ++++---
 .../webapp/js/nf/canvas/nf-reporting-task.js    | 426 +++++++++++++
 .../src/main/webapp/js/nf/canvas/nf-settings.js | 618 +++++++++++++++++--
 .../webapp/js/nf/history/nf-history-table.js    |   2 +-
 33 files changed, 2188 insertions(+), 252 deletions(-)
----------------------------------------------------------------------