Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-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 DEC2818CB0 for ; Tue, 12 May 2015 10:35:17 +0000 (UTC) Received: (qmail 45599 invoked by uid 500); 12 May 2015 10:35:17 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 45567 invoked by uid 500); 12 May 2015 10:35:17 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 45558 invoked by uid 99); 12 May 2015 10:35:17 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 May 2015 10:35:17 +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 678B918294F for ; Tue, 12 May 2015 10:35:12 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.771 X-Spam-Level: * X-Spam-Status: No, score=1.771 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id 61zeM8q08u_k for ; Tue, 12 May 2015 10:35:11 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id D38A847518 for ; Tue, 12 May 2015 10:34:52 +0000 (UTC) Received: (qmail 43252 invoked by uid 99); 12 May 2015 10:34:52 -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; Tue, 12 May 2015 10:34:52 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4ECE5E17E2; Tue, 12 May 2015 10:34:52 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Date: Tue, 12 May 2015 10:35:38 -0000 Message-Id: In-Reply-To: <30cea4972f274f449cc697c729a1ab88@git.apache.org> References: <30cea4972f274f449cc697c729a1ab88@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [48/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-sprint-5' into ignite-sprint-5 Merge remote-tracking branch 'origin/ignite-sprint-5' into ignite-sprint-5 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f6012f1e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f6012f1e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f6012f1e Branch: refs/heads/ignite-695 Commit: f6012f1e802be3ade9efd53d79ec6b85df5a4c8c Parents: e6ca757 f4a3591 Author: avinogradov Authored: Fri May 8 18:54:49 2015 +0300 Committer: avinogradov Committed: Fri May 8 18:54:49 2015 +0300 ---------------------------------------------------------------------- .../processors/resource/GridResourceField.java | 11 + .../processors/resource/GridResourceIoc.java | 387 ++++++------------- .../processors/resource/GridResourceMethod.java | 13 + .../resource/GridResourceProcessor.java | 4 +- .../ignite/internal/util/IgniteUtils.java | 15 + .../spi/discovery/tcp/TcpDiscoverySpi.java | 24 +- 6 files changed, 191 insertions(+), 263 deletions(-) ----------------------------------------------------------------------