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/384b2ac2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/384b2ac2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/384b2ac2 Branch: refs/heads/NIFI-292 Commit: 384b2ac2535987a42ae36568d285c829461a1587 Parents: 3cd18b0 1086094 Author: Mark Payne <[email protected]> Authored: Mon Apr 27 14:14:48 2015 -0400 Committer: Mark Payne <[email protected]> Committed: Mon Apr 27 14:14:48 2015 -0400 ---------------------------------------------------------------------- nifi-parent/pom.xml | 6 +- .../nifi-hadoop-bundle/nifi-hadoop-nar/pom.xml | 28 +-- .../hadoop/AbstractHadoopProcessor.java | 7 +- .../hadoop/CreateHadoopSequenceFile.java | 28 +-- .../apache/nifi/processors/hadoop/GetHDFS.java | 60 +++---- .../processors/hadoop/GetHDFSSequenceFile.java | 18 +- .../nifi/processors/hadoop/KeyValueReader.java | 6 +- .../nifi/processors/hadoop/ValueReader.java | 5 +- .../hadoop/util/ByteFilteringOutputStream.java | 24 +-- .../hadoop/util/InputStreamWritable.java | 6 +- .../hadoop/util/OutputStreamWritable.java | 3 +- .../hadoop/util/SequenceFileWriter.java | 12 +- .../nifi/processors/standard/BinFiles.java | 15 +- .../processors/standard/CompressContent.java | 9 +- .../nifi/processors/standard/ControlRate.java | 11 +- .../standard/ConvertCharacterSet.java | 22 ++- .../processors/standard/DistributeLoad.java | 17 +- .../processors/standard/EvaluateJsonPath.java | 36 ++-- .../nifi/processors/standard/EvaluateXPath.java | 9 +- .../processors/standard/EvaluateXQuery.java | 6 +- .../processors/standard/ExecuteProcess.java | 9 +- .../standard/ExecuteStreamCommand.java | 21 +-- .../nifi/processors/standard/ExtractText.java | 3 +- .../processors/standard/GenerateFlowFile.java | 3 +- .../nifi/processors/standard/GetFile.java | 6 +- .../nifi/processors/standard/GetJMSTopic.java | 3 +- .../processors/standard/HandleHttpRequest.java | 17 +- .../processors/standard/HandleHttpResponse.java | 3 +- .../nifi/processors/standard/HashAttribute.java | 10 +- .../nifi/processors/standard/InvokeHTTP.java | 24 ++- .../nifi/processors/standard/JmsConsumer.java | 6 +- .../nifi/processors/standard/ListenUDP.java | 178 +++++++++---------- .../nifi/processors/standard/MergeContent.java | 6 +- .../nifi/processors/standard/PostHTTP.java | 47 +++-- .../nifi/processors/standard/PutEmail.java | 6 +- .../apache/nifi/processors/standard/PutFTP.java | 9 +- .../processors/standard/PutFileTransfer.java | 11 +- .../apache/nifi/processors/standard/PutJMS.java | 3 +- .../nifi/processors/standard/PutSFTP.java | 6 +- .../nifi/processors/standard/ReplaceText.java | 28 ++- .../standard/ReplaceTextWithMapping.java | 13 +- .../processors/standard/RouteOnAttribute.java | 6 +- .../nifi/processors/standard/ScanAttribute.java | 5 +- .../nifi/processors/standard/SplitContent.java | 9 +- .../nifi/processors/standard/SplitText.java | 18 +- .../nifi/processors/standard/SplitXml.java | 3 +- .../nifi/processors/standard/TransformXml.java | 52 +++--- .../nifi/processors/standard/UnpackContent.java | 39 ++-- .../nifi/processors/standard/ValidateXml.java | 51 +++--- .../servlets/ContentAcknowledgmentServlet.java | 5 - .../standard/servlets/ListenHTTPServlet.java | 5 - .../nifi/processors/standard/util/Bin.java | 22 +-- .../processors/standard/util/BinManager.java | 2 +- .../standard/util/DocumentReaderCallback.java | 10 +- .../processors/standard/util/FTPTransfer.java | 3 +- .../nifi/processors/standard/util/FTPUtils.java | 2 +- .../processors/standard/util/FileTransfer.java | 29 ++- .../processors/standard/util/SFTPTransfer.java | 9 +- .../standard/util/XmlSplitterSaxParser.java | 11 +- .../processors/standard/TestDistributeLoad.java | 3 +- .../standard/TestHandleHttpRequest.java | 4 +- .../distributed/cache/client/CommsSession.java | 16 +- .../DistributedMapCacheClientService.java | 7 +- .../DistributedSetCacheClientService.java | 6 +- .../cache/client/SSLCommsSession.java | 25 +-- .../cache/client/StandardCommsSession.java | 1 + .../additionalDetails.html | 60 +++---- .../cache/server/AbstractCacheServer.java | 25 +-- .../distributed/cache/server/CacheRecord.java | 12 +- .../distributed/cache/server/CacheServer.java | 3 +- .../cache/server/DistributedCacheServer.java | 3 +- .../cache/server/DistributedSetCacheServer.java | 13 +- .../cache/server/EvictionPolicy.java | 24 +-- .../cache/server/SetCacheServer.java | 25 +-- .../server/map/DistributedMapCacheServer.java | 12 +- .../distributed/cache/server/map/MapCache.java | 4 + .../cache/server/map/MapCacheRecord.java | 19 +- .../cache/server/map/MapCacheServer.java | 113 ++++++------ .../cache/server/map/MapPutResult.java | 5 +- .../cache/server/map/PersistentMapCache.java | 51 +++--- .../cache/server/map/SimpleMapCache.java | 47 ++--- .../cache/server/set/PersistentSetCache.java | 57 +++--- .../distributed/cache/server/set/SetCache.java | 5 +- .../cache/server/set/SetCacheRecord.java | 15 +- .../cache/server/set/SetCacheResult.java | 11 +- .../cache/server/set/SimpleSetCache.java | 41 ++--- .../additionalDetails.html | 62 +++---- .../cache/server/TestServerAndClient.java | 9 +- .../nifi-http-context-map-api/pom.xml | 34 ++-- .../org/apache/nifi/http/HttpContextMap.java | 45 +++-- .../nifi-http-context-map/pom.xml | 20 +-- .../nifi/http/StandardHttpContextMap.java | 83 ++++----- .../index.html | 36 ++-- .../nifi/ssl/StandardSSLContextService.java | 3 +- .../apache/nifi/ssl/SSLContextServiceTest.java | 4 +- 95 files changed, 916 insertions(+), 1008 deletions(-) ----------------------------------------------------------------------
