ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anovi...@apache.org
Subject ignite git commit: ignite-1219 Properties loading, sort.
Date Tue, 29 Sep 2015 02:16:39 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843 ef5dd576e -> 87d9f4150


ignite-1219 Properties loading, sort.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/87d9f415
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/87d9f415
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/87d9f415

Branch: refs/heads/ignite-843
Commit: 87d9f415000ee9e7d84ea38c78b402bde6d2004e
Parents: ef5dd57
Author: Vasiliy Sisko <vsisko@gridgain.com>
Authored: Tue Sep 29 09:17:06 2015 +0700
Committer: Andrey <anovikov@gridgain.com>
Committed: Tue Sep 29 09:17:06 2015 +0700

----------------------------------------------------------------------
 .../main/js/controllers/models/clusters.json    | 188 +++++++++----------
 .../main/js/routes/generator/generator-xml.js   |  10 +-
 2 files changed, 102 insertions(+), 96 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/87d9f415/modules/control-center-web/src/main/js/controllers/models/clusters.json
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/models/clusters.json b/modules/control-center-web/src/main/js/controllers/models/clusters.json
index c8cf8d8..5e4e282 100644
--- a/modules/control-center-web/src/main/js/controllers/models/clusters.json
+++ b/modules/control-center-web/src/main/js/controllers/models/clusters.json
@@ -721,6 +721,100 @@
       ]
     },
     {
+      "label": "SSL configuration",
+      "group": "sslConfiguration",
+      "tip": [
+        "Settings for SSL configuration"
+      ],
+      "fields": [
+        {
+          "label": "Enabled",
+          "id": "sslEnabled",
+          "type": "check",
+          "model": "sslEnabled",
+          "tip": [
+            "Flag indicating whether to configure SSL configuration"
+          ]
+        },
+        {
+          "label": "Algorithm to create a key manager",
+          "id": "keyAlgorithm",
+          "type": "typeahead",
+          "path": "sslContextFactory",
+          "model": "keyAlgorithm",
+          "placeholder": "SumX509",
+          "items": "sslKeyAlgorithms",
+          "hide": "!backupItem.sslEnabled",
+          "tip": [
+            "Sets key manager algorithm that will be used to create a key manager",
+            "Notice that in most cased default value suites well, however, on Android platform
this value need to be set to X509"
+          ]
+        },
+        {
+          "label": "Key store file",
+          "id": "keyStoreFilePath",
+          "type": "text",
+          "path": "sslContextFactory",
+          "model": "keyStoreFilePath",
+          "hide": "!backupItem.sslEnabled",
+          "tip": [
+            "Path to the key store file",
+            "This is a mandatory parameter since ssl context could not be initialized without
key manager"
+          ]
+        },
+        {
+          "label": "Key store type",
+          "id": "keyStoreType",
+          "type": "typeahead",
+          "path": "sslContextFactory",
+          "model": "keyStoreType",
+          "placeholder": "JKS",
+          "items": "sslStoreType",
+          "hide": "!backupItem.sslEnabled",
+          "tip": [
+            "Key store type used in context initialization"
+          ]
+        },
+        {
+          "label": "Protocol",
+          "id": "protocol",
+          "type": "typeahead",
+          "path": "sslContextFactory",
+          "model": "protocol",
+          "placeholder": "TSL",
+          "items": "sslProtocols",
+          "hide": "!backupItem.sslEnabled",
+          "tip": [
+            "Protocol for secure transport"
+          ]
+        },
+        {
+          "label": "Trust store file",
+          "id": "trustStoreFilePath",
+          "type": "text",
+          "path": "sslContextFactory",
+          "model": "trustStoreFilePath",
+          "hide": "!backupItem.sslEnabled",
+          "tip": [
+            "Path to the trust store file"
+          ]
+        },
+        {
+          "label": "Trust store type",
+          "id": "trustStoreType",
+          "type": "typeahead",
+          "path": "sslContextFactory",
+          "model": "trustStoreType",
+          "placeholder": "JKS",
+          "items": "sslStoreType",
+          "hide": "!backupItem.sslEnabled",
+          "tip": [
+            "Trust store type used in context initialization"
+          ]
+        }
+      ]
+    },
+    {
       "label": "Swap",
       "group": "swap",
       "tip": [
@@ -990,100 +1084,6 @@
           ]
         }
       ]
-    },
-    {
-      "label": "SSL configuration",
-      "group": "sslConfiguration",
-      "tip": [
-        "Settings for SSL configuration"
-      ],
-      "fields": [
-        {
-          "label": "Enabled",
-          "id": "sslEnabled",
-          "type": "check",
-          "model": "sslEnabled",
-          "tip": [
-            "Flag indicating whether to configure SSL configuration"
-          ]
-        },
-        {
-          "label": "Algorithm to create a key manager",
-          "id": "keyAlgorithm",
-          "type": "typeahead",
-          "path": "sslContextFactory",
-          "model": "keyAlgorithm",
-          "placeholder": "SumX509",
-          "items": "sslKeyAlgorithms",
-          "hide": "!backupItem.sslEnabled",
-          "tip": [
-            "Sets key manager algorithm that will be used to create a key manager",
-            "Notice that in most cased default value suites well, however, on Android platform
this value need to be set to X509"
-          ]
-        },
-        {
-          "label": "Key store file",
-          "id": "keyStoreFilePath",
-          "type": "text",
-          "path": "sslContextFactory",
-          "model": "keyStoreFilePath",
-          "hide": "!backupItem.sslEnabled",
-          "tip": [
-            "Path to the key store file",
-            "This is a mandatory parameter since ssl context could not be initialized without
key manager"
-          ]
-        },
-        {
-          "label": "Key store type",
-          "id": "keyStoreType",
-          "type": "typeahead",
-          "path": "sslContextFactory",
-          "model": "keyStoreType",
-          "placeholder": "JKS",
-          "items": "sslStoreType",
-          "hide": "!backupItem.sslEnabled",
-          "tip": [
-            "Key store type used in context initialization"
-          ]
-        },
-        {
-          "label": "Protocol",
-          "id": "protocol",
-          "type": "typeahead",
-          "path": "sslContextFactory",
-          "model": "protocol",
-          "placeholder": "TSL",
-          "items": "sslProtocols",
-          "hide": "!backupItem.sslEnabled",
-          "tip": [
-            "Protocol for secure transport"
-          ]
-        },
-        {
-          "label": "Trust store file",
-          "id": "trustStoreFilePath",
-          "type": "text",
-          "path": "sslContextFactory",
-          "model": "trustStoreFilePath",
-          "hide": "!backupItem.sslEnabled",
-          "tip": [
-            "Path to the trust store file"
-          ]
-        },
-        {
-          "label": "Trust store type",
-          "id": "trustStoreType",
-          "type": "typeahead",
-          "path": "sslContextFactory",
-          "model": "trustStoreType",
-          "placeholder": "JKS",
-          "items": "sslStoreType",
-          "hide": "!backupItem.sslEnabled",
-          "tip": [
-            "Trust store type used in context initialization"
-          ]
-        }
-      ]
     }
   ]
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/87d9f415/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 8b956ff..81d2ab3 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
@@ -1079,13 +1079,19 @@ $generatorXml.cluster = function (cluster, clientNearCfg) {
         xml += '                           http://www.springframework.org/schema/util\n';
         xml += '                           http://www.springframework.org/schema/util/spring-util.xsd">\n';
 
-        // 2. Add external property file and all data sources.
-        if (res.datasources.length > 0) {
+        // 2. Add external property file
+        if (res.datasources.length > 0
+            || (cluster.sslEnabled && (
+                $commonUtils.isDefinedAndNotEmpty(cluster.sslContextFactory.keyStoreFilePath)
||
+                $commonUtils.isDefinedAndNotEmpty(cluster.sslContextFactory.trustStoreFilePath))))
{
             xml += '    <!-- Load external properties file. -->\n';
             xml += '    <bean id="placeholderConfig" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">\n';
             xml += '        <property name="location" value="classpath:secret.properties"/>\n';
             xml += '    </bean>\n\n';
+        }
 
+        // 3. Add data sources.
+        if (res.datasources.length > 0) {
             xml += '    <!-- Data source beans will be initialized from external properties
file. -->\n';
 
             _.forEach(res.datasources, function (item) {


Mime
View raw message