You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by an...@apache.org on 2015/03/04 04:11:25 UTC
[48/50] incubator-ignite git commit: # ignite-185 Merge sprint-2 into
ignite-185
# ignite-185 Merge sprint-2 into ignite-185
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f8478f5c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f8478f5c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f8478f5c
Branch: refs/heads/ignite-185
Commit: f8478f5c83016a49b25a306ae046f06e843235fb
Parents: 1ff1c8e 6909cc4
Author: anovikov <an...@gridgain.com>
Authored: Wed Mar 4 09:11:00 2015 +0700
Committer: anovikov <an...@gridgain.com>
Committed: Wed Mar 4 09:11:00 2015 +0700
----------------------------------------------------------------------
config/hadoop/default-config.xml | 12 +
config/ignite-log4j.xml | 2 +-
.../hibernate/example-hibernate-L2-cache.xml | 2 +-
examples/pom-standalone.xml | 2 +-
.../ComputeFibonacciContinuationExample.java | 17 +-
.../datagrid/CacheContinuousQueryExample.java | 6 +-
.../store/CacheNodeWithStoreStartup.java | 6 +-
.../store/jdbc/CacheJdbcPersonStore.java | 115 +-
.../IgniteCountDownLatchExample.java | 3 +-
.../MessagingPingPongListenActorExample.java | 3 +-
.../examples/ScalarContinuationExample.scala | 20 +-
ipc/shmem/Makefile.am | 15 +
ipc/shmem/igniteshmem/Makefile.am | 15 +
ipc/shmem/include/Makefile.am | 15 +
.../checkpoint/s3/S3CheckpointSpiSelfTest.java | 10 +-
.../ClientAbstractMultiThreadedSelfTest.java | 37 +-
.../internal/client/ClientStartNodeTask.java | 5 +-
.../impl/ClientPartitionAffinitySelfTest.java | 406 ---
.../ClientAbstractMultiNodeSelfTest.java | 54 +-
.../integration/ClientAbstractSelfTest.java | 8 -
.../ClientTcpUnreachableMultiNodeSelfTest.java | 4 -
.../client/suite/IgniteClientTestSuite.java | 1 -
.../processors/rest/RestProcessorTest.java | 8 +-
.../processors/rest/TestBinaryClient.java | 1 -
.../processors/rest/TestMemcacheClient.java | 13 +-
.../protocols/tcp/TcpRestParserSelfTest.java | 2 +-
modules/clients/src/test/keystore/generate.sh | 15 +-
.../src/test/resources/spring-server-node.xml | 2 +-
.../test/resources/spring-server-ssl-node.xml | 2 +-
.../ignite/codegen/MessageCodeGenerator.java | 28 +-
.../src/main/java/org/apache/ignite/Ignite.java | 4 +-
.../java/org/apache/ignite/IgniteCache.java | 69 +
.../java/org/apache/ignite/IgniteCluster.java | 11 +-
.../java/org/apache/ignite/IgniteEvents.java | 2 +-
.../main/java/org/apache/ignite/IgniteFs.java | 2 +-
.../apache/ignite/IgniteSystemProperties.java | 5 +
.../ignite/cache/CacheTypeFieldMetadata.java | 2 +-
.../apache/ignite/cache/CacheTypeMetadata.java | 18 +-
.../java/org/apache/ignite/cache/GridCache.java | 2 +-
.../ignite/cache/IgniteEntryProcessor.java | 28 +
.../CacheConsistentHashAffinityFunction.java | 702 -----
.../cache/affinity/consistenthash/package.html | 24 -
.../CacheRendezvousAffinityFunction.java | 3 +-
.../ignite/cache/query/ContinuousQuery.java | 18 +-
.../apache/ignite/cache/store/CacheStore.java | 4 +-
.../ignite/cache/store/CacheStoreAdapter.java | 2 +-
.../ignite/cache/store/CacheStoreSession.java | 17 +-
.../cache/store/jdbc/CacheJdbcPojoStore.java | 28 +-
.../apache/ignite/cluster/ClusterMetrics.java | 2 +-
.../ignite/cluster/ClusterNodeLocalMap.java | 60 -
.../configuration/CacheConfiguration.java | 2 +-
.../configuration/IgniteConfiguration.java | 11 +-
.../configuration/QueryConfiguration.java | 37 +-
.../org/apache/ignite/events/EventType.java | 8 +
.../java/org/apache/ignite/igfs/IgfsMode.java | 6 +-
.../IgfsByteDelimiterRecordResolver.java | 1 +
.../java/org/apache/ignite/igfs/package.html | 2 +-
.../ignite/internal/ClusterMetricsSnapshot.java | 9 +-
.../internal/GridEventConsumeHandler.java | 1 +
.../ignite/internal/GridKernalContext.java | 26 +-
.../ignite/internal/GridKernalContextImpl.java | 37 +-
.../internal/GridMessageListenHandler.java | 1 +
.../apache/ignite/internal/GridProperties.java | 78 -
.../ignite/internal/GridUpdateNotifier.java | 2 +-
.../apache/ignite/internal/IgniteKernal.java | 52 +-
.../ignite/internal/IgniteProperties.java | 79 +
.../ignite/internal/IgniteVersionUtils.java | 8 +-
.../org/apache/ignite/internal/IgnitionEx.java | 592 ++--
.../ignite/internal/client/GridClientNode.java | 8 -
.../client/GridClientPartitionAffinity.java | 2 +-
.../client/impl/GridClientNodeImpl.java | 22 -
.../connection/GridClientNioTcpConnection.java | 3 +-
.../cluster/ClusterNodeLocalMapImpl.java | 27 +-
.../cluster/IgniteClusterAsyncImpl.java | 3 +-
.../internal/cluster/IgniteClusterImpl.java | 4 +-
.../internal/events/DiscoveryCustomEvent.java | 71 +
.../igfs/common/IgfsControlResponse.java | 1 +
.../internal/igfs/common/IgfsMarshaller.java | 1 +
.../internal/managers/GridManagerAdapter.java | 5 +
.../discovery/GridDiscoveryManager.java | 105 +-
.../affinity/GridAffinityAssignmentCache.java | 13 +-
.../affinity/GridAffinityMessage.java | 1 +
.../processors/cache/CacheMetricsImpl.java | 4 +
.../processors/cache/GridCacheAttributes.java | 32 +-
.../processors/cache/GridCacheContext.java | 19 +
.../processors/cache/GridCacheEntryInfo.java | 5 +-
.../processors/cache/GridCacheMapEntry.java | 571 ++--
.../processors/cache/GridCacheProcessor.java | 44 +-
.../processors/cache/GridCacheStoreManager.java | 18 +-
.../processors/cache/GridCacheSwapManager.java | 4 +-
.../processors/cache/GridCacheUtils.java | 4 +
.../processors/cache/IgniteCacheProxy.java | 69 +-
.../GridDistributedCacheAdapter.java | 2 +
.../GridDistributedTxRemoteAdapter.java | 66 +-
.../distributed/dht/GridDhtCacheEntry.java | 3 +
.../distributed/dht/GridDhtLocalPartition.java | 5 +
.../dht/atomic/GridDhtAtomicCache.java | 46 +-
.../dht/atomic/GridNearAtomicUpdateFuture.java | 84 +-
.../dht/colocated/GridDhtColocatedCache.java | 2 +-
.../distributed/near/GridNearAtomicCache.java | 3 -
.../query/GridCacheDistributedQueryManager.java | 4 +-
.../cache/query/GridCacheQueryManager.java | 2 +-
.../continuous/CacheContinuousQueryEntry.java | 1 +
.../continuous/CacheContinuousQueryHandler.java | 1 +
.../cache/transactions/IgniteTxAdapter.java | 58 +-
.../cache/transactions/IgniteTxEntry.java | 17 +-
.../transactions/IgniteTxLocalAdapter.java | 48 +-
.../cache/transactions/IgniteTxManager.java | 7 +-
.../version/GridCacheRawVersionedEntry.java | 1 +
.../cache/version/GridCacheVersion.java | 3 +-
.../GridCacheVersionConflictContext.java | 35 +-
.../cache/version/GridCacheVersionEx.java | 2 +-
.../processors/clock/GridClockMessage.java | 1 +
.../processors/cluster/ClusterProcessor.java | 46 +
.../dataload/GridDataLoaderProcessor.java | 2 +-
.../dataload/IgniteDataLoaderImpl.java | 29 +-
.../datastructures/DataStructuresProcessor.java | 2 +-
.../dr/GridDrDataLoadCacheUpdater.java | 6 +-
.../processors/igfs/IgfsDataManager.java | 4 +-
.../internal/processors/igfs/IgfsImpl.java | 6 +-
.../processors/igfs/IgfsOutputStreamImpl.java | 4 +-
.../internal/processors/igfs/IgfsServer.java | 1 +
.../internal/processors/job/GridJobWorker.java | 2 +-
.../plugin/IgnitePluginProcessor.java | 24 +
.../processors/rest/GridRestProcessor.java | 85 +-
.../processors/rest/GridRestResponse.java | 1 +
.../message/GridClientAbstractMessage.java | 1 +
.../message/GridClientHandshakeRequest.java | 1 +
.../rest/client/message/GridClientNodeBean.java | 23 -
.../cache/GridCacheQueryCommandHandler.java | 7 +-
.../top/GridTopologyCommandHandler.java | 8 -
.../protocols/tcp/GridMemcachedMessage.java | 3 +-
.../rest/protocols/tcp/GridTcpRestParser.java | 10 +-
.../securesession/GridSecureSession.java | 60 -
.../GridSecureSessionProcessor.java | 59 -
.../os/GridOsSecureSessionProcessor.java | 61 -
.../security/GridSecurityContext.java | 251 --
.../security/GridSecurityProcessor.java | 6 +-
.../processors/security/SecurityContext.java | 56 +
.../security/os/GridOsSecurityProcessor.java | 146 +-
.../processors/task/GridTaskWorker.java | 4 +-
.../internal/util/IgniteExceptionRegistry.java | 259 ++
.../ignite/internal/util/IgniteUtils.java | 2693 ++++++++----------
.../nio/GridConnectionBytesVerifyFilter.java | 1 +
.../util/nio/GridTcpCommunicationClient.java | 1 +
.../apache/ignite/internal/util/typedef/X.java | 3 +-
.../ignite/internal/visor/cache/VisorCache.java | 190 +-
.../cache/VisorCacheAffinityConfiguration.java | 70 +-
.../visor/cache/VisorCacheConfiguration.java | 484 +---
.../cache/VisorCacheDefaultConfiguration.java | 27 +-
.../cache/VisorCacheEvictionConfiguration.java | 81 +-
.../cache/VisorCacheMetricsCollectorTask.java | 10 +-
.../cache/VisorCacheNearConfiguration.java | 42 +-
.../cache/VisorCachePreloadConfiguration.java | 54 +-
.../cache/VisorCacheStoreConfiguration.java | 148 +-
.../VisorCacheWriteBehindConfiguration.java | 137 -
.../VisorComputeToggleMonitoringTask.java | 4 +-
.../visor/node/VisorAtomicConfiguration.java | 27 +-
.../visor/node/VisorBasicConfiguration.java | 197 +-
.../node/VisorCacheQueryConfiguration.java | 45 +-
.../node/VisorExecutorServiceConfiguration.java | 54 +-
.../visor/node/VisorGridConfiguration.java | 177 +-
.../visor/node/VisorIgfsConfiguration.java | 244 +-
.../visor/node/VisorLifecycleConfiguration.java | 9 +-
.../visor/node/VisorMetricsConfiguration.java | 29 +-
.../visor/node/VisorNodeDataCollectorJob.java | 4 +-
.../node/VisorNodeEventsCollectorTask.java | 13 +-
.../internal/visor/node/VisorNodeGcTask.java | 10 +-
.../internal/visor/node/VisorNodePingTask.java | 10 +-
.../node/VisorPeerToPeerConfiguration.java | 28 +-
.../visor/node/VisorQueryConfiguration.java | 65 +-
.../visor/node/VisorRestConfiguration.java | 80 +-
.../node/VisorSegmentationConfiguration.java | 45 +-
.../visor/node/VisorSpisConfiguration.java | 92 +-
.../node/VisorTransactionConfiguration.java | 62 +-
.../visor/query/VisorQueryCleanupTask.java | 4 +-
.../visor/query/VisorQueryNextPageTask.java | 6 +-
.../internal/visor/query/VisorQueryTask.java | 4 +-
.../internal/visor/util/VisorTaskUtils.java | 49 +-
.../ignite/lang/IgniteProductVersion.java | 1 +
.../optimized-classnames.previous.properties | 15 +
.../optimized/optimized-classnames.properties | 1566 +---------
.../org/apache/ignite/mxbean/IgniteMXBean.java | 6 +
.../apache/ignite/plugin/PluginProvider.java | 5 +
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 15 +
.../org/apache/ignite/spi/IgniteSpiContext.java | 8 +
.../ignite/spi/IgniteSpiThreadFactory.java | 2 +-
.../communication/tcp/TcpCommunicationSpi.java | 54 +-
.../ignite/spi/discovery/DiscoverySpi.java | 7 +
.../spi/discovery/DiscoverySpiListener.java | 11 +-
.../DiscoverySpiNodeAuthenticator.java | 2 +-
.../discovery/tcp/TcpClientDiscoverySpi.java | 7 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 413 ++-
.../discovery/tcp/TcpDiscoverySpiAdapter.java | 119 +
.../tcp/internal/TcpDiscoveryNode.java | 1 +
.../TcpDiscoveryMulticastIpFinder.java | 1 +
.../messages/TcpDiscoveryAuthFailedMessage.java | 1 +
.../TcpDiscoveryCustomEventMessage.java | 69 +
.../messages/TcpDiscoveryHeartbeatMessage.java | 1 +
.../spi/swapspace/file/FileSwapSpaceSpi.java | 2 +-
.../core/src/main/resources/ignite.properties | 2 +-
.../config/load/dsi-49-server-production.xml | 2 +-
.../core/src/test/config/store/jdbc/Ignite.xml | 63 +-
.../GridCacheAffinityBackupsSelfTest.java | 9 -
.../ignite/IgniteCacheAffinitySelfTest.java | 30 +-
.../internal/GridDiscoveryEventSelfTest.java | 44 +
.../internal/GridEventStorageSelfTest.java | 3 +-
.../GridJobMasterLeaveAwareSelfTest.java | 24 +-
.../internal/GridMultipleJobsSelfTest.java | 2 +-
.../ignite/internal/GridNodeLocalSelfTest.java | 4 +-
.../GridTaskContinuousMapperSelfTest.java | 3 +-
.../GridTaskExecutionContextSelfTest.java | 2 +-
.../internal/GridUpdateNotifierSelfTest.java | 2 +-
.../GridCheckpointManagerAbstractSelfTest.java | 20 +-
...AffinityProcessorConsistentHashSelfTest.java | 31 -
.../cache/GridCacheAbstractFullApiSelfTest.java | 101 +-
.../GridCacheAbstractLocalStoreSelfTest.java | 440 +++
.../cache/GridCacheAbstractMetricsSelfTest.java | 42 +
...acheAbstractUsersAffinityMapperSelfTest.java | 207 ++
...dCacheAtomicUsersAffinityMapperSelfTest.java | 45 +
.../GridCacheConcurrentTxMultiNodeTest.java | 13 +-
...idCacheConfigurationConsistencySelfTest.java | 46 +-
...ridCacheConfigurationValidationSelfTest.java | 8 +-
.../cache/GridCacheOffHeapSelfTest.java | 12 +-
.../GridCachePartitionedAffinitySpreadTest.java | 16 +-
.../GridCachePartitionedLocalStoreSelfTest.java | 51 +
...chePartitionedOffHeapLocalStoreSelfTest.java | 56 +
.../cache/GridCachePutAllFailoverSelfTest.java | 5 +-
.../GridCacheReplicatedLocalStoreSelfTest.java | 51 +
...heReplicatedUsersAffinityMapperSelfTest.java | 45 +
...ridCacheTxPartitionedLocalStoreSelfTest.java | 51 +
.../GridCacheTxUsersAffinityMapperSelfTest.java | 45 +
.../IgniteClientAffinityAssignmentSelfTest.java | 16 +-
.../cache/IgniteTxMultiNodeAbstractTest.java | 33 +-
...cheAtomicReferenceMultiNodeAbstractTest.java | 12 +-
.../GridCacheMultiNodeDataStructureTest.java | 3 +-
.../GridCacheQueueCleanupSelfTest.java | 1 -
...dCacheSequenceMultiNodeAbstractSelfTest.java | 2 +-
...titionedAtomicSequenceMultiThreadedTest.java | 16 +-
...dCachePartitionedQueueEntryMoveSelfTest.java | 2 +-
.../GridCacheAbstractJobExecutionTest.java | 2 +-
.../GridCacheClientModesAbstractSelfTest.java | 4 +-
.../distributed/GridCacheEventAbstractTest.java | 4 +-
...dCachePartitionedAffinityFilterSelfTest.java | 6 +-
...GridCachePreloadRestartAbstractSelfTest.java | 4 +-
.../dht/GridCacheColocatedDebugTest.java | 4 +-
.../dht/GridCacheDhtEntrySelfTest.java | 4 +-
...GridCacheDhtEvictionNearReadersSelfTest.java | 13 +-
.../dht/GridCacheDhtEvictionSelfTest.java | 13 +-
.../dht/GridCacheDhtInternalEntrySelfTest.java | 10 +-
.../dht/GridCacheDhtMultiBackupTest.java | 2 +-
.../dht/GridCacheDhtPreloadBigDataSelfTest.java | 4 +-
.../dht/GridCacheDhtPreloadDelayedSelfTest.java | 4 +-
.../GridCacheDhtPreloadDisabledSelfTest.java | 4 +-
.../GridCacheDhtPreloadMessageCountTest.java | 4 +-
...ridCacheDhtPreloadMultiThreadedSelfTest.java | 4 +-
.../dht/GridCacheDhtPreloadSelfTest.java | 4 +-
.../GridCacheDhtPreloadStartStopSelfTest.java | 4 +-
.../dht/GridCacheDhtPreloadUnloadSelfTest.java | 4 +-
.../distributed/dht/GridCacheDhtTestUtils.java | 6 +-
...dCachePartitionedTopologyChangeSelfTest.java | 7 +-
...ridCachePartitionedUnloadEventsSelfTest.java | 5 +-
...ffinityFunctionExcludeNeighborsSelfTest.java | 32 -
...AffinityExcludeNeighborsPerformanceTest.java | 4 +-
...rtitionedAffinityHashIdResolverSelfTest.java | 4 +-
.../GridCachePartitionedAffinitySelfTest.java | 226 --
.../GridCachePartitionedFullApiSelfTest.java | 11 +-
...idCachePartitionedHitsAndMissesSelfTest.java | 3 +-
...ePartitionedMultiThreadedPutGetSelfTest.java | 2 +-
.../GridCachePartitionedNodeRestartTest.java | 4 +-
...ePartitionedOptimisticTxNodeRestartTest.java | 4 +-
.../GridCachePartitionedTxSalvageSelfTest.java | 4 +-
.../near/IgniteCacheNearReadCommittedTest.java | 3 +
...cheSynchronousEvictionsFailoverSelfTest.java | 4 +-
.../GridCacheRandomEvictionPolicySelfTest.java | 2 +-
.../IgniteCacheExpiryPolicyAbstractTest.java | 38 +-
.../IgniteCacheLoaderWriterAbstractTest.java | 47 +
...ridCacheContinuousQueryAbstractSelfTest.java | 12 +-
.../closure/GridClosureProcessorSelfTest.java | 14 +-
.../processors/igfs/IgfsAbstractSelfTest.java | 5 +-
.../igfs/IgfsDataManagerSelfTest.java | 1 +
.../processors/igfs/IgfsProcessorSelfTest.java | 3 +-
.../streamer/GridStreamerEvictionSelfTest.java | 2 +-
.../streamer/GridStreamerSelfTest.java | 2 +-
...dStartupWithUndefinedIgniteHomeSelfTest.java | 103 +
.../util/IgniteExceptionRegistrySelfTest.java | 89 +
.../internal/util/IgniteUtilsSelfTest.java | 6 +-
.../internal/util/nio/GridRoundTripTest.java | 1 +
.../offheap/GridOffHeapMapAbstractSelfTest.java | 1 +
...idOffHeapPartitionedMapAbstractSelfTest.java | 4 +-
...apPartitionedMapPerformanceAbstractTest.java | 4 +-
...GridUnsafePartitionedMapPerformanceTest.java | 4 +-
.../cache/GridCacheDataStructuresLoadTest.java | 36 +-
.../loadtests/cache/GridCacheLoadTest.java | 6 +-
.../loadtests/cache/GridCacheSwapLoadTest.java | 5 +-
.../capacity/spring-capacity-cache.xml | 2 +-
.../loadtests/colocation/GridTestMain.java | 3 +-
.../loadtests/colocation/spring-colocation.xml | 2 +-
.../communication/GridIoManagerBenchmark.java | 3 +-
.../GridCachePartitionedAtomicLongLoadTest.java | 4 +-
.../GridMultiSplitsRedeployLoadTest.java | 5 +-
.../loadtests/discovery/GridGcTimeoutTest.java | 3 +-
.../ignite/loadtests/dsi/GridDsiPerfJob.java | 16 +-
.../job/GridJobExecutionSingleNodeLoadTest.java | 2 +-
.../mapper/GridContinuousMapperLoadTest1.java | 3 +-
.../loadtests/mapper/GridNodeStartup.java | 3 +-
.../mergesort/GridMergeSortLoadTest.java | 3 +-
...apPartitionedMapPerformanceAbstractTest.java | 4 +-
...GridUnsafePartitionedMapPerformanceTest.java | 4 +-
.../streamer/GridStreamerIndexLoadTest.java | 4 +-
.../swap/GridSwapEvictAllBenchmark.java | 3 +-
.../marshaller/GridMarshallerAbstractTest.java | 6 +-
...idSessionFutureWaitJobAttributeSelfTest.java | 3 +-
.../GridSessionSetTaskAttributeSelfTest.java | 3 +-
...GridSessionTaskWaitJobAttributeSelfTest.java | 3 +-
.../discovery/AbstractDiscoverySelfTest.java | 22 +-
.../tcp/TcpDiscoverySpiStartStopSelfTest.java | 23 -
.../roundrobin/GridRoundRobinTestUtils.java | 6 +-
.../file/GridFileSwapSpaceSpiSelfTest.java | 1 +
.../index/GridStreamerIndexSelfTest.java | 17 +-
.../window/GridStreamerWindowSelfTest.java | 3 +-
.../testframework/GridSpiTestContext.java | 6 +
.../ignite/testframework/GridTestUtils.java | 11 +-
.../config/GridTestProperties.java | 10 +-
.../junits/GridTestKernalContext.java | 2 +
.../ignite/testframework/junits/IgniteMock.java | 1 -
.../cache/GridAbstractCacheStoreSelfTest.java | 3 +-
.../junits/cache/TestCacheSession.java | 5 +
.../cache/TestThreadLocalCacheSession.java | 5 +
.../junits/spi/GridSpiAbstractTest.java | 12 -
.../ignite/testsuites/IgniteBasicTestSuite.java | 1 -
.../ignite/testsuites/IgniteCacheTestSuite.java | 8 +-
.../testsuites/IgniteKernalSelfTestSuite.java | 1 +
.../testsuites/IgniteUtilSelfTestSuite.java | 1 +
modules/extdata/p2p/pom.xml | 6 -
.../tests/p2p/GridP2PAwareTestUserResource.java | 5 +-
.../tests/p2p/GridTestMessageListener.java | 4 +-
modules/hadoop/pom.xml | 10 -
.../client/hadoop/GridHadoopClientProtocol.java | 9 +-
.../hadoop/IgfsHadoopFileSystemWrapper.java | 412 +++
.../igfs/hadoop/v1/IgfsHadoopFileSystem.java | 3 +-
.../igfs/hadoop/v2/IgfsHadoopFileSystem.java | 3 +-
.../java/org/apache/ignite/igfs/package.html | 2 +-
.../igfs/hadoop/IgfsHadoopFSProperties.java | 10 +-
.../hadoop/IgfsHadoopFileSystemWrapper.java | 413 ---
.../internal/igfs/hadoop/IgfsHadoopReader.java | 2 +-
.../internal/igfs/hadoop/IgfsHadoopUtils.java | 4 +-
.../internal/igfs/hadoop/IgfsHadoopWrapper.java | 2 +-
.../hadoop/GridHadoopClassLoader.java | 12 +-
.../hadoop/GridHadoopDefaultJobInfo.java | 5 +-
.../processors/hadoop/GridHadoopSetup.java | 11 +-
.../processors/hadoop/GridHadoopUtils.java | 4 +-
.../GridHadoopDefaultMapReducePlanner.java | 3 +-
.../shuffle/GridHadoopShuffleMessage.java | 1 +
.../collections/GridHadoopHashMultimapBase.java | 2 +-
.../taskexecutor/GridHadoopExecutorService.java | 2 +-
.../GridHadoopExternalCommunication.java | 14 +-
.../hadoop/v1/GridHadoopV1MapTask.java | 6 +-
.../hadoop/v2/GridHadoopSplitWrapper.java | 3 +-
.../v2/GridHadoopV2JobResourceManager.java | 2 +-
.../GridHadoopClientProtocolSelfTest.java | 6 +-
.../apache/ignite/igfs/IgfsEventsTestSuite.java | 2 +-
.../IgfsHadoop20FileSystemAbstractSelfTest.java | 2 +-
.../igfs/IgfsHadoopDualAbstractSelfTest.java | 2 +-
.../IgfsHadoopFileSystemAbstractSelfTest.java | 1 +
...fsHadoopFileSystemSecondaryModeSelfTest.java | 2 +-
.../hadoop/GridHadoopGroupingTest.java | 14 +-
.../hadoop/GridHadoopJobTrackerSelfTest.java | 2 +-
.../hadoop/GridHadoopSortingTest.java | 9 +-
.../processors/hadoop/GridHadoopStartup.java | 2 +-
.../ignite/loadtests/igfs/IgfsNodeStartup.java | 3 +-
.../igfs/IgfsPerformanceBenchmark.java | 9 +-
.../testsuites/IgniteHadoopTestSuite.java | 7 +-
modules/hibernate/pom.xml | 6 -
...idHibernateAbstractRegionAccessStrategy.java | 97 -
.../GridHibernateAccessStrategyAdapter.java | 369 ---
.../GridHibernateCollectionRegion.java | 99 -
.../hibernate/GridHibernateEntityRegion.java | 110 -
.../GridHibernateGeneralDataRegion.java | 69 -
.../hibernate/GridHibernateNaturalIdRegion.java | 98 -
.../GridHibernateNonStrictAccessStrategy.java | 220 --
.../GridHibernateQueryResultsRegion.java | 71 -
.../GridHibernateReadOnlyAccessStrategy.java | 106 -
.../GridHibernateReadWriteAccessStrategy.java | 282 --
.../cache/hibernate/GridHibernateRegion.java | 101 -
.../hibernate/GridHibernateRegionFactory.java | 231 --
.../GridHibernateTimestampsRegion.java | 40 -
...ridHibernateTransactionalAccessStrategy.java | 139 -
.../GridHibernateTransactionalDataRegion.java | 96 -
.../HibernateAbstractRegionAccessStrategy.java | 97 +
.../HibernateAccessStrategyAdapter.java | 369 +++
.../hibernate/HibernateCollectionRegion.java | 99 +
.../cache/hibernate/HibernateEntityRegion.java | 110 +
.../hibernate/HibernateGeneralDataRegion.java | 69 +
.../hibernate/HibernateNaturalIdRegion.java | 98 +
.../HibernateNonStrictAccessStrategy.java | 220 ++
.../hibernate/HibernateQueryResultsRegion.java | 71 +
.../HibernateReadOnlyAccessStrategy.java | 106 +
.../HibernateReadWriteAccessStrategy.java | 327 +++
.../ignite/cache/hibernate/HibernateRegion.java | 101 +
.../cache/hibernate/HibernateRegionFactory.java | 231 ++
.../hibernate/HibernateTimestampsRegion.java | 40 +
.../HibernateTransactionalAccessStrategy.java | 139 +
.../HibernateTransactionalDataRegion.java | 96 +
.../apache/ignite/cache/hibernate/package.html | 2 +-
...idHibernateL2CacheConfigurationSelfTest.java | 393 ---
.../hibernate/GridHibernateL2CacheSelfTest.java | 1923 -------------
...idHibernateL2CacheTransactionalSelfTest.java | 135 -
.../HibernateL2CacheConfigurationSelfTest.java | 393 +++
.../hibernate/HibernateL2CacheSelfTest.java | 1923 +++++++++++++
.../HibernateL2CacheTransactionalSelfTest.java | 135 +
.../testsuites/IgniteHibernateTestSuite.java | 6 +-
modules/indexing/pom.xml | 6 -
.../cache/GridCacheCrossCacheQuerySelfTest.java | 2 +-
.../GridCacheCrossCacheQuerySelfTestNewApi.java | 2 +-
.../processors/cache/GridCacheSwapSelfTest.java | 12 +-
modules/jta/pom.xml | 6 -
.../http/jetty/GridJettyRestHandler.java | 1 +
modules/scalar/pom.xml | 12 +-
.../ignite/schema/generator/PojoGenerator.java | 3 +-
.../schema/generator/SnippetGenerator.java | 138 +
.../ignite/schema/generator/XmlGenerator.java | 8 +-
.../apache/ignite/schema/model/PojoField.java | 11 +-
.../apache/ignite/schema/ui/SchemaLoadApp.java | 2 +
.../apache/ignite/schema/load/model/Ignite.xml | 133 +-
modules/spring/pom.xml | 6 -
.../p2p/GridP2PUserVersionChangeSelfTest.java | 4 +-
...gniteProjectionStartStopRestartSelfTest.java | 3 +-
modules/visor-console/pom.xml | 7 -
.../commands/alert/VisorAlertCommand.scala | 8 +-
.../commands/cache/VisorCacheCommand.scala | 115 +-
.../commands/cache/VisorCacheScanCommand.scala | 7 +-
.../config/VisorConfigurationCommand.scala | 141 +-
.../commands/disco/VisorDiscoveryCommand.scala | 2 +-
.../visor/commands/node/VisorNodeCommand.scala | 6 +-
.../scala/org/apache/ignite/visor/visor.scala | 70 +-
.../commands/tasks/VisorTasksCommandSpec.scala | 2 +-
modules/web/pom.xml | 6 -
modules/winservice/IgniteService.sln | 2 +-
.../IgniteService/IgniteService.csproj | 2 +-
.../config/benchmark-atomic-win.properties | 15 +
.../config/benchmark-atomic.properties | 15 +
.../config/benchmark-compute-win.properties | 15 +
.../config/benchmark-compute.properties | 15 +
.../config/benchmark-multicast.properties | 15 +
.../config/benchmark-query-win.properties | 15 +
.../yardstick/config/benchmark-query.properties | 15 +
.../config/benchmark-tx-win.properties | 15 +
.../yardstick/config/benchmark-tx.properties | 15 +
.../yardstick/config/benchmark-win.properties | 15 +
modules/yardstick/config/benchmark.properties | 15 +
.../yardstick/config/ignite-store-config.xml | 15 +-
pom.xml | 154 +-
453 files changed, 12119 insertions(+), 14622 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f8478f5c/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
----------------------------------------------------------------------
diff --cc modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
index 511cc0f,964de1d..cdaaf88
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
@@@ -47,12 -48,13 +49,13 @@@ import java.text.
import java.util.concurrent._
import java.util.{HashSet => JHashSet, _}
+import org.apache.ignite.visor.commands.VisorConsole.consoleReader
- import org.apache.ignite.visor.commands._
+ import org.apache.ignite.visor.commands.{VisorConsoleCommand, VisorTextTable}
import scala.collection.JavaConversions._
import scala.collection.immutable
-import scala.io.StdIn
import scala.language.{implicitConversions, reflectiveCalls}
+ import scala.reflect.ClassTag
import scala.util.control.Breaks._
/**