Return-Path: X-Original-To: apmail-nifi-commits-archive@minotaur.apache.org Delivered-To: apmail-nifi-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D68AF17E8A for ; Mon, 2 Mar 2015 04:04:24 +0000 (UTC) Received: (qmail 93228 invoked by uid 500); 2 Mar 2015 04:04:24 -0000 Delivered-To: apmail-nifi-commits-archive@nifi.apache.org Received: (qmail 93177 invoked by uid 500); 2 Mar 2015 04:04:24 -0000 Mailing-List: contact commits-help@nifi.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@nifi.incubator.apache.org Delivered-To: mailing list commits@nifi.incubator.apache.org Received: (qmail 93168 invoked by uid 99); 2 Mar 2015 04:04:24 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Mar 2015 04:04:24 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Mon, 02 Mar 2015 04:03:43 +0000 Received: (qmail 88493 invoked by uid 99); 2 Mar 2015 04:03:40 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Mar 2015 04:03:40 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5562FE0FCC; Mon, 2 Mar 2015 04:03:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: joewitt@apache.org To: commits@nifi.incubator.apache.org Date: Mon, 02 Mar 2015 04:03:59 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [20/50] [abbrv] incubator-nifi git commit: Merge branch 'nifi-site-to-site-client' into develop X-Virus-Checked: Checked by ClamAV on apache.org Merge branch 'nifi-site-to-site-client' 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/40e1fcbb Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/40e1fcbb Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/40e1fcbb Branch: refs/heads/NIFI-360 Commit: 40e1fcbb982520851c4591970e70b03b2ab9109e Parents: d939359 5291084 Author: Mark Payne Authored: Sun Feb 22 11:19:24 2015 -0500 Committer: Mark Payne Committed: Sun Feb 22 11:19:24 2015 -0500 ---------------------------------------------------------------------- .../apache/nifi/remote/RemoteDestination.java | 53 + .../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 | 970 +++++++++++++++++++ .../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 | 90 ++ .../remote/io/socket/SocketChannelInput.java | 71 ++ .../remote/io/socket/SocketChannelOutput.java | 58 ++ .../SSLSocketChannelCommunicationsSession.java | 93 ++ .../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 ++ .../io/socket/SocketChannelInputStream.java | 10 + .../remote/io/socket/ssl/SSLSocketChannel.java | 10 + .../socket/ssl/SSLSocketChannelInputStream.java | 4 + .../nifi/stream/io/LimitingInputStream.java | 111 +++ .../stream/io/MinimumLengthInputStream.java | 93 ++ nifi/nifi-commons/pom.xml | 1 + 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/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 +- .../org/apache/nifi/remote/RemoteNiFiUtils.java | 216 +++++ .../nifi/remote/StandardRemoteProcessGroup.java | 309 +----- .../nifi-framework/nifi-site-to-site/.gitignore | 1 + .../util/RemoteProcessGroupUtils.class | Bin 0 -> 9526 bytes .../remote/AbstractCommunicationsSession.class | Bin 0 -> 2308 bytes .../nifi/remote/RemoteResourceFactory.class | Bin 0 -> 8707 bytes .../nifi/remote/RemoteResourceManager.class | Bin 0 -> 6898 bytes .../apache/nifi/remote/RemoteSiteListener.class | Bin 0 -> 841 bytes .../nifi/remote/SocketRemoteSiteListener.class | Bin 0 -> 8448 bytes ...emoteGroupPort$EndpointConnectionState.class | Bin 0 -> 5427 bytes .../nifi/remote/StandardRemoteGroupPort.class | Bin 0 -> 10677 bytes .../StandardRootGroupPort$FlowFileRequest.class | Bin 0 -> 5836 bytes ...StandardRootGroupPort$ProcessingResult.class | Bin 0 -> 5032 bytes ...upPort$StandardPortAuthorizationResult.class | Bin 0 -> 5159 bytes .../nifi/remote/StandardRootGroupPort.class | Bin 0 -> 9700 bytes .../remote/codec/StandardFlowFileCodec.class | Bin 0 -> 8538 bytes .../exception/UnsupportedCodecException.class | Bin 0 -> 1057 bytes .../SocketChannelCommunicationsSession.class | Bin 0 -> 3735 bytes .../remote/io/socket/SocketChannelInput.class | Bin 0 -> 4008 bytes .../remote/io/socket/SocketChannelOutput.class | Bin 0 -> 3741 bytes .../SSLSocketChannelCommunicationsSession.class | Bin 0 -> 4611 bytes .../io/socket/ssl/SSLSocketChannelInput.class | Bin 0 -> 3127 bytes .../io/socket/ssl/SSLSocketChannelOutput.class | Bin 0 -> 2587 bytes .../socket/ClusterManagerServerProtocol.class | Bin 0 -> 10540 bytes .../protocol/socket/HandshakeProperty.class | Bin 0 -> 917 bytes .../nifi/remote/protocol/socket/Response.class | Bin 0 -> 2674 bytes .../remote/protocol/socket/ResponseCode.class | Bin 0 -> 6889 bytes .../protocol/socket/SocketClientProtocol.class | Bin 0 -> 8965 bytes .../socket/SocketFlowFileServerProtocol.class | Bin 0 -> 8806 bytes .../remote/TestStandardRemoteGroupPort.class | Bin 0 -> 5974 bytes .../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 | 685 ++++--------- .../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 -- .../main/webapp/js/nf/canvas/nf-context-menu.js | 2 +- nifi/pom.xml | 6 + 141 files changed, 6833 insertions(+), 3397 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/40e1fcbb/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-context-menu.js ----------------------------------------------------------------------