You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by al...@apache.org on 2016/02/06 04:36:02 UTC

[06/50] nifi git commit: Merge branch 'NIFI-259' of https://git-wip-us.apache.org/repos/asf/nifi into NIFI-259

Merge branch 'NIFI-259' of https://git-wip-us.apache.org/repos/asf/nifi into NIFI-259


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/06f525b6
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/06f525b6
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/06f525b6

Branch: refs/heads/master
Commit: 06f525b674dd01306a40a0bb7323c9727cdad414
Parents: 0151b1e d05314c
Author: Mark Payne <ma...@hotmail.com>
Authored: Wed Jan 13 13:57:57 2016 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Wed Jan 13 13:57:57 2016 -0500

----------------------------------------------------------------------
 .../nifi/web/api/dto/ComponentStateDTO.java     |  15 +
 .../nifi/web/api/dto/ControllerServiceDTO.java  |  15 +
 .../apache/nifi/web/api/dto/ProcessorDTO.java   |  15 +
 .../nifi/web/api/dto/ReportingTaskDTO.java      |  15 +
 .../nifi/web/StandardNiFiServiceFacade.java     |  22 +-
 .../org/apache/nifi/web/api/dto/DtoFactory.java |  26 +-
 .../nifi-framework/nifi-web/nifi-web-ui/pom.xml |   1 +
 .../main/resources/filters/canvas.properties    |   1 +
 .../src/main/webapp/WEB-INF/pages/canvas.jsp    |   1 +
 .../partials/canvas/component-state-dialog.jsp  |  45 +++
 .../nifi-web-ui/src/main/webapp/css/canvas.css  |   1 +
 .../src/main/webapp/css/component-state.css     |  88 +++++
 .../src/main/webapp/images/iconViewState.png    | Bin 0 -> 1245 bytes
 .../src/main/webapp/js/nf/canvas/nf-actions.js  |  17 +
 .../src/main/webapp/js/nf/canvas/nf-canvas.js   |   1 +
 .../webapp/js/nf/canvas/nf-component-state.js   | 358 +++++++++++++++++++
 .../main/webapp/js/nf/canvas/nf-context-menu.js |  20 ++
 .../js/nf/canvas/nf-processor-configuration.js  |  21 +-
 18 files changed, 649 insertions(+), 13 deletions(-)
----------------------------------------------------------------------