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 2015/02/26 04:54:54 UTC
[51/51] [abbrv] incubator-nifi git commit: Merge branch 'develop'
into NIFI-353
Merge branch 'develop' into NIFI-353
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/48192289
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/48192289
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/48192289
Branch: refs/heads/NIFI-353
Commit: 48192289e492ed98bcc433925a70203570223c2a
Parents: cc0b6fe 50744bf
Author: Matt Gilman <ma...@gmail.com>
Authored: Wed Feb 25 22:53:29 2015 -0500
Committer: Matt Gilman <ma...@gmail.com>
Committed: Wed Feb 25 22:53:29 2015 -0500
----------------------------------------------------------------------
.../apache/nifi/remote/RemoteDestination.java | 53 +
nifi/nifi-assembly/pom.xml | 1 +
.../org/apache/nifi/util/NiFiProperties.java | 5 +
.../nifi-site-to-site-client/pom.xml | 45 +
.../remote/AbstractCommunicationsSession.java | 54 ++
.../org/apache/nifi/remote/Communicant.java | 47 +
.../main/java/org/apache/nifi/remote/Peer.java | 151 +++
.../org/apache/nifi/remote/PeerDescription.java | 79 ++
.../java/org/apache/nifi/remote/PeerStatus.java | 60 ++
.../nifi/remote/RemoteResourceInitiator.java | 73 ++
.../org/apache/nifi/remote/Transaction.java | 214 ++++
.../nifi/remote/TransactionCompletion.java | 63 ++
.../apache/nifi/remote/TransferDirection.java | 34 +
.../nifi/remote/VersionedRemoteResource.java | 24 +
.../nifi/remote/client/SiteToSiteClient.java | 519 ++++++++++
.../remote/client/SiteToSiteClientConfig.java | 124 +++
.../client/socket/EndpointConnection.java | 54 ++
.../client/socket/EndpointConnectionPool.java | 965 +++++++++++++++++++
.../nifi/remote/client/socket/SocketClient.java | 218 +++++
.../remote/cluster/AdaptedNodeInformation.java | 66 ++
.../remote/cluster/ClusterNodeInformation.java | 67 ++
.../nifi/remote/cluster/NodeInformation.java | 98 ++
.../remote/cluster/NodeInformationAdapter.java | 41 +
.../apache/nifi/remote/codec/FlowFileCodec.java | 71 ++
.../remote/codec/StandardFlowFileCodec.java | 129 +++
.../remote/exception/HandshakeException.java | 37 +
.../exception/PortNotRunningException.java | 30 +
.../remote/exception/ProtocolException.java | 40 +
.../remote/exception/UnknownPortException.java | 29 +
.../SocketChannelCommunicationsSession.java | 110 +++
.../remote/io/socket/SocketChannelInput.java | 71 ++
.../remote/io/socket/SocketChannelOutput.java | 58 ++
.../SSLSocketChannelCommunicationsSession.java | 113 +++
.../io/socket/ssl/SSLSocketChannelInput.java | 55 ++
.../io/socket/ssl/SSLSocketChannelOutput.java | 44 +
.../nifi/remote/protocol/ClientProtocol.java | 86 ++
.../remote/protocol/CommunicationsInput.java | 33 +
.../remote/protocol/CommunicationsOutput.java | 27 +
.../remote/protocol/CommunicationsSession.java | 64 ++
.../apache/nifi/remote/protocol/DataPacket.java | 45 +
.../nifi/remote/protocol/RequestType.java | 43 +
.../protocol/socket/HandshakeProperty.java | 61 ++
.../nifi/remote/protocol/socket/Response.java | 51 +
.../remote/protocol/socket/ResponseCode.java | 153 +++
.../protocol/socket/SocketClientProtocol.java | 438 +++++++++
.../socket/SocketClientTransaction.java | 399 ++++++++
.../SocketClientTransactionCompletion.java | 57 ++
.../nifi/remote/util/NiFiRestApiUtil.java | 98 ++
.../nifi/remote/util/PeerStatusCache.java | 43 +
.../nifi/remote/util/StandardDataPacket.java | 50 +
.../socket/TestEndpointConnectionStatePool.java | 95 ++
.../client/socket/TestSiteToSiteClient.java | 105 ++
.../nifi/remote/io/CompressionInputStream.java | 2 +-
.../io/socket/SocketChannelInputStream.java | 12 +
.../remote/io/socket/ssl/SSLSocketChannel.java | 12 +
.../socket/ssl/SSLSocketChannelInputStream.java | 4 +
.../nifi/stream/io/LimitingInputStream.java | 111 +++
.../stream/io/MinimumLengthInputStream.java | 93 ++
nifi/nifi-commons/pom.xml | 1 +
.../src/main/asciidoc/administration-guide.adoc | 43 +-
nifi/nifi-docs/src/main/asciidoc/overview.adoc | 4 +-
.../nifi-docs/src/main/asciidoc/user-guide.adoc | 11 +
nifi/nifi-external/README.md | 19 +
nifi/nifi-external/nifi-spark-receiver/pom.xml | 37 +
.../org/apache/nifi/spark/NiFiDataPacket.java | 40 +
.../org/apache/nifi/spark/NiFiReceiver.java | 198 ++++
nifi/nifi-external/pom.xml | 29 +
.../nifi-framework/nifi-cluster/pom.xml | 4 +
.../nifi/cluster/manager/ClusterManager.java | 18 +-
.../cluster/manager/impl/WebClusterManager.java | 9 +-
.../nifi-framework-core-api/pom.xml | 4 +
.../nifi/cluster/AdaptedNodeInformation.java | 66 --
.../nifi/cluster/ClusterNodeInformation.java | 67 --
.../org/apache/nifi/cluster/NodeInformant.java | 22 -
.../apache/nifi/cluster/NodeInformation.java | 98 --
.../nifi/cluster/NodeInformationAdapter.java | 39 -
.../apache/nifi/controller/StandardFunnel.java | 2 +-
.../apache/nifi/groups/RemoteProcessGroup.java | 39 +-
.../main/java/org/apache/nifi/remote/Peer.java | 107 --
.../java/org/apache/nifi/remote/PeerStatus.java | 72 --
.../org/apache/nifi/remote/RemoteGroupPort.java | 22 +-
.../apache/nifi/remote/TransferDirection.java | 23 -
.../nifi/remote/VersionedRemoteResource.java | 24 -
.../nifi/remote/cluster/NodeInformant.java | 22 +
.../apache/nifi/remote/codec/FlowFileCodec.java | 79 --
.../remote/exception/HandshakeException.java | 30 -
.../exception/PortNotRunningException.java | 26 -
.../remote/exception/ProtocolException.java | 34 -
.../remote/exception/UnknownPortException.java | 26 -
.../nifi/remote/protocol/ClientProtocol.java | 78 --
.../remote/protocol/CommunicationsInput.java | 27 -
.../remote/protocol/CommunicationsOutput.java | 27 -
.../remote/protocol/CommunicationsSession.java | 64 --
.../nifi/remote/protocol/RequestType.java | 43 -
.../nifi/remote/protocol/ServerProtocol.java | 2 +-
.../nifi-framework/nifi-framework-core/pom.xml | 4 +
.../apache/nifi/controller/FlowController.java | 5 +-
.../scheduling/QuartzSchedulingAgent.java | 21 +-
.../controller/scheduling/ScheduleState.java | 18 +-
.../scheduling/StandardProcessScheduler.java | 5 +-
.../scheduling/TimerDrivenSchedulingAgent.java | 124 ++-
.../tasks/ContinuallyRunConnectableTask.java | 32 +-
.../tasks/ContinuallyRunProcessorTask.java | 82 +-
.../org/apache/nifi/remote/RemoteNiFiUtils.java | 216 +++++
.../nifi/remote/StandardRemoteProcessGroup.java | 353 +------
.../src/main/resources/conf/nifi.properties | 2 +
.../nifi-framework/nifi-site-to-site/.gitignore | 1 +
.../nifi-framework/nifi-site-to-site/pom.xml | 4 +
.../remote/AbstractCommunicationsSession.java | 54 --
.../nifi/remote/RemoteResourceFactory.java | 50 +-
.../nifi/remote/SocketRemoteSiteListener.java | 16 +-
.../nifi/remote/StandardRemoteGroupPort.java | 697 ++++----------
.../remote/codec/StandardFlowFileCodec.java | 169 ----
.../SocketChannelCommunicationsSession.java | 90 --
.../remote/io/socket/SocketChannelInput.java | 66 --
.../remote/io/socket/SocketChannelOutput.java | 58 --
.../SSLSocketChannelCommunicationsSession.java | 93 --
.../io/socket/ssl/SSLSocketChannelInput.java | 50 -
.../io/socket/ssl/SSLSocketChannelOutput.java | 44 -
.../socket/ClusterManagerServerProtocol.java | 7 +-
.../protocol/socket/HandshakeProperty.java | 23 -
.../nifi/remote/protocol/socket/Response.java | 51 -
.../remote/protocol/socket/ResponseCode.java | 152 ---
.../protocol/socket/SocketClientProtocol.java | 510 ----------
.../socket/SocketFlowFileServerProtocol.java | 195 ++--
.../remote/TestStandardRemoteGroupPort.java | 97 --
.../web/api/RemoteProcessGroupResource.java | 8 +
.../canvas/new-remote-process-group-dialog.jsp | 2 +-
.../main/webapp/js/nf/canvas/nf-context-menu.js | 2 +-
.../hadoop/CreateHadoopSequenceFile.java | 4 +-
.../standard/Base64EncodeContent.java | 13 +-
.../processors/standard/CompressContent.java | 27 +-
.../nifi/processors/standard/HashContent.java | 14 +-
.../nifi/processors/standard/PutEmail.java | 5 +-
.../processors/standard/SegmentContent.java | 114 ++-
.../nifi/processors/standard/TransformXml.java | 3 +-
.../standard/TestCompressContent.java | 18 +
.../nifi/processors/standard/TestPutEmail.java | 45 +
nifi/pom.xml | 6 +
139 files changed, 7307 insertions(+), 3623 deletions(-)
----------------------------------------------------------------------