Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-71
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/258a0e7f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/258a0e7f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/258a0e7f Branch: refs/heads/ignite-26 Commit: 258a0e7fcf55ea96f1d0c3dcd3803a659aab5da2 Parents: 1e71423 9ea9607 Author: avinogradov <avinogra...@gridgain.com> Authored: Thu Jan 29 16:21:35 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Thu Jan 29 16:21:35 2015 +0300 ---------------------------------------------------------------------- assembly/release-base-fabric.xml | 2 +- .../ClientAbstractMultiThreadedSelfTest.java | 2 +- .../ClientAbstractMultiNodeSelfTest.java | 4 +- .../rest/RestBinaryProtocolSelfTest.java | 2 +- .../rest/TaskCommandHandlerSelfTest.java | 2 +- .../main/java/org/apache/ignite/Ignition.java | 38 +- .../apache/ignite/cache/CachingProvider.java | 2 +- .../ignite/fs/mapreduce/IgniteFsTask.java | 2 +- .../ignite/internal/ClusterGroupAdapter.java | 2 +- .../internal/ClusterNodeLocalMapImpl.java | 2 +- .../java/org/apache/ignite/internal/GridEx.java | 143 - .../org/apache/ignite/internal/GridGainEx.java | 2399 ------------- .../org/apache/ignite/internal/GridKernal.java | 3322 ------------------ .../ignite/internal/GridKernalContext.java | 2 +- .../ignite/internal/GridKernalContextImpl.java | 8 +- .../apache/ignite/internal/GridLoggerProxy.java | 2 +- .../ignite/internal/GridUpdateNotifier.java | 2 +- .../ignite/internal/IgniteClusterAsyncImpl.java | 4 +- .../org/apache/ignite/internal/IgniteEx.java | 143 + .../apache/ignite/internal/IgniteKernal.java | 3322 ++++++++++++++++++ .../org/apache/ignite/internal/IgnitionEx.java | 2396 +++++++++++++ .../processors/affinity/GridAffinityUtils.java | 2 +- .../processors/cache/GridCacheAdapter.java | 8 +- .../processors/cache/GridCacheContext.java | 4 +- .../GridCacheDataStructuresManager.java | 4 +- .../cache/query/GridCacheQueryManager.java | 2 +- .../jdbc/GridCacheQueryJdbcMetadataTask.java | 2 +- .../query/jdbc/GridCacheQueryJdbcTask.java | 2 +- .../dr/GridDrDataLoadCacheUpdater.java | 2 +- .../internal/processors/fs/GridGgfsImpl.java | 2 +- .../resource/GridResourceProcessor.java | 2 +- .../resource/GridSpringResourceContext.java | 2 +- .../handlers/cache/GridCacheCommandHandler.java | 6 +- .../handlers/task/GridTaskCommandHandler.java | 2 +- .../processors/service/GridServiceProxy.java | 2 +- .../apache/ignite/internal/visor/VisorJob.java | 2 +- .../internal/visor/VisorMultiNodeTask.java | 2 +- .../ignite/internal/visor/cache/VisorCache.java | 2 +- .../compute/VisorComputeMonitoringHolder.java | 10 +- .../visor/node/VisorBasicConfiguration.java | 2 +- .../visor/node/VisorGridConfiguration.java | 2 +- .../visor/node/VisorNodeDataCollectorJob.java | 2 +- .../internal/visor/query/VisorQueryTask.java | 2 +- .../StreamerCacheAffinityEventRouter.java | 2 +- .../ignite/GridExceptionHelpLinksSelfTest.java | 106 - .../ignite/GridExternalizableAbstractTest.java | 41 - .../IgniteExceptionHelpLinksSelfTest.java | 106 + .../IgniteExternalizableAbstractTest.java | 41 + ...CachePartitionFairAffinityNodesSelfTest.java | 6 +- ...CacheJdbcBlobStoreMultithreadedSelfTest.java | 2 +- .../fs/GridGgfsEventsAbstractSelfTest.java | 2 +- .../ignite/fs/GridGgfsFragmentizerSelfTest.java | 2 +- .../internal/GridDiscoveryEventSelfTest.java | 3 +- .../ignite/internal/GridDiscoverySelfTest.java | 4 +- .../internal/GridExecutorServiceTest.java | 315 -- .../GridExplicitImplicitDeploymentSelfTest.java | 476 --- .../ignite/internal/GridKernalTestUtils.java | 3 +- .../internal/GridListenActorSelfTest.java | 3 +- .../GridTopicExternalizableSelfTest.java | 3 +- .../GridTopologyBuildVersionSelfTest.java | 2 +- .../internal/GridUpdateNotifierSelfTest.java | 3 +- .../internal/IgniteExecutorServiceTest.java | 315 ++ ...gniteExplicitImplicitDeploymentSelfTest.java | 476 +++ .../GridCheckpointManagerAbstractSelfTest.java | 2 +- .../GridCommunicationSendMessageSelfTest.java | 4 +- .../GridDiscoveryManagerAliveCacheSelfTest.java | 2 +- .../discovery/GridDiscoveryManagerSelfTest.java | 6 +- .../swapspace/GridSwapSpaceManagerSelfTest.java | 2 +- .../GridAffinityProcessorAbstractSelfTest.java | 6 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 4 +- .../cache/GridCacheAbstractSelfTest.java | 2 +- .../cache/GridCacheAffinityApiSelfTest.java | 4 +- .../GridCacheConcurrentTxMultiNodeTest.java | 4 +- .../cache/GridCacheEntryVersionSelfTest.java | 4 +- .../GridCacheFinishPartitionsSelfTest.java | 4 +- .../GridCacheGroupLockAbstractSelfTest.java | 4 +- .../processors/cache/GridCacheLeakTest.java | 2 +- ...GridCacheMixedPartitionExchangeSelfTest.java | 2 +- .../cache/GridCacheMultiUpdateLockSelfTest.java | 2 +- .../cache/GridCacheMvccFlagsTest.java | 4 +- .../cache/GridCacheMvccManagerSelfTest.java | 4 +- .../cache/GridCacheMvccPartitionedSelfTest.java | 4 +- .../processors/cache/GridCacheMvccSelfTest.java | 4 +- .../cache/GridCacheNestedTxAbstractTest.java | 2 +- .../cache/GridCacheObjectToStringSelfTest.java | 2 +- .../GridCacheOrderedPreloadingSelfTest.java | 2 +- .../cache/GridCacheP2PUndeploySelfTest.java | 6 +- .../cache/GridCachePartitionedGetSelfTest.java | 2 +- .../GridCachePreloadingEvictionsSelfTest.java | 6 +- .../GridCacheQueryInternalKeysSelfTest.java | 2 +- .../cache/GridCacheSlowTxWarnTest.java | 4 +- .../cache/GridCacheStoreValueBytesSelfTest.java | 4 +- .../cache/GridCacheSwapReloadSelfTest.java | 2 +- .../cache/GridCacheTtlManagerLoadTest.java | 2 +- .../cache/GridCacheTtlManagerSelfTest.java | 2 +- .../IgniteCacheEntryListenerAbstractTest.java | 2 +- .../processors/cache/IgniteTxAbstractTest.java | 2 +- .../IgniteTxConcurrentGetAbstractTest.java | 3 +- .../IgniteTxExceptionAbstractSelfTest.java | 2 +- .../cache/IgniteTxMultiNodeAbstractTest.java | 6 +- .../IgniteTxStoreExceptionAbstractSelfTest.java | 2 +- ...actQueueFailoverDataConsistencySelfTest.java | 2 +- .../GridCacheCountDownLatchSelfTest.java | 2 +- .../GridCacheQueueCleanupSelfTest.java | 2 +- .../GridCacheSetAbstractSelfTest.java | 8 +- .../GridCacheSetFailoverAbstractSelfTest.java | 2 +- .../GridCacheAtomicTimeoutSelfTest.java | 2 +- .../distributed/GridCacheEventAbstractTest.java | 2 +- ...heExpiredEntriesPreloadAbstractSelfTest.java | 2 +- .../GridCacheMultiNodeLockAbstractTest.java | 2 +- ...iteTxConsistencyRestartAbstractSelfTest.java | 4 +- ...xOriginatingNodeFailureAbstractSelfTest.java | 10 +- ...cOriginatingNodeFailureAbstractSelfTest.java | 20 +- .../dht/GridCacheAtomicNearCacheSelfTest.java | 2 +- .../dht/GridCacheColocatedDebugTest.java | 6 +- .../dht/GridCacheDhtEntrySelfTest.java | 2 +- ...GridCacheDhtEvictionNearReadersSelfTest.java | 4 +- .../dht/GridCacheDhtEvictionSelfTest.java | 4 +- .../dht/GridCacheDhtMappingSelfTest.java | 2 +- .../dht/GridCacheDhtPreloadDelayedSelfTest.java | 2 +- .../GridCacheDhtPreloadStartStopSelfTest.java | 2 +- ...dCachePartitionedTopologyChangeSelfTest.java | 32 +- ...itionedTxOriginatingNodeFailureSelfTest.java | 8 +- ...eAtomicInvalidPartitionHandlingSelfTest.java | 2 +- .../atomic/GridCacheAtomicPreloadSelfTest.java | 4 +- .../near/GridCacheNearMultiNodeSelfTest.java | 6 +- .../near/GridCacheNearReadersSelfTest.java | 4 +- .../near/GridCacheNearTxMultiNodeSelfTest.java | 2 +- .../GridCachePartitionedFullApiSelfTest.java | 4 +- ...achePartitionedMultiNodeCounterSelfTest.java | 2 +- .../GridCachePartitionedProjectionSelfTest.java | 4 +- .../GridCachePartitionedTxSalvageSelfTest.java | 2 +- .../IgniteCacheExpiryPolicyAbstractTest.java | 2 +- ...ridCacheContinuousQueryAbstractSelfTest.java | 4 +- .../clock/GridTimeSyncProcessorSelfTest.java | 6 +- .../continuous/GridEventConsumeSelfTest.java | 2 +- .../processors/fs/GridGgfsAbstractSelfTest.java | 2 +- .../processors/fs/GridGgfsModesSelfTest.java | 4 +- .../fs/GridGgfsProcessorSelfTest.java | 2 +- ...IpcEndpointRegistrationAbstractSelfTest.java | 2 +- .../processors/fs/GridGgfsSizeSelfTest.java | 8 +- .../cache/GridCacheCommandHandlerSelfTest.java | 6 +- .../GridServiceReassignmentSelfTest.java | 2 +- .../util/future/GridFinishedFutureSelfTest.java | 2 +- .../cache/GridCachePutRemoveLoadTest.java | 2 +- .../communication/GridIoManagerBenchmark.java | 10 +- .../communication/GridIoManagerBenchmark0.java | 12 +- .../ignite/loadtests/dsi/GridDsiPerfJob.java | 2 +- .../marshaller/GridMarshallerAbstractTest.java | 6 +- .../tcp/GridTcpDiscoveryMultiThreadedTest.java | 2 +- .../discovery/tcp/GridTcpDiscoverySelfTest.java | 14 +- .../ignite/testframework/GridTestUtils.java | 4 +- .../testframework/junits/GridAbstractTest.java | 14 +- .../junits/GridTestKernalContext.java | 2 +- .../junits/common/GridCommonAbstractTest.java | 22 +- .../ignite/testsuites/IgniteBasicTestSuite.java | 2 +- .../testsuites/IgniteComputeGridTestSuite.java | 4 +- .../GridHadoopDefaultMapReducePlanner.java | 2 +- .../GridGgfsHadoopFileSystemClientSelfTest.java | 2 +- ...idHadoopDefaultMapReducePlannerSelfTest.java | 4 +- .../hadoop/GridHadoopJobTrackerSelfTest.java | 2 +- .../cache/GridCacheAbstractQuerySelfTest.java | 6 +- .../cache/GridCacheOffHeapAndSwapSelfTest.java | 4 +- .../cache/GridCacheQueryLoadSelfTest.java | 2 +- .../GridCacheQueryMultiThreadedSelfTest.java | 8 +- .../GridCacheReplicatedFieldsQuerySelfTest.java | 2 +- .../GridCacheReplicatedQuerySelfTest.java | 4 +- .../query/h2/sql/GridQueryParsingTest.java | 2 +- .../tcp/GridOrderedMessageCancelSelfTest.java | 2 +- .../GridTmLookupLifecycleAwareSelfTest.java | 2 +- .../java/org/apache/ignite/IgniteSpring.java | 8 +- .../cache/spring/SpringDynamicCacheManager.java | 2 +- .../scala/org/apache/ignite/visor/visor.scala | 6 +- .../GridServletContextListenerStartup.java | 4 +- .../startup/servlet/GridServletStartup.java | 4 +- 175 files changed, 7124 insertions(+), 7133 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/258a0e7f/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java ----------------------------------------------------------------------