You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2014/12/22 12:59:43 UTC
[31/31] incubator-nifi git commit: Merge branch 'develop' into
NIFI-182
Merge branch 'develop' into NIFI-182
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/24372962
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/24372962
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/24372962
Branch: refs/heads/NIFI-182
Commit: 24372962aa823498cf740e44f784ddd90477f428
Parents: 5e6de84 0d8da14
Author: Matt Gilman <ma...@gmail.com>
Authored: Mon Dec 22 06:58:39 2014 -0500
Committer: Matt Gilman <ma...@gmail.com>
Committed: Mon Dec 22 06:58:39 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 ---------------
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 +-
.../framework-bundle/framework/cluster/pom.xml | 2 +-
.../impl/FileBasedClusterNodeFirewall.java | 2 +-
.../nifi/cluster/flow/impl/DataFlowDaoImpl.java | 10 +-
.../impl/FileBasedClusterNodeFirewallTest.java | 3 +-
.../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 | 2 +-
.../nifi/controller/FlowUnmarshaller.java | 2 +-
.../apache/nifi/controller/SnippetManager.java | 8 +-
.../nifi/controller/StandardFlowService.java | 2 +-
.../controller/StandardFlowSynchronizer.java | 2 +-
.../nifi/controller/StandardProcessorNode.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 | 2 +-
.../FileAuthorizationProvider.java | 2 +-
.../FileAuthorizationProviderTest.java | 2 +-
.../resources/src/main/resources/DISCLAIMER | 15 -
.../resources/src/main/resources/LICENSE | 202 -----
.../resources/src/main/resources/NOTICE | 7 -
.../src/main/resources/conf/bootstrap.conf | 22 +-
.../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 +-
.../apache/nifi/web/api/ProvenanceResource.java | 2 +-
.../nifi/web/util/ClientResponseUtils.java | 2 +-
.../src/main/webapp/js/application.js | 5 +
.../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 +-
.../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 +-
nifi-docs/pom.xml | 124 +++
.../images/add-processor-with-tag-cloud.png | Bin 0 -> 22925 bytes
.../src/main/asciidoc/images/add-processor.png | Bin 0 -> 31524 bytes
.../src/main/asciidoc/images/addConnect.png | Bin 0 -> 1996 bytes
.../src/main/asciidoc/images/comments-tab.png | Bin 0 -> 6431 bytes
.../src/main/asciidoc/images/components.png | Bin 0 -> 8992 bytes
.../asciidoc/images/connection-settings.png | Bin 0 -> 15214 bytes
.../main/asciidoc/images/create-connection.png | Bin 0 -> 9430 bytes
.../asciidoc/images/edit-property-dropdown.png | Bin 0 -> 14291 bytes
.../asciidoc/images/edit-property-textarea.png | Bin 0 -> 17146 bytes
.../src/main/asciidoc/images/iconAlert.png | Bin 0 -> 1396 bytes
.../src/main/asciidoc/images/iconConnection.png | Bin 0 -> 1517 bytes
.../src/main/asciidoc/images/iconDelete.png | Bin 0 -> 670 bytes
.../src/main/asciidoc/images/iconDisable.png | Bin 0 -> 764 bytes
nifi-docs/src/main/asciidoc/images/iconEdit.png | Bin 0 -> 493 bytes
.../src/main/asciidoc/images/iconEnable.png | Bin 0 -> 667 bytes
.../src/main/asciidoc/images/iconFunnel.png | Bin 0 -> 1223 bytes
nifi-docs/src/main/asciidoc/images/iconInfo.png | Bin 0 -> 550 bytes
.../src/main/asciidoc/images/iconInputPort.png | Bin 0 -> 1842 bytes
.../src/main/asciidoc/images/iconLabel.png | Bin 0 -> 838 bytes
.../src/main/asciidoc/images/iconNotSecure.png | Bin 0 -> 137 bytes
.../src/main/asciidoc/images/iconOutputPort.png | Bin 0 -> 1658 bytes
.../main/asciidoc/images/iconProcessGroup.png | Bin 0 -> 1422 bytes
.../src/main/asciidoc/images/iconProcessor.png | Bin 0 -> 1446 bytes
.../asciidoc/images/iconRemoteProcessGroup.png | Bin 0 -> 674 bytes
nifi-docs/src/main/asciidoc/images/iconRun.png | Bin 0 -> 538 bytes
.../src/main/asciidoc/images/iconSecure.png | Bin 0 -> 133 bytes
nifi-docs/src/main/asciidoc/images/iconStop.png | Bin 0 -> 402 bytes
.../src/main/asciidoc/images/iconTemplate.png | Bin 0 -> 970 bytes
.../asciidoc/images/iconTransmissionActive.png | Bin 0 -> 1330 bytes
.../images/iconTransmissionInactive.png | Bin 0 -> 1248 bytes
.../images/instantiate-template-description.png | Bin 0 -> 6508 bytes
.../asciidoc/images/instantiate-template.png | Bin 0 -> 3216 bytes
.../main/asciidoc/images/invalid-processor.png | Bin 0 -> 8187 bytes
nifi-docs/src/main/asciidoc/images/new-flow.png | Bin 0 -> 53989 bytes
.../main/asciidoc/images/nifi-navigation.png | Bin 0 -> 85458 bytes
.../asciidoc/images/nifi-toolbar-components.png | Bin 0 -> 72263 bytes
.../main/asciidoc/images/processor-anatomy.png | Bin 0 -> 37035 bytes
.../images/processor-connection-bubble.png | Bin 0 -> 9936 bytes
.../src/main/asciidoc/images/properties-tab.png | Bin 0 -> 11847 bytes
.../images/remote-group-ports-dialog.png | Bin 0 -> 21662 bytes
.../images/remote-port-connection-status.png | Bin 0 -> 57332 bytes
.../src/main/asciidoc/images/scheduling-tab.png | Bin 0 -> 12288 bytes
.../src/main/asciidoc/images/settings-tab.png | Bin 0 -> 16225 bytes
.../src/main/asciidoc/images/status-bar.png | Bin 0 -> 57171 bytes
.../main/asciidoc/images/valid-processor.png | Bin 0 -> 8090 bytes
.../src/main/asciidoc/nifi-user-guide.adoc | 782 +++++++++++++++++++
nifi-docs/src/main/assembly/dependencies.xml | 28 +
nifi-mock/pom.xml | 4 -
pom.xml | 56 +-
267 files changed, 7893 insertions(+), 7111 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/24372962/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/js/application.js
----------------------------------------------------------------------
diff --cc nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/js/application.js
index 5e5ee1c,e9b0499..748fc62
--- a/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/js/application.js
+++ b/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/js/application.js
@@@ -255,12 -255,12 +255,17 @@@ $(document).ready(function ()
selectComponent(componentName);
}
});
+
+ // listen for on the rest api and user guide
+ $('a.rest-api a.user-guide').on('click', function() {
+ selectComponent($(this).text());
+ });
+ // listen for on the rest api and user guide
+ $('a.rest-api a.user-guide').on('click', function() {
+ selectComponent($(this).text());
+ });
+
// get the initial selection
var initialComponentLink = $('a.component-link:first');
var initialSelection = $('#initial-selection').text();