ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [02/50] incubator-ignite git commit: Merge branch 'sprint-1' into ignite-213
Date Wed, 11 Feb 2015 14:37:36 GMT
Merge branch 'sprint-1' into ignite-213

Conflicts:
	modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
	modules/core/src/test/java/org/apache/ignite/internal/util/GridStartupWithUndefinedIgniteHomeSelfTest.java


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

Branch: refs/heads/ignite-204
Commit: c56e4e3345971efa82f8cc1d307abde70288c9c4
Parents: 11d4192 4e60207
Author: Artem Shutak <ashutak@gridgain.com>
Authored: Tue Feb 10 15:26:44 2015 +0300
Committer: Artem Shutak <ashutak@gridgain.com>
Committed: Tue Feb 10 15:26:44 2015 +0300

----------------------------------------------------------------------
 assembly/release-base.xml                       |    5 +
 .../HibernateL2CacheExampleNodeStartup.java     |    1 -
 .../datastructures/IgniteQueueExample.java      |    2 +-
 .../datastructures/IgniteSetExample.java        |    2 +-
 .../MemcacheRestExampleNodeStartup.java         |    2 +
 .../singlesplit/SingleSplitsLoadTest.java       |    4 -
 .../gridify/GridifySingleSplitLoadTest.java     |    2 -
 .../client/ClientPortableArgumentTask.java      |   52 -
 .../ignite/client/ClientPutPortableTask.java    |   43 -
 .../ignite/client/ClientTestPortable.java       |  490 ------
 .../ClientTestPortableAffinityKeyTask.java      |   85 -
 .../ignite/client/ClientTestRestServer.java     |    6 +
 .../ClientAbstractMultiNodeSelfTest.java        |   30 +-
 .../integration/ClientAbstractSelfTest.java     |    2 +-
 .../internal/TaskEventSubjectIdSelfTest.java    |    2 +-
 .../rest/RestProcessorMultiStartSelfTest.java   |    2 +-
 .../processors/rest/TestBinaryClient.java       |   10 +-
 .../protocols/tcp/TcpRestParserSelfTest.java    |   12 +-
 .../ignite/jdbc/JdbcComplexQuerySelfTest.java   |    2 +-
 .../ignite/jdbc/JdbcEmptyCacheSelfTest.java     |    2 +-
 .../ignite/jdbc/JdbcLocalCachesSelfTest.java    |    2 +-
 .../ignite/jdbc/JdbcMetadataSelfTest.java       |    2 +-
 .../jdbc/JdbcPreparedStatementSelfTest.java     |    2 +-
 .../ignite/jdbc/JdbcResultSetSelfTest.java      |    2 +-
 .../ignite/jdbc/JdbcStatementSelfTest.java      |    2 +-
 .../clients/src/test/resources/spring-cache.xml |    6 +-
 .../src/test/resources/spring-server-node.xml   |   47 +-
 .../test/resources/spring-server-ssl-node.xml   |   41 +-
 modules/codegen/pom.xml                         |   50 +
 .../CommunicationMessageCodeGenerator.java      |  782 +++++++++
 .../src/main/java/org/apache/ignite/Ignite.java |    7 -
 .../java/org/apache/ignite/IgniteCache.java     |    4 +-
 .../java/org/apache/ignite/IgnitePortables.java |  364 ----
 .../apache/ignite/cache/CacheProjection.java    |   41 +-
 .../apache/ignite/cache/store/CacheStore.java   |   10 +-
 .../ignite/client/GridClientCacheFlag.java      |    2 +-
 .../ignite/client/GridClientConfiguration.java  |   23 -
 .../apache/ignite/client/GridClientFactory.java |    2 +-
 .../ignite/client/impl/GridClientImpl.java      |   17 +-
 .../GridClientConnectionManagerAdapter.java     |  149 +-
 .../GridClientConnectionManagerOsImpl.java      |    5 +-
 .../connection/GridClientNioTcpConnection.java  |  128 +-
 .../router/impl/GridRouterClientImpl.java       |    4 +-
 .../router/impl/GridTcpRouterNioParser.java     |    6 +
 .../ComputeExecutionRejectedException.java      |    2 +-
 .../configuration/CacheConfiguration.java       |   64 -
 .../ClientConnectionConfiguration.java          |   66 +-
 .../configuration/IgniteConfiguration.java      |  435 +----
 .../DataStructureRemovedException.java          |   61 -
 .../ignite/internal/ClusterGroupAdapter.java    |    6 +
 .../apache/ignite/internal/ClusterGroupEx.java  |    9 +
 .../ignite/internal/GridDirectVersion.java      |   32 -
 .../ignite/internal/GridJobCancelRequest.java   |   58 +-
 .../ignite/internal/GridJobContextImpl.java     |    2 +-
 .../ignite/internal/GridJobExecuteRequest.java  |  390 ++---
 .../ignite/internal/GridJobExecuteResponse.java |  106 +-
 .../ignite/internal/GridJobSiblingsRequest.java |   46 +-
 .../internal/GridJobSiblingsResponse.java       |   34 +-
 .../ignite/internal/GridKernalContext.java      |   44 +-
 .../ignite/internal/GridKernalContextImpl.java  |  163 +-
 .../ignite/internal/GridPluginContext.java      |    6 -
 .../ignite/internal/GridPortablesImpl.java      |  174 --
 .../ignite/internal/GridTaskCancelRequest.java  |   34 +-
 .../ignite/internal/GridTaskSessionRequest.java |   58 +-
 .../apache/ignite/internal/IgniteKernal.java    |   69 +-
 .../org/apache/ignite/internal/IgnitionEx.java  |  276 +--
 .../internal/direct/DirectByteBufferStream.java | 1613 ++++++++++++++++++
 .../internal/direct/DirectMessageReader.java    |  279 +++
 .../internal/direct/DirectMessageWriter.java    |  216 +++
 .../internal/managers/GridManagerAdapter.java   |   32 +-
 .../checkpoint/GridCheckpointRequest.java       |   58 +-
 .../managers/communication/GridIoManager.java   |  105 +-
 .../managers/communication/GridIoMessage.java   |  114 +-
 .../communication/GridIoMessageFactory.java     |  543 ++++++
 .../communication/GridIoUserMessage.java        |  176 +-
 .../deployment/GridDeploymentCommunication.java |    6 +-
 .../deployment/GridDeploymentInfoBean.java      |  152 +-
 .../deployment/GridDeploymentRequest.java       |  126 +-
 .../deployment/GridDeploymentResponse.java      |   60 +-
 .../discovery/GridDiscoveryManager.java         |   17 -
 .../eventstorage/GridEventStorageMessage.java   |  200 +--
 .../swapspace/GridSwapSpaceManager.java         |   17 +
 .../affinity/GridAffinityAssignmentCache.java   |    3 +-
 .../affinity/GridAffinityProcessor.java         |    2 +-
 .../processors/cache/CacheEntryImpl0.java       |   60 +
 .../cache/CacheWeakQueryIteratorsHolder.java    |    4 +-
 .../processors/cache/GridCacheAdapter.java      |  600 +++++--
 .../processors/cache/GridCacheAttributes.java   |   11 -
 .../processors/cache/GridCacheContext.java      |  125 +-
 .../GridCacheDefaultAffinityKeyMapper.java      |   34 +-
 .../cache/GridCacheEvictionRequest.java         |   58 +-
 .../cache/GridCacheEvictionResponse.java        |  102 +-
 .../processors/cache/GridCacheIoManager.java    |   26 +-
 .../processors/cache/GridCacheMapEntry.java     |    2 +-
 .../processors/cache/GridCacheMessage.java      |   56 +-
 .../GridCachePartitionExchangeManager.java      |   18 +-
 .../processors/cache/GridCacheProcessor.java    |   12 +-
 .../cache/GridCacheProjectionImpl.java          |   43 +-
 .../processors/cache/GridCacheProxyImpl.java    |   73 +
 .../processors/cache/GridCacheStoreManager.java |    4 +-
 .../processors/cache/GridCacheSwapManager.java  |  206 +++
 .../processors/cache/GridCacheUtils.java        |    6 +-
 .../processors/cache/GridCacheValueBytes.java   |   86 +-
 .../IgniteCacheOsSerializationManager.java      |   48 +
 .../processors/cache/IgniteCacheProxy.java      |   56 +-
 .../cache/affinity/GridCacheAffinityImpl.java   |    3 +-
 ...idCacheOptimisticCheckPreparedTxRequest.java |   72 +-
 ...dCacheOptimisticCheckPreparedTxResponse.java |   58 +-
 ...CachePessimisticCheckCommittedTxRequest.java |   98 +-
 ...achePessimisticCheckCommittedTxResponse.java |   58 +-
 .../distributed/GridCacheTtlUpdateRequest.java  |  270 +--
 .../distributed/GridDistributedBaseMessage.java |  168 +-
 .../GridDistributedCacheAdapter.java            |   72 +-
 .../distributed/GridDistributedLockRequest.java |  306 ++--
 .../GridDistributedLockResponse.java            |  102 +-
 .../GridDistributedTxFinishRequest.java         |  272 +--
 .../GridDistributedTxFinishResponse.java        |   48 +-
 .../GridDistributedTxPrepareRequest.java        |  284 ++-
 .../GridDistributedTxPrepareResponse.java       |   46 +-
 .../GridDistributedUnlockRequest.java           |   78 +-
 .../dht/GridDhtAffinityAssignmentRequest.java   |   34 +-
 .../dht/GridDhtAffinityAssignmentResponse.java  |   46 +-
 .../distributed/dht/GridDhtCacheAdapter.java    |   80 +-
 .../distributed/dht/GridDhtLockFuture.java      |    2 +-
 .../distributed/dht/GridDhtLockRequest.java     |  176 +-
 .../distributed/dht/GridDhtLockResponse.java    |  207 +--
 .../distributed/dht/GridDhtTxFinishRequest.java |  276 +--
 .../dht/GridDhtTxFinishResponse.java            |   34 +-
 .../dht/GridDhtTxPrepareRequest.java            |  215 +--
 .../dht/GridDhtTxPrepareResponse.java           |  215 +--
 .../distributed/dht/GridDhtUnlockRequest.java   |   78 +-
 .../GridDhtAtomicDeferredUpdateResponse.java    |   78 +-
 .../dht/atomic/GridDhtAtomicUpdateRequest.java  |  635 ++-----
 .../dht/atomic/GridDhtAtomicUpdateResponse.java |  117 +-
 .../dht/atomic/GridNearAtomicUpdateRequest.java |  485 ++----
 .../atomic/GridNearAtomicUpdateResponse.java    |  299 +---
 .../dht/preloader/GridDhtForceKeysRequest.java  |  114 +-
 .../dht/preloader/GridDhtForceKeysResponse.java |  114 +-
 .../GridDhtPartitionDemandMessage.java          |  142 +-
 .../preloader/GridDhtPartitionExchangeId.java   |   98 +-
 .../GridDhtPartitionSupplyMessage.java          |  190 +--
 .../GridDhtPartitionsAbstractMessage.java       |   46 +-
 .../preloader/GridDhtPartitionsFullMessage.java |   58 +-
 .../GridDhtPartitionsSingleMessage.java         |   34 +-
 .../GridDhtPartitionsSingleRequest.java         |   18 +-
 .../distributed/near/GridNearAtomicCache.java   |    5 +
 .../distributed/near/GridNearCacheAdapter.java  |    8 +
 .../distributed/near/GridNearGetRequest.java    |  270 +--
 .../distributed/near/GridNearGetResponse.java   |  152 +-
 .../distributed/near/GridNearLockRequest.java   |  256 +--
 .../distributed/near/GridNearLockResponse.java  |  214 +--
 .../near/GridNearTxFinishRequest.java           |   97 +-
 .../near/GridNearTxFinishResponse.java          |   58 +-
 .../near/GridNearTxPrepareRequest.java          |  165 +-
 .../near/GridNearTxPrepareResponse.java         |  228 +--
 .../distributed/near/GridNearUnlockRequest.java |   18 +-
 .../processors/cache/local/GridLocalCache.java  |   12 +
 .../local/atomic/GridLocalAtomicCache.java      |   11 +
 .../cache/query/GridCacheQueryRequest.java      |  255 ++-
 .../cache/query/GridCacheQueryResponse.java     |  182 +-
 .../IgniteCacheSerializationManager.java        |   51 +
 .../transactions/IgniteTxLocalAdapter.java      |    7 +-
 .../cache/version/GridCacheVersion.java         |  113 +-
 .../clock/GridClockDeltaSnapshotMessage.java    |  118 +-
 .../processors/clock/GridClockDeltaVersion.java |   82 +-
 .../closure/GridClosureProcessor.java           |    6 +-
 .../continuous/GridContinuousMessage.java       |   88 +-
 .../continuous/GridContinuousProcessor.java     |    6 -
 .../dataload/GridDataLoadRequest.java           |  250 +--
 .../dataload/GridDataLoadResponse.java          |   60 +-
 .../dataload/IgniteDataLoaderImpl.java          |    6 +-
 .../datastructures/GridCacheAtomicLongImpl.java |    7 +-
 .../GridCacheAtomicReferenceImpl.java           |    7 +-
 .../GridCacheAtomicSequenceImpl.java            |    7 +-
 .../GridCacheAtomicStampedImpl.java             |    7 +-
 .../datastructures/GridCacheQueueAdapter.java   |    9 +-
 .../datastructures/GridCacheSetImpl.java        |    5 +-
 .../datastructures/GridCacheSetProxy.java       |    3 +-
 .../processors/fs/GridGgfsAckMessage.java       |   58 +-
 .../processors/fs/GridGgfsBlockKey.java         |   72 +-
 .../processors/fs/GridGgfsBlocksMessage.java    |  127 +-
 .../fs/GridGgfsCommunicationMessage.java        |   16 +-
 .../processors/fs/GridGgfsDataManager.java      |    2 +-
 .../processors/fs/GridGgfsDeleteMessage.java    |   46 +-
 .../processors/fs/GridGgfsDeleteWorker.java     |    8 +-
 .../fs/GridGgfsFileAffinityRange.java           |   84 +-
 .../fs/GridGgfsFragmentizerRequest.java         |   90 +-
 .../fs/GridGgfsFragmentizerResponse.java        |   34 +-
 .../processors/fs/GridGgfsSyncMessage.java      |   46 +-
 .../processors/fs/IgniteFsProcessor.java        |   38 -
 .../processors/job/GridJobProcessor.java        |    2 +-
 .../offheap/GridOffHeapProcessor.java           |   15 +
 .../plugin/IgnitePluginProcessor.java           |    8 +-
 .../portable/GridPortableOutputStream.java      |    7 -
 .../portable/GridPortableProcessor.java         |   88 +-
 .../portable/os/GridOsPortableProcessor.java    |   48 +-
 .../processors/query/GridQueryProcessor.java    |   35 +-
 .../processors/rest/GridRestProcessor.java      |   12 +-
 .../message/GridClientAbstractMessage.java      |   17 +-
 .../GridClientAuthenticationRequest.java        |   19 -
 .../message/GridClientCacheQueryRequest.java    |   45 -
 .../client/message/GridClientCacheRequest.java  |   48 -
 .../message/GridClientGetMetaDataRequest.java   |   64 -
 .../GridClientHandshakeRequestWrapper.java      |  129 --
 .../GridClientHandshakeResponseWrapper.java     |   96 --
 .../client/message/GridClientLogRequest.java    |   23 -
 .../message/GridClientMessageWrapper.java       |  266 ---
 .../message/GridClientMetaDataResponse.java     |   57 -
 .../rest/client/message/GridClientNodeBean.java |   40 +-
 .../message/GridClientNodeMetricsBean.java      |  120 +-
 .../client/message/GridClientPingPacket.java    |    4 +-
 .../message/GridClientPingPacketWrapper.java    |   89 -
 .../message/GridClientPortableMetaData.java     |   23 +-
 .../message/GridClientPutMetaDataRequest.java   |   64 -
 .../rest/client/message/GridClientResponse.java |   23 -
 .../client/message/GridClientTaskRequest.java   |   28 -
 .../message/GridClientTaskResultBean.java       |   28 +-
 .../message/GridClientTopologyRequest.java      |   25 -
 .../rest/client/message/GridRouterRequest.java  |    1 +
 .../rest/client/message/GridRouterResponse.java |    2 +-
 .../cache/GridCacheClientQueryResult.java       |   24 +-
 .../metadata/GridPortableMetadataHandler.java   |  103 --
 .../handlers/task/GridTaskCommandHandler.java   |    3 +-
 .../handlers/task/GridTaskResultRequest.java    |   48 +-
 .../handlers/task/GridTaskResultResponse.java   |   72 +-
 .../protocols/tcp/GridClientPacketType.java     |    3 +
 .../protocols/tcp/GridMemcachedMessage.java     |    3 +
 .../tcp/GridMemcachedMessageWrapper.java        |  269 ---
 .../tcp/GridTcpMemcachedNioListener.java        |   13 +-
 .../protocols/tcp/GridTcpRestDirectParser.java  |  519 ------
 .../protocols/tcp/GridTcpRestNioListener.java   |   45 +-
 .../rest/protocols/tcp/GridTcpRestParser.java   |   75 +-
 .../rest/protocols/tcp/GridTcpRestProtocol.java |   63 +-
 .../GridRestPortableGetMetaDataRequest.java     |   44 -
 .../GridRestPortablePutMetaDataRequest.java     |   44 -
 .../streamer/GridStreamerCancelRequest.java     |   36 +-
 .../streamer/GridStreamerExecutionRequest.java  |  178 +-
 .../streamer/GridStreamerResponse.java          |   48 +-
 .../processors/streamer/IgniteStreamerImpl.java |    6 +-
 .../processors/task/GridTaskProcessor.java      |    4 +-
 .../version/GridVersionConverter.java           |   46 -
 .../ignite/internal/util/GridByteArrayList.java |   81 +-
 .../internal/util/GridClientByteUtils.java      |    3 +-
 .../ignite/internal/util/GridLongList.java      |   92 +-
 .../ignite/internal/util/GridUuidCache.java     |   59 -
 .../ignite/internal/util/IgniteUtils.java       |  137 +-
 .../ignite/internal/util/IgniteUuidCache.java   |   59 +
 .../GridTcpCommunicationMessageAdapter.java     |  218 ---
 .../GridTcpCommunicationMessageFactory.java     |  359 ----
 .../GridTcpCommunicationMessageProducer.java    |   31 -
 .../GridTcpCommunicationMessageState.java       | 1599 -----------------
 .../util/direct/GridTcpMessageFactory.java      |   29 -
 .../internal/util/ipc/IpcToNioAdapter.java      |   23 +-
 .../ignite/internal/util/lang/GridFunc.java     |  149 ++
 .../util/nio/GridCommunicationClient.java       |    4 +-
 .../internal/util/nio/GridDirectParser.java     |   30 +-
 .../internal/util/nio/GridNioMessageReader.java |    6 +-
 .../internal/util/nio/GridNioMessageWriter.java |    6 +-
 .../ignite/internal/util/nio/GridNioServer.java |   84 +-
 .../util/nio/GridShmemCommunicationClient.java  |   24 +-
 .../util/nio/GridTcpCommunicationClient.java    |   21 +-
 .../util/nio/GridTcpNioCommunicationClient.java |    4 +-
 .../internal/util/offheap/GridOffHeapMap.java   |    7 +
 .../util/offheap/GridOffHeapPartitionedMap.java |   11 +
 .../util/offheap/unsafe/GridUnsafeMap.java      |   12 +-
 .../unsafe/GridUnsafePartitionedMap.java        |   10 +
 .../util/portable/PortableRawReaderEx.java      |   32 -
 .../util/portable/PortableRawWriterEx.java      |   43 -
 .../node/VisorExecutorServiceConfiguration.java |  149 +-
 .../visor/portable/VisorPortableMetadata.java   |   72 -
 .../VisorPortableMetadataCollectorTask.java     |   94 -
 .../portable/VisorPortableMetadataField.java    |   71 -
 .../org/apache/ignite/lang/IgniteBiTuple.java   |    4 +-
 .../optimized/optimized-classnames.properties   |  160 +-
 .../org/apache/ignite/plugin/PluginContext.java |    7 -
 .../apache/ignite/plugin/PluginProvider.java    |    4 +-
 .../communication/MessageAdapter.java           |   97 ++
 .../communication/MessageCallback.java          |   48 -
 .../communication/MessageFactory.java           |   41 +
 .../communication/MessageFormatter.java         |   46 +
 .../extensions/communication/MessageReader.java |  252 +++
 .../extensions/communication/MessageWriter.java |  266 +++
 .../extensions/communication/package.html       |   24 +
 .../extensions/discovery/DiscoveryCallback.java |   51 -
 .../security/GridSecurityCredentials.java       |   20 +-
 .../ignite/portables/PortableBuilder.java       |  137 --
 .../ignite/portables/PortableConfiguration.java |  189 --
 .../ignite/portables/PortableException.java     |   57 -
 .../ignite/portables/PortableIdMapper.java      |   55 -
 .../PortableInvalidClassException.java          |   58 -
 .../ignite/portables/PortableMarshalAware.java  |   48 -
 .../ignite/portables/PortableMetadata.java      |   61 -
 .../apache/ignite/portables/PortableObject.java |  160 --
 .../ignite/portables/PortableRawReader.java     |  235 ---
 .../ignite/portables/PortableRawWriter.java     |  218 ---
 .../apache/ignite/portables/PortableReader.java |  286 ----
 .../ignite/portables/PortableSerializer.java    |   47 -
 .../portables/PortableTypeConfiguration.java    |  195 ---
 .../apache/ignite/portables/PortableWriter.java |  265 ---
 .../org/apache/ignite/portables/package.html    |   24 -
 .../org/apache/ignite/spi/IgniteSpiAdapter.java |   19 +-
 .../org/apache/ignite/spi/IgniteSpiContext.java |   34 +-
 .../jobstealing/JobStealingRequest.java         |   36 +-
 .../spi/collision/noop/NoopCollisionSpi.java    |    2 +-
 .../communication/tcp/TcpCommunicationSpi.java  |  209 +--
 .../ignite/spi/swapspace/SwapSpaceSpi.java      |   11 +
 .../spi/swapspace/file/FileSwapSpaceSpi.java    |   27 +
 .../spi/swapspace/noop/NoopSwapSpaceSpi.java    |    5 +
 .../test/config/default-spring-url-testing.xml  |    2 -
 modules/core/src/test/config/example-cache.xml  |    2 -
 .../src/test/config/io-manager-benchmark.xml    |    1 -
 .../src/test/config/job-loadtest/client.xml     |   41 +-
 .../src/test/config/job-loadtest/server.xml     |   15 +-
 modules/core/src/test/config/jobs-load-base.xml |   28 +-
 .../src/test/config/load/cache-benchmark.xml    |    2 -
 .../test/config/load/cache-client-benchmark.xml |    2 -
 .../core/src/test/config/load/dsi-load-base.xml |   28 +-
 .../src/test/config/load/merge-sort-base.xml    |   41 +-
 .../test/config/loaders/grid-cfg-2-grids.xml    |    4 -
 .../core/src/test/config/loaders/grid-cfg.xml   |    5 -
 .../config/spring-cache-put-remove-load.xml     |    2 -
 .../core/src/test/config/spring-multicache.xml  |   39 +-
 .../src/test/config/spring-start-nodes-attr.xml |    2 -
 .../core/src/test/config/spring-start-nodes.xml |    2 -
 .../config/streamer/spring-streamer-base.xml    |    2 -
 .../test/config/websession/spring-cache-1.xml   |    2 -
 .../test/config/websession/spring-cache-2.xml   |    2 -
 .../test/config/websession/spring-cache-3.xml   |    2 -
 .../store/jdbc/CacheJdbcPojoStoreTest.java      |   22 +-
 ...eJdbcStoreAbstractMultithreadedSelfTest.java |   27 +-
 .../internal/GridCancelUnusedJobSelfTest.java   |    9 +-
 .../internal/GridDiscoveryEventSelfTest.java    |    2 -
 .../GridJobMasterLeaveAwareSelfTest.java        |    6 +-
 .../internal/GridManagementJobSelfTest.java     |  168 --
 .../ignite/internal/GridStartStopSelfTest.java  |    6 -
 .../GridCommunicationSendMessageSelfTest.java   |   21 +-
 .../communication/GridIoManagerSelfTest.java    |   10 +-
 .../GridDeploymentMessageCountSelfTest.java     |    4 +-
 .../cache/GridCacheAbstractFullApiSelfTest.java |  249 ++-
 .../GridCacheAbstractIteratorsSelfTest.java     |    2 -
 .../cache/GridCacheAbstractSelfTest.java        |   18 +-
 .../cache/GridCacheAffinityMapperSelfTest.java  |   17 +
 .../GridCacheAtomicMessageCountSelfTest.java    |    4 +-
 .../GridCacheDaemonNodeAbstractSelfTest.java    |    2 -
 .../cache/GridCacheDeploymentSelfTest.java      |    2 -
 .../cache/GridCacheLuceneQueryIndexTest.java    |    1 -
 .../cache/GridCacheMemoryModeSelfTest.java      |    8 -
 ...HeapMultiThreadedUpdateAbstractSelfTest.java |    1 -
 .../GridCacheOffHeapTieredAbstractSelfTest.java |   15 +-
 ...heOffHeapTieredEvictionAbstractSelfTest.java |   78 +-
 ...ridCacheReplicatedSynchronousCommitTest.java |    4 +-
 .../cache/IgniteCacheAbstractTest.java          |    8 -
 .../IgniteCacheAtomicLocalPeekModesTest.java    |   43 +
 .../cache/IgniteCacheAtomicLocalPeekTest.java   |   43 -
 .../cache/IgniteCacheAtomicPeekModesTest.java   |   49 +
 .../cache/IgniteCacheAtomicPeekTest.java        |   49 -
 ...gniteCacheAtomicReplicatedPeekModesTest.java |   32 +
 .../IgniteCacheAtomicReplicatedPeekTest.java    |   32 -
 .../cache/IgniteCachePeekAbstractTest.java      |  333 ----
 .../cache/IgniteCachePeekModesAbstractTest.java | 1131 ++++++++++++
 .../cache/IgniteCacheTxLocalPeekModesTest.java  |   43 +
 .../cache/IgniteCacheTxLocalPeekTest.java       |   43 -
 .../cache/IgniteCacheTxPeekModesTest.java       |   49 +
 .../processors/cache/IgniteCacheTxPeekTest.java |   49 -
 .../IgniteCacheTxReplicatedPeekModesTest.java   |   32 +
 .../cache/IgniteCacheTxReplicatedPeekTest.java  |   32 -
 .../cache/IgniteTxReentryAbstractSelfTest.java  |    4 +-
 ...CacheAtomicReferenceApiSelfAbstractTest.java |    3 +-
 ...idCacheAtomicStampedApiSelfAbstractTest.java |    3 +-
 .../GridCacheQueueApiSelfAbstractTest.java      |    4 +-
 ...GridCacheQueueMultiNodeAbstractSelfTest.java |   19 +-
 ...CacheQueueRotativeMultiNodeAbstractTest.java |    3 +-
 .../GridCacheSequenceApiSelfAbstractTest.java   |    3 +-
 .../GridCacheSetAbstractSelfTest.java           |    9 +-
 .../IgniteAtomicLongApiAbstractSelfTest.java    |    3 +-
 ...tractDistributedByteArrayValuesSelfTest.java |   10 -
 ...tractPartitionedByteArrayValuesSelfTest.java |    3 -
 .../GridCacheAtomicTimeoutSelfTest.java         |    4 +-
 ...dCacheMultithreadedFailoverAbstractTest.java |    1 -
 .../GridCachePreloadLifecycleAbstractTest.java  |    9 +-
 ...xOriginatingNodeFailureAbstractSelfTest.java |    4 +-
 ...cOriginatingNodeFailureAbstractSelfTest.java |    4 +-
 .../dht/GridCacheAtomicFullApiSelfTest.java     |   18 +
 .../GridCacheDhtPreloadMessageCountTest.java    |    4 +-
 ...eAtomicInvalidPartitionHandlingSelfTest.java |    4 +-
 ...tomicClientOnlyMultiNodeFullApiSelfTest.java |   10 +
 ...eAtomicNearOnlyMultiNodeFullApiSelfTest.java |   18 +-
 ...idCacheNearOnlyMultiNodeFullApiSelfTest.java |  221 ++-
 .../GridCacheNearReaderPreloadSelfTest.java     |    1 -
 .../near/GridCachePartitionedLockSelfTest.java  |   34 -
 ...achePartitionedMultiNodeFullApiSelfTest.java |   18 +-
 .../GridCacheReplicatedInvalidateSelfTest.java  |    4 +-
 .../local/GridCacheLocalIteratorsSelfTest.java  |   80 -
 .../GridCacheSwapScanQueryAbstractSelfTest.java |   59 +-
 .../query/GridCacheSwapScanQuerySelfTest.java   |    4 -
 .../dataload/GridDataLoaderPerformanceTest.java |    2 -
 ...heGgfsPerBlockLruEvictionPolicySelfTest.java |    2 -
 .../processors/fs/GridGgfsAbstractSelfTest.java |    1 -
 .../processors/fs/GridGgfsModesSelfTest.java    |    2 -
 .../cache/GridCacheCommandHandlerSelfTest.java  |    6 +-
 .../GridServiceReassignmentSelfTest.java        |   17 +-
 .../util/future/GridFutureAdapterSelfTest.java  |    8 +-
 .../offheap/GridOffHeapMapAbstractSelfTest.java |   52 +-
 .../cache/GridCacheSingleNodeLoadTest.java      |    6 +-
 .../loadtests/colocation/spring-colocation.xml  |   26 +-
 .../communication/GridIoManagerBenchmark0.java  |    8 +-
 .../communication/GridTestMessage.java          |    8 +-
 .../multisplit/GridMultiSplitsLoadTest.java     |    2 -
 .../GridMultiSplitsRedeployLoadTest.java        |    2 -
 ...ridSingleSplitsNewNodesAbstractLoadTest.java |    9 +-
 .../GridSingleSplitsRedeployLoadTest.java       |    2 -
 .../loadtests/hashmap/GridCacheTestContext.java |    1 +
 ...SessionCancelSiblingsFromFutureSelfTest.java |    9 +-
 ...ridSessionCancelSiblingsFromJobSelfTest.java |    9 +-
 ...idSessionCancelSiblingsFromTaskSelfTest.java |    9 +-
 ...GridSessionJobWaitTaskAttributeSelfTest.java |   10 +-
 .../GridSessionSetFutureAttributeSelfTest.java  |    9 +-
 ...nSetFutureAttributeWaitListenerSelfTest.java |    9 +-
 .../GridSessionSetJobAttributeSelfTest.java     |   10 +-
 ...sionSetJobAttributeWaitListenerSelfTest.java |    9 +-
 .../GridSessionWaitAttributeSelfTest.java       |   10 +-
 .../spi/GridTcpSpiForwardingSelfTest.java       |    1 -
 .../GridAbstractCommunicationSelfTest.java      |   27 +-
 .../spi/communication/GridTestMessage.java      |   66 +-
 .../tcp/GridCacheDhtLockBackupSelfTest.java     |    6 +-
 ...mmunicationSpiConcurrentConnectSelfTest.java |   23 +-
 .../tcp/GridTcpCommunicationSpiLanTest.java     |    6 +-
 ...cpCommunicationSpiMultithreadedSelfTest.java |   27 +-
 ...dTcpCommunicationSpiRecoveryAckSelfTest.java |   17 +-
 ...GridTcpCommunicationSpiRecoverySelfTest.java |   16 +-
 .../spi/discovery/tcp/TcpDiscoverySelfTest.java |    2 -
 .../tcp/TcpDiscoverySnapshotHistoryTest.java    |    1 -
 .../inmemory/GridTestSwapSpaceSpi.java          |   41 +
 .../testframework/GridSpiTestContext.java       |   48 +-
 .../testframework/junits/GridAbstractTest.java  |    2 -
 .../junits/GridTestKernalContext.java           |   26 +
 .../ignite/testframework/junits/IgniteMock.java |    5 -
 .../IgniteCacheFullApiSelfTestSuite.java        |    2 +-
 .../ignite/testsuites/IgniteCacheTestSuite.java |   12 +-
 .../testsuites/IgniteComputeGridTestSuite.java  |    1 -
 .../GridHadoopExternalTaskExecutor.java         |    2 +-
 .../GridGgfsHadoopDualAbstractSelfTest.java     |    1 -
 ...idGgfsHadoopFileSystemHandshakeSelfTest.java |    1 -
 ...GgfsHadoopFileSystemLoggerStateSelfTest.java |    1 -
 .../hadoop/GridHadoopAbstractSelfTest.java      |    7 +-
 ...idHadoopDefaultMapReducePlannerSelfTest.java |    5 +
 .../tcp/GridOrderedMessageCancelSelfTest.java   |    4 +-
 .../log4j/GridLog4jCorrectFileNameTest.java     |    1 -
 .../org/apache/ignite/IgniteSpringBean.java     |    7 -
 .../ignite/internal/GridFactorySelfTest.java    |    9 -
 .../GridSpringBeanSerializationSelfTest.java    |    2 -
 .../config/VisorConfigurationCommand.scala      |    4 -
 .../scala/org/apache/ignite/visor/visor.scala   |    8 +-
 .../yardstick/config/benchmark-store.properties |   33 +-
 modules/yardstick/config/ignite-base-config.xml |    2 -
 .../yardstick/config/ignite-store-config.xml    |   52 +-
 .../yardstick/IgniteBenchmarkArguments.java     |   22 +
 .../org/apache/ignite/yardstick/IgniteNode.java |    5 +
 pom.xml                                         |    8 +-
 459 files changed, 13251 insertions(+), 19956 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c56e4e33/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
index d15685d,31a4fb0..9266fac
--- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
@@@ -25,13 -25,14 +25,13 @@@ import org.apache.ignite.internal.manag
  import org.apache.ignite.internal.util.typedef.internal.*;
  import org.apache.ignite.lang.*;
  import org.apache.ignite.lifecycle.*;
 -import org.apache.ignite.services.*;
  import org.apache.ignite.marshaller.*;
  import org.apache.ignite.plugin.*;
+ import org.apache.ignite.spi.authentication.*;
+ import org.apache.ignite.spi.indexing.*;
+ import org.apache.ignite.streamer.*;
  import org.apache.ignite.plugin.security.*;
  import org.apache.ignite.plugin.segmentation.*;
- import org.apache.ignite.portables.*;
- import org.apache.ignite.services.*;
- import org.apache.ignite.spi.authentication.*;
  import org.apache.ignite.spi.checkpoint.*;
  import org.apache.ignite.spi.collision.*;
  import org.apache.ignite.spi.communication.*;

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

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c56e4e33/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c56e4e33/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala
----------------------------------------------------------------------


Mime
View raw message