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:55 UTC

[10/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/666de3d4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/666de3d4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/666de3d4

Branch: refs/heads/develop
Commit: 666de3d410a8f80a8ad4a90e5fbcce08c777103e
Parents: ba96e43 d29a2d6
Author: Mark Payne <ma...@hotmail.com>
Authored: Mon Apr 27 12:04:35 2015 -0400
Committer: Mark Payne <ma...@hotmail.com>
Committed: Mon Apr 27 12:04:35 2015 -0400

----------------------------------------------------------------------
 .../standard/AbstractJsonPathProcessor.java     |  11 +-
 .../standard/ConvertCharacterSet.java           |   2 +-
 .../nifi/processors/standard/HashAttribute.java |  34 +-
 .../nifi/processors/standard/PutEmail.java      | 302 +++++++---------
 .../apache/nifi/processors/standard/PutFTP.java |  24 +-
 .../nifi/processors/standard/PutFile.java       | 275 ++++++--------
 .../processors/standard/PutFileTransfer.java    | 140 +++-----
 .../apache/nifi/processors/standard/PutJMS.java | 161 +++------
 .../nifi/processors/standard/ReplaceText.java   | 169 ++++-----
 .../standard/ReplaceTextWithMapping.java        | 231 +++++-------
 .../processors/standard/RouteOnAttribute.java   | 136 +++----
 .../processors/standard/RouteOnContent.java     | 147 +++-----
 .../nifi/processors/standard/ScanAttribute.java | 121 +++----
 .../nifi/processors/standard/ScanContent.java   |  86 ++---
 .../processors/standard/SegmentContent.java     |  54 ++-
 .../nifi/processors/standard/SplitContent.java  | 125 +++----
 .../nifi/processors/standard/SplitJson.java     |  77 ++--
 .../nifi/processors/standard/SplitText.java     | 142 ++++----
 .../nifi/processors/standard/SplitXml.java      |  70 ++--
 .../nifi/processors/standard/TransformXml.java  |  87 ++---
 .../nifi/processors/standard/UnpackContent.java | 215 +++++------
 .../servlets/ContentAcknowledgmentServlet.java  |  55 +--
 .../standard/servlets/ListenHTTPServlet.java    | 142 +++-----
 .../nifi/processors/standard/util/Bin.java      |  22 +-
 .../processors/standard/util/BinManager.java    |  41 +--
 .../standard/util/DocumentReaderCallback.java   |   6 +-
 .../processors/standard/util/FTPTransfer.java   | 351 +++++++-----------
 .../nifi/processors/standard/util/FTPUtils.java |  95 ++---
 .../nifi/processors/standard/util/FileInfo.java |   3 +-
 .../processors/standard/util/FileTransfer.java  | 356 +++++++++----------
 .../processors/standard/util/JmsFactory.java    | 128 +++----
 .../processors/standard/util/JmsProperties.java | 256 ++++++-------
 .../util/JsonPathExpressionValidator.java       |  27 +-
 .../standard/util/NLKBufferedReader.java        |  14 +-
 .../processors/standard/util/SFTPTransfer.java  | 351 +++++++-----------
 .../processors/standard/util/SFTPUtils.java     | 167 ++++-----
 .../standard/util/UDPStreamConsumer.java        |  25 +-
 .../util/ValidatingBase32InputStream.java       |   3 +-
 .../util/ValidatingBase64InputStream.java       |   3 +-
 .../standard/util/WrappedMessageConsumer.java   |   9 +-
 .../standard/util/WrappedMessageProducer.java   |   9 +-
 .../src/test/java/TestIngestAndUpdate.java      |   3 +-
 .../processors/standard/CaptureServlet.java     |   3 +-
 .../standard/RESTServiceContentModified.java    |  15 +-
 .../standard/TestBase64EncodeContent.java       |  42 +--
 .../standard/TestCompressContent.java           |  85 ++---
 .../processors/standard/TestControlRate.java    |   3 +-
 .../standard/TestConvertCharacterSet.java       |  13 +-
 .../standard/TestDetectDuplicate.java           |  33 +-
 .../processors/standard/TestDistributeLoad.java |  19 +-
 .../processors/standard/TestEncodeContent.java  |  66 ++--
 .../processors/standard/TestEncryptContent.java |  30 +-
 .../standard/TestEvaluateJsonPath.java          | 219 ++++--------
 .../processors/standard/TestEvaluateXPath.java  | 106 ++----
 .../processors/standard/TestEvaluateXQuery.java | 312 +++++-----------
 .../processors/standard/TestExecuteProcess.java |  18 +-
 .../standard/TestExecuteStreamCommand.java      | 135 +++----
 .../processors/standard/TestExtractText.java    |  81 ++---
 .../nifi/processors/standard/TestGetFile.java   |  63 ++--
 .../nifi/processors/standard/TestGetHTTP.java   |  57 +--
 .../processors/standard/TestGetJMSQueue.java    |  63 ++--
 .../standard/TestHandleHttpRequest.java         |  19 +-
 .../standard/TestHandleHttpResponse.java        |  81 ++---
 .../processors/standard/TestHashAttribute.java  |   8 +-
 .../processors/standard/TestHashContent.java    |   5 +-
 .../standard/TestIdentifyMimeType.java          |  16 +-
 .../processors/standard/TestInvokeHTTP.java     | 137 ++-----
 .../processors/standard/TestJmsConsumer.java    |  88 ++---
 .../nifi/processors/standard/TestListenUDP.java |  39 +-
 .../processors/standard/TestMergeContent.java   | 176 +++------
 .../processors/standard/TestModifyBytes.java    |  82 ++---
 .../standard/TestMonitorActivity.java           |  84 ++---
 .../nifi/processors/standard/TestPostHTTP.java  | 102 ++----
 .../nifi/processors/standard/TestPutEmail.java  |  17 +-
 .../processors/standard/TestReplaceText.java    |  81 ++---
 .../standard/TestReplaceTextLineByLine.java     | 204 ++++-------
 .../standard/TestReplaceTextWithMapping.java    | 316 +++++-----------
 .../standard/TestRouteOnAttribute.java          |  65 ++--
 .../processors/standard/TestRouteOnContent.java |  19 +-
 .../processors/standard/TestScanAttribute.java  |  16 +-
 .../processors/standard/TestScanContent.java    |  34 +-
 .../processors/standard/TestSegmentContent.java |  14 +-
 .../nifi/processors/standard/TestServer.java    |  21 +-
 .../processors/standard/TestSplitContent.java   | 196 ++++------
 .../nifi/processors/standard/TestSplitJson.java |  91 ++---
 .../nifi/processors/standard/TestSplitText.java |  80 ++---
 .../nifi/processors/standard/TestSplitXml.java  |   4 +-
 .../processors/standard/TestTransformXml.java   |  45 +--
 .../processors/standard/TestUnpackContent.java  | 131 +++----
 .../processors/standard/TestValidateXml.java    |   4 +-
 .../standard/UserAgentTestingServlet.java       |   1 -
 91 files changed, 2933 insertions(+), 5281 deletions(-)
----------------------------------------------------------------------