ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yzhda...@apache.org
Subject [10/16] ignite git commit: Ignite-642: resolves merge conflict.
Date Tue, 12 Apr 2016 17:48:54 GMT
Ignite-642: resolves merge conflict.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7190f242
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7190f242
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7190f242

Branch: refs/heads/ignite-642
Commit: 7190f2426c5f06f38eefe6727e68bca09f051f02
Parents: 0ae6a94 4af5316
Author: Vladisav Jelisavcic <vladisavj@gmail.com>
Authored: Fri Mar 18 15:44:27 2016 +0100
Committer: vladisav <vladisavj@gmail.com>
Committed: Fri Mar 18 15:44:27 2016 +0100

----------------------------------------------------------------------
 .gitignore                                      |    1 +
 assembly/dependencies-fabric-lgpl.xml           |    1 +
 assembly/dependencies-fabric.xml                |    1 +
 bin/ignite.bat                                  |    7 +-
 bin/ignite.sh                                   |    6 +-
 .../streaming/StreamVisitorExample.java         |   31 +-
 modules/aws/pom.xml                             |   38 +-
 .../java/org/apache/ignite/IgniteQueue.java     |   27 +-
 .../main/java/org/apache/ignite/IgniteSet.java  |   26 +-
 .../apache/ignite/IgniteSystemProperties.java   |    3 +
 .../cache/query/CacheQueryEntryEvent.java       |   48 +
 .../ignite/cache/query/ContinuousQuery.java     |   35 +
 .../configuration/FileSystemConfiguration.java  |   47 +
 .../configuration/IgniteConfiguration.java      |   14 +
 .../configuration/TransactionConfiguration.java |   32 +
 .../java/org/apache/ignite/igfs/IgfsPath.java   |    9 +
 .../internal/GridEventConsumeHandler.java       |    4 +-
 .../ignite/internal/GridJobCancelRequest.java   |    5 +
 .../ignite/internal/GridJobExecuteRequest.java  |    5 +
 .../ignite/internal/GridJobExecuteResponse.java |    5 +
 .../ignite/internal/GridJobSiblingsRequest.java |    5 +
 .../internal/GridJobSiblingsResponse.java       |    5 +
 .../internal/GridMessageListenHandler.java      |    4 +-
 .../ignite/internal/GridTaskCancelRequest.java  |    5 +
 .../ignite/internal/GridTaskSessionRequest.java |    5 +
 .../ignite/internal/IgniteComputeImpl.java      |    4 +-
 .../apache/ignite/internal/IgniteKernal.java    |    2 +-
 .../org/apache/ignite/internal/IgnitionEx.java  |    7 +
 .../ignite/internal/MarshallerContextImpl.java  |    3 +-
 .../internal/binary/BinaryClassDescriptor.java  |    2 +-
 .../ignite/internal/binary/BinaryContext.java   |   30 +-
 .../internal/binary/BinaryEnumObjectImpl.java   |   57 +-
 .../internal/binary/BinaryFieldAccessor.java    |    1 +
 .../internal/binary/BinaryObjectImpl.java       |    5 +
 .../binary/BinaryObjectOffheapImpl.java         |    5 +
 .../ignite/internal/binary/BinarySchema.java    |   11 +-
 .../ignite/internal/binary/BinaryUtils.java     |   10 +-
 .../ignite/internal/jdbc/JdbcStatement.java     |    9 +-
 .../ignite/internal/jdbc2/JdbcStatement.java    |    7 +-
 .../internal/managers/GridManagerAdapter.java   |    4 +-
 .../checkpoint/GridCheckpointManager.java       |    2 +-
 .../checkpoint/GridCheckpointRequest.java       |    5 +
 .../managers/communication/GridIoManager.java   |  202 +-
 .../managers/communication/GridIoMessage.java   |    5 +
 .../communication/GridIoUserMessage.java        |    5 +
 .../deployment/GridDeploymentCommunication.java |    2 +-
 .../deployment/GridDeploymentInfoBean.java      |    5 +
 .../deployment/GridDeploymentLocalStore.java    |    2 +-
 .../deployment/GridDeploymentRequest.java       |    5 +
 .../deployment/GridDeploymentResponse.java      |    5 +
 .../discovery/GridDiscoveryManager.java         |   18 +-
 .../eventstorage/GridEventStorageManager.java   |   10 +-
 .../eventstorage/GridEventStorageMessage.java   |    5 +
 .../affinity/AffinityTopologyVersion.java       |    5 +
 .../processors/affinity/GridAffinityUtils.java  |    3 +-
 .../cache/CacheEntryInfoCollection.java         |    5 +
 .../cache/CacheEntryPredicateAdapter.java       |    8 +
 .../cache/CacheEntryPredicateContainsValue.java |    8 +-
 .../cache/CacheEntrySerializablePredicate.java  |    8 +-
 .../cache/CacheEvictableEntryImpl.java          |    2 +-
 .../processors/cache/CacheEvictionEntry.java    |    5 +
 .../cache/CacheInvokeDirectResult.java          |    8 +-
 .../processors/cache/CacheLazyEntry.java        |    3 +-
 .../internal/processors/cache/CacheObject.java  |    3 +
 .../cache/CacheObjectByteArrayImpl.java         |    5 +
 .../processors/cache/CacheObjectImpl.java       |    5 +
 .../processors/cache/GridCacheAdapter.java      |   15 +-
 .../cache/GridCacheDeploymentManager.java       |   13 +-
 .../processors/cache/GridCacheEntryEx.java      |    5 +-
 .../processors/cache/GridCacheEntryInfo.java    |    5 +
 .../cache/GridCacheEvictionManager.java         |    6 +-
 .../processors/cache/GridCacheMapEntry.java     |  157 +-
 .../processors/cache/GridCacheMessage.java      |    9 +-
 .../processors/cache/GridCacheMvccManager.java  |  144 +-
 .../GridCachePartitionExchangeManager.java      |    3 +
 .../processors/cache/GridCacheProcessor.java    |   29 +-
 .../processors/cache/GridCacheReturn.java       |    5 +
 .../processors/cache/GridCacheTtlManager.java   |   75 +-
 .../processors/cache/GridCacheUtils.java        |   56 +-
 .../processors/cache/IgniteCacheProxy.java      |    4 +
 .../processors/cache/KeyCacheObjectImpl.java    |    5 +
 .../cache/affinity/GridCacheAffinityImpl.java   |    7 +-
 .../binary/CacheObjectBinaryProcessorImpl.java  |   18 +-
 .../CacheDataStructuresManager.java             |    4 +-
 .../GridDistributedLockResponse.java            |    3 +-
 .../GridDistributedTxPrepareRequest.java        |    2 +-
 .../GridDistributedTxPrepareResponse.java       |    3 +-
 .../dht/GridDhtAffinityAssignmentResponse.java  |    3 +-
 .../distributed/dht/GridDhtCacheAdapter.java    |   29 +-
 .../distributed/dht/GridDhtCacheEntry.java      |    4 +-
 .../distributed/dht/GridDhtLockFuture.java      |   17 +-
 .../dht/GridDhtPartitionTopologyImpl.java       |   12 +-
 .../dht/GridDhtTxFinishResponse.java            |    3 +-
 .../cache/distributed/dht/GridDhtTxRemote.java  |   11 +-
 .../dht/atomic/GridDhtAtomicCache.java          |    5 +-
 .../dht/atomic/GridDhtAtomicUpdateRequest.java  |   14 +-
 .../dht/atomic/GridDhtAtomicUpdateResponse.java |    3 +-
 .../dht/atomic/GridNearAtomicUpdateRequest.java |   19 +-
 .../atomic/GridNearAtomicUpdateResponse.java    |    3 +-
 .../dht/preloader/GridDhtForceKeysResponse.java |    3 +-
 .../GridDhtPartitionDemandMessage.java          |    3 +-
 .../dht/preloader/GridDhtPartitionDemander.java |   36 +-
 .../preloader/GridDhtPartitionExchangeId.java   |    5 +
 .../preloader/GridDhtPartitionsFullMessage.java |    5 +-
 .../GridDhtPartitionsSingleMessage.java         |    5 +-
 .../distributed/near/CacheVersionedValue.java   |    5 +
 .../distributed/near/GridNearCacheEntry.java    |    4 +-
 .../distributed/near/GridNearGetResponse.java   |    3 +-
 .../near/GridNearOptimisticTxPrepareFuture.java |   18 +-
 .../near/GridNearSingleGetResponse.java         |    3 +-
 .../near/GridNearTxFinishResponse.java          |    3 +-
 .../distributed/near/GridNearTxRemote.java      |    9 +-
 .../processors/cache/dr/GridCacheDrManager.java |    4 +-
 .../cache/dr/GridOsCacheDrManager.java          |    3 +-
 .../cache/query/GridCacheLocalQueryFuture.java  |    7 +-
 .../cache/query/GridCacheQueryManager.java      |  424 +-
 .../cache/query/GridCacheQueryRequest.java      |   13 +-
 .../cache/query/GridCacheQueryResponse.java     |    3 +-
 .../cache/query/GridCacheSqlQuery.java          |   11 +-
 .../CacheContinuousQueryBatchAck.java           |    4 +
 .../continuous/CacheContinuousQueryEntry.java   |    5 +
 .../continuous/CacheContinuousQueryEvent.java   |   17 +-
 .../continuous/CacheContinuousQueryHandler.java |  243 +-
 .../CacheContinuousQueryHandlerV2.java          |  176 +
 .../CacheContinuousQueryListener.java           |    3 +-
 .../continuous/CacheContinuousQueryManager.java |  271 +-
 .../transactions/IgniteTransactionsImpl.java    |    9 +-
 .../cache/transactions/IgniteTxAdapter.java     |    6 +-
 .../cache/transactions/IgniteTxEntry.java       |   11 +-
 .../IgniteTxImplicitSingleStateImpl.java        |   25 +-
 .../cache/transactions/IgniteTxKey.java         |    5 +
 .../transactions/IgniteTxLocalAdapter.java      |    8 +-
 .../IgniteTxRemoteSingleStateImpl.java          |    6 +-
 .../cache/transactions/TxEntryValueHolder.java  |    5 +
 .../version/GridCacheRawVersionedEntry.java     |    5 +-
 .../cache/version/GridCacheVersion.java         |    5 +
 .../IgniteCacheObjectProcessorImpl.java         |    3 +-
 .../clock/GridClockDeltaSnapshotMessage.java    |    5 +
 .../processors/clock/GridClockDeltaVersion.java |    5 +
 .../closure/GridClosureProcessor.java           |  381 +-
 .../continuous/GridContinuousMessage.java       |    5 +
 .../continuous/GridContinuousProcessor.java     |   18 +-
 .../datastreamer/DataStreamProcessor.java       |    4 +-
 .../datastreamer/DataStreamerEntry.java         |    5 +
 .../datastreamer/DataStreamerImpl.java          |   21 +-
 .../datastreamer/DataStreamerRequest.java       |    5 +
 .../datastreamer/DataStreamerResponse.java      |    5 +
 .../datastructures/DataStructuresProcessor.java |   10 +-
 .../datastructures/GridCacheQueueAdapter.java   |   25 +
 .../datastructures/GridCacheQueueProxy.java     |   14 +-
 .../datastructures/GridCacheSemaphoreEx.java    |    5 +
 .../datastructures/GridCacheSemaphoreImpl.java  |  161 +-
 .../datastructures/GridCacheSetImpl.java        |   38 +-
 .../datastructures/GridCacheSetProxy.java       |   14 +-
 .../processors/igfs/IgfsAckMessage.java         |    5 +
 .../internal/processors/igfs/IgfsBlockKey.java  |    5 +
 .../processors/igfs/IgfsBlocksMessage.java      |    5 +
 .../IgfsColocatedMetadataAffinityKeyMapper.java |   47 +
 .../processors/igfs/IgfsDeleteMessage.java      |    5 +
 .../processors/igfs/IgfsDeleteWorker.java       |   28 +-
 .../processors/igfs/IgfsFileAffinityRange.java  |    5 +
 .../internal/processors/igfs/IgfsFileImpl.java  |   52 +-
 .../internal/processors/igfs/IgfsFileInfo.java  |  112 +-
 .../internal/processors/igfs/IgfsFileMap.java   |    9 +-
 .../igfs/IgfsFragmentizerManager.java           |  166 +-
 .../igfs/IgfsFragmentizerRequest.java           |    5 +
 .../igfs/IgfsFragmentizerResponse.java          |    5 +
 .../internal/processors/igfs/IgfsImpl.java      |   99 +-
 .../igfs/IgfsInvalidRangeException.java         |    4 +-
 .../processors/igfs/IgfsListingEntry.java       |  134 +-
 .../processors/igfs/IgfsMetaManager.java        | 2198 ++++---
 .../processors/igfs/IgfsOutputStreamImpl.java   |   80 +-
 .../internal/processors/igfs/IgfsPathIds.java   |  291 +
 .../processors/igfs/IgfsPathsCreateResult.java  |   77 +
 .../processors/igfs/IgfsSyncMessage.java        |    5 +
 .../internal/processors/igfs/IgfsUtils.java     |  142 +-
 .../processors/job/GridJobProcessor.java        |   10 +-
 .../internal/processors/job/GridJobWorker.java  |    2 +-
 .../offheap/GridOffHeapProcessor.java           |    2 +-
 .../processors/platform/PlatformContext.java    |   16 +
 .../platform/PlatformContextImpl.java           |   85 +-
 .../platform/PlatformProcessorImpl.java         |   31 +-
 .../callback/PlatformCallbackGateway.java       |   30 +
 .../callback/PlatformCallbackUtils.java         |   15 +
 .../platform/cluster/PlatformClusterGroup.java  |   12 +
 .../platform/compute/PlatformCompute.java       |   26 +-
 .../datastructures/PlatformAtomicReference.java |    7 +-
 .../PlatformDotNetConfigurationClosure.java     |    5 -
 .../utils/PlatformConfigurationUtils.java       |   24 +-
 .../processors/query/GridQueryProcessor.java    |   13 +-
 .../messages/GridQueryCancelRequest.java        |    5 +
 .../twostep/messages/GridQueryFailResponse.java |    5 +
 .../messages/GridQueryNextPageRequest.java      |    5 +
 .../messages/GridQueryNextPageResponse.java     |    5 +
 .../h2/twostep/messages/GridQueryRequest.java   |    5 +
 .../handlers/log/GridLogCommandHandler.java     |   32 +-
 .../handlers/task/GridTaskCommandHandler.java   |    6 +-
 .../handlers/task/GridTaskResultRequest.java    |    5 +
 .../handlers/task/GridTaskResultResponse.java   |    5 +
 .../service/GridServiceProcessor.java           |  106 +-
 .../processors/service/GridServiceProxy.java    |  132 +-
 .../processors/task/GridTaskProcessor.java      |    5 +-
 .../processors/task/GridTaskWorker.java         |    9 +-
 .../ignite/internal/util/GridByteArrayList.java |    5 +
 .../ignite/internal/util/GridHandleTable.java   |    7 +-
 .../ignite/internal/util/GridLongList.java      |    5 +
 .../internal/util/GridMessageCollection.java    |    5 +
 .../ignite/internal/util/IgniteUtils.java       |   67 +-
 .../util/StripedCompositeReadWriteLock.java     |  174 +
 .../internal/util/UUIDCollectionMessage.java    |    5 +
 .../util/nio/GridNioFinishedFuture.java         |    5 +
 .../ignite/internal/util/nio/GridNioFuture.java |    7 +-
 .../internal/util/nio/GridNioFutureImpl.java    |    5 +
 .../util/nio/GridNioRecoveryDescriptor.java     |   23 +-
 .../ignite/internal/util/nio/GridNioServer.java |   59 +-
 .../apache/ignite/internal/util/typedef/X.java  |    2 +-
 .../ignite/internal/visor/cache/VisorCache.java |    2 +-
 .../cache/VisorCacheAggregatedMetrics.java      |  113 +-
 .../internal/visor/cache/VisorCacheMetrics.java |   88 +-
 .../cache/VisorCacheMetricsCollectorTask.java   |   21 +-
 .../visor/cache/VisorCacheMetricsV2.java        |   66 +
 .../internal/visor/cache/VisorCacheV2.java      |    2 +-
 .../internal/visor/util/VisorTaskUtils.java     |    4 +-
 .../ignite/logger/java/JavaLoggerFormatter.java |    4 +-
 .../OptimizedObjectStreamRegistry.java          |  145 +-
 .../extensions/communication/Message.java       |    5 +
 .../ignite/resources/JobContextResource.java    |    4 +-
 .../org/apache/ignite/spi/IgniteSpiAdapter.java |   15 +
 .../ignite/spi/IgniteSpiConsistencyChecked.java |    8 +
 .../jobstealing/JobStealingRequest.java         |    5 +
 .../communication/tcp/TcpCommunicationSpi.java  |   23 +
 .../tcp/TcpCommunicationSpiMBean.java           |    8 +-
 .../ignite/spi/discovery/tcp/ClientImpl.java    |   31 +-
 .../ignite/spi/discovery/tcp/ServerImpl.java    |   18 +-
 .../spi/discovery/tcp/TcpDiscoverySpi.java      |    3 +-
 .../tcp/internal/TcpDiscoveryNode.java          |   41 +-
 .../TcpDiscoveryMulticastIpFinder.java          |    1 +
 .../sharedfs/TcpDiscoverySharedFsIpFinder.java  |   35 +-
 .../TcpDiscoveryCustomEventMessage.java         |    2 +-
 .../spi/swapspace/file/FileSwapSpaceSpi.java    |    2 +
 .../spi/swapspace/noop/NoopSwapSpaceSpi.java    |    2 +
 .../org/apache/ignite/thread/IgniteThread.java  |   34 +-
 .../ignite/thread/IgniteThreadFactory.java      |    7 +-
 .../resources/META-INF/classnames.properties    |    6 +
 .../config/websession/example-cache-base.xml    |  148 +
 .../config/websession/example-cache-client.xml  |   33 +
 .../test/config/websession/example-cache.xml    |  128 +-
 .../test/config/websession/example-cache2.xml   |   31 +
 .../ComputeJobCancelWithServiceSelfTest.java    |  154 +
 .../internal/GridAffinityNoCacheSelfTest.java   |    5 +
 .../ignite/internal/GridAffinitySelfTest.java   |    4 +-
 ...omputationBinarylizableClosuresSelfTest.java |  413 ++
 .../GridMultithreadedJobStealingSelfTest.java   |    3 +-
 .../GridTaskCancelSingleNodeSelfTest.java       |   37 +-
 .../internal/binary/BinaryEnumsSelfTest.java    |   51 +-
 .../binary/BinaryMarshallerSelfTest.java        |   50 +
 .../GridCommunicationSendMessageSelfTest.java   |    5 +
 .../communication/GridIoManagerSelfTest.java    |    5 +
 .../cache/CacheEntryProcessorCopySelfTest.java  |  213 +
 .../cache/CacheEnumOperationsAbstractTest.java  |  339 +
 .../CacheEnumOperationsSingleNodeTest.java      |   28 +
 .../cache/CacheEnumOperationsTest.java          |   28 +
 .../cache/GridCacheAbstractFullApiSelfTest.java |   75 +-
 .../cache/GridCacheAbstractSelfTest.java        |   19 +
 .../cache/GridCacheDeploymentSelfTest.java      |   78 +-
 .../GridCacheOffHeapValuesEvictionSelfTest.java |   26 +
 .../GridCacheOnCopyFlagAbstractSelfTest.java    |  479 +-
 ...ridCacheStoreManagerDeserializationTest.java |  346 ++
 ...ridCacheSwapSpaceSpiConsistencySelfTest.java |  146 +
 .../processors/cache/GridCacheTestEntryEx.java  |    2 +-
 ...calCacheStoreManagerDeserializationTest.java |  101 +
 .../IgniteCacheConfigVariationsFullApiTest.java | 5851 ++++++++++++++++++
 .../IgniteCacheEntryListenerAbstractTest.java   |   75 +-
 .../cache/IgniteCacheEntryListenerTxTest.java   |    5 -
 .../IgniteCachePutStackOverflowSelfTest.java    |  133 +
 .../IgniteDynamicClientCacheStartSelfTest.java  |   97 +
 .../cache/IgniteTxConfigCacheSelfTest.java      |  249 +
 .../GridCacheBinaryObjectsAbstractSelfTest.java |   40 +
 .../GridDataStreamerImplSelfTest.java           |   49 +-
 ...eAbstractDataStructuresFailoverSelfTest.java |   44 +
 .../GridCacheQueueApiSelfAbstractTest.java      |  104 +-
 .../GridCacheSetAbstractSelfTest.java           |  103 +-
 .../IgniteCacheNearRestartRollbackSelfTest.java |  278 +
 ...idCacheReplicatedPreloadOffHeapSelfTest.java |    3 +-
 .../GridCacheReplicatedPreloadSelfTest.java     |  216 +-
 .../GridCacheEvictableEntryEqualsSelfTest.java  |   85 +
 ...CacheAtomicLocalOffheapExpiryPolicyTest.java |   30 +
 ...gniteCacheAtomicOffheapExpiryPolicyTest.java |   30 +
 ...rimaryWriteOrderOffheapExpiryPolicyTest.java |   31 +
 ...teOrderWithStoreOffheapExpiryPolicyTest.java |   31 +
 ...AtomicReplicatedOffheapExpiryPolicyTest.java |   30 +
 ...eAtomicWithStoreOffheapExpiryPolicyTest.java |   30 +
 .../IgniteCacheExpiryPolicyAbstractTest.java    |  169 +-
 .../IgniteCacheExpiryPolicyTestSuite.java       |   13 +
 ...niteCacheTxLocalOffheapExpiryPolicyTest.java |   30 +
 .../IgniteCacheTxOffheapExpiryPolicyTest.java   |   30 +
 ...acheTxReplicatedOffheapExpiryPolicyTest.java |   30 +
 ...CacheTxWithStoreOffheapExpiryPolicyTest.java |   30 +
 .../continuous/CacheContinuousBatchAckTest.java |  355 ++
 ...heContinuousBatchForceServerModeAckTest.java |   80 +
 ...CacheContinuousQueryCounterAbstractTest.java |  612 ++
 ...inuousQueryCounterPartitionedAtomicTest.java |   41 +
 ...ContinuousQueryCounterPartitionedTxTest.java |   41 +
 ...tinuousQueryCounterReplicatedAtomicTest.java |   41 +
 ...eContinuousQueryCounterReplicatedTxTest.java |   41 +
 .../CacheContinuousQueryFactoryFilterTest.java  |  714 +++
 ...ContinuousQueryFailoverAbstractSelfTest.java |    2 +-
 .../CacheContinuousQueryLostPartitionTest.java  |    4 +-
 .../CacheContinuousQueryOperationP2PTest.java   |  326 +
 ...acheContinuousQueryRandomOperationsTest.java |  955 ++-
 .../processors/igfs/IgfsAbstractSelfTest.java   |   89 +-
 .../igfs/IgfsDataManagerSelfTest.java           |   30 +-
 .../igfs/IgfsDualAbstractSelfTest.java          |   74 +-
 .../processors/igfs/IgfsFileInfoSelfTest.java   |   11 +-
 .../igfs/IgfsMetaManagerSelfTest.java           |   67 +-
 .../processors/igfs/IgfsProcessorSelfTest.java  |   35 +-
 .../processors/igfs/IgfsSizeSelfTest.java       |   13 +-
 .../processors/igfs/IgfsStartCacheTest.java     |    9 +-
 .../handlers/log/GridLogCommandHandlerTest.java |   97 +-
 .../GridServiceProxyNodeStopSelfTest.java       |  105 +
 .../GridServiceSerializationSelfTest.java       |  149 +
 .../processors/service/inner/MyService.java     |   11 +
 .../processors/service/inner/MyServiceImpl.java |   10 +
 .../internal/util/GridHandleTableSelfTest.java  |   50 +
 .../communication/GridTestMessage.java          |    5 +
 ...namicProxySerializationMultiJvmSelfTest.java |  106 +-
 .../OptimizedMarshallerPooledSelfTest.java      |   44 +
 .../platform/PlatformComputeEchoTask.java       |   11 +-
 .../ignite/platform/PlatformSqlQueryTask.java   |  117 +
 .../platform/PlatformStartIgniteTask.java       |   77 +
 .../ignite/platform/PlatformStopIgniteTask.java |   74 +
 .../spi/communication/GridTestMessage.java      |    5 +
 .../TcpDiscoveryIpFinderAbstractSelfTest.java   |   15 +-
 .../GridSwapSpaceSpiConsistencySelfTest.java    |  131 +
 .../configvariations/CacheStartMode.java        |   29 +
 .../configvariations/ConfigFactory.java         |   39 +
 .../configvariations/ConfigParameter.java       |   34 +
 .../configvariations/ConfigVariations.java      |  346 ++
 .../ConfigVariationsFactory.java                |  197 +
 .../ConfigVariationsTestSuiteBuilder.java       |  382 ++
 .../IgniteConfigVariationsTestSuite.java        |   50 +
 .../configvariations/Parameters.java            |  377 ++
 .../configvariations/VariationsIterator.java    |  174 +
 .../configvariations/VariationsTestsConfig.java |  161 +
 .../testframework/junits/GridAbstractTest.java  |   51 +-
 .../junits/GridTestKernalContext.java           |   34 +-
 ...IgniteCacheConfigVariationsAbstractTest.java |  583 ++
 .../IgniteConfigVariationsAbstractTest.java     |  420 ++
 .../ConfigVariationsTestSuiteBuilderTest.java   |  112 +
 .../testframework/test/ParametersTest.java      |   87 +
 .../test/VariationsIteratorTest.java            |  156 +
 .../ignite/testsuites/IgniteBasicTestSuite.java |    8 +
 .../testsuites/IgniteBinaryBasicTestSuite.java  |    4 +
 .../testsuites/IgniteBinaryCacheTestSuite.java  |    2 +
 ...IgniteBinaryObjectsComputeGridTestSuite.java |    7 +-
 ...heBasicConfigVariationsFullApiTestSuite.java |   41 +
 .../IgniteCacheEvictionSelfTestSuite.java       |    4 +-
 .../testsuites/IgniteCacheRestartTestSuite.java |    2 +
 .../ignite/testsuites/IgniteCacheTestSuite.java |    5 +
 .../testsuites/IgniteCacheTestSuite2.java       |    4 +
 .../testsuites/IgniteCacheTestSuite4.java       |   11 +-
 .../testsuites/IgniteCacheTestSuite5.java       |    4 +
 .../ignite/testsuites/IgniteIgfsTestSuite.java  |    6 -
 .../testsuites/IgniteKernalSelfTestSuite.java   |    8 +-
 .../IgniteMarshallerSelfTestSuite.java          |    8 +-
 .../IgniteSpiSwapSpaceSelfTestSuite.java        |    2 +
 .../p2p/CacheDeploymentEntryEventFilter.java    |   33 +
 .../CacheDeploymentEntryEventFilterFactory.java |   31 +
 .../CacheDeploymentExternalizableTestValue.java |   69 +
 .../fs/IgniteHadoopIgfsSecondaryFileSystem.java |    7 +-
 .../hadoop/jobtracker/HadoopJobTracker.java     |    5 +-
 .../hadoop/cache/HadoopTxConfigCacheTest.java   |   42 +
 .../apache/ignite/igfs/IgfsEventsTestSuite.java |   10 +-
 .../testsuites/IgniteHadoopTestSuite.java       |    3 +
 .../HibernateL2CacheTransactionalSelfTest.java  |    9 +
 ...nateL2CacheTransactionalUseSyncSelfTest.java |   31 +
 .../testsuites/IgniteHibernateTestSuite.java    |    4 +-
 .../processors/query/h2/IgniteH2Indexing.java   |   65 +-
 .../query/h2/opt/GridH2ValueCacheObject.java    |    9 +
 .../query/h2/sql/GridSqlAggregateFunction.java  |   12 +-
 .../query/h2/sql/GridSqlQueryParser.java        |   30 +-
 .../query/h2/twostep/GridMapQueryExecutor.java  |    2 +-
 .../query/h2/twostep/GridMergeIndex.java        |   32 +-
 .../h2/twostep/GridMergeIndexUnsorted.java      |   19 +-
 .../query/h2/twostep/GridMergeTable.java        |   16 +-
 .../h2/twostep/GridReduceQueryExecutor.java     |    2 +-
 .../h2/twostep/msg/GridH2ValueMessage.java      |    5 +
 .../cache/CacheQueryNewClientSelfTest.java      |  115 +
 .../IgniteBinaryObjectQueryArgumentsTest.java   |  161 +
 .../cache/IgniteCacheAbstractQuerySelfTest.java |  187 +-
 .../cache/IgniteClientReconnectQueriesTest.java |    9 +-
 .../near/IgniteCacheQueryNodeFailTest.java      |  148 +
 .../h2/GridIndexingSpiAbstractSelfTest.java     |   43 +-
 .../IgniteCacheQuerySelfTestSuite.java          |   24 +-
 .../processors/cache/jta/CacheJtaManager.java   |   26 +-
 .../processors/cache/jta/CacheJtaResource.java  |  304 +
 .../cache/jta/GridCacheXAResource.java          |  251 -
 .../cache/AbstarctCacheJtaSelfTest.java         |  183 -
 .../cache/AbstractCacheJtaSelfTest.java         |  183 +
 .../GridPartitionedCacheJtaFactorySelfTest.java |    2 +-
 ...rtitionedCacheJtaFactoryUseSyncSelfTest.java |   32 +
 ...titionedCacheJtaLookupClassNameSelfTest.java |    2 +-
 ...eplicatedCacheJtaFactoryUseSyncSelfTest.java |   32 +
 .../ignite/testsuites/IgniteJtaTestSuite.java   |    5 +
 .../cpp/common/include/ignite/common/exports.h  |    6 +-
 .../cpp/common/include/ignite/common/java.h     |   21 +-
 modules/platforms/cpp/common/src/exports.cpp    |    6 +-
 modules/platforms/cpp/common/src/java.cpp       |   28 +-
 .../cpp/core-test/src/cache_query_test.cpp      |   45 +
 .../ignite/cache/query/query_fields_row.h       |    2 +-
 .../Apache.Ignite.Core.Tests.NuGet.csproj       |  103 +
 .../Apache.Ignite.Core.Tests.NuGet.sln          |   26 +
 ...ache.Ignite.Core.Tests.NuGet.sln.DotSettings |    4 +
 .../Apache.Ignite.Core.Tests.NuGet/CacheTest.cs |  107 +
 .../ComputeTest.cs                              |   84 +
 .../Config/ignite-config.xml                    |   50 +
 .../Apache.Ignite.Core.Tests.NuGet/NuGet.config |   34 +
 .../Properties/AssemblyInfo.cs                  |   35 +
 .../StartupTest.cs                              |   66 +
 .../TestRunner.cs                               |   70 +
 .../Apache.Ignite.Core.Tests.NuGet/TestUtil.cs  |   43 +
 .../install-package.cmd                         |   10 +
 .../Apache.Ignite.Core.Tests.csproj             |   15 +-
 .../Binary/BinaryBuilderSelfTest.cs             |   33 +-
 .../Binary/BinaryBuilderSelfTestFullFooter.cs   |   31 +
 .../Binary/BinaryCompactFooterInteropTest.cs    |  129 +
 .../Binary/BinarySelfTest.cs                    |  133 +-
 .../Binary/BinarySelfTestFullFooter.cs          |   35 +
 .../Cache/CacheAffinityFieldTest.cs             |  199 +
 .../Cache/CacheConfigurationTest.cs             |   18 +-
 .../Cache/Store/CacheStoreTest.cs               |    5 +-
 .../Cache/Store/CacheStoreTestCodeConfig.cs     |  106 +
 .../Compute/ComputeApiTest.cs                   |   62 +-
 .../Compute/ComputeApiTestFullFooter.cs         |   65 +
 .../Compute/MixedClusterTest.cs                 |  123 +
 .../Config/Compute/compute-grid1.xml            |   21 +-
 .../Config/Compute/compute-grid2.xml            |   17 +-
 .../Config/Compute/compute-grid3.xml            |    2 +-
 .../Apache.Ignite.Core.Tests/Config/binary.xml  |   56 -
 .../Apache.Ignite.Core.Tests/DeploymentTest.cs  |  180 +
 .../IgniteConfigurationSerializerTest.cs        |    7 +-
 .../IgniteConfigurationTest.cs                  |   19 +-
 .../IgniteStartStopTest.cs                      |   58 +-
 .../Process/IgniteProcess.cs                    |   31 +-
 .../ProcessExtensions.cs                        |   78 +
 .../ProjectFilesTest.cs                         |   94 +
 .../Apache.Ignite.Core.Tests/ReconnectTest.cs   |   96 +
 .../Services/ServicesTest.cs                    |   26 +-
 .../Services/ServicesTestFullFooter.cs          |   33 +
 .../Apache.Ignite.Core.Tests/TestUtils.cs       |   33 +-
 .../Apache.Ignite.Core.csproj                   |   10 +-
 .../Apache.Ignite.Core.nuspec                   |   80 +
 .../Binary/BinaryConfiguration.cs               |   44 +-
 .../Binary/BinaryReflectiveSerializer.cs        |  241 +
 .../Cache/Affinity/AffinityKey.cs               |  162 +
 .../Affinity/AffinityKeyMappedAttribute.cs      |   46 +
 .../Cache/Configuration/CacheConfiguration.cs   |   36 +
 .../Apache.Ignite.Core/Cluster/ICluster.cs      |   14 +
 .../Common/ClientDisconnectedException.cs       |   97 +
 .../Multicast/TcpDiscoveryMulticastIpFinder.cs  |    2 +-
 .../Apache.Ignite.Core/IgniteConfiguration.cs   |   15 +
 .../IgniteConfigurationSection.xsd              |    3 +
 .../dotnet/Apache.Ignite.Core/Ignition.cs       |   56 +-
 .../Apache.Ignite.Core/Impl/Binary/Binary.cs    |    8 +-
 .../Impl/Binary/BinaryObject.cs                 |    9 +-
 .../Impl/Binary/BinaryObjectBuilder.cs          |    9 +-
 .../Impl/Binary/BinaryObjectHeader.cs           |  176 +-
 .../Impl/Binary/BinaryObjectSchema.cs           |   20 +
 .../Impl/Binary/BinaryObjectSchemaHolder.cs     |   18 +-
 .../Impl/Binary/BinaryObjectSchemaSerializer.cs |  262 +
 .../Impl/Binary/BinaryReader.cs                 |   46 +-
 .../Impl/Binary/BinaryReflectiveActions.cs      |  576 +-
 .../Impl/Binary/BinaryReflectiveSerializer.cs   |  218 -
 .../Impl/Binary/BinaryUtils.cs                  |    2 +-
 .../Impl/Binary/BinaryWriter.cs                 |   48 +-
 .../Impl/Binary/Marshaller.cs                   |   45 +-
 .../Impl/Binary/Metadata/BinaryType.cs          |   28 +-
 .../Apache.Ignite.Core/Impl/Cache/CacheImpl.cs  |    2 +-
 .../Impl/Cluster/ClusterGroupImpl.cs            |   15 +
 .../Apache.Ignite.Core/Impl/Common/Classpath.cs |   18 +-
 .../Impl/Common/IgniteHome.cs                   |    9 +-
 .../Impl/Compute/ComputeTaskHolder.cs           |    2 +-
 .../Impl/DataStructures/AtomicReference.cs      |    2 +-
 .../Apache.Ignite.Core/Impl/ExceptionUtils.cs   |  110 +-
 .../dotnet/Apache.Ignite.Core/Impl/Ignite.cs    |   51 +-
 .../Apache.Ignite.Core/Impl/IgniteManager.cs    |   11 +-
 .../Apache.Ignite.Core/Impl/IgniteProxy.cs      |    7 +
 .../Apache.Ignite.Core/Impl/PlatformTarget.cs   |   47 +-
 .../Impl/Unmanaged/UnmanagedCallbackHandlers.cs |    3 +
 .../Impl/Unmanaged/UnmanagedCallbacks.cs        |   32 +-
 .../dotnet/Apache.Ignite.Core/NuGet/Install.ps1 |   27 +
 .../NuGet/LINQPad/ComputeExample.linq           |  106 +
 .../NuGet/LINQPad/PutGetExample.linq            |   69 +
 .../NuGet/LINQPad/QueryExample.linq             |   96 +
 .../Apache.Ignite.Core/NuGet/PostBuild.ps1      |   20 +
 .../Apache.Ignite.Core/NuGet/Uninstall.ps1      |   21 +
 .../Binary/EmployeeKey.cs                       |    2 +
 .../ignite/schema/ui/SchemaImportApp.java       |  205 +-
 .../commands/cache/VisorCacheCommand.scala      |   30 +-
 modules/web/ignite-weblogic-test/pom.xml        |   76 +
 .../webapp/META-INF/config/default-config.xml   |   37 +
 .../src/main/webapp/WEB-INF/web.xml             |   52 +
 .../src/main/webapp/index.jsp                   |   36 +
 .../ignite/cache/websession/WebSession.java     |   84 +-
 .../cache/websession/WebSessionFilter.java      |  265 +-
 .../cache/websession/WebSessionListener.java    |   66 +-
 .../IgniteWebSessionSelfTestSuite.java          |   10 +
 .../internal/websession/WebSessionSelfTest.java |  332 +-
 .../yardstick/IgniteBenchmarkArguments.java     |   11 +
 .../org/apache/ignite/yardstick/IgniteNode.java |    2 +
 .../cache/IgniteCacheAbstractBenchmark.java     |   54 +
 .../apache/ignite/yarn/ApplicationMaster.java   |   30 +-
 .../apache/ignite/yarn/IgniteYarnClient.java    |   25 +
 .../ignite/yarn/utils/IgniteYarnUtils.java      |   19 +
 modules/zookeeper/pom.xml                       |   50 +-
 .../tcp/ipfinder/zk/ZookeeperIpFinderTest.java  |   24 +-
 parent/pom.xml                                  |    4 +-
 pom.xml                                         |    3 +-
 518 files changed, 31625 insertions(+), 4754 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/7190f242/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/7190f242/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
index 396f23d,0b02abd..72937cb
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
@@@ -268,10 -260,10 +269,15 @@@ public final class DataStructuresProces
          super.onKernalStop(cancel);
  
          for (GridCacheRemovable ds : dsMap.values()) {
+             if (ds instanceof GridCacheSemaphoreEx)
+                 ((GridCacheSemaphoreEx)ds).stop();
+         }
+ 
++        for (GridCacheRemovable ds : dsMap.values()) {
 +            if (ds instanceof GridCacheLockEx)
 +                ((GridCacheLockEx)ds).onStop();
 +        }
 +
          if (initLatch.getCount() > 0) {
              initFailed = true;
  

http://git-wip-us.apache.org/repos/asf/ignite/blob/7190f242/modules/core/src/main/resources/META-INF/classnames.properties
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/7190f242/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java
----------------------------------------------------------------------


Mime
View raw message