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/04/27 18:04:52 UTC
[07/10] incubator-nifi git commit: Merge branch 'develop' of
http://git-wip-us.apache.org/repos/asf/incubator-nifi into develop
Merge branch 'develop' of http://git-wip-us.apache.org/repos/asf/incubator-nifi into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/c10facae
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/c10facae
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/c10facae
Branch: refs/heads/develop
Commit: c10facae487a900af69df89bf393d413d43725bc
Parents: 953d9e5 5481889
Author: Mark Payne <ma...@hotmail.com>
Authored: Mon Apr 27 09:29:19 2015 -0400
Committer: Mark Payne <ma...@hotmail.com>
Committed: Mon Apr 27 10:47:07 2015 -0400
----------------------------------------------------------------------
.../apache/nifi/processors/aws/sns/PutSNS.java | 5 +-
.../apache/nifi/processors/aws/sqs/GetSQS.java | 3 +-
.../org/apache/nifi/processors/GeoEnrichIP.java | 38 +-
.../nifi/processors/maxmind/DatabaseReader.java | 44 +-
.../nifi-hl7-bundle/nifi-hl7-processors/pom.xml | 114 +--
.../processors/hl7/ExtractHL7Attributes.java | 365 +++++----
.../apache/nifi/processors/hl7/RouteHL7.java | 300 +++----
.../hl7/TestExtractHL7Attributes.java | 30 +-
.../apache/nifi/processors/kafka/GetKafka.java | 438 +++++-----
.../apache/nifi/processors/kafka/PutKafka.java | 285 +++----
.../additionalDetails.html | 28 +-
.../additionalDetails.html | 30 +-
.../nifi/processors/kafka/TestGetKafka.java | 58 +-
.../nifi/processors/kafka/TestPutKafka.java | 189 ++---
nifi/nifi-nar-bundles/nifi-kafka-bundle/pom.xml | 14 +-
.../processors/kite/AbstractKiteProcessor.java | 10 +-
.../apache/nifi/processors/kite/AvroUtil.java | 18 +-
.../nifi/processors/kite/ConvertCSVToAvro.java | 348 ++++----
.../nifi/processors/kite/ConvertJSONToAvro.java | 2 +-
.../processors/kite/StoreInKiteDataset.java | 208 ++---
.../processors/kite/TestCSVToAvroProcessor.java | 181 ++---
.../kite/TestConfigurationProperty.java | 65 +-
.../nifi/processors/kite/TestGetSchema.java | 117 ++-
.../kite/TestJSONToAvroProcessor.java | 58 +-
.../kite/TestKiteProcessorsCluster.java | 125 ++-
.../kite/TestKiteStorageProcessor.java | 225 +++--
.../apache/nifi/processors/kite/TestUtil.java | 114 +--
.../nifi-yandex-processors/pom.xml | 4 +-
.../nifi/processors/yandex/YandexTranslate.java | 381 +++++----
.../processors/yandex/model/Translation.java | 55 +-
.../nifi/processors/yandex/util/Languages.java | 124 +--
.../processors/yandex/TestYandexTranslate.java | 317 ++++----
.../nifi-language-translation-bundle/pom.xml | 28 +-
.../nifi-twitter-processors/pom.xml | 10 +-
.../nifi/processors/twitter/GetTwitter.java | 450 +++++-----
.../web/StandardContentViewerController.java | 9 +-
.../standard/AbstractJsonPathProcessor.java | 19 +-
.../standard/Base64EncodeContent.java | 11 +-
.../nifi/processors/standard/BinFiles.java | 170 ++--
.../processors/standard/CompressContent.java | 38 +-
.../nifi/processors/standard/ControlRate.java | 39 +-
.../standard/ConvertCharacterSet.java | 37 +-
.../processors/standard/DetectDuplicate.java | 28 +-
.../processors/standard/DistributeLoad.java | 89 +-
.../nifi/processors/standard/EncodeContent.java | 27 +-
.../processors/standard/EncryptContent.java | 23 +-
.../processors/standard/EvaluateJsonPath.java | 91 ++-
.../standard/EvaluateRegularExpression.java | 31 +-
.../nifi/processors/standard/EvaluateXPath.java | 89 +-
.../processors/standard/EvaluateXQuery.java | 63 +-
.../processors/standard/ExecuteProcess.java | 19 +-
.../standard/ExecuteStreamCommand.java | 71 +-
.../nifi/processors/standard/ExtractText.java | 26 +-
.../processors/standard/GenerateFlowFile.java | 10 +-
.../apache/nifi/processors/standard/GetFTP.java | 14 +-
.../nifi/processors/standard/GetFile.java | 32 +-
.../processors/standard/GetFileTransfer.java | 9 +-
.../nifi/processors/standard/GetHTTP.java | 69 +-
.../nifi/processors/standard/GetJMSTopic.java | 50 +-
.../nifi/processors/standard/GetSFTP.java | 16 +-
.../processors/standard/HandleHttpRequest.java | 468 ++++++-----
.../processors/standard/HandleHttpResponse.java | 127 +--
.../nifi/processors/standard/HashAttribute.java | 38 +-
.../nifi/processors/standard/HashContent.java | 18 +-
.../processors/standard/IdentifyMimeType.java | 17 +-
.../nifi/processors/standard/InvokeHTTP.java | 149 ++--
.../nifi/processors/standard/JmsConsumer.java | 100 +--
.../nifi/processors/standard/ListenHTTP.java | 18 +-
.../nifi/processors/standard/ListenUDP.java | 133 ++-
.../nifi/processors/standard/LogAttribute.java | 5 +-
.../nifi/processors/standard/MergeContent.java | 180 ++--
.../nifi/processors/standard/ModifyBytes.java | 3 -
.../processors/standard/MonitorActivity.java | 27 +-
.../nifi/processors/standard/PostHTTP.java | 152 ++--
.../nifi/processors/standard/PutEmail.java | 423 +++++-----
.../apache/nifi/processors/standard/PutFTP.java | 56 +-
.../nifi/processors/standard/PutFile.java | 264 +++---
.../processors/standard/PutFileTransfer.java | 127 ++-
.../apache/nifi/processors/standard/PutJMS.java | 133 ++-
.../nifi/processors/standard/PutSFTP.java | 9 +-
.../nifi/processors/standard/ReplaceText.java | 163 ++--
.../standard/ReplaceTextWithMapping.java | 215 +++--
.../processors/standard/RouteOnAttribute.java | 111 ++-
.../processors/standard/RouteOnContent.java | 149 ++--
.../nifi/processors/standard/ScanAttribute.java | 115 ++-
.../nifi/processors/standard/ScanContent.java | 83 +-
.../processors/standard/SegmentContent.java | 75 +-
.../nifi/processors/standard/SplitContent.java | 163 ++--
.../nifi/processors/standard/SplitJson.java | 74 +-
.../nifi/processors/standard/SplitText.java | 142 ++--
.../nifi/processors/standard/SplitXml.java | 61 +-
.../nifi/processors/standard/TransformXml.java | 121 +--
.../nifi/processors/standard/UnpackContent.java | 216 +++--
.../nifi/processors/standard/ValidateXml.java | 45 +-
.../servlets/ContentAcknowledgmentServlet.java | 53 +-
.../standard/servlets/ListenHTTPServlet.java | 156 ++--
.../nifi/processors/standard/util/Bin.java | 6 +-
.../processors/standard/util/BinManager.java | 26 +-
.../standard/util/DocumentReaderCallback.java | 3 +-
.../processors/standard/util/FTPTransfer.java | 351 +++++---
.../nifi/processors/standard/util/FTPUtils.java | 38 +-
.../nifi/processors/standard/util/FileInfo.java | 3 +-
.../processors/standard/util/FileTransfer.java | 356 ++++----
.../processors/standard/util/JmsFactory.java | 127 ++-
.../standard/util/JmsProcessingSummary.java | 100 ++-
.../processors/standard/util/JmsProperties.java | 257 +++---
.../util/JsonPathExpressionValidator.java | 107 ++-
.../standard/util/SFTPConnection.java | 9 -
.../processors/standard/util/SFTPTransfer.java | 342 +++++---
.../processors/standard/util/SFTPUtils.java | 179 ++--
.../standard/util/UDPStreamConsumer.java | 25 +-
.../util/ValidatingBase32InputStream.java | 1 -
.../standard/util/WrappedMessageConsumer.java | 9 +-
.../standard/util/WrappedMessageProducer.java | 9 +-
.../standard/util/XmlSplitterSaxParser.java | 11 +-
.../additionalDetails.html | 6 +-
.../additionalDetails.html | 2 +-
.../org/apache/tika/mime/custom-mimetypes.xml | 144 ++--
.../src/test/java/TestIngestAndUpdate.java | 3 +-
.../processors/standard/CaptureServlet.java | 12 +-
.../processors/standard/HelloWorldServlet.java | 3 +-
.../standard/RESTServiceContentModified.java | 15 +-
.../standard/TestBase64EncodeContent.java | 41 +-
.../standard/TestCompressContent.java | 96 ++-
.../processors/standard/TestControlRate.java | 6 +-
.../standard/TestConvertCharacterSet.java | 13 +-
.../standard/TestDetectDuplicate.java | 36 +-
.../processors/standard/TestDistributeLoad.java | 21 +-
.../processors/standard/TestEncodeContent.java | 66 +-
.../processors/standard/TestEncryptContent.java | 29 +-
.../standard/TestEvaluateJsonPath.java | 222 +++--
.../processors/standard/TestEvaluateXPath.java | 105 ++-
.../processors/standard/TestEvaluateXQuery.java | 312 ++++---
.../processors/standard/TestExecuteProcess.java | 36 +-
.../standard/TestExecuteStreamCommand.java | 131 ++-
.../processors/standard/TestExtractText.java | 104 ++-
.../nifi/processors/standard/TestGetFile.java | 63 +-
.../nifi/processors/standard/TestGetHTTP.java | 112 +--
.../processors/standard/TestGetJMSQueue.java | 63 +-
.../standard/TestHandleHttpRequest.java | 49 +-
.../standard/TestHandleHttpResponse.java | 109 ++-
.../processors/standard/TestHashAttribute.java | 6 +-
.../processors/standard/TestHashContent.java | 4 +-
.../standard/TestIdentifyMimeType.java | 15 +-
.../processors/standard/TestInvokeHTTP.java | 94 ++-
.../processors/standard/TestJmsConsumer.java | 224 ++---
.../nifi/processors/standard/TestListenUDP.java | 38 +-
.../processors/standard/TestMergeContent.java | 180 ++--
.../processors/standard/TestModifyBytes.java | 81 +-
.../standard/TestMonitorActivity.java | 78 +-
.../nifi/processors/standard/TestPostHTTP.java | 189 +++--
.../nifi/processors/standard/TestPutEmail.java | 84 +-
.../processors/standard/TestReplaceText.java | 81 +-
.../standard/TestReplaceTextLineByLine.java | 203 +++--
.../standard/TestReplaceTextWithMapping.java | 318 +++++---
.../standard/TestRouteOnAttribute.java | 64 +-
.../processors/standard/TestRouteOnContent.java | 18 +-
.../processors/standard/TestScanAttribute.java | 15 +-
.../processors/standard/TestScanContent.java | 34 +-
.../processors/standard/TestSegmentContent.java | 13 +-
.../nifi/processors/standard/TestServer.java | 84 +-
.../processors/standard/TestSplitContent.java | 213 +++--
.../nifi/processors/standard/TestSplitJson.java | 91 ++-
.../nifi/processors/standard/TestSplitText.java | 70 +-
.../nifi/processors/standard/TestSplitXml.java | 3 +-
.../processors/standard/TestTransformXml.java | 40 +-
.../processors/standard/TestUnpackContent.java | 129 ++-
.../processors/standard/TestValidateXml.java | 3 +-
.../test/resources/TestJson/json-sample.json | 814 +++++++++----------
.../ControllerStatusReportingTask.java | 19 +-
.../apache/nifi/controller/MonitorMemory.java | 3 +-
.../processors/attributes/UpdateAttribute.java | 59 +-
.../update/attributes/api/RuleResource.java | 10 +-
173 files changed, 9831 insertions(+), 7454 deletions(-)
----------------------------------------------------------------------