Merge branch 'ignite-sprint-3' into ignite-673
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7abbcf4c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7abbcf4c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7abbcf4c Branch: refs/heads/ignite-673 Commit: 7abbcf4cf09795982753fc12e0f3bedcf206c210 Parents: 0b44c85 e7fa0a9 Author: Artem Shutak <ashu...@gridgain.com> Authored: Thu Apr 9 17:59:00 2015 +0300 Committer: Artem Shutak <ashu...@gridgain.com> Committed: Thu Apr 9 17:59:00 2015 +0300 ---------------------------------------------------------------------- .../datastructures/IgniteQueueExample.java | 28 +- .../datastructures/IgniteSetExample.java | 30 +- .../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/GridCacheIoManager.java | 87 ++-- .../processors/cache/GridCacheMessage.java | 7 + .../GridCachePartitionExchangeManager.java | 136 +++++- .../processors/cache/GridCacheProcessor.java | 63 ++- .../dht/GridDhtAffinityAssignmentRequest.java | 5 + .../dht/GridDhtAffinityAssignmentResponse.java | 5 + .../GridDhtPartitionsAbstractMessage.java | 15 +- .../continuous/CacheContinuousQueryManager.java | 28 -- .../cacheobject/IgniteCacheObjectProcessor.java | 5 +- .../IgniteCacheObjectProcessorImpl.java | 34 +- .../datastreamer/DataStreamerImpl.java | 8 +- .../CacheDataStructuresCacheKey.java | 62 +++ .../CacheDataStructuresConfigurationKey.java | 2 +- .../datastructures/DataStructuresProcessor.java | 222 ++++++++- .../plugin/IgnitePluginProcessor.java | 58 +-- .../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 +- ...actQueueFailoverDataConsistencySelfTest.java | 4 +- .../GridCacheQueueApiSelfAbstractTest.java | 80 ++++ .../GridCacheQueueCleanupSelfTest.java | 11 +- ...dCacheQueueMultiNodeConsistencySelfTest.java | 11 +- .../GridCacheSetAbstractSelfTest.java | 4 +- .../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 + .../h2/sql/AbstractH2CompareQueryTest.java | 13 +- .../query/h2/sql/BaseH2CompareQueryTest.java | 25 +- .../query/h2/sql/H2CompareBigQueryTest.java | 38 +- 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 - 105 files changed, 2830 insertions(+), 2503 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7abbcf4c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java ----------------------------------------------------------------------
