Repository: ignite Updated Branches: refs/heads/ignite-843-rc2 8cd5fa053 -> 17c4423e6
IGNITE-2039 minor fix. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/17c4423e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/17c4423e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/17c4423e Branch: refs/heads/ignite-843-rc2 Commit: 17c4423e6820c281ce0ede576ef7d0a3161ddabf Parents: 8cd5fa0 Author: Alexey Kuznetsov <[email protected]> Authored: Wed Dec 2 17:19:49 2015 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Wed Dec 2 17:19:49 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/controllers/summary-controller.js | 12 ++++++------ .../src/main/js/helpers/generator/generator-java.js | 11 ++--------- 2 files changed, 8 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/17c4423e/modules/control-center-web/src/main/js/controllers/summary-controller.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/controllers/summary-controller.js b/modules/control-center-web/src/main/js/controllers/summary-controller.js index d577441..ce75693 100644 --- a/modules/control-center-web/src/main/js/controllers/summary-controller.js +++ b/modules/control-center-web/src/main/js/controllers/summary-controller.js @@ -217,15 +217,15 @@ consoleModule.controller('summaryController', [ zip.file(serverXml, $generatorXml.cluster(cluster)); zip.file(clientXml , $generatorXml.cluster(cluster, clientNearCfg)); - zip.file(srcPath + '/factory/ServerConfigurationFactory.java', $generatorJava.cluster(cluster, 'factory', 'ServerConfigurationFactory', null)); - zip.file(srcPath + '/factory/ClientConfigurationFactory.java', $generatorJava.cluster(cluster, 'factory', 'ClientConfigurationFactory', clientNearCfg)); + zip.file(srcPath + 'factory/ServerConfigurationFactory.java', $generatorJava.cluster(cluster, 'factory', 'ServerConfigurationFactory', null)); + zip.file(srcPath + 'factory/ClientConfigurationFactory.java', $generatorJava.cluster(cluster, 'factory', 'ClientConfigurationFactory', clientNearCfg)); - zip.file(srcPath + '/startup/ServerNodeSpringStartup.java', $generatorJava.nodeStartup(cluster, 'startup', 'ServerNodeSpringStartup', '"' + serverXml + '"')); - zip.file(srcPath + '/startup/ClientNodeSpringStartup.java', $generatorJava.nodeStartup(cluster, 'startup', 'ClientNodeSpringStartup', '"' + clientXml + '"')); + zip.file(srcPath + 'startup/ServerNodeSpringStartup.java', $generatorJava.nodeStartup(cluster, 'startup', 'ServerNodeSpringStartup', '"' + serverXml + '"')); + zip.file(srcPath + 'startup/ClientNodeSpringStartup.java', $generatorJava.nodeStartup(cluster, 'startup', 'ClientNodeSpringStartup', '"' + clientXml + '"')); - zip.file(srcPath + '/startup/ServerNodeCodeStartup.java', $generatorJava.nodeStartup(cluster, 'startup', 'ServerNodeCodeStartup', + zip.file(srcPath + 'startup/ServerNodeCodeStartup.java', $generatorJava.nodeStartup(cluster, 'startup', 'ServerNodeCodeStartup', 'ServerConfigurationFactory.createConfiguration()', 'factory.ServerConfigurationFactory')); - zip.file(srcPath + '/startup/ClientNodeCodeStartup.java', $generatorJava.nodeStartup(cluster, 'startup', 'ClientNodeCodeStartup', + zip.file(srcPath + 'startup/ClientNodeCodeStartup.java', $generatorJava.nodeStartup(cluster, 'startup', 'ClientNodeCodeStartup', 'ClientConfigurationFactory.createConfiguration()', 'factory.ClientConfigurationFactory', clientNearCfg)); zip.file('pom.xml', $generatorPom.pom(cluster, igniteVersion).asString()); http://git-wip-us.apache.org/repos/asf/ignite/blob/17c4423e/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 9f5e982..b22f35d 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 @@ -1881,11 +1881,6 @@ $generatorJava.cluster = function (cluster, pkg, javaClass, clientNearCfg) { res.mergeProps(resCfg); if (javaClass) { - if (clientNearCfg) - res.importClass('org.apache.ignite.Ignite'); - - res.importClass('org.apache.ignite.Ignition'); - res.line('/**'); res.line(' * ' + $generatorCommon.mainComment()); res.line(' */'); @@ -1984,9 +1979,6 @@ $generatorJava.nodeStartup = function (cluster, pkg, cls, cfg, factoryCls, clien res.importClass('org.apache.ignite.Ignite'); res.importClass('org.apache.ignite.Ignition'); - if (factoryCls) - res.importClass(factoryCls); - res.line('/**'); res.line(' * ' + $generatorCommon.mainComment()); res.line(' */'); @@ -2007,7 +1999,8 @@ $generatorJava.nodeStartup = function (cluster, pkg, cls, cfg, factoryCls, clien if ($commonUtils.isDefinedAndNotEmpty(cluster.caches)) { res.line('// Example of near cache creation on client node.'); - res.line('ignite.getOrCreateNearCache("' + cluster.caches[0].name + '", ' + factoryCls + '.createNearCacheConfiguration());'); + res.line('ignite.getOrCreateNearCache("' + cluster.caches[0].name + '", ' + + res.importClass(factoryCls) + '.createNearCacheConfiguration());'); res.needEmptyLine = true; }
