Merge remote-tracking branch 'origin/sprint-2' into sprint-2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3be22ab1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3be22ab1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3be22ab1 Branch: refs/heads/ignite-185 Commit: 3be22ab1f4d9e9096b5600cf8728b19800760ccc Parents: ea6a1c0 0086e9c Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Mon Mar 2 16:00:38 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Mon Mar 2 16:00:38 2015 +0300 ---------------------------------------------------------------------- .../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 +- .../core/src/test/config/store/jdbc/Ignite.xml | 63 ++- .../IgniteCacheExpiryPolicyAbstractTest.java | 38 +- .../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 +- 31 files changed, 606 insertions(+), 2044 deletions(-) ----------------------------------------------------------------------
