Merge branch 'develop' of https://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/c69e4dbe Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/c69e4dbe Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/c69e4dbe Branch: refs/heads/develop Commit: c69e4dbec620ff776b42feb25a83a73107a74e41 Parents: a2fd263 b6f2dd2 Author: Mark Payne <[email protected]> Authored: Sun Dec 28 13:33:03 2014 -0500 Committer: Mark Payne <[email protected]> Committed: Sun Dec 28 13:33:03 2014 -0500 ---------------------------------------------------------------------- LICENSE | 384 +++++++++ NOTICE | 7 + README.md | 32 +- assembly/pom.xml | 199 ++--- assembly/src/main/assembly/dependencies.xml | 34 +- commons/core-flowfile-attributes/pom.xml | 29 - .../flowfile/attributes/CoreAttributes.java | 72 -- .../attributes/FlowFileAttributeKey.java | 21 - commons/data-provenance-utils/pom.xml | 2 +- commons/naive-search-ring-buffer/pom.xml | 30 - .../apache/nifi/util/NaiveSearchRingBuffer.java | 135 ---- .../nifi/util/TestNaiveSearchRingBuffer.java | 72 -- commons/nifi-file-utils/pom.xml | 35 - .../java/org/apache/nifi/file/FileUtils.java | 612 --------------- .../org/apache/nifi/util/NiFiProperties.java | 14 +- commons/nifi-stream-utils/.gitignore | 1 - commons/nifi-stream-utils/pom.xml | 30 - .../org/apache/nifi/io/BufferedInputStream.java | 37 - .../apache/nifi/io/BufferedOutputStream.java | 140 ---- .../apache/nifi/io/ByteArrayInputStream.java | 250 ------ .../apache/nifi/io/ByteArrayOutputStream.java | 250 ------ .../apache/nifi/io/ByteCountingInputStream.java | 104 --- .../nifi/io/ByteCountingOutputStream.java | 63 -- .../org/apache/nifi/io/DataOutputStream.java | 417 ---------- .../org/apache/nifi/io/GZIPOutputStream.java | 41 - .../nifi/io/LeakyBucketStreamThrottler.java | 324 -------- .../apache/nifi/io/NonCloseableInputStream.java | 56 -- .../nifi/io/NonCloseableOutputStream.java | 51 -- .../org/apache/nifi/io/NullOutputStream.java | 46 -- .../org/apache/nifi/io/StreamThrottler.java | 33 - .../java/org/apache/nifi/io/StreamUtils.java | 257 ------ .../org/apache/nifi/io/ZipOutputStream.java | 38 - .../exception/BytePatternNotFoundException.java | 28 - .../io/util/NonThreadSafeCircularBuffer.java | 69 -- .../nifi/io/TestLeakyBucketThrottler.java | 144 ---- .../src/test/resources/logback-test.xml | 48 -- commons/nifi-utils/pom.xml | 4 + .../flowfile/attributes/CoreAttributes.java | 72 ++ .../attributes/FlowFileAttributeKey.java | 21 + .../apache/nifi/io/CompoundUpdateMonitor.java | 115 --- .../org/apache/nifi/io/LastModifiedMonitor.java | 30 - .../java/org/apache/nifi/io/MD5SumMonitor.java | 49 -- .../apache/nifi/io/SynchronousFileWatcher.java | 123 --- .../java/org/apache/nifi/io/UpdateMonitor.java | 25 - .../nifi/remote/StandardVersionNegotiator.java | 81 ++ .../apache/nifi/remote/VersionNegotiator.java | 65 ++ .../TransmissionDisabledException.java | 25 + .../nifi/remote/io/CompressionInputStream.java | 184 +++++ .../nifi/remote/io/CompressionOutputStream.java | 147 ++++ .../remote/io/InterruptableInputStream.java | 117 +++ .../remote/io/InterruptableOutputStream.java | 81 ++ .../remote/io/socket/BufferStateManager.java | 111 +++ .../io/socket/SocketChannelInputStream.java | 157 ++++ .../io/socket/SocketChannelOutputStream.java | 113 +++ .../remote/io/socket/ssl/SSLSocketChannel.java | 602 ++++++++++++++ .../socket/ssl/SSLSocketChannelInputStream.java | 62 ++ .../ssl/SSLSocketChannelOutputStream.java | 53 ++ .../nifi/stream/io/BufferedInputStream.java | 37 + .../nifi/stream/io/BufferedOutputStream.java | 140 ++++ .../nifi/stream/io/ByteArrayInputStream.java | 250 ++++++ .../nifi/stream/io/ByteArrayOutputStream.java | 250 ++++++ .../nifi/stream/io/ByteCountingInputStream.java | 104 +++ .../stream/io/ByteCountingOutputStream.java | 63 ++ .../apache/nifi/stream/io/DataOutputStream.java | 417 ++++++++++ .../apache/nifi/stream/io/GZIPOutputStream.java | 41 + .../stream/io/LeakyBucketStreamThrottler.java | 324 ++++++++ .../nifi/stream/io/NonCloseableInputStream.java | 56 ++ .../stream/io/NonCloseableOutputStream.java | 51 ++ .../apache/nifi/stream/io/NullOutputStream.java | 46 ++ .../apache/nifi/stream/io/StreamThrottler.java | 33 + .../org/apache/nifi/stream/io/StreamUtils.java | 257 ++++++ .../apache/nifi/stream/io/ZipOutputStream.java | 38 + .../exception/BytePatternNotFoundException.java | 28 + .../io/util/NonThreadSafeCircularBuffer.java | 69 ++ .../apache/nifi/util/NaiveSearchRingBuffer.java | 135 ++++ .../org/apache/nifi/util/file/FileUtils.java | 623 +++++++++++++++ .../file/monitor/CompoundUpdateMonitor.java | 115 +++ .../util/file/monitor/LastModifiedMonitor.java | 30 + .../nifi/util/file/monitor/MD5SumMonitor.java | 51 ++ .../file/monitor/SynchronousFileWatcher.java | 123 +++ .../nifi/util/file/monitor/UpdateMonitor.java | 25 + .../org/apache/nifi/util/search/Search.java | 57 ++ .../org/apache/nifi/util/search/SearchTerm.java | 141 ++++ .../util/search/ahocorasick/AhoCorasick.java | 155 ++++ .../nifi/util/search/ahocorasick/Node.java | 72 ++ .../util/search/ahocorasick/SearchState.java | 63 ++ .../io/TestCompressionInputOutputStreams.java | 153 ++++ .../stream/io/TestLeakyBucketThrottler.java | 147 ++++ .../nifi/util/TestNaiveSearchRingBuffer.java | 72 ++ .../file/monitor/TestCompoundUpdateMonitor.java | 71 ++ .../monitor/TestSynchronousFileWatcher.java | 61 ++ .../timebuffer/TestCompoundUpdateMonitor.java | 75 -- .../timebuffer/TestSynchronousFileWatcher.java | 64 -- .../src/test/resources/logback-test.xml | 32 + commons/pom.xml | 6 - commons/remote-communications-utils/pom.xml | 29 - .../nifi/remote/StandardVersionNegotiator.java | 81 -- .../apache/nifi/remote/VersionNegotiator.java | 65 -- .../TransmissionDisabledException.java | 25 - .../nifi/remote/io/CompressionInputStream.java | 184 ----- .../nifi/remote/io/CompressionOutputStream.java | 147 ---- .../remote/io/InterruptableInputStream.java | 117 --- .../remote/io/InterruptableOutputStream.java | 81 -- .../remote/io/socket/BufferStateManager.java | 111 --- .../io/socket/SocketChannelInputStream.java | 157 ---- .../io/socket/SocketChannelOutputStream.java | 113 --- .../remote/io/socket/ssl/SSLSocketChannel.java | 602 -------------- .../socket/ssl/SSLSocketChannelInputStream.java | 62 -- .../ssl/SSLSocketChannelOutputStream.java | 53 -- .../io/TestCompressionInputOutputStreams.java | 153 ---- commons/search-utils/pom.xml | 30 - .../org/apache/nifi/util/search/Search.java | 57 -- .../org/apache/nifi/util/search/SearchTerm.java | 141 ---- .../util/search/ahocorasick/AhoCorasick.java | 155 ---- .../nifi/util/search/ahocorasick/Node.java | 72 -- .../util/search/ahocorasick/SearchState.java | 63 -- commons/wali/pom.xml | 2 +- .../org/wali/MinimalLockingWriteAheadLog.java | 4 +- .../apache/nifi/admin/service/UserService.java | 13 + .../service/action/AuthorizeDownloadAction.java | 54 ++ .../admin/service/impl/StandardUserService.java | 36 +- .../AuthorityProviderFactoryBean.java | 13 + .../java/org/apache/nifi/user/NiFiUser.java | 10 + .../impl/NiFiAuthorizationServiceTest.java | 284 ------- .../framework/client-dto/pom.xml | 3 +- .../NodeAuthorizationProvider.java | 8 + .../framework-bundle/framework/cluster/pom.xml | 2 +- .../impl/FileBasedClusterNodeFirewall.java | 2 +- .../nifi/cluster/flow/impl/DataFlowDaoImpl.java | 10 +- .../impl/FileBasedClusterNodeFirewallTest.java | 3 +- .../impl/DataFlowManagementServiceImplTest.java | 6 +- .../framework-bundle/framework/core-api/pom.xml | 6 +- .../framework-bundle/framework/core/pom.xml | 8 - .../nifi/controller/FileSystemSwapManager.java | 2 +- .../apache/nifi/controller/FlowController.java | 9 +- .../nifi/controller/FlowUnmarshaller.java | 2 +- .../apache/nifi/controller/SnippetManager.java | 8 +- .../nifi/controller/StandardFlowService.java | 2 +- .../controller/StandardFlowSynchronizer.java | 2 +- .../apache/nifi/controller/TemplateManager.java | 8 +- .../repository/FileSystemRepository.java | 4 +- .../repository/StandardProcessSession.java | 6 +- .../repository/VolatileContentRepository.java | 4 +- .../service/ControllerServiceLoader.java | 2 +- .../StandardXMLFlowConfigurationDAO.java | 2 +- .../nifi/remote/StandardRemoteProcessGroup.java | 2 +- .../TestWriteAheadFlowFileRepository.java | 2 +- .../repository/io/TestLimitedOutputStream.java | 3 +- .../file-authorization-provider/pom.xml | 4 +- .../FileAuthorizationProvider.java | 18 +- .../FileAuthorizationProviderTest.java | 2 +- .../resources/src/main/resources/DISCLAIMER | 15 - .../resources/src/main/resources/LICENSE | 202 ----- .../resources/src/main/resources/NOTICE | 7 - .../src/main/resources/bin/nifi-status.bat | 7 +- .../src/main/resources/bin/run-nifi.bat | 7 +- .../src/main/resources/bin/start-nifi.bat | 8 +- .../src/main/resources/bin/stop-nifi.bat | 7 +- .../src/main/resources/conf/bootstrap.conf | 8 +- .../resources/src/main/resources/docs/README.md | 65 -- .../framework/site-to-site/pom.xml | 12 - .../remote/codec/StandardFlowFileCodec.java | 2 +- .../remote/io/socket/SocketChannelInput.java | 4 +- .../remote/io/socket/SocketChannelOutput.java | 4 +- .../io/socket/ssl/SSLSocketChannelInput.java | 4 +- .../io/socket/ssl/SSLSocketChannelOutput.java | 4 +- .../org/apache/nifi/web/server/JettyServer.java | 20 +- .../framework/web/nifi-web-api/pom.xml | 6 +- .../nifi-web-api/src/main/enunciate/default.css | 266 ------- .../src/main/enunciate/enunciate.xml | 4 +- .../src/main/enunciate/images/bgcode.gif | Bin 56 -> 0 bytes .../src/main/enunciate/images/bgcontainer.png | Bin 386 -> 0 bytes .../src/main/enunciate/images/bgul.gif | Bin 304 -> 0 bytes .../src/main/enunciate/images/header.png | Bin 51928 -> 0 bytes .../src/main/enunciate/images/home.png | Bin 0 -> 144 bytes .../src/main/enunciate/images/li.png | Bin 191 -> 0 bytes .../src/main/enunciate/images/quote.gif | Bin 228 -> 0 bytes .../src/main/enunciate/images/search.gif | Bin 680 -> 0 bytes .../src/main/enunciate/override.css | 178 +++++ .../apache/nifi/web/api/ProvenanceResource.java | 12 +- .../nifi/web/controller/ControllerFacade.java | 30 + .../nifi/web/util/ClientResponseUtils.java | 2 +- .../src/main/resources/nifi-web-api-context.xml | 1 + .../src/main/webapp/WEB-INF/web.xml | 14 +- .../util/NiFiTestAuthorizationProvider.java | 7 + .../main/webapp/WEB-INF/jsp/documentation.jsp | 22 +- .../WEB-INF/jsp/no-documentation-found.jsp | 10 +- .../src/main/webapp/css/component-usage.css | 92 ++- .../nifi-web-docs/src/main/webapp/css/main.css | 29 +- .../src/main/webapp/js/application.js | 18 +- .../nifi-web-error/src/main/webapp/index.jsp | 1 + .../framework/web/nifi-web-ui/pom.xml | 2 +- .../nifi-web-ui/src/main/webapp/css/cluster.css | 4 + .../webapp/js/nf/canvas/nf-canvas-toolbox.js | 16 +- .../webapp/js/nf/cluster/nf-cluster-table.js | 35 +- .../src/main/webapp/js/nf/nf-common.js | 2 +- .../js/nf/provenance/nf-provenance-table.js | 107 ++- .../js/nf/templates/nf-templates-table.js | 2 +- .../authorization/NiFiAuthorizationService.java | 35 +- .../NiFiAuthorizationServiceTest.java | 250 ++++++ .../hadoop-bundle/hdfs-processors/pom.xml | 6 +- ...lowFileStreamUnpackerSequenceFileWriter.java | 2 +- .../apache/nifi/processors/hadoop/PutHDFS.java | 4 +- .../hadoop/SequenceFileWriterImpl.java | 2 +- .../hadoop/TarUnpackerSequenceFileWriter.java | 2 +- .../hadoop/ZipUnpackerSequenceFileWriter.java | 2 +- .../hadoop/util/OutputStreamWritable.java | 4 +- .../monitor-threshold-bundle/processor/pom.xml | 8 - .../processors/monitor/MonitorThreshold.java | 2 +- nar-bundles/monitor-threshold-bundle/ui/pom.xml | 2 +- .../persistent-provenance-repository/pom.xml | 8 - .../nifi/provenance/StandardRecordReader.java | 4 +- .../nifi/provenance/StandardRecordWriter.java | 6 +- .../provenance/rollover/CompressionAction.java | 4 +- .../provenance/serialization/RecordReaders.java | 2 +- nar-bundles/pom.xml | 8 +- .../standard-bundle/jms-processors/pom.xml | 6 +- .../apache/nifi/processors/jms/JmsConsumer.java | 2 +- .../org/apache/nifi/processors/jms/PutJMS.java | 2 +- .../nifi/processors/jms/util/JmsFactory.java | 30 +- .../nifi/processors/jms/util/JmsProperties.java | 3 +- .../index.html | 1 - .../index.html | 1 - .../index.html | 1 - .../standard-bundle/standard-processors/pom.xml | 14 +- .../processors/standard/CompressContent.java | 6 +- .../processors/standard/EncryptContent.java | 2 +- .../standard/EvaluateRegularExpression.java | 2 +- .../nifi/processors/standard/EvaluateXPath.java | 4 +- .../processors/standard/EvaluateXQuery.java | 4 +- .../standard/ExecuteStreamCommand.java | 6 +- .../nifi/processors/standard/HashContent.java | 4 +- .../nifi/processors/standard/ListenHTTP.java | 4 +- .../nifi/processors/standard/MergeContent.java | 8 +- .../nifi/processors/standard/ModifyBytes.java | 2 +- .../nifi/processors/standard/PostHTTP.java | 12 +- .../processors/standard/PutFileTransfer.java | 2 +- .../nifi/processors/standard/ReplaceText.java | 2 +- .../standard/ReplaceTextWithMapping.java | 2 +- .../processors/standard/RouteOnContent.java | 2 +- .../nifi/processors/standard/ScanAttribute.java | 4 +- .../nifi/processors/standard/ScanContent.java | 6 +- .../nifi/processors/standard/SplitContent.java | 2 +- .../nifi/processors/standard/SplitText.java | 8 +- .../nifi/processors/standard/SplitXml.java | 2 +- .../nifi/processors/standard/TransformXml.java | 2 +- .../nifi/processors/standard/UnpackContent.java | 6 +- .../standard/servlets/ListenHTTPServlet.java | 4 +- .../standard/util/UDPStreamConsumer.java | 2 +- .../processors/standard/TestMergeContent.java | 3 +- .../processors/standard/TestScanContent.java | 4 +- .../distributed-cache-client-service/pom.xml | 6 +- .../DistributedMapCacheClientService.java | 4 +- .../DistributedSetCacheClientService.java | 4 +- .../cache/client/SSLCommsSession.java | 4 +- .../cache/client/StandardCommsSession.java | 4 +- .../distributed-cache-protocol/pom.xml | 2 +- .../distributed-cache-server/pom.xml | 6 +- .../cache/server/AbstractCacheServer.java | 4 +- .../cache/server/SetCacheServer.java | 2 +- .../cache/server/map/MapCacheServer.java | 2 +- .../update-attribute-bundle/processor/pom.xml | 2 +- nar-maven-plugin/pom.xml | 33 +- .../nifi/authorization/AuthorityProvider.java | 19 + .../authorization/DownloadAuthorization.java | 86 ++ nifi-docs/pom.xml | 82 +- .../src/main/asciidoc/administration-guide.adoc | 34 + .../src/main/asciidoc/developer-guide.adoc | 43 + .../src/main/asciidoc/nifi-user-guide.adoc | 782 ------------------- nifi-docs/src/main/asciidoc/overview.adoc | 31 + nifi-docs/src/main/asciidoc/user-guide.adoc | 778 ++++++++++++++++++ nifi-docs/src/main/assembly/dependencies.xml | 28 + nifi-mock/pom.xml | 4 - pom.xml | 131 ++-- 274 files changed, 9017 insertions(+), 8687 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c69e4dbe/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/remote/StandardRemoteProcessGroup.java ----------------------------------------------------------------------
