ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject ignite git commit: IGNITE-1200 Minor.
Date Tue, 03 Nov 2015 10:40:02 GMT
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 <vsisko@gridgain.com>
Authored: Tue Nov 3 17:40:05 2015 +0700
Committer: Alexey Kuznetsov <akuznetsov@apache.org>
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;
     }


Mime
View raw message