Repository: ignite Updated Branches: refs/heads/ignite-843-rc1 e8216ed3a -> fd1dc0b31
IGNITE-1749 Fixed code generation: read secret props from file. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fd1dc0b3 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fd1dc0b3 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fd1dc0b3 Branch: refs/heads/ignite-843-rc1 Commit: fd1dc0b315e8aff95246777e2d193d8a9f2b68a1 Parents: e8216ed Author: vsisko <[email protected]> Authored: Wed Oct 28 15:28:02 2015 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Wed Oct 28 15:28:02 2015 +0700 ---------------------------------------------------------------------- .../main/js/routes/generator/generator-java.js | 28 +++++++++++++------- .../main/js/routes/generator/generator-xml.js | 5 +--- 2 files changed, 19 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/fd1dc0b3/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 935ac0c..971c87d 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 @@ -872,18 +872,18 @@ $generatorJava.cacheStore = function (cache, varName, res) { switch (storeFactory.dialect) { case 'DB2': - res.line(dsVarName + '.setServerName("_SERVER_NAME_");'); - res.line('// ' + dsVarName + '.setPortNumber("_PORT_NUMBER_"); // 50000 by default'); - res.line(dsVarName + '.setDatabaseName("_DATABASE_NAME_");'); - res.line('// ' + dsVarName + '.setDriverType(_DRIVER_TYPE_); // 4 by default'); + res.line(dsVarName + '.setServerName(props.getProperty("' + dataSourceBean + '.jdbc.server_name"));'); + res.line(dsVarName + '.setPortNumber(props.getProperty("' + dataSourceBean + '.jdbc.port_number"));'); + res.line(dsVarName + '.setDatabaseName(props.getProperty("' + dataSourceBean + '.jdbc.database_name"));'); + res.line(dsVarName + '.setDriverType(props.getProperty("' + dataSourceBean + '.jdbc.driver_type"));'); break; default: - res.line(dsVarName + '.setURL("_URL_");'); + res.line(dsVarName + '.setURL(props.getProperty("' + dataSourceBean + '.jdbc.url"));'); } - res.line(dsVarName + '.setUser("_USER_NAME_");'); - res.line(dsVarName + '.setPassword("_PASSWORD_");'); + res.line(dsVarName + '.setUser(props.getProperty("' + dataSourceBean + '.jdbc.username"));'); + res.line(dsVarName + '.setPassword(props.getProperty("' + dataSourceBean + '.jdbc.password"));'); } } @@ -1508,11 +1508,10 @@ $generatorJava.clusterSsl = function(cluster, res) { res = $generatorCommon.builder(); if (cluster.sslEnabled && $commonUtils.isDefined(cluster.sslContextFactory)) { - cluster.sslContextFactory.keyStorePassword = - ($commonUtils.isDefinedAndNotEmpty(cluster.sslContextFactory.keyStoreFilePath)) ? '_Key_Storage_Password_' : undefined; + cluster.sslContextFactory.keyStorePassword = 'props.getProperty("ssl.key.storage.password")'; cluster.sslContextFactory.trustStorePassword = ($commonUtils.isDefinedAndNotEmpty(cluster.sslContextFactory.trustStoreFilePath)) ? - '_Trust_Storage_Password_' : undefined; + 'props.getProperty("ssl.trust.storage.password")' : undefined; var propsDesc = $commonUtils.isDefinedAndNotEmpty(cluster.sslContextFactory.trustManagers) ? $generatorCommon.SSL_CONFIGURATION_TRUST_MANAGER_FACTORY.fields : @@ -1689,6 +1688,15 @@ $generatorJava.cluster = function (cluster, javaClass, clientNearCfg) { res.startBlock('public static IgniteConfiguration createConfiguration() throws Exception {'); } + if (res.datasources.length > 0 || cluster.sslEnabled) { + res.line(res.importClass('java.net.URL') + ' res = IgniteConfiguration.class.getResource("/secret.properties");'); + res.line(res.importClass('java.io.File') + ' propsFile = new File(res.toURI());'); + res.line(res.importClass('java.util.Properties') + ' props = new Properties();'); + res.line('props.load(new ' + res.importClass('java.io.FileInputStream') + '(propsFile));'); + + res.needEmptyLine = true; + } + $generatorJava.clusterGeneral(cluster, clientNearCfg, res); $generatorJava.clusterAtomics(cluster, res); http://git-wip-us.apache.org/repos/asf/ignite/blob/fd1dc0b3/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 6ad0f92..127e551 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 @@ -1311,10 +1311,7 @@ $generatorXml.cluster = function (cluster, clientNearCfg) { xml += ' http://www.springframework.org/schema/util/spring-util.xsd";>\n'; // 2. Add external property file - if (res.datasources.length > 0 - || (cluster.sslEnabled && ( - $commonUtils.isDefinedAndNotEmpty(cluster.sslContextFactory.keyStoreFilePath) || - $commonUtils.isDefinedAndNotEmpty(cluster.sslContextFactory.trustStoreFilePath)))) { + if (res.datasources.length > 0 || cluster.sslEnabled) { 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';
