nifi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From joew...@apache.org
Subject [18/50] [abbrv] incubator-nifi git commit: Merge branch 'develop' into nifi-site-to-site-client
Date Mon, 02 Mar 2015 04:03:57 GMT
Merge branch 'develop' into nifi-site-to-site-client


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

Branch: refs/heads/NIFI-360
Commit: 5291084dc04c5fd328619e004dbd15569e90f70d
Parents: dbae98f f1e74cc
Author: Mark Payne <markap14@hotmail.com>
Authored: Sun Feb 22 11:18:26 2015 -0500
Committer: Mark Payne <markap14@hotmail.com>
Committed: Sun Feb 22 11:18:26 2015 -0500

----------------------------------------------------------------------
 README.md                                       |   6 +-
 nifi-site/src/includes/topbar.hbs               |   1 +
 nifi-site/src/pages/html/screencasts.hbs        |  35 ++++
 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-cluster-protocol/pom.xml               |   1 -
 .../nifi-file-authorization-provider/pom.xml    |   1 -
 .../nifi-framework-core-api/pom.xml             |   1 -
 .../apache/nifi/controller/StandardFunnel.java  |   2 +-
 .../scheduling/QuartzSchedulingAgent.java       |  21 ++-
 .../controller/scheduling/ScheduleState.java    |  18 +-
 .../scheduling/TimerDrivenSchedulingAgent.java  | 115 ++++++++++--
 .../tasks/ContinuallyRunConnectableTask.java    |  32 ++--
 .../tasks/ContinuallyRunProcessorTask.java      |  32 ++--
 .../nifi-framework/nifi-security/pom.xml        |   1 -
 .../nifi-framework/nifi-site-to-site/pom.xml    |   1 -
 .../nifi-framework/nifi-user-actions/pom.xml    |   1 -
 .../partials/canvas/fill-color-dialog.jsp       |   6 +-
 .../nifi-web-ui/src/main/webapp/css/dialog.css  |   6 +-
 .../src/main/webapp/js/nf/canvas/nf-actions.js  |  39 +++--
 .../webapp/js/nf/canvas/nf-canvas-header.js     |  56 ++++--
 .../webapp/js/nf/canvas/nf-canvas-toolbar.js    |  15 +-
 .../webapp/js/nf/canvas/nf-canvas-toolbox.js    |  56 +++---
 .../main/webapp/js/nf/canvas/nf-canvas-utils.js |   2 +-
 .../src/main/webapp/js/nf/canvas/nf-canvas.js   |  25 ++-
 .../main/webapp/js/nf/canvas/nf-connectable.js  | 111 ++++++++----
 .../src/main/webapp/js/nf/canvas/nf-graph.js    |   6 +-
 .../nf-remote-process-group-configuration.js    |   3 +
 .../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 +-
 .../apache/nifi/processors/standard/GetFTP.java |   5 +
 .../nifi/processors/standard/JmsConsumer.java   | 143 ++++++++-------
 .../apache/nifi/processors/standard/PutFTP.java |   7 +-
 .../apache/nifi/processors/standard/PutJMS.java |  11 +-
 .../processors/standard/util/FTPTransfer.java   |  48 ++++-
 .../standard/util/JmsProcessingSummary.java     |  83 +++++++++
 .../processors/standard/util/JmsProperties.java |   3 +-
 .../standard/util/SocksProxySocketFactory.java  |  69 ++++++++
 .../processors/standard/TestJmsConsumer.java    | 173 +++++++++++++++++++
 .../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 -
 84 files changed, 1071 insertions(+), 308 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/5291084d/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/5291084d/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/pom.xml
----------------------------------------------------------------------


Mime
View raw message