Repository: incubator-ignite Updated Branches: refs/heads/ignite-843 67c9aa60e -> 47eeda1b6
# IGNITE-843 Segmentation removed. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/47eeda1b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/47eeda1b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/47eeda1b Branch: refs/heads/ignite-843 Commit: 47eeda1b6f88c28b8408397e134d9701b99afd14 Parents: 67c9aa6 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Mon Jun 29 15:47:15 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Mon Jun 29 15:47:15 2015 +0700 ---------------------------------------------------------------------- .../nodejs/public/form-models/clusters.json | 37 -------------------- modules/webconfig/nodejs/utils/generatorJava.js | 7 ---- modules/webconfig/nodejs/utils/generatorXml.js | 7 ---- 3 files changed, 51 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/47eeda1b/modules/webconfig/nodejs/public/form-models/clusters.json ---------------------------------------------------------------------- diff --git a/modules/webconfig/nodejs/public/form-models/clusters.json b/modules/webconfig/nodejs/public/form-models/clusters.json index b991d10..3258cc8 100644 --- a/modules/webconfig/nodejs/public/form-models/clusters.json +++ b/modules/webconfig/nodejs/public/form-models/clusters.json @@ -589,43 +589,6 @@ ] }, { - "label": "Segmentation", - "tip": ["How node will react on topology segmentation."], - "fields": [ - { - "label": "Policy", - "type": "dropdown", - "model": "segmentationPolicy", - "placeholder": "STOP", - "items": "segmentationPolicy", - "tip": [ - "Policy that defines how node will react on topology segmentation." - ] - }, - { - "label": "Resolve attempts count", - "type": "number", - "model": "segmentationResolveAttempts", - "placeholder": "2", - "tip": [ - "Each configured resolver will have this attempts number to pass segmentation check prior to check failure." - ] - }, - { - "label": "All resolvers pass required flag", - "type": "check", - "model": "allSegmentationResolversPassRequired", - "tip": [ - "All segmentation resolvers pass required flag.", - "<ul>", - " <li>If enabled all segmentation resolvers should succeed for node to be in correct segment.</li>", - " <li>If disabled at least one segmentation resolver should succeed for node to be in correct segment.</li>", - "</ul>" - ] - } - ] - }, - { "label": "Swap", "tip": ["Settings for overflow data to disk if it cannot fit in memory."], "fields": [ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/47eeda1b/modules/webconfig/nodejs/utils/generatorJava.js ---------------------------------------------------------------------- diff --git a/modules/webconfig/nodejs/utils/generatorJava.js b/modules/webconfig/nodejs/utils/generatorJava.js index 50c6cb0..f050079 100644 --- a/modules/webconfig/nodejs/utils/generatorJava.js +++ b/modules/webconfig/nodejs/utils/generatorJava.js @@ -266,13 +266,6 @@ exports.generateClusterConfiguration = function(cluster, generateJavaClass) { res.needEmptyLine = true; - addProperty(res, cluster, 'cfg', 'segmentationPolicy', 'SegmentationPolicy'); - addProperty(res, cluster, 'cfg', 'segmentationResolveAttempts'); - addProperty(res, cluster, 'cfg', 'allSegmentationResolversPassRequired'); - - res.needEmptyLine = true; - - res.needEmptyLine = true; addProperty(res, cluster, 'cfg', 'utilityCacheKeepAliveTime'); addProperty(res, cluster, 'cfg', 'utilityCachePoolSize'); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/47eeda1b/modules/webconfig/nodejs/utils/generatorXml.js ---------------------------------------------------------------------- diff --git a/modules/webconfig/nodejs/utils/generatorXml.js b/modules/webconfig/nodejs/utils/generatorXml.js index 99b2961..d82ff60 100644 --- a/modules/webconfig/nodejs/utils/generatorXml.js +++ b/modules/webconfig/nodejs/utils/generatorXml.js @@ -253,17 +253,10 @@ exports.generateClusterConfiguration = function(cluster) { res.needEmptyLine = true; - addProperty(res, cluster, 'segmentationPolicy'); - addProperty(res, cluster, 'allSegmentationResolversPassRequired'); - addProperty(res, cluster, 'segmentationResolveAttempts'); - - res.needEmptyLine = true; - addProperty(res, cluster, 'cacheSanityCheckEnabled'); res.needEmptyLine = true; - res.needEmptyLine = true; addProperty(res, cluster, 'utilityCacheKeepAliveTime'); addProperty(res, cluster, 'utilityCachePoolSize');
