Merge branch 'sprint-2' into ignite-337
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/aa7ce405 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/aa7ce405 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/aa7ce405 Branch: refs/heads/ignite-406 Commit: aa7ce405cb1603a099e23a7feca008e5eda2134c Parents: 472ef05 c847e88 Author: Artem Shutak <ashu...@gridgain.com> Authored: Mon Mar 2 13:23:08 2015 +0300 Committer: Artem Shutak <ashu...@gridgain.com> Committed: Mon Mar 2 13:23:08 2015 +0300 ---------------------------------------------------------------------- .../store/CacheNodeWithStoreStartup.java | 6 +- .../store/jdbc/CacheJdbcPersonStore.java | 115 ++--- .../apache/ignite/cache/store/CacheStore.java | 4 +- .../ignite/cache/store/CacheStoreAdapter.java | 2 +- .../ignite/cache/store/CacheStoreSession.java | 17 +- .../apache/ignite/internal/GridProperties.java | 78 --- .../ignite/internal/GridUpdateNotifier.java | 2 +- .../apache/ignite/internal/IgniteKernal.java | 18 +- .../ignite/internal/IgniteProperties.java | 79 +++ .../ignite/internal/IgniteVersionUtils.java | 8 +- .../processors/cache/GridCacheStoreManager.java | 6 +- .../plugin/IgnitePluginProcessor.java | 24 + .../ignite/internal/util/IgniteUtils.java | 90 +++- .../ignite/internal/visor/cache/VisorCache.java | 190 ++------ .../cache/VisorCacheAffinityConfiguration.java | 53 +- .../visor/cache/VisorCacheConfiguration.java | 484 ++++--------------- .../cache/VisorCacheDefaultConfiguration.java | 27 +- .../cache/VisorCacheEvictionConfiguration.java | 81 +--- .../cache/VisorCacheNearConfiguration.java | 42 +- .../cache/VisorCachePreloadConfiguration.java | 54 +-- .../cache/VisorCacheStoreConfiguration.java | 148 +++++- .../VisorCacheWriteBehindConfiguration.java | 137 ------ .../visor/node/VisorAtomicConfiguration.java | 27 +- .../visor/node/VisorBasicConfiguration.java | 180 +------ .../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 +- .../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 +-- .../internal/visor/util/VisorTaskUtils.java | 4 +- .../apache/ignite/plugin/PluginProvider.java | 5 + .../spi/discovery/tcp/TcpDiscoverySpi.java | 137 +++--- .../discovery/tcp/TcpDiscoverySpiAdapter.java | 116 +++++ .../core/src/test/config/store/jdbc/Ignite.xml | 63 ++- .../internal/GridUpdateNotifierSelfTest.java | 2 +- .../junits/cache/TestCacheSession.java | 5 + .../cache/TestThreadLocalCacheSession.java | 5 + .../ignite/schema/generator/XmlGenerator.java | 8 +- .../apache/ignite/schema/model/PojoField.java | 11 +- .../apache/ignite/schema/load/model/Ignite.xml | 133 +++-- .../commands/cache/VisorCacheCommand.scala | 25 +- .../yardstick/config/ignite-store-config.xml | 15 +- 49 files changed, 1079 insertions(+), 2252 deletions(-) ----------------------------------------------------------------------
