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 337DA18975 for ; Thu, 2 Jul 2015 10:07:23 +0000 (UTC) Received: (qmail 93442 invoked by uid 500); 2 Jul 2015 10:07:23 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 93412 invoked by uid 500); 2 Jul 2015 10:07:23 -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 93403 invoked by uid 99); 2 Jul 2015 10:07:23 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Jul 2015 10:07:23 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 8F14AD19DD for ; Thu, 2 Jul 2015 10:07:22 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.229 X-Spam-Level: X-Spam-Status: No, score=0.229 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, RP_MATCHES_RCVD=-0.571] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id 10lP16l_gY2J for ; Thu, 2 Jul 2015 10:07:07 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id 23EC6261DC for ; Thu, 2 Jul 2015 10:07:04 +0000 (UTC) Received: (qmail 90705 invoked by uid 99); 2 Jul 2015 10:07:04 -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; Thu, 02 Jul 2015 10:07:04 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id EEB22E364B; Thu, 2 Jul 2015 10:07:03 +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: Thu, 02 Jul 2015 10:07:26 -0000 Message-Id: <997d12f784804f94b2acfceff8e7c800@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [24/32] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1060' into ignite-sprint-7 Merge remote-tracking branch 'remotes/origin/ignite-1060' into ignite-sprint-7 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/44b187d4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/44b187d4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/44b187d4 Branch: refs/heads/ignite-1058 Commit: 44b187d44e3270b69f95e8ed690ec772557b05b4 Parents: da6ff64 25cef86 Author: Anton Authored: Wed Jul 1 19:19:34 2015 +0300 Committer: Anton Committed: Wed Jul 1 19:19:34 2015 +0300 ---------------------------------------------------------------------- assembly/dependencies-fabric.xml | 1 + modules/core/src/test/config/tests.properties | 6 +- modules/core/src/test/resources/helloworld.gar | Bin 6092 -> 0 bytes modules/core/src/test/resources/helloworld1.gar | Bin 6092 -> 0 bytes modules/core/src/test/resources/readme.txt | 6 -- modules/extdata/p2p/pom.xml | 2 +- modules/extdata/uri/META-INF/ignite.xml | 38 +++++++++ .../extdata/uri/modules/uri-dependency/pom.xml | 42 ++++++++++ .../deployment/uri/tasks/GarHelloWorldBean.java | 60 ++++++++++++++ .../src/main/resources/gar-example.properties | 18 +++++ modules/extdata/uri/pom.xml | 60 +++++++++++++- .../deployment/uri/tasks/GarHelloWorldTask.java | 81 +++++++++++++++++++ .../deployment/uri/tasks/gar-spring-bean.xml | 29 +++++++ modules/urideploy/pom.xml | 14 ++++ .../GridTaskUriDeploymentDeadlockSelfTest.java | 13 +-- .../ignite/p2p/GridP2PDisabledSelfTest.java | 2 +- 16 files changed, 347 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44b187d4/modules/extdata/p2p/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44b187d4/modules/extdata/uri/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44b187d4/modules/urideploy/pom.xml ----------------------------------------------------------------------