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 3AE26177B7 for ; Thu, 9 Apr 2015 17:34:41 +0000 (UTC) Received: (qmail 10417 invoked by uid 500); 9 Apr 2015 17:34:41 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 10389 invoked by uid 500); 9 Apr 2015 17:34: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 10380 invoked by uid 99); 9 Apr 2015 17:34:41 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Apr 2015 17:34:41 +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; Thu, 09 Apr 2015 17:34:16 +0000 Received: (qmail 7460 invoked by uid 99); 9 Apr 2015 17:34: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; Thu, 09 Apr 2015 17:34:13 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 70534E0019; Thu, 9 Apr 2015 17:34:13 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: akuznetsov@apache.org To: commits@ignite.incubator.apache.org Date: Thu, 09 Apr 2015 17:35:01 -0000 Message-Id: <4b517fba0c574679a03728ea103a740b@git.apache.org> In-Reply-To: <4294682043474807a0fe5f496b891a35@git.apache.org> References: <4294682043474807a0fe5f496b891a35@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [50/50] [abbrv] incubator-ignite git commit: Merge branches 'ignite-692' and 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-692 X-Virus-Checked: Checked by ClamAV on apache.org Merge branches 'ignite-692' and 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-692 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4c4eb2f3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4c4eb2f3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4c4eb2f3 Branch: refs/heads/ignite-692 Commit: 4c4eb2f311ed6800f6e6bb9e73c97d3500030e23 Parents: c279485 a60f47d Author: AKuznetsov Authored: Fri Apr 10 00:25:29 2015 +0700 Committer: AKuznetsov Committed: Fri Apr 10 00:25:29 2015 +0700 ---------------------------------------------------------------------- .../examples/datagrid/CacheAffinityExample.java | 9 +- .../examples/datagrid/CacheApiExample.java | 9 +- .../examples/datagrid/CacheAsyncApiExample.java | 9 +- .../datagrid/CacheContinuousQueryExample.java | 8 +- .../datagrid/CacheDataStreamerExample.java | 9 +- .../examples/datagrid/CacheEventsExample.java | 9 +- .../examples/datagrid/CachePutGetExample.java | 10 +- .../datagrid/CacheTransactionExample.java | 8 +- .../hibernate/HibernateL2CacheExample.java | 5 +- .../starschema/CacheStarSchemaExample.java | 10 +- .../store/auto/CacheAutoStoreExample.java | 8 +- .../auto/CacheAutoStoreLoadDataExample.java | 5 +- .../datagrid/store/auto/CacheConfig.java | 4 +- .../store/dummy/CacheDummyStoreExample.java | 5 +- .../hibernate/CacheHibernateStoreExample.java | 5 +- .../store/jdbc/CacheJdbcStoreExample.java | 5 +- .../datastructures/IgniteQueueExample.java | 28 +- .../datastructures/IgniteSetExample.java | 30 +- .../streaming/StreamVisitorExample.java | 5 +- .../java/org/apache/ignite/IgniteCluster.java | 2 +- .../configuration/CacheConfiguration.java | 20 +- .../configuration/CollectionConfiguration.java | 114 ++++- .../ignite/internal/ClusterMetricsSnapshot.java | 2 +- .../ignite/internal/GridPluginContext.java | 15 +- .../apache/ignite/internal/IgniteKernal.java | 16 +- .../ignite/internal/MarshallerContextImpl.java | 3 + .../affinity/GridAffinityProcessor.java | 5 +- .../processors/cache/GridCacheAdapter.java | 59 ++- .../processors/cache/GridCacheIoManager.java | 87 ++-- .../processors/cache/GridCacheMessage.java | 7 + .../GridCachePartitionExchangeManager.java | 136 +++++- .../processors/cache/GridCacheProcessor.java | 63 ++- .../cache/GridCacheProjectionImpl.java | 2 +- .../processors/cache/GridCacheProxyImpl.java | 2 +- .../cache/GridLoadCacheCloseablePredicate.java | 30 ++ .../dht/GridDhtAffinityAssignmentRequest.java | 5 + .../dht/GridDhtAffinityAssignmentResponse.java | 5 + .../distributed/dht/GridDhtCacheAdapter.java | 22 +- .../GridDhtPartitionsAbstractMessage.java | 15 +- .../cache/query/GridCacheQueriesImpl.java | 2 +- .../continuous/CacheContinuousQueryManager.java | 28 -- .../cache/version/GridCacheVersionEx.java | 2 +- .../cacheobject/IgniteCacheObjectProcessor.java | 5 +- .../IgniteCacheObjectProcessorImpl.java | 36 +- .../datastreamer/DataStreamerImpl.java | 8 +- .../CacheDataStructuresCacheKey.java | 62 +++ .../CacheDataStructuresConfigurationKey.java | 2 +- .../datastructures/DataStructuresProcessor.java | 222 ++++++++- .../datastructures/GridCacheQueueAdapter.java | 2 +- .../plugin/IgnitePluginProcessor.java | 58 +-- .../util/lang/GridMetadataAwareAdapter.java | 2 +- .../ignite/plugin/CachePluginConfiguration.java | 2 +- .../org/apache/ignite/plugin/IgnitePlugin.java | 3 - .../ignite/plugin/PluginConfiguration.java | 10 +- .../org/apache/ignite/plugin/PluginContext.java | 7 +- .../apache/ignite/plugin/PluginProvider.java | 4 +- .../communication/tcp/TcpCommunicationSpi.java | 2 +- .../discovery/tcp/TcpDiscoverySpiAdapter.java | 2 +- ...actQueueFailoverDataConsistencySelfTest.java | 4 +- .../GridCacheQueueApiSelfAbstractTest.java | 80 ++++ .../GridCacheQueueCleanupSelfTest.java | 11 +- ...dCacheQueueMultiNodeConsistencySelfTest.java | 11 +- .../GridCacheSetAbstractSelfTest.java | 5 +- .../IgniteCollectionAbstractTest.java | 160 ++----- .../IgniteDataStructureUniqueNameTest.java | 47 +- .../GridCacheLocalAtomicOffheapSetSelfTest.java | 32 ++ .../GridCacheLocalAtomicQueueApiSelfTest.java | 6 + .../local/GridCacheLocalAtomicSetSelfTest.java | 6 + .../GridCacheLocalOffheapQueueApiSelfTest.java | 31 ++ .../local/GridCacheLocalQueueApiSelfTest.java | 6 + .../local/GridCacheLocalSetSelfTest.java | 6 + ...artitionedAtomicOffheapQueueApiSelfTest.java | 32 ++ ...omicOffheapQueueCreateMultiNodeSelfTest.java | 32 ++ ...onedAtomicOffheapQueueMultiNodeSelfTest.java | 32 ++ ...dCachePartitionedAtomicQueueApiSelfTest.java | 6 + ...ionedAtomicQueueCreateMultiNodeSelfTest.java | 6 + ...micQueueFailoverDataConsistencySelfTest.java | 6 + ...PartitionedAtomicQueueMultiNodeSelfTest.java | 6 + ...itionedAtomicQueueRotativeMultiNodeTest.java | 6 + ...chePartitionedAtomicSetFailoverSelfTest.java | 6 + ...rtitionedDataStructuresFailoverSelfTest.java | 6 + ...artitionedOffHeapValuesQueueApiSelfTest.java | 31 ++ ...achePartitionedOffHeapValuesSetSelfTest.java | 32 ++ ...edOffheapDataStructuresFailoverSelfTest.java | 34 ++ ...hePartitionedOffheapSetFailoverSelfTest.java | 32 ++ .../GridCachePartitionedQueueApiSelfTest.java | 6 + ...PartitionedQueueCreateMultiNodeSelfTest.java | 6 + ...dCachePartitionedQueueEntryMoveSelfTest.java | 10 +- ...nedQueueFailoverDataConsistencySelfTest.java | 6 + ...CachePartitionedQueueJoinedNodeSelfTest.java | 6 + ...dCachePartitionedQueueMultiNodeSelfTest.java | 6 + ...hePartitionedQueueRotativeMultiNodeTest.java | 6 + ...GridCachePartitionedSetFailoverSelfTest.java | 6 + .../GridCachePartitionedSetSelfTest.java | 6 + .../IgnitePartitionedSetNoBackupsSelfTest.java | 5 +- ...eplicatedDataStructuresFailoverSelfTest.java | 6 + .../GridCacheReplicatedQueueApiSelfTest.java | 11 + ...idCacheReplicatedQueueMultiNodeSelfTest.java | 6 + ...cheReplicatedQueueRotativeMultiNodeTest.java | 6 + .../GridCacheReplicatedSetSelfTest.java | 6 + .../IgniteCacheAtomicNodeJoinTest.java | 44 ++ .../IgniteCacheNodeJoinAbstractTest.java | 109 +++++ .../distributed/IgniteCacheTxNodeJoinTest.java | 38 ++ .../IgniteCacheDataStructuresSelfTestSuite.java | 10 + .../IgniteCacheFailoverTestSuite.java | 4 + .../query/h2/sql/GridSqlQueryParser.java | 24 +- .../h2/sql/AbstractH2CompareQueryTest.java | 13 +- .../query/h2/sql/BaseH2CompareQueryTest.java | 37 +- .../query/h2/sql/H2CompareBigQueryTest.java | 38 +- .../ignite/tools/javadoc/IgniteLinkTaglet.java | 20 +- modules/urideploy/README.txt | 2 +- modules/urideploy/licenses/edtftp-license.pdf | Bin 58355 -> 0 bytes modules/urideploy/licenses/jtidy-license.txt | 50 -- .../urideploy/licenses/jtidy-mit-license.txt | 50 ++ modules/urideploy/pom.xml | 6 - .../spi/deployment/uri/UriDeploymentSpi.java | 182 +++---- .../uri/scanners/GridUriDeploymentScanner.java | 286 ----------- .../GridUriDeploymentScannerListener.java | 2 +- .../uri/scanners/UriDeploymentScanner.java | 47 ++ .../scanners/UriDeploymentScannerContext.java | 92 ++++ .../scanners/UriDeploymentScannerManager.java | 221 +++++++++ .../file/GridUriDeploymentFileScanner.java | 311 ------------ .../scanners/file/UriDeploymentFileScanner.java | 327 +++++++++++++ .../ftp/GridUriDeploymentFtpClient.java | 199 -------- .../ftp/GridUriDeploymentFtpConfiguration.java | 115 ----- .../ftp/GridUriDeploymentFtpException.java | 43 -- .../scanners/ftp/GridUriDeploymentFtpFile.java | 119 ----- .../ftp/GridUriDeploymentFtpScanner.java | 234 --------- .../uri/scanners/ftp/package-info.java | 22 - .../http/GridUriDeploymentHttpScanner.java | 423 ---------------- .../scanners/http/UriDeploymentHttpScanner.java | 478 +++++++++++++++++++ ...loymentMultiScannersErrorThrottlingTest.java | 3 - .../GridUriDeploymentMultiScannersSelfTest.java | 3 +- .../GridFileDeploymentUndeploySelfTest.java | 4 +- .../uri/scanners/ftp/GridFtpDeploymentTest.java | 46 -- .../uri/scanners/ftp/package-info.java | 22 - .../scala/org/apache/ignite/visor/visor.scala | 3 + 137 files changed, 2994 insertions(+), 2653 deletions(-) ----------------------------------------------------------------------