Repository: ignite Updated Branches: refs/heads/ignite-843-rc2 5efe2ba0a -> 283e63c5d
IGNITE_2068 Method renamed. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/283e63c5 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/283e63c5 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/283e63c5 Branch: refs/heads/ignite-843-rc2 Commit: 283e63c5d9672ad71a0e480a438525d0cf48c61d Parents: 5efe2ba Author: Andrey <[email protected]> Authored: Fri Dec 11 11:23:23 2015 +0700 Committer: Andrey <[email protected]> Committed: Fri Dec 11 11:23:23 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/helpers/generator/generator-common.js | 2 +- .../src/main/js/helpers/generator/generator-java.js | 8 ++++---- .../src/main/js/helpers/generator/generator-xml.js | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/283e63c5/modules/control-center-web/src/main/js/helpers/generator/generator-common.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/helpers/generator/generator-common.js b/modules/control-center-web/src/main/js/helpers/generator/generator-common.js index 8e1453c..cc8bdcf 100644 --- a/modules/control-center-web/src/main/js/helpers/generator/generator-common.js +++ b/modules/control-center-web/src/main/js/helpers/generator/generator-common.js @@ -456,6 +456,6 @@ $generatorCommon.cacheHasDatasource = function (cache) { return false; }; -$generatorCommon.loadOfPropertiesNeeded = function (cluster, res) { +$generatorCommon.secretPropertiesNeeded = function (cluster, res) { return $commonUtils.isDefined(_.find(cluster.caches, $generatorCommon.cacheHasDatasource)) || cluster.sslEnabled; }; http://git-wip-us.apache.org/repos/asf/ignite/blob/283e63c5/modules/control-center-web/src/main/js/helpers/generator/generator-java.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/helpers/generator/generator-java.js b/modules/control-center-web/src/main/js/helpers/generator/generator-java.js index e5e0b06..645d93c 100644 --- a/modules/control-center-web/src/main/js/helpers/generator/generator-java.js +++ b/modules/control-center-web/src/main/js/helpers/generator/generator-java.js @@ -1999,8 +1999,8 @@ $generatorJava.clusterConfiguration = function (cluster, clientNearCfg, res) { }; // Generate loading of secret properties file. -$generatorJava.loadSecretProperties = function (cluster, res) { - if ($generatorCommon.loadOfPropertiesNeeded(cluster, res)) { +$generatorJava.tryLoadSecretProperties = function (cluster, res) { + if ($generatorCommon.secretPropertiesNeeded(cluster, res)) { res.importClass('org.apache.ignite.configuration.IgniteConfiguration'); $generatorJava.declareVariableCustom(res, 'res', 'java.net.URL', 'IgniteConfiguration.class.getResource("/secret.properties")'); @@ -2049,7 +2049,7 @@ $generatorJava.cluster = function (cluster, pkg, javaClass, clientNearCfg) { res.startBlock('public static IgniteConfiguration createConfiguration() throws Exception {'); } - $generatorJava.loadSecretProperties(cluster, res); + $generatorJava.tryLoadSecretProperties(cluster, res); res.mergeLines(resCfg); @@ -2144,7 +2144,7 @@ $generatorJava.nodeStartup = function (cluster, pkg, cls, cfg, factoryCls, clien res.needEmptyLine = true; if ($commonUtils.isDefinedAndNotEmpty(cluster.caches)) { - $generatorJava.loadSecretProperties(cluster, res); + $generatorJava.tryLoadSecretProperties(cluster, res); res.line('// Example of near cache creation on client node.'); http://git-wip-us.apache.org/repos/asf/ignite/blob/283e63c5/modules/control-center-web/src/main/js/helpers/generator/generator-xml.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/helpers/generator/generator-xml.js b/modules/control-center-web/src/main/js/helpers/generator/generator-xml.js index 3bcf425..2bc7af0 100644 --- a/modules/control-center-web/src/main/js/helpers/generator/generator-xml.js +++ b/modules/control-center-web/src/main/js/helpers/generator/generator-xml.js @@ -1492,7 +1492,7 @@ $generatorXml.cluster = function (cluster, clientNearCfg) { xml += ' http://www.springframework.org/schema/util/spring-util.xsd";>\n'; // 2. Add external property file - if ($generatorCommon.loadOfPropertiesNeeded(cluster, res)) { + if ($generatorCommon.secretPropertiesNeeded(cluster, res)) { 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';
