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 03A8717E41 for ; Wed, 8 Apr 2015 14:09:14 +0000 (UTC) Received: (qmail 94194 invoked by uid 500); 8 Apr 2015 14:02:34 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 94165 invoked by uid 500); 8 Apr 2015 14:02:34 -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 94154 invoked by uid 99); 8 Apr 2015 14:02:34 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 Apr 2015 14:02:34 +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; Wed, 08 Apr 2015 14:02:33 +0000 Received: (qmail 92255 invoked by uid 99); 8 Apr 2015 14:02:10 -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; Wed, 08 Apr 2015 14:02:10 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7F399E2F61; Wed, 8 Apr 2015 14:02:10 +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: Wed, 08 Apr 2015 14:02:54 -0000 Message-Id: In-Reply-To: <7fed2b8568994458a66afac1f57e2fc4@git.apache.org> References: <7fed2b8568994458a66afac1f57e2fc4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [45/50] incubator-ignite git commit: Merge branches 'ignite-639' and 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-639 X-Virus-Checked: Checked by ClamAV on apache.org Merge branches 'ignite-639' and 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-639 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4d44e610 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4d44e610 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4d44e610 Branch: refs/heads/ignite-635 Commit: 4d44e6106666c57870938b4c1699249c8d68beca Parents: 36c330a fa552bc Author: AKuznetsov Authored: Wed Apr 8 17:55:20 2015 +0700 Committer: AKuznetsov Committed: Wed Apr 8 17:55:20 2015 +0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/ignite/Ignite.java | 15 + .../apache/ignite/internal/IgniteKernal.java | 37 ++ .../org/apache/ignite/internal/IgnitionEx.java | 171 ++++----- .../internal/managers/GridManagerAdapter.java | 34 +- .../cache/DynamicCacheChangeRequest.java | 17 + .../cache/DynamicCacheDescriptor.java | 17 +- .../processors/cache/GridCacheIoManager.java | 2 +- .../processors/cache/GridCacheProcessor.java | 349 +++++++++++++++--- .../dht/GridClientPartitionTopology.java | 6 +- .../distributed/dht/GridDhtLockFuture.java | 10 +- .../dht/GridDhtPartitionTopologyImpl.java | 6 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 49 +-- .../distributed/dht/GridDhtTxPrepareFuture.java | 2 +- .../GridDhtPartitionsExchangeFuture.java | 1 + .../cache/transactions/IgniteTxManager.java | 6 +- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 24 +- .../communication/tcp/TcpCommunicationSpi.java | 14 +- .../discovery/tcp/TcpClientDiscoverySpi.java | 47 ++- .../spi/discovery/tcp/TcpDiscoverySpi.java | 78 ++-- .../discovery/tcp/TcpDiscoverySpiAdapter.java | 8 +- .../spi/swapspace/file/FileSwapSpaceSpi.java | 4 +- .../resources/META-INF/classnames.properties | 19 +- ...eCacheConfigurationTemplateNotFoundTest.java | 114 ++++++ .../IgniteCacheConfigurationTemplateTest.java | 364 +++++++++++++++++++ .../cache/IgniteDynamicCacheStartSelfTest.java | 23 ++ ...ePartitionedBasicStoreMultiNodeSelfTest.java | 110 +----- .../GridAbstractCommunicationSelfTest.java | 3 +- .../GridTcpCommunicationSpiAbstractTest.java | 5 +- ...mmunicationSpiConcurrentConnectSelfTest.java | 3 +- ...cpCommunicationSpiMultithreadedSelfTest.java | 3 +- ...dTcpCommunicationSpiRecoveryAckSelfTest.java | 3 +- ...GridTcpCommunicationSpiRecoverySelfTest.java | 2 +- .../ignite/testframework/junits/IgniteMock.java | 10 + .../ignite/testsuites/IgniteCacheTestSuite.java | 5 +- .../org/apache/ignite/IgniteSpringBean.java | 14 + .../commands/cache/VisorCacheClearCommand.scala | 3 +- .../scala/org/apache/ignite/visor/visor.scala | 12 +- parent/pom.xml | 2 +- pom.xml | 1 + 39 files changed, 1192 insertions(+), 401 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4d44e610/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ----------------------------------------------------------------------