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 DDE69181F4 for ; Thu, 2 Jul 2015 06:54:41 +0000 (UTC) Received: (qmail 2232 invoked by uid 500); 2 Jul 2015 06:54:41 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 2200 invoked by uid 500); 2 Jul 2015 06:54:41 -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 2191 invoked by uid 99); 2 Jul 2015 06:54:41 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Jul 2015 06:54:41 +0000 X-ASF-Spam-Status: No, hits=-2000.7 required=5.0 tests=ALL_TRUSTED,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; Thu, 02 Jul 2015 06:52:31 +0000 Received: (qmail 120 invoked by uid 99); 2 Jul 2015 06:54:17 -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 06:54:17 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 125B1E35DD; Thu, 2 Jul 2015 06:54:17 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: anovikov@apache.org To: commits@ignite.incubator.apache.org Date: Thu, 02 Jul 2015 06:55:00 -0000 Message-Id: <8e425e939bbc42e98e714e8fedd8069a@git.apache.org> In-Reply-To: <53d0a4bd701f4d168b4aa7e87606e34b@git.apache.org> References: <53d0a4bd701f4d168b4aa7e87606e34b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [46/50] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1060' into ignite-sprint-7 X-Virus-Checked: Checked by ClamAV on apache.org 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-gg-10416 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 ----------------------------------------------------------------------