Merge branch 'sprint-1' into ignite-50
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8292f329 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8292f329 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8292f329 Branch: refs/heads/ignite-189 Commit: 8292f3297fac4bcdc7c5eb7d47ad1931720f7c7f Parents: d83c7fc c049edb Author: nikolay_tikhonov <ntikho...@gridgain.com> Authored: Thu Feb 12 15:56:59 2015 +0300 Committer: nikolay_tikhonov <ntikho...@gridgain.com> Committed: Thu Feb 12 15:56:59 2015 +0300 ---------------------------------------------------------------------- .../src/main/java/org/apache/ignite/Ignite.java | 9 +- .../ignite/internal/GridKernalContext.java | 23 -- .../ignite/internal/GridKernalContextImpl.java | 34 +-- .../ignite/internal/GridPluginComponent.java | 2 - .../apache/ignite/internal/GridProductImpl.java | 198 ----------------- .../apache/ignite/internal/GridProperties.java | 2 +- .../ignite/internal/GridUpdateNotifier.java | 15 -- .../org/apache/ignite/internal/IgniteEx.java | 12 +- .../apache/ignite/internal/IgniteKernal.java | 212 ++++--------------- .../ignite/internal/IgniteVersionUtils.java | 78 +++++++ .../impl/GridRouterCommandLineStartup.java | 4 +- .../processors/cache/GridCacheContext.java | 13 ++ .../cache/GridCacheEvictionManager.java | 4 +- .../processors/cache/GridCacheIoManager.java | 74 ++----- .../GridCachePartitionExchangeManager.java | 5 +- .../processors/cache/GridCacheSwapManager.java | 4 - ...ridCacheOptimisticCheckPreparedTxFuture.java | 8 +- ...idCacheOptimisticCheckPreparedTxRequest.java | 30 ++- ...dCachePessimisticCheckCommittedTxFuture.java | 2 +- ...CachePessimisticCheckCommittedTxRequest.java | 27 +++ ...achePessimisticCheckCommittedTxResponse.java | 29 ++- .../distributed/dht/GridDhtCacheAdapter.java | 4 +- .../distributed/dht/GridDhtLockFuture.java | 5 +- .../dht/GridDhtTransactionalCacheAdapter.java | 8 +- .../distributed/dht/GridDhtTxFinishFuture.java | 4 +- .../cache/distributed/dht/GridDhtTxLocal.java | 2 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 9 +- .../dht/GridPartitionedGetFuture.java | 2 +- .../dht/atomic/GridDhtAtomicCache.java | 6 +- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 2 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 4 +- .../dht/colocated/GridDhtColocatedCache.java | 4 +- .../colocated/GridDhtColocatedLockFuture.java | 5 +- .../dht/preloader/GridDhtForceKeysFuture.java | 2 +- .../preloader/GridDhtPartitionDemandPool.java | 2 +- .../preloader/GridDhtPartitionSupplyPool.java | 20 +- .../GridDhtPartitionsExchangeFuture.java | 8 +- .../dht/preloader/GridDhtPreloader.java | 2 +- .../distributed/near/GridNearGetFuture.java | 2 +- .../distributed/near/GridNearLockFuture.java | 5 +- .../near/GridNearTransactionalCache.java | 4 +- .../near/GridNearTxFinishFuture.java | 2 +- .../near/GridNearTxPrepareFuture.java | 2 +- .../query/GridCacheDistributedQueryFuture.java | 2 +- .../query/GridCacheDistributedQueryManager.java | 4 +- .../jdbc/GridCacheQueryJdbcValidationTask.java | 5 - .../cache/transactions/IgniteInternalTx.java | 6 + .../cache/transactions/IgniteTxAdapter.java | 14 +- .../cache/transactions/IgniteTxHandler.java | 13 +- .../processors/fs/GridGgfsIpcHandler.java | 13 +- .../internal/processors/fs/GridGgfsServer.java | 2 +- .../processors/fs/IgniteFsProcessor.java | 5 - .../license/GridLicenseProcessor.java | 69 ------ .../license/GridLicenseSubsystem.java | 53 ----- .../license/GridLicenseUseRegistry.java | 90 -------- .../license/os/GridOsLicenseProcessor.java | 66 ------ .../internal/processors/license/os/package.html | 24 --- .../internal/processors/license/package.html | 24 --- .../handlers/cache/GridCacheCommandHandler.java | 4 - .../version/GridVersionCommandHandler.java | 4 +- .../streamer/GridStreamProcessor.java | 5 - .../ignite/internal/product/IgniteProduct.java | 75 ------- .../internal/product/IgniteProductLicense.java | 183 ---------------- .../product/IgniteProductLicenseException.java | 70 ------ .../apache/ignite/internal/product/package.html | 24 --- .../ipc/shmem/IpcSharedMemoryNativeLoader.java | 5 +- .../visor/misc/VisorLatestVersionTask.java | 2 +- .../optimized/optimized-classnames.properties | 5 +- .../startup/cmdline/CommandLineStartup.java | 8 +- .../core/src/main/resources/ignite.properties | 1 + .../ignite/internal/GridVersionSelfTest.java | 7 +- .../cache/GridCacheAbstractMetricsSelfTest.java | 7 +- .../product/GridProductVersionSelfTest.java | 4 +- .../marshaller/GridMarshallerAbstractTest.java | 24 --- .../testframework/junits/GridAbstractTest.java | 4 - .../ignite/testframework/junits/IgniteMock.java | 4 +- .../processors/hadoop/GridHadoopSetup.java | 4 +- ...idHadoopDefaultMapReducePlannerSelfTest.java | 10 +- .../scala/org/apache/ignite/scalar/scalar.scala | 6 +- .../org/apache/ignite/IgniteSpringBean.java | 7 +- .../ignite/visor/commands/VisorConsole.scala | 8 +- .../commands/alert/VisorAlertCommand.scala | 2 +- .../scala/org/apache/ignite/visor/visor.scala | 6 +- pom.xml | 4 +- 84 files changed, 383 insertions(+), 1379 deletions(-) ----------------------------------------------------------------------
