Repository: ignite Updated Branches: refs/heads/ignite-843-rc2 33847c3ac -> 4d9f44313
IGNITE-843 Do not generate IGFS and Store for client. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4d9f4431 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4d9f4431 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4d9f4431 Branch: refs/heads/ignite-843-rc2 Commit: 4d9f4431305e1294b66b4f31fa9391f603c3f60f Parents: 33847c3 Author: Alexey Kuznetsov <akuznet...@apache.org> Authored: Wed Dec 16 18:17:00 2015 +0700 Committer: Alexey Kuznetsov <akuznet...@apache.org> Committed: Wed Dec 16 18:17:00 2015 +0700 ---------------------------------------------------------------------- .../main/js/controllers/clusters-controller.js | 4 +- .../main/js/helpers/generator/generator-java.js | 92 ++++++++++---------- .../main/js/helpers/generator/generator-xml.js | 32 ++++--- 3 files changed, 65 insertions(+), 63 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/4d9f4431/modules/control-center-web/src/main/js/controllers/clusters-controller.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/controllers/clusters-controller.js b/modules/control-center-web/src/main/js/controllers/clusters-controller.js index 54e7534..a9b23d9 100644 --- a/modules/control-center-web/src/main/js/controllers/clusters-controller.js +++ b/modules/control-center-web/src/main/js/controllers/clusters-controller.js @@ -253,8 +253,8 @@ consoleModule.controller('clustersController', [ $scope.ui.checkDirty(val, srcItem); - $scope.preview.general.xml = $generatorXml.clusterCaches(clusterCaches, null, $generatorXml.clusterGeneral(val)).asString(); - $scope.preview.general.java = $generatorJava.clusterCaches(clusterCaches, null, $generatorJava.clusterGeneral(val)).asString(); + $scope.preview.general.xml = $generatorXml.clusterCaches(clusterCaches, null, true, $generatorXml.clusterGeneral(val)).asString(); + $scope.preview.general.java = $generatorJava.clusterCaches(clusterCaches, null, true, $generatorJava.clusterGeneral(val)).asString(); $scope.preview.general.allDefaults = $common.isEmptyString($scope.preview.general.xml); $scope.preview.atomics.xml = $generatorXml.clusterAtomics(val).asString(); http://git-wip-us.apache.org/repos/asf/ignite/blob/4d9f4431/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 251a985..7062a32 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 @@ -1284,7 +1284,7 @@ $generatorJava.cacheMetadatas = function (metadatas, varName, res) { }; // Generate cache configs. -$generatorJava.cache = function(cache, varName, res) { +$generatorJava.cache = function(cache, varName, isSrvCfg, res) { if (!res) res = $generatorCommon.builder(); @@ -1294,7 +1294,8 @@ $generatorJava.cache = function(cache, varName, res) { $generatorJava.cacheQuery(cache, varName, res); - $generatorJava.cacheStore(cache, cache.metadatas, varName, res); + if (isSrvCfg) + $generatorJava.cacheStore(cache, cache.metadatas, varName, res); $generatorJava.cacheConcurrency(cache, varName, res); @@ -1400,7 +1401,7 @@ $generatorJava.cacheVariableName = function (cache, names) { }; // Generate cluster caches. -$generatorJava.clusterCaches = function (caches, igfss, res) { +$generatorJava.clusterCaches = function (caches, igfss, isSrvCfg, res) { function clusterCache(res, cache, names) { res.emptyLineIfNeeded(); @@ -1424,7 +1425,7 @@ $generatorJava.clusterCaches = function (caches, igfss, res) { $generatorJava.declareVariable(res, cacheName, 'org.apache.ignite.configuration.CacheConfiguration'); - $generatorJava.cache(cache, cacheName, res); + $generatorJava.cache(cache, cacheName, isSrvCfg, res); res.line('return ' + cacheName + ';'); res.endBlock('}'); @@ -1449,7 +1450,7 @@ $generatorJava.clusterCaches = function (caches, igfss, res) { res.needEmptyLine = true; } - if (igfss && igfss.length > 0) { + if (isSrvCfg && igfss && igfss.length > 0) { res.emptyLineIfNeeded(); _.forEach(igfss, function (igfs) { @@ -2009,12 +2010,17 @@ $generatorJava.clusterConfiguration = function (cluster, clientNearCfg, res) { $generatorJava.clusterTransactions(cluster, res); - if (!$commonUtils.isDefined(clientNearCfg)) + var isSrvCfg = !$commonUtils.isDefined(clientNearCfg); + + if (isSrvCfg) $generatorJava.clusterCacheUse(cluster.caches, cluster.igfss, res); $generatorJava.clusterSsl(cluster, res); - return $generatorJava.igfss(cluster.igfss, 'cfg', res); + if (isSrvCfg) + $generatorJava.igfss(cluster.igfss, 'cfg', res); + + return res; }; // Generate loading of secret properties file. @@ -2049,56 +2055,52 @@ $generatorJava.tryLoadSecretProperties = function (cluster, res) { $generatorJava.cluster = function (cluster, pkg, javaClass, clientNearCfg) { var res = $generatorCommon.builder(); + var isSrvCfg = !$commonUtils.isDefined(clientNearCfg); + if (cluster) { var resCfg = $generatorJava.clusterConfiguration(cluster, clientNearCfg, $generatorCommon.builder()); res.mergeProps(resCfg); - if (javaClass) { - res.line('/**'); - res.line(' * ' + $generatorCommon.mainComment()); - res.line(' */'); - res.startBlock('public class ' + javaClass + ' {'); - res.line('/**'); - res.line(' * Configure grid.'); - res.line(' *'); - res.line(' * @return Ignite configuration.'); - res.line(' * @throws Exception If failed to construct Ignite configuration instance.'); - res.line(' */'); - res.startBlock('public static IgniteConfiguration createConfiguration() throws Exception {'); - } + res.line('/**'); + res.line(' * ' + $generatorCommon.mainComment()); + res.line(' */'); + res.startBlock('public class ' + javaClass + ' {'); + res.line('/**'); + res.line(' * Configure grid.'); + res.line(' *'); + res.line(' * @return Ignite configuration.'); + res.line(' * @throws Exception If failed to construct Ignite configuration instance.'); + res.line(' */'); + res.startBlock('public static IgniteConfiguration createConfiguration() throws Exception {'); $generatorJava.tryLoadSecretProperties(cluster, res); res.mergeLines(resCfg); - if (javaClass) { - res.needEmptyLine = true; + res.needEmptyLine = true; - res.line('return cfg;'); - res.endBlock('}'); + res.line('return cfg;'); + res.endBlock('}'); - res.needEmptyLine = true; + res.needEmptyLine = true; - $generatorJava.clusterMetadatas(cluster.caches, res); + $generatorJava.clusterMetadatas(cluster.caches, res); - $generatorJava.clusterCaches(cluster.caches, cluster.igfss, res); + $generatorJava.clusterCaches(cluster.caches, cluster.igfss, isSrvCfg, res); - res.needEmptyLine = true; - } + res.needEmptyLine = true; if (clientNearCfg) { - if (javaClass) { - res.line('/**'); - res.line(' * Configure client near cache configuration.'); - res.line(' *'); - res.line(' * @return Near cache configuration.'); - res.line(' * @throws Exception If failed to construct near cache configuration instance.'); - res.line(' */'); - res.startBlock('public static NearCacheConfiguration createNearCacheConfiguration() throws Exception {'); + res.line('/**'); + res.line(' * Configure client near cache configuration.'); + res.line(' *'); + res.line(' * @return Near cache configuration.'); + res.line(' * @throws Exception If failed to construct near cache configuration instance.'); + res.line(' */'); + res.startBlock('public static NearCacheConfiguration createNearCacheConfiguration() throws Exception {'); - $generatorJava.resetVariables(res); - } + $generatorJava.resetVariables(res); $generatorJava.declareVariable(res, 'clientNearCfg', 'org.apache.ignite.configuration.NearCacheConfiguration'); @@ -2111,19 +2113,15 @@ $generatorJava.cluster = function (cluster, pkg, javaClass, clientNearCfg) { if (clientNearCfg.nearEvictionPolicy && clientNearCfg.nearEvictionPolicy.kind) $generatorJava.evictionPolicy(res, 'clientNearCfg', clientNearCfg.nearEvictionPolicy, 'nearEvictionPolicy'); - if (javaClass) { - res.line('return clientNearCfg;'); - res.endBlock('}'); - } + res.line('return clientNearCfg;'); + res.endBlock('}'); res.needEmptyLine = true; } - if (javaClass) { - res.endBlock('}'); + res.endBlock('}'); - return 'package ' + pkg + ';\n\n' + res.generateImports() + '\n\n' + res.asString(); - } + return 'package ' + pkg + ';\n\n' + res.generateImports() + '\n\n' + res.asString(); } return res.asString(); http://git-wip-us.apache.org/repos/asf/ignite/blob/4d9f4431/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 fc46287..36fb6e8 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 @@ -1103,13 +1103,13 @@ $generatorXml.cacheMetadatas = function(metadatas, res) { }; // Generate cache configs. -$generatorXml.cache = function(cache, res) { +$generatorXml.cache = function(cache, isSrvCfg, res) { if (!res) res = $generatorCommon.builder(); res.startBlock('<bean class="org.apache.ignite.configuration.CacheConfiguration">'); - $generatorXml.cacheConfiguration(cache, res); + $generatorXml.cacheConfiguration(cache, isSrvCfg, res); res.endBlock('</bean>'); @@ -1117,7 +1117,7 @@ $generatorXml.cache = function(cache, res) { }; // Generate cache configs. -$generatorXml.cacheConfiguration = function(cache, res) { +$generatorXml.cacheConfiguration = function(cache, isSrvCfg, res) { if (!res) res = $generatorCommon.builder(); @@ -1127,7 +1127,8 @@ $generatorXml.cacheConfiguration = function(cache, res) { $generatorXml.cacheQuery(cache, res); - $generatorXml.cacheStore(cache, cache.metadatas, res); + if (isSrvCfg) + $generatorXml.cacheStore(cache, cache.metadatas, res); $generatorXml.cacheConcurrency(cache, res); @@ -1143,7 +1144,7 @@ $generatorXml.cacheConfiguration = function(cache, res) { }; // Generate caches configs. -$generatorXml.clusterCaches = function(caches, igfss, res) { +$generatorXml.clusterCaches = function(caches, igfss, isSrvCfg, res) { if (!res) res = $generatorCommon.builder(); @@ -1154,20 +1155,21 @@ $generatorXml.clusterCaches = function(caches, igfss, res) { res.startBlock('<list>'); _.forEach(caches, function(cache) { - $generatorXml.cache(cache, res); + $generatorXml.cache(cache, isSrvCfg, res); res.needEmptyLine = true; }); - _.forEach(igfss, function(igfs) { - $generatorXml.cache($generatorCommon.igfsDataCache(igfs), res); + if (isSrvCfg) + _.forEach(igfss, function(igfs) { + $generatorXml.cache($generatorCommon.igfsDataCache(igfs), res); - res.needEmptyLine = true; + res.needEmptyLine = true; - $generatorXml.cache($generatorCommon.igfsMetaCache(igfs), res); + $generatorXml.cache($generatorCommon.igfsMetaCache(igfs), res); - res.needEmptyLine = true; - }); + res.needEmptyLine = true; + }); res.endBlock('</list>'); res.endBlock('</property>'); @@ -1415,7 +1417,9 @@ $generatorXml.generateDataSources = function (datasources, res) { }; $generatorXml.clusterConfiguration = function (cluster, clientNearCfg, res) { - if (clientNearCfg) { + var isSrvCfg = !$commonUtils.isDefined(clientNearCfg); + + if (!isSrvCfg) { res.line('<property name="clientMode" value="true"/>'); res.line(); @@ -1445,7 +1449,7 @@ $generatorXml.clusterConfiguration = function (cluster, clientNearCfg, res) { $generatorXml.clusterTransactions(cluster, res); - $generatorXml.clusterCaches(cluster.caches, cluster.igfss, res); + $generatorXml.clusterCaches(cluster.caches, cluster.igfss, isSrvCfg, res); $generatorXml.clusterSsl(cluster, res);