Merge remote-tracking branch 'apache/master' into NIFI-1156
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/3e26ed81 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/3e26ed81 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/3e26ed81 Branch: refs/heads/NIFI-259 Commit: 3e26ed810596fdc798f1e190958974d9d1b1cd21 Parents: f8d26d2 fd35b8f Author: Jeremy Dyer <[email protected]> Authored: Mon Nov 30 10:12:39 2015 -0500 Committer: Jeremy Dyer <[email protected]> Committed: Mon Nov 30 10:12:39 2015 -0500 ---------------------------------------------------------------------- NOTICE | 3 + .../annotation/behavior/TriggerWhenEmpty.java | 26 +- .../apache/nifi/processor/ProcessContext.java | 10 +- nifi-assembly/NOTICE | 4 + .../java/org/apache/nifi/bootstrap/RunNiFi.java | 14 +- .../nifi/provenance/StandardLineageResult.java | 1 + .../StandardProvenanceEventRecord.java | 1 + .../nifi/io/socket/SSLContextFactory.java | 15 +- .../stream/io/TestLeakyBucketThrottler.java | 102 +- .../src/main/asciidoc/administration-guide.adoc | 18 +- .../asciidoc/images/nifi-connection-menu.png | Bin 0 -> 31189 bytes .../main/asciidoc/images/nifi-connection.png | Bin 0 -> 166905 bytes .../asciidoc/images/nifi-process-group-menu.png | Bin 0 -> 98964 bytes .../asciidoc/images/nifi-processor-menu.png | Bin 0 -> 99962 bytes .../src/main/asciidoc/images/nifi-rpg-menu.png | Bin 0 -> 108291 bytes nifi-docs/src/main/asciidoc/user-guide.adoc | 145 ++- .../nifi/processors/WriteResourceToStream.java | 10 +- .../apache/nifi/util/MockProcessContext.java | 12 +- .../apache/nifi/util/MockProcessSession.java | 6 +- .../nifi/util/StandardProcessorTestRunner.java | 5 + .../java/org/apache/nifi/util/TestRunner.java | 10 +- .../nifi/util/TestMockProcessSession.java | 58 + .../nifi/processors/avro/ConvertAvroToJSON.java | 2 + .../nifi/processors/aws/s3/DeleteS3Object.java | 3 + .../azure/eventhub/GetAzureEventHub.java | 3 + .../azure/eventhub/PutAzureEventHub.java | 3 + .../couchbase/AbstractCouchbaseProcessor.java | 8 +- .../processors/couchbase/PutCouchbaseKey.java | 3 + .../processors/flume/util/FlowFileEvent.java | 15 +- .../documentation/mock/MockProcessContext.java | 5 + .../cluster/manager/impl/WebClusterManager.java | 12 +- .../nifi/controller/StandardFlowFileQueue.java | 1 + .../nifi/controller/StandardProcessorNode.java | 20 +- .../repository/FileSystemRepository.java | 9 +- .../repository/StandardFlowFileRecord.java | 13 + .../repository/StandardProcessSession.java | 59 +- .../repository/VolatileContentRepository.java | 15 +- .../scheduling/ConnectableProcessContext.java | 6 + .../tasks/ContinuallyRunProcessorTask.java | 46 +- .../nifi/processor/SimpleProcessLogger.java | 81 +- .../nifi/processor/StandardProcessContext.java | 6 + .../processor/StandardSchedulingContext.java | 5 + .../java/org/apache/nifi/util/Connectables.java | 12 + .../repository/TestStandardProcessSession.java | 40 + .../tasks/TestContinuallyRunProcessorTask.java | 82 ++ .../nifi/processor/TestSimpleProcessLogger.java | 7 + .../org/apache/nifi/web/server/JettyServer.java | 71 +- .../org/apache/nifi/web/api/dto/DtoFactory.java | 2 +- .../web/dao/impl/StandardConnectionDAO.java | 8 +- .../main/webapp/WEB-INF/jsp/documentation.jsp | 1 + .../src/main/webapp/js/application.js | 2 +- .../src/main/webapp/js/nf/canvas/nf-actions.js | 72 +- .../main/webapp/js/nf/canvas/nf-canvas-utils.js | 38 + .../js/nf/canvas/nf-connection-configuration.js | 37 +- .../main/webapp/js/nf/canvas/nf-connection.js | 20 +- .../js/nf/provenance/nf-provenance-table.js | 5 + .../nifi/processors/hadoop/PutHDFSTest.java | 24 + .../hadoop/TestCreateHadoopSequenceFile.java | 80 +- .../nifi-hbase-processors/pom.xml | 4 + .../nifi/hbase/AbstractHBaseProcessor.java | 23 - .../org/apache/nifi/hbase/AbstractPutHBase.java | 183 +++ .../java/org/apache/nifi/hbase/GetHBase.java | 3 +- .../org/apache/nifi/hbase/PutHBaseCell.java | 153 +-- .../org/apache/nifi/hbase/PutHBaseJSON.java | 230 ++++ .../org.apache.nifi.processor.Processor | 3 +- .../org/apache/nifi/hbase/HBaseTestUtil.java | 87 ++ .../nifi/hbase/MockHBaseClientService.java | 14 +- .../org/apache/nifi/hbase/TestPutHBaseCell.java | 60 +- .../org/apache/nifi/hbase/TestPutHBaseJSON.java | 423 +++++++ .../nifi-kafka-processors/pom.xml | 5 + .../apache/nifi/processors/kafka/GetKafka.java | 256 ++-- .../nifi/processors/kafka/KafkaUtils.java | 56 + .../apache/nifi/processors/kafka/PutKafka.java | 27 + .../nifi/processors/kite/ConvertAvroSchema.java | 3 + .../nifi/processors/mongodb/GetMongo.java | 3 + .../nifi/processors/mongodb/PutMongo.java | 3 + .../PersistentProvenanceRepository.java | 1 + .../nifi/provenance/StandardRecordReader.java | 2 + .../nifi/provenance/StandardRecordWriter.java | 2 + .../nifi/provenance/lucene/DocsReader.java | 115 +- .../nifi/provenance/lucene/IndexSearch.java | 2 +- .../nifi/provenance/lucene/LineageQuery.java | 2 +- .../nifi/provenance/lucene/LuceneUtil.java | 36 +- .../TestPersistentProvenanceRepository.java | 70 ++ .../nifi/processors/twitter/GetTwitter.java | 4 +- .../nifi-standard-processors/pom.xml | 52 +- .../standard/AbstractSyslogProcessor.java | 2 +- .../processors/standard/AttributesToJSON.java | 2 +- .../processors/standard/ConvertJSONToSQL.java | 30 +- .../nifi/processors/standard/EncodeContent.java | 12 +- .../standard/EvaluateRegularExpression.java | 3 + .../nifi/processors/standard/ExecuteSQL.java | 6 +- .../standard/ExecuteStreamCommand.java | 200 +++- .../nifi/processors/standard/FetchFile.java | 311 +++++ .../nifi/processors/standard/GetFile.java | 2 +- .../nifi/processors/standard/GetHTTP.java | 33 +- .../nifi/processors/standard/InvokeHTTP.java | 1120 ++++++++++-------- .../nifi/processors/standard/ListFile.java | 370 ++++++ .../processors/standard/ListFileTransfer.java | 9 +- .../nifi/processors/standard/ListenSyslog.java | 3 +- .../nifi/processors/standard/PostHTTP.java | 2 + .../nifi/processors/standard/PutFile.java | 2 +- .../nifi/processors/standard/PutSyslog.java | 1 + .../nifi/processors/standard/RouteText.java | 3 + .../nifi/processors/standard/SplitText.java | 2 +- .../nifi/processors/standard/TailFile.java | 694 ++++++----- .../standard/util/OpenPGPKeyBasedEncryptor.java | 4 +- .../util/OpenPGPPasswordBasedEncryptor.java | 4 +- .../SoftLimitBoundedByteArrayOutputStream.java | 99 ++ .../org.apache.nifi.processor.Processor | 2 + .../processors/standard/CaptureServlet.java | 12 +- .../processors/standard/TestExecuteSQL.java | 40 +- .../standard/TestExecuteStreamCommand.java | 237 +++- .../nifi/processors/standard/TestFetchFile.java | 258 ++++ .../nifi/processors/standard/TestGetHTTP.java | 96 +- .../processors/standard/TestInvokeHTTP.java | 91 +- .../processors/standard/TestInvokeHttpSSL.java | 3 +- .../nifi/processors/standard/TestListFile.java | 628 ++++++++++ .../nifi/processors/standard/TestRouteText.java | 15 +- .../nifi/processors/standard/TestTailFile.java | 156 ++- .../processors/standard/TestTransformXml.java | 31 +- .../standard/util/TestInvokeHttpCommon.java | 1029 ++++++++++++---- .../standard/util/TestJdbcHugeStream.java | 82 +- .../pom.xml | 4 + .../DistributedMapCacheClientService.java | 22 +- .../DistributedSetCacheClientService.java | 28 +- .../apache/nifi/hbase/HBaseClientService.java | 41 +- .../org/apache/nifi/hbase/put/PutColumn.java | 47 + .../org/apache/nifi/hbase/put/PutFlowFile.java | 38 +- .../nifi-hbase_1_1_2-client-service/pom.xml | 6 + .../nifi/hbase/HBase_1_1_2_ClientService.java | 118 +- .../hbase/TestHBase_1_1_2_ClientService.java | 94 +- .../processors/attributes/UpdateAttribute.java | 35 +- .../update/attributes/TestUpdateAttribute.java | 130 ++ pom.xml | 38 + 135 files changed, 7179 insertions(+), 2094 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/3e26ed81/pom.xml ----------------------------------------------------------------------
