Return-Path: X-Original-To: apmail-apex-commits-archive@minotaur.apache.org Delivered-To: apmail-apex-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 2D58E17968 for ; Sat, 30 Jan 2016 19:31:31 +0000 (UTC) Received: (qmail 2404 invoked by uid 500); 30 Jan 2016 19:31:31 -0000 Delivered-To: apmail-apex-commits-archive@apex.apache.org Received: (qmail 2355 invoked by uid 500); 30 Jan 2016 19:31:31 -0000 Mailing-List: contact commits-help@apex.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@apex.incubator.apache.org Delivered-To: mailing list commits@apex.incubator.apache.org Received: (qmail 2346 invoked by uid 99); 30 Jan 2016 19:31:31 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 30 Jan 2016 19:31:31 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id AA9D7180498 for ; Sat, 30 Jan 2016 19:31:30 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.247 X-Spam-Level: * X-Spam-Status: No, score=1.247 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.554, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id DXMacAbjj98r for ; Sat, 30 Jan 2016 19:31:20 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id E1A0E31AA9 for ; Sat, 30 Jan 2016 19:31:19 +0000 (UTC) Received: (qmail 2301 invoked by uid 99); 30 Jan 2016 19:31:18 -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; Sat, 30 Jan 2016 19:31:18 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id ABD28E01D9; Sat, 30 Jan 2016 19:31:18 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: thw@apache.org To: commits@apex.incubator.apache.org Date: Sat, 30 Jan 2016 19:31:19 -0000 Message-Id: <00ed1b2e938746d6bf2b71b1f8eee007@git.apache.org> In-Reply-To: <443871397f774126ba69b72ec7a36971@git.apache.org> References: <443871397f774126ba69b72ec7a36971@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] incubator-apex-malhar git commit: Merge branch 'MLHR-1936.nifi-connector' of https://github.com/bbende/incubator-apex-malhar into devel-3 Merge branch 'MLHR-1936.nifi-connector' of https://github.com/bbende/incubator-apex-malhar into devel-3 Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/commit/98495ab6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/98495ab6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/98495ab6 Branch: refs/heads/devel-3 Commit: 98495ab62be21cc6a5ebcff32a27dd9a02e5ea23 Parents: a44e81a 2cb8494 Author: Thomas Weise Authored: Sat Jan 30 11:29:32 2016 -0800 Committer: Thomas Weise Committed: Sat Jan 30 11:29:32 2016 -0800 ---------------------------------------------------------------------- contrib/pom.xml | 6 + .../contrib/nifi/AbstractNiFiInputOperator.java | 212 +++++++++++++++++ .../nifi/AbstractNiFiOutputOperator.java | 187 +++++++++++++++ .../AbstractNiFiSinglePortInputOperator.java | 83 +++++++ .../contrib/nifi/NiFiDataPacket.java | 42 ++++ .../contrib/nifi/NiFiDataPacketBuilder.java | 33 +++ .../nifi/NiFiSinglePortInputOperator.java | 72 ++++++ .../nifi/NiFiSinglePortOutputOperator.java | 126 ++++++++++ .../contrib/nifi/StandardNiFiDataPacket.java | 59 +++++ .../nifi/NiFiSinglePortInputOperatorTest.java | 200 ++++++++++++++++ .../nifi/NiFiSinglePortOutputOperatorTest.java | 231 +++++++++++++++++++ .../nifi/demo/TestNiFiInputApplication.java | 63 +++++ .../nifi/demo/TestNiFiOutputApplication.java | 85 +++++++ .../contrib/nifi/mock/MockDataPacket.java | 58 +++++ .../contrib/nifi/mock/MockSiteToSiteClient.java | 102 ++++++++ .../contrib/nifi/mock/MockTransaction.java | 166 +++++++++++++ 16 files changed, 1725 insertions(+) ----------------------------------------------------------------------