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/02/19 19:30:52 UTC
[2/5] 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/2ac64329
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/2ac64329
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/2ac64329
Branch: refs/heads/NIFI-250
Commit: 2ac643292c691d451cf98e2a309bff72182b0a88
Parents: d30a184 6457929
Author: Mark Payne <ma...@hotmail.com>
Authored: Wed Feb 18 08:15:45 2015 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Wed Feb 18 08:15:45 2015 -0500
----------------------------------------------------------------------
README.md | 6 +-
nifi/README.md | 2 +-
nifi/nifi-api/pom.xml | 1 -
nifi/nifi-assembly/pom.xml | 1 -
.../nifi-data-provenance-utils/pom.xml | 1 -
.../nifi-expression-language/pom.xml | 1 -
.../nifi-commons/nifi-flowfile-packager/pom.xml | 1 -
nifi/nifi-commons/nifi-logging-utils/pom.xml | 1 -
.../nifi-processor-utilities/pom.xml | 1 -
nifi/nifi-commons/nifi-properties/pom.xml | 1 -
nifi/nifi-commons/nifi-security-utils/pom.xml | 1 -
nifi/nifi-commons/nifi-socket-utils/pom.xml | 1 -
nifi/nifi-commons/nifi-web-utils/pom.xml | 1 -
nifi/nifi-commons/nifi-write-ahead-log/pom.xml | 1 -
.../src/main/asciidoc/administration-guide.adoc | 139 +++++++-
nifi/nifi-docs/src/main/asciidoc/images/ncm.png | Bin 0 -> 339522 bytes
nifi/nifi-docs/src/main/asciidoc/overview.adoc | 20 +-
nifi/nifi-mock/pom.xml | 1 -
.../nifi-framework-nar/pom.xml | 1 -
.../nifi-framework/nifi-administration/pom.xml | 1 -
.../nifi/web/api/dto/ControllerServiceDTO.java | 146 +--------
...ontrollerServiceReferencingComponentDTO.java | 160 +++++++++
...ollerServiceReferencingComponentsEntity.java | 46 +++
.../nifi-cluster-protocol/pom.xml | 1 -
.../nifi-file-authorization-provider/pom.xml | 1 -
.../nifi-framework-core-api/pom.xml | 1 -
.../nifi-framework/nifi-security/pom.xml | 1 -
.../nifi-framework/nifi-site-to-site/pom.xml | 1 -
.../nifi-framework/nifi-user-actions/pom.xml | 1 -
.../nifi/audit/ControllerServiceAuditor.java | 74 +++++
.../org/apache/nifi/web/NiFiServiceFacade.java | 19 ++
.../nifi/web/StandardNiFiServiceFacade.java | 19 ++
.../nifi/web/api/ControllerServiceResource.java | 114 +++++++
.../org/apache/nifi/web/api/dto/DtoFactory.java | 70 ++--
.../nifi/web/dao/ControllerServiceDAO.java | 10 +
.../dao/impl/StandardControllerServiceDAO.java | 18 +
.../src/main/webapp/WEB-INF/pages/canvas.jsp | 1 +
.../canvas/controller-service-configuration.jsp | 4 +-
.../disable-controller-service-dialog.jsp | 5 +-
.../canvas/enable-controller-service-dialog.jsp | 40 +++
.../partials/canvas/fill-color-dialog.jsp | 6 +-
.../src/main/webapp/css/controller-service.css | 53 ++-
.../nifi-web-ui/src/main/webapp/css/dialog.css | 8 +-
.../src/main/webapp/css/settings.css | 1 -
.../src/main/webapp/js/nf/canvas/nf-actions.js | 48 ++-
.../webapp/js/nf/canvas/nf-canvas-header.js | 117 ++++---
.../webapp/js/nf/canvas/nf-canvas-toolbar.js | 18 +-
.../webapp/js/nf/canvas/nf-canvas-toolbox.js | 56 ++--
.../main/webapp/js/nf/canvas/nf-canvas-utils.js | 23 +-
.../src/main/webapp/js/nf/canvas/nf-canvas.js | 25 +-
.../main/webapp/js/nf/canvas/nf-connectable.js | 111 ++++---
.../main/webapp/js/nf/canvas/nf-context-menu.js | 7 +-
.../js/nf/canvas/nf-controller-service.js | 325 +++++++++++++++----
.../src/main/webapp/js/nf/canvas/nf-graph.js | 6 +-
.../src/main/webapp/js/nf/canvas/nf-settings.js | 11 +-
.../webapp/js/nf/cluster/nf-cluster-table.js | 8 +-
.../webapp/js/nf/counters/nf-counters-table.js | 2 +-
.../js/nf/provenance/nf-provenance-table.js | 4 +-
.../webapp/js/nf/summary/nf-summary-table.js | 14 +-
.../js/nf/templates/nf-templates-table.js | 6 +-
.../main/webapp/js/nf/users/nf-users-table.js | 2 +-
.../nifi-framework/pom.xml | 1 -
.../nifi-framework-bundle/pom.xml | 1 -
.../nifi-hadoop-bundle/nifi-hadoop-nar/pom.xml | 1 -
.../nifi-nar-bundles/nifi-hadoop-bundle/pom.xml | 1 -
.../nifi-hadoop-libraries-nar/pom.xml | 1 -
.../nifi-hadoop-libraries-bundle/pom.xml | 1 -
nifi/nifi-nar-bundles/nifi-jetty-bundle/pom.xml | 2 -
.../nifi-kafka-bundle/nifi-kafka-nar/pom.xml | 1 -
nifi/nifi-nar-bundles/nifi-kafka-bundle/pom.xml | 2 +-
.../nifi-provenance-repository-nar/pom.xml | 1 -
.../nifi-provenance-repository-bundle/pom.xml | 1 -
.../nifi-standard-nar/pom.xml | 1 -
.../nifi/processors/standard/EvaluateXPath.java | 2 +-
.../nifi-standard-bundle/pom.xml | 1 -
.../nifi-distributed-cache-services-nar/pom.xml | 1 -
.../pom.xml | 1 -
.../nifi-load-distribution-service-api/pom.xml | 1 -
.../nifi-ssl-context-nar/pom.xml | 1 -
.../nifi-ssl-context-bundle/pom.xml | 1 -
.../nifi-standard-services-api-nar/pom.xml | 1 -
.../nifi-standard-services/pom.xml | 1 -
.../nifi-update-attribute-nar/pom.xml | 2 -
.../nifi-update-attribute-bundle/pom.xml | 3 -
nifi/nifi-nar-bundles/pom.xml | 3 -
85 files changed, 1302 insertions(+), 495 deletions(-)
----------------------------------------------------------------------