nifi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marka...@apache.org
Subject [05/10] incubator-nifi git commit: Merge pull request #4 from apache/develop
Date Mon, 22 Jun 2015 16:05:35 GMT
Merge pull request #4 from apache/develop

Merging latest Apache NiFi develop branch

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

Branch: refs/heads/develop
Commit: ce16aab6c57a5b3d771149a1720471b980cf5a1c
Parents: 421ad8f 82174e4
Author: Brian Ghigiarelli <brianghig@gmail.com>
Authored: Thu May 21 08:42:32 2015 -0400
Committer: Brian Ghigiarelli <brianghig@gmail.com>
Committed: Thu May 21 08:42:32 2015 -0400

----------------------------------------------------------------------
 README.md                                       |   4 +-
 nifi-nar-maven-plugin/pom.xml                   |   4 +-
 nifi-parent/pom.xml                             |   2 +-
 nifi-site/Gruntfile.js                          |  33 +-
 nifi-site/README.md                             |   3 +-
 nifi-site/src/images/flow-th.png                | Bin 0 -> 144319 bytes
 nifi-site/src/pages/html/download.hbs           |  19 ++
 nifi-site/src/pages/html/index.hbs              | 183 ++--------
 nifi/nifi-api/pom.xml                           |   2 +-
 nifi/nifi-assembly/LICENSE                      |  29 ++
 nifi/nifi-assembly/NOTICE                       |   4 +
 nifi/nifi-assembly/pom.xml                      |  24 +-
 nifi/nifi-bootstrap/pom.xml                     |   2 +-
 .../nifi-data-provenance-utils/pom.xml          |   2 +-
 .../nifi-expression-language/pom.xml            |   2 +-
 .../nifi-commons/nifi-flowfile-packager/pom.xml |   2 +-
 .../nifi-hl7-query-language/pom.xml             |   5 +-
 nifi/nifi-commons/nifi-logging-utils/pom.xml    |   2 +-
 .../nifi-processor-utilities/pom.xml            |   2 +-
 nifi/nifi-commons/nifi-properties/pom.xml       |   2 +-
 nifi/nifi-commons/nifi-security-utils/pom.xml   |   2 +-
 .../nifi-site-to-site-client/pom.xml            |   4 +-
 nifi/nifi-commons/nifi-socket-utils/pom.xml     |   2 +-
 .../apache/nifi/io/nio/ChannelDispatcher.java   |   6 +-
 .../org/apache/nifi/io/nio/ChannelListener.java |   4 +-
 .../nifi/io/nio/DatagramChannelReader.java      |   8 +-
 .../apache/nifi/io/nio/example/ServerMain.java  |   2 +-
 nifi/nifi-commons/nifi-utils/pom.xml            |   4 +-
 nifi/nifi-commons/nifi-web-utils/pom.xml        |   2 +-
 nifi/nifi-commons/nifi-write-ahead-log/pom.xml  |   2 +-
 nifi/nifi-commons/pom.xml                       |   2 +-
 nifi/nifi-docs/pom.xml                          |   2 +-
 nifi/nifi-external/nifi-spark-receiver/pom.xml  |   2 +-
 nifi/nifi-external/pom.xml                      |   2 +-
 .../nifi-processor-bundle-archetype/pom.xml     |   2 +-
 nifi/nifi-maven-archetypes/pom.xml              |   2 +-
 nifi/nifi-mock/pom.xml                          |   2 +-
 .../nifi-aws-bundle/nifi-aws-nar/pom.xml        |  72 ++--
 .../nifi-aws-bundle/nifi-aws-processors/pom.xml | 142 ++++----
 nifi/nifi-nar-bundles/nifi-aws-bundle/pom.xml   |  86 ++---
 .../nifi-framework-nar/pom.xml                  |   2 +-
 .../nifi-framework/nifi-administration/pom.xml  |   2 +-
 .../nifi-framework/nifi-client-dto/pom.xml      |   2 +-
 .../nifi-cluster-authorization-provider/pom.xml |   2 +-
 .../nifi-framework/nifi-documentation/pom.xml   |  80 +++--
 .../nifi-file-authorization-provider/pom.xml    |   2 +-
 .../nifi-framework-cluster-protocol/pom.xml     |   2 +-
 .../nifi-framework-cluster-web/pom.xml          |   2 +-
 .../nifi-framework-cluster/pom.xml              |   2 +-
 .../nifi-framework-core-api/pom.xml             |   2 +-
 .../nifi-framework/nifi-framework-core/pom.xml  |   2 +-
 .../nifi-framework/nifi-nar-utils/pom.xml       |   2 +-
 .../nifi-framework/nifi-resources/pom.xml       |   2 +-
 .../nifi-framework/nifi-runtime/pom.xml         |   2 +-
 .../nifi-framework/nifi-security/pom.xml        |   2 +-
 .../nifi-framework/nifi-site-to-site/pom.xml    |   2 +-
 .../nifi-framework/nifi-user-actions/pom.xml    |   2 +-
 .../nifi-web/nifi-custom-ui-utilities/pom.xml   |   2 +-
 .../nifi-framework/nifi-web/nifi-jetty/pom.xml  |   2 +-
 .../nifi-web/nifi-ui-extension/pom.xml          |   2 +-
 .../nifi-web/nifi-web-api/pom.xml               |   2 +-
 .../nifi-web/nifi-web-content-access/pom.xml    |   2 +-
 .../nifi-web/nifi-web-content-viewer/pom.xml    |   2 +-
 .../nifi-web/nifi-web-docs/pom.xml              |   2 +-
 .../nifi-web/nifi-web-error/pom.xml             |   2 +-
 .../nifi-web-optimistic-locking/pom.xml         |   2 +-
 .../nifi-web/nifi-web-security/pom.xml          |   2 +-
 .../nifi-framework/nifi-web/nifi-web-ui/pom.xml |   2 +-
 .../nifi-framework/nifi-web/pom.xml             |  12 +-
 .../nifi-framework/pom.xml                      |   2 +-
 .../nifi-framework-bundle/pom.xml               |  38 +--
 .../nifi-geo-bundle/nifi-geo-nar/pom.xml        |   2 +-
 .../nifi-geo-bundle/nifi-geo-processors/pom.xml |   2 +-
 nifi/nifi-nar-bundles/nifi-geo-bundle/pom.xml   |   4 +-
 .../nifi-hadoop-bundle/nifi-hadoop-nar/pom.xml  |   2 +-
 .../nifi-hdfs-processors/pom.xml                |   2 +-
 .../hadoop/AbstractHadoopProcessor.java         |  31 ++
 .../apache/nifi/processors/hadoop/GetHDFS.java  |  10 +-
 .../apache/nifi/processors/hadoop/PutHDFS.java  |  11 +-
 .../nifi/processors/hadoop/GetHDFSTest.java     |  36 +-
 .../nifi/processors/hadoop/PutHDFSTest.java     |  17 +-
 .../test/resources/testdata/randombytes-1.gz    | Bin 0 -> 500175 bytes
 .../nifi-nar-bundles/nifi-hadoop-bundle/pom.xml |   4 +-
 .../nifi-hadoop-libraries-nar/pom.xml           |   2 +-
 .../nifi-hadoop-libraries-bundle/pom.xml        |   2 +-
 .../nifi-hl7-bundle/nifi-hl7-nar/pom.xml        |   4 +-
 .../nifi-hl7-bundle/nifi-hl7-processors/pom.xml |   4 +-
 nifi/nifi-nar-bundles/nifi-hl7-bundle/pom.xml   |   2 +-
 nifi/nifi-nar-bundles/nifi-jetty-bundle/pom.xml |   2 +-
 .../nifi-kafka-bundle/nifi-kafka-nar/pom.xml    |   2 +-
 .../nifi-kafka-processors/pom.xml               |   2 +-
 nifi/nifi-nar-bundles/nifi-kafka-bundle/pom.xml |   4 +-
 .../nifi-kite-bundle/nifi-kite-nar/pom.xml      |   2 +-
 .../nifi-kite-processors/pom.xml                |   2 +-
 nifi/nifi-nar-bundles/nifi-kite-bundle/pom.xml  |   4 +-
 .../nifi-language-translation-nar/pom.xml       |   4 +-
 .../nifi-yandex-processors/pom.xml              |   2 +-
 .../nifi-language-translation-bundle/pom.xml    |   2 +-
 .../nifi-mongodb-nar/pom.xml                    |  37 +++
 .../nifi-mongodb-processors/pom.xml             |  98 ++++++
 .../mongodb/AbstractMongoProcessor.java         |  93 ++++++
 .../nifi/processors/mongodb/GetMongo.java       | 184 +++++++++++
 .../nifi/processors/mongodb/PutMongo.java       | 215 ++++++++++++
 .../org.apache.nifi.processor.Processor         |  16 +
 .../nifi/processors/mongodb/GetMongoTest.java   | 201 +++++++++++
 .../nifi/processors/mongodb/PutMongoTest.java   | 254 ++++++++++++++
 .../nifi-mongodb-bundle/pom.xml                 |  35 ++
 .../pom.xml                                     |   2 +-
 .../nifi-provenance-repository-nar/pom.xml      |   2 +-
 .../nifi-volatile-provenance-repository/pom.xml |   2 +-
 .../nifi-provenance-repository-bundle/pom.xml   |   6 +-
 .../nifi-social-media-nar/pom.xml               |   4 +-
 .../nifi-twitter-processors/pom.xml             |   2 +-
 .../nifi-social-media-bundle/pom.xml            |   2 +-
 .../nifi-solr-bundle/nifi-solr-nar/pom.xml      |   4 +-
 .../nifi-solr-processors/pom.xml                |   2 +-
 nifi/nifi-nar-bundles/nifi-solr-bundle/pom.xml  |   2 +-
 .../nifi-standard-content-viewer/pom.xml        |   2 +-
 .../nifi-standard-nar/pom.xml                   |   2 +-
 .../nifi-standard-prioritizers/pom.xml          |   2 +-
 .../nifi-standard-processors/pom.xml            |   2 +-
 .../nifi/processors/standard/ListenUDP.java     |  14 +-
 .../nifi/processors/standard/MergeContent.java  |  92 +++++-
 .../standard/util/UDPStreamConsumer.java        |  11 +-
 .../processors/standard/TestMergeContent.java   |  98 ++++++
 .../nifi-standard-reporting-tasks/pom.xml       |   2 +-
 .../nifi-standard-bundle/pom.xml                |  10 +-
 .../nifi-dbcp-service-api/pom.xml               |  31 ++
 .../java/org/apache/nifi/dbcp/DBCPService.java  |  34 ++
 .../nifi-dbcp-service-nar/pom.xml               |  37 +++
 .../src/main/resources/META-INF/NOTICE          |  22 ++
 .../nifi-dbcp-service/pom.xml                   |  65 ++++
 .../apache/nifi/dbcp/DBCPConnectionPool.java    | 269 +++++++++++++++
 .../nifi/dbcp/DatabaseSystemDescriptor.java     |  50 +++
 .../org/apache/nifi/dbcp/DatabaseSystems.java   |  82 +++++
 .../java/org/apache/nifi/dbcp/DriverShim.java   |  74 +++++
 ...org.apache.nifi.controller.ControllerService |  15 +
 .../org/apache/nifi/dbcp/DBCPServiceTest.java   | 331 +++++++++++++++++++
 .../apache/nifi/dbcp/TestDatabaseSystems.java   |  31 ++
 .../org/apache/nifi/dbcp/TestProcessor.java     |  45 +++
 .../nifi-dbcp-service-bundle/pom.xml            |  29 ++
 .../pom.xml                                     |   2 +-
 .../pom.xml                                     |   2 +-
 .../nifi-distributed-cache-protocol/pom.xml     |   2 +-
 .../nifi-distributed-cache-server/pom.xml       |   2 +-
 .../nifi-distributed-cache-services-nar/pom.xml |   2 +-
 .../pom.xml                                     |   2 +-
 .../nifi-http-context-map-api/pom.xml           |   2 +-
 .../nifi-http-context-map-nar/pom.xml           |   2 +-
 .../nifi-http-context-map/pom.xml               |   2 +-
 .../nifi-http-context-map-bundle/pom.xml        |   2 +-
 .../nifi-load-distribution-service-api/pom.xml  |   2 +-
 .../nifi-ssl-context-nar/pom.xml                |   2 +-
 .../nifi-ssl-context-service/pom.xml            |   2 +-
 .../nifi-ssl-context-bundle/pom.xml             |   2 +-
 .../nifi-ssl-context-service-api/pom.xml        |   2 +-
 .../nifi-standard-services-api-nar/pom.xml      |   8 +-
 .../nifi-standard-services/pom.xml              |   4 +-
 .../nifi-update-attribute-model/pom.xml         |   2 +-
 .../nifi-update-attribute-nar/pom.xml           |   2 +-
 .../nifi-update-attribute-processor/pom.xml     |   2 +-
 .../nifi-update-attribute-ui/pom.xml            |   2 +-
 .../nifi-update-attribute-bundle/pom.xml        |   8 +-
 nifi/nifi-nar-bundles/pom.xml                   |  47 +--
 nifi/pom.xml                                    |  95 +++---
 165 files changed, 3112 insertions(+), 622 deletions(-)
----------------------------------------------------------------------



Mime
View raw message