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 05696179F1 for ; Mon, 2 Feb 2015 15:58:42 +0000 (UTC) Received: (qmail 15105 invoked by uid 500); 2 Feb 2015 15:58:42 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 15070 invoked by uid 500); 2 Feb 2015 15:58:42 -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 15061 invoked by uid 99); 2 Feb 2015 15:58:42 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Feb 2015 15:58:42 +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; Mon, 02 Feb 2015 15:58:16 +0000 Received: (qmail 13592 invoked by uid 99); 2 Feb 2015 15:58:13 -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; Mon, 02 Feb 2015 15:58:13 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6F00BE03AB; Mon, 2 Feb 2015 15:58:13 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sevdokimov@apache.org To: commits@ignite.incubator.apache.org Date: Mon, 02 Feb 2015 15:58:14 -0000 Message-Id: <095aaaefc6b242ecaffc5aeef309a3ec@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [02/42] incubator-ignite git commit: Merge branches 'ignite-86' and 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-86 X-Virus-Checked: Checked by ClamAV on apache.org Merge branches 'ignite-86' and 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-86 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/173726f9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/173726f9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/173726f9 Branch: refs/heads/ignite-56 Commit: 173726f926a085660b4c3af466ad107ad47249ca Parents: edf0b18 e466b24 Author: Yakov Zhdanov Authored: Wed Jan 21 20:34:08 2015 +0300 Committer: Yakov Zhdanov Committed: Wed Jan 21 20:34:08 2015 +0300 ---------------------------------------------------------------------- assembly/release-base.xml | 2 +- docs/core-site.gridgain.xml | 21 ++ .../main/java/org/apache/ignite/CacheLock.java | 86 ----- .../java/org/apache/ignite/IgniteCache.java | 1 - .../java/org/apache/ignite/cache/CacheFlag.java | 3 - .../java/org/apache/ignite/cache/CacheLock.java | 57 ++++ .../cache/CachePartialUpdateException.java | 22 +- .../processors/cache/CacheLockImpl.java | 150 +++++++++ .../processors/cache/IgniteCacheProxy.java | 104 +----- .../grid/cache/GridCacheConfiguration.java | 32 ++ .../org/gridgain/grid/cache/GridCacheFlag.java | 3 - .../processors/cache/CacheInvokeEntry.java | 22 +- .../processors/cache/CacheInvokeResult.java | 22 +- .../processors/cache/GridCacheAdapter.java | 8 +- .../cache/IgniteCacheExpiryPolicy.java | 22 +- .../distributed/GridCacheTtlUpdateRequest.java | 22 +- .../IgniteExternalizableExpiryPolicy.java | 22 +- .../cache/IgniteCacheAbstractTest.java | 22 +- .../cache/IgniteCacheAtomicInvokeTest.java | 22 +- .../cache/IgniteCacheAtomicLocalInvokeTest.java | 22 +- ...niteCacheAtomicLocalWithStoreInvokeTest.java | 22 +- .../IgniteCacheAtomicNearEnabledInvokeTest.java | 22 +- ...eCacheAtomicPrimaryWriteOrderInvokeTest.java | 22 +- ...micPrimaryWriteOrderWithStoreInvokeTest.java | 22 +- .../cache/IgniteCacheInvokeAbstractTest.java | 22 +- .../cache/IgniteCacheTxInvokeTest.java | 22 +- .../cache/IgniteCacheTxLocalInvokeTest.java | 22 +- .../IgniteCacheTxNearEnabledInvokeTest.java | 22 +- .../IgniteCacheAtomicExpiryPolicyTest.java | 22 +- .../IgniteCacheAtomicLocalExpiryPolicyTest.java | 22 +- ...AtomicPrimaryWriteOrderExpiryPolicyTest.java | 22 +- ...maryWriteOrderWithStoreExpiryPolicyTest.java | 22 +- ...teCacheAtomicReplicatedExpiryPolicyTest.java | 22 +- ...iteCacheAtomicWithStoreExpiryPolicyTest.java | 22 +- .../IgniteCacheExpiryPolicyAbstractTest.java | 22 +- .../IgniteCacheExpiryPolicyTestSuite.java | 22 +- .../expiry/IgniteCacheTxExpiryPolicyTest.java | 22 +- .../IgniteCacheTxLocalExpiryPolicyTest.java | 22 +- ...IgniteCacheTxReplicatedExpiryPolicyTest.java | 22 +- .../IgniteCacheTxWithStoreExpiryPolicyTest.java | 22 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 65 ++-- .../GridCacheMultiNodeLockAbstractTest.java | 137 +------- .../dht/GridCacheColocatedDebugTest.java | 20 +- .../dht/GridCacheGlobalLoadTest.java | 22 +- .../near/GridCachePartitionedLockSelfTest.java | 23 +- ...idCachePartitionedMultiNodeLockSelfTest.java | 10 - .../GridCacheLocalMultithreadedSelfTest.java | 135 +------- ...heGgfsPerBlockLruEvictionPolicySelfTest.java | 15 +- .../ggfs/GridGgfsAbstractSelfTest.java | 20 +- .../ggfs/GridGgfsMetricsSelfTest.java | 10 +- .../processors/ggfs/GridGgfsModesSelfTest.java | 6 +- ...IpcEndpointRegistrationAbstractSelfTest.java | 33 +- ...dpointRegistrationOnLinuxAndMacSelfTest.java | 6 +- ...pcEndpointRegistrationOnWindowsSelfTest.java | 4 +- ...idIpcServerEndpointDeserializerSelfTest.java | 76 ++--- .../testframework/GridGgfsTestUtils.java | 55 ---- .../counter/GridHadoopFSCounterWriter.java | 4 +- .../counter/GridHadoopPerformanceCounter.java | 18 +- .../v2/GridHadoopV2JobResourceManager.java | 13 +- .../grid/ggfs/GridGgfsEventsTestSuite.java | 26 +- ...dGgfsHadoop20FileSystemAbstractSelfTest.java | 9 +- ...doop20FileSystemLoopbackPrimarySelfTest.java | 11 +- ...sHadoop20FileSystemShmemPrimarySelfTest.java | 11 +- .../GridGgfsHadoopDualAbstractSelfTest.java | 19 +- ...ridGgfsHadoopFileSystemAbstractSelfTest.java | 15 +- .../GridGgfsHadoopFileSystemClientSelfTest.java | 6 +- ...idGgfsHadoopFileSystemHandshakeSelfTest.java | 7 +- ...ridGgfsHadoopFileSystemIpcCacheSelfTest.java | 7 +- ...GgfsHadoopFileSystemLoggerStateSelfTest.java | 7 +- ...adoopFileSystemLoopbackAbstractSelfTest.java | 9 +- ...fsHadoopFileSystemSecondaryModeSelfTest.java | 12 +- ...fsHadoopFileSystemShmemAbstractSelfTest.java | 7 +- .../ggfs/GridGgfsNearOnlyMultiNodeSelfTest.java | 7 +- .../grid/hadoop/GridHadoopTestUtils.java | 20 +- .../hadoop/GridHadoopCommandLineTest.java | 2 +- .../hadoop/GridHadoopMapReduceTest.java | 5 +- .../grid/cache/spring/GridSpringCache.java | 185 +++++++++++ .../cache/spring/GridSpringCacheManager.java | 190 ++--------- .../spring/GridSpringDynamicCacheManager.java | 316 +++++++++++++++++++ .../spring/GridSpringCacheManagerSelfTest.java | 2 +- .../GridSpringDynamicCacheManagerSelfTest.java | 218 +++++++++++++ .../GridSpringDynamicCacheTestService.java | 62 ++++ .../cache/spring/spring-dynamic-caching.xml | 43 +++ .../testsuites/bamboo/GridSpringTestSuite.java | 1 + 84 files changed, 1861 insertions(+), 1113 deletions(-) ----------------------------------------------------------------------