Repository: ignite Updated Branches: refs/heads/ignite-843-rc1 6f9ca9719 -> 52d122b62
IGNITE-1841 Fixed properties. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/52d122b6 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/52d122b6 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/52d122b6 Branch: refs/heads/ignite-843-rc1 Commit: 52d122b625ca45f1d12102f053347b088783f2ac Parents: 6f9ca97 Author: Andrey <[email protected]> Authored: Mon Nov 9 16:50:17 2015 +0700 Committer: Andrey <[email protected]> Committed: Mon Nov 9 16:50:17 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/routes/generator/generator-common.js | 6 ++---- .../src/main/js/routes/generator/generator-java.js | 11 ++++++++--- .../src/main/js/routes/generator/generator-xml.js | 9 ++++++++- 3 files changed, 18 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/52d122b6/modules/control-center-web/src/main/js/routes/generator/generator-common.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/routes/generator/generator-common.js b/modules/control-center-web/src/main/js/routes/generator/generator-common.js index 7dee51a..0ae36b5 100644 --- a/modules/control-center-web/src/main/js/routes/generator/generator-common.js +++ b/modules/control-center-web/src/main/js/routes/generator/generator-common.js @@ -384,11 +384,9 @@ $generatorCommon.CONNECTOR_CONFIGURATION = { noDelay: {dflt: false}, selectorCount: null, threadPoolSize: null, - messageInterceptor: null, + messageInterceptor: {type: 'bean'}, secretKey: null, - sslEnabled: {dflt: false}, - sslClientAuth: {dflt: false}, - sslFactory: null + sslEnabled: {dflt: false} } }; http://git-wip-us.apache.org/repos/asf/ignite/blob/52d122b6/modules/control-center-web/src/main/js/routes/generator/generator-java.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/routes/generator/generator-java.js b/modules/control-center-web/src/main/js/routes/generator/generator-java.js index 2e58d1b..60c0947 100644 --- a/modules/control-center-web/src/main/js/routes/generator/generator-java.js +++ b/modules/control-center-web/src/main/js/routes/generator/generator-java.js @@ -521,11 +521,16 @@ $generatorJava.clusterConnector = function (cluster, res) { if (!res) res = $generatorCommon.builder(); - var cfg = $generatorCommon.CONNECTOR_CONFIGURATION; - if ($commonUtils.isDefined($commonUtils.isDefined(cluster.connector) && cluster.connector.enabled)) { + var cfg = _.cloneDeep($generatorCommon.CONNECTOR_CONFIGURATION); + + if (cluster.connector.sslEnabled) { + cfg.fields.sslClientAuth = {dflt: false}; + cfg.fields.sslFactory = {type: 'bean'}; + } + $generatorJava.beanProperty(res, 'cfg', cluster.connector, 'connectorConfiguration', 'clientCfg', - $generatorCommon.CONNECTOR_CONFIGURATION.className, $generatorCommon.CONNECTOR_CONFIGURATION.fields, true); + cfg.className, cfg.fields, true); res.needEmptyLine = true; } http://git-wip-us.apache.org/repos/asf/ignite/blob/52d122b6/modules/control-center-web/src/main/js/routes/generator/generator-xml.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/routes/generator/generator-xml.js b/modules/control-center-web/src/main/js/routes/generator/generator-xml.js index d9763f5..38885c5 100644 --- a/modules/control-center-web/src/main/js/routes/generator/generator-xml.js +++ b/modules/control-center-web/src/main/js/routes/generator/generator-xml.js @@ -418,7 +418,14 @@ $generatorXml.clusterConnector = function(cluster, res) { res = $generatorCommon.builder(); if ($commonUtils.isDefined(cluster.connector) && cluster.connector.enabled) { - $generatorXml.beanProperty(res, cluster.connector, 'connectorConfiguration', $generatorCommon.CONNECTOR_CONFIGURATION, true); + var cfg = _.cloneDeep($generatorCommon.CONNECTOR_CONFIGURATION); + + if (cluster.connector.sslEnabled) { + cfg.fields.sslClientAuth = {dflt: false}; + cfg.fields.sslFactory = {type: 'bean'}; + } + + $generatorXml.beanProperty(res, cluster.connector, 'connectorConfiguration', cfg, true); res.needEmptyLine = true; }
