Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D83AB1841C for ; Tue, 3 Nov 2015 10:40:31 +0000 (UTC) Received: (qmail 76667 invoked by uid 500); 3 Nov 2015 10:40:02 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 76600 invoked by uid 500); 3 Nov 2015 10:40:02 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 76226 invoked by uid 99); 3 Nov 2015 10:40:02 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Nov 2015 10:40:02 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1E2B1DFE61; Tue, 3 Nov 2015 10:40:02 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: akuznetsov@apache.org To: commits@ignite.apache.org Message-Id: <1e2879848d284793b3602f23093fdde0@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ignite git commit: IGNITE-1200 Minor. Date: Tue, 3 Nov 2015 10:40:02 +0000 (UTC) Repository: ignite Updated Branches: refs/heads/ignite-843-rc1 1d8003557 -> a0f8887ba IGNITE-1200 Minor. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a0f8887b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a0f8887b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a0f8887b Branch: refs/heads/ignite-843-rc1 Commit: a0f8887bac438d725c2979c02e7ba5fe177bb117 Parents: 1d80035 Author: vsisko Authored: Tue Nov 3 17:40:05 2015 +0700 Committer: Alexey Kuznetsov Committed: Tue Nov 3 17:40:05 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/controllers/igfs-controller.js | 3 --- .../src/main/js/controllers/models/igfs.json | 1 - .../src/main/js/routes/generator/generator-common.js | 2 +- .../src/main/js/routes/generator/generator-java.js | 8 +++++--- .../src/main/js/routes/generator/generator-xml.js | 6 +++--- 5 files changed, 9 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/a0f8887b/modules/control-center-web/src/main/js/controllers/igfs-controller.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/controllers/igfs-controller.js b/modules/control-center-web/src/main/js/controllers/igfs-controller.js index ab8af07..9329559 100644 --- a/modules/control-center-web/src/main/js/controllers/igfs-controller.js +++ b/modules/control-center-web/src/main/js/controllers/igfs-controller.js @@ -257,9 +257,6 @@ consoleModule.controller('igfsController', [ if ($common.isEmptyString(item.name)) return showPopoverMessage($scope.panels, 'general', 'igfsName', 'Name should not be empty'); - if (!item.affinnityGroupSize || item.affinnityGroupSize < 1) - return showPopoverMessage($scope.panels, 'general', 'affinnityGroupSize', 'Group size should be specified and more or equal to 1'); - if (!$common.isEmptyString(item.dualModePutExecutorService) && !$common.isValidJavaClass('Put executor service', item.dualModePutExecutorService, false, 'dualModePutExecutorService', false, $scope.panels, 'dualMode')) return false; http://git-wip-us.apache.org/repos/asf/ignite/blob/a0f8887b/modules/control-center-web/src/main/js/controllers/models/igfs.json ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/controllers/models/igfs.json b/modules/control-center-web/src/main/js/controllers/models/igfs.json index 9bef578..8efd1a9 100644 --- a/modules/control-center-web/src/main/js/controllers/models/igfs.json +++ b/modules/control-center-web/src/main/js/controllers/models/igfs.json @@ -56,7 +56,6 @@ "id": "affinnityGroupSize", "type": "number", "model": "affinnityGroupSize", - "required": true, "placeholder": "512", "min": 1, "tip": [ http://git-wip-us.apache.org/repos/asf/ignite/blob/a0f8887b/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 ffad061..295d0db 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 @@ -251,7 +251,7 @@ $generatorCommon.igfsDataCache = function(igfs) { atomicityMode: 'TRANSACTIONAL', writeSynchronizationMode: 'FULL_SYNC', backups: 0, - igfsAffinnityGroupSize: igfs.affinnityGroupSize + igfsAffinnityGroupSize: igfs.affinnityGroupSize || 512 }; }; http://git-wip-us.apache.org/repos/asf/ignite/blob/a0f8887b/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 0f86c2c..2a5462d 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 @@ -1578,9 +1578,11 @@ $generatorJava.clusterSsl = function(cluster, res) { res = $generatorCommon.builder(); if (cluster.sslEnabled && $commonUtils.isDefined(cluster.sslContextFactory)) { - cluster.sslContextFactory.keyStorePassword = 'props.getProperty("ssl.key.storage.password").toCharArray()'; - cluster.sslContextFactory.trustStorePassword = ($commonUtils.isDefinedAndNotEmpty(cluster.sslContextFactory.trustStoreFilePath)) ? + cluster.sslContextFactory.keyStorePassword = $commonUtils.isDefinedAndNotEmpty(cluster.sslContextFactory.keyStoreFilePath) ? + 'props.getProperty("ssl.key.storage.password").toCharArray()' : undefined; + + cluster.sslContextFactory.trustStorePassword = $commonUtils.isDefinedAndNotEmpty(cluster.sslContextFactory.trustStoreFilePath) ? 'props.getProperty("ssl.trust.storage.password").toCharArray()' : undefined; var propsDesc = $commonUtils.isDefinedAndNotEmpty(cluster.sslContextFactory.trustManagers) ? @@ -1588,7 +1590,7 @@ $generatorJava.clusterSsl = function(cluster, res) { $generatorCommon.SSL_CONFIGURATION_TRUST_FILE_FACTORY.fields; $generatorJava.beanProperty(res, 'cfg', cluster.sslContextFactory, 'sslContextFactory', 'sslContextFactory', - 'org.apache.ignite.ssl.SslContextFactory', propsDesc, false); + 'org.apache.ignite.ssl.SslContextFactory', propsDesc, true); res.needEmptyLine = true; } http://git-wip-us.apache.org/repos/asf/ignite/blob/a0f8887b/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 984042d..c677288 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 @@ -616,16 +616,16 @@ $generatorXml.clusterSsl = function(cluster, res) { if (cluster.sslEnabled && $commonUtils.isDefined(cluster.sslContextFactory)) { cluster.sslContextFactory.keyStorePassword = - ($commonUtils.isDefinedAndNotEmpty(cluster.sslContextFactory.keyStoreFilePath)) ? '${ssl.key.storage.password}' : undefined; + $commonUtils.isDefinedAndNotEmpty(cluster.sslContextFactory.keyStoreFilePath) ? '${ssl.key.storage.password}' : undefined; cluster.sslContextFactory.trustStorePassword = - ($commonUtils.isDefinedAndNotEmpty(cluster.sslContextFactory.trustStoreFilePath)) ? '${ssl.trust.storage.password}' : undefined; + $commonUtils.isDefinedAndNotEmpty(cluster.sslContextFactory.trustStoreFilePath) ? '${ssl.trust.storage.password}' : undefined; var propsDesc = $commonUtils.isDefinedAndNotEmpty(cluster.sslContextFactory.trustManagers) ? $generatorCommon.SSL_CONFIGURATION_TRUST_MANAGER_FACTORY : $generatorCommon.SSL_CONFIGURATION_TRUST_FILE_FACTORY; - $generatorXml.beanProperty(res, cluster.sslContextFactory, 'sslContextFactory', propsDesc, false); + $generatorXml.beanProperty(res, cluster.sslContextFactory, 'sslContextFactory', propsDesc, true); res.needEmptyLine = true; }