You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/12/17 04:27:16 UTC
ignite git commit: IGNITE-843 Fixed java and XML code generation for
caches.
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc2 685d52c20 -> 40a0b99bb
IGNITE-843 Fixed java and XML code generation for caches.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/40a0b99b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/40a0b99b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/40a0b99b
Branch: refs/heads/ignite-843-rc2
Commit: 40a0b99bb80ec25ba66646e217952dd4abdb3d08
Parents: 685d52c
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Thu Dec 17 10:28:07 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Thu Dec 17 10:28:07 2015 +0700
----------------------------------------------------------------------
.../main/js/helpers/generator/generator-java.js | 25 +++++++++++++-------
.../main/js/helpers/generator/generator-xml.js | 13 +++++-----
2 files changed, 23 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/40a0b99b/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 7062a32..d326d9b 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, isSrvCfg, res) {
+$generatorJava.cache = function(cache, varName, res) {
if (!res)
res = $generatorCommon.builder();
@@ -1294,8 +1294,7 @@ $generatorJava.cache = function(cache, varName, isSrvCfg, res) {
$generatorJava.cacheQuery(cache, varName, res);
- if (isSrvCfg)
- $generatorJava.cacheStore(cache, cache.metadatas, varName, res);
+ $generatorJava.cacheStore(cache, cache.metadatas, varName, res);
$generatorJava.cacheConcurrency(cache, varName, res);
@@ -1425,7 +1424,7 @@ $generatorJava.clusterCaches = function (caches, igfss, isSrvCfg, res) {
$generatorJava.declareVariable(res, cacheName, 'org.apache.ignite.configuration.CacheConfiguration');
- $generatorJava.cache(cache, cacheName, isSrvCfg, res);
+ $generatorJava.cache(cache, cacheName, res);
res.line('return ' + cacheName + ';');
res.endBlock('}');
@@ -1479,13 +1478,23 @@ $generatorJava.clusterCacheUse = function (caches, igfss, res) {
clusterCacheInvoke(res, cache, names);
});
+ if (names.length > 0) {
+ res.line('// Set data caches.');
+ res.line('cfg.setCacheConfiguration(' + names.join(', ') + ');');
+
+ res.needEmptyLine = true;
+ }
+
+ var igfsNames = [];
+
_.forEach(igfss, function (igfs) {
- clusterCacheInvoke(res, $generatorCommon.igfsDataCache(igfs), names);
- clusterCacheInvoke(res, $generatorCommon.igfsMetaCache(igfs), names);
+ clusterCacheInvoke(res, $generatorCommon.igfsDataCache(igfs), igfsNames);
+ clusterCacheInvoke(res, $generatorCommon.igfsMetaCache(igfs), igfsNames);
});
- if (names.length > 0) {
- res.line('cfg.setCacheConfiguration(' + names.join(', ') + ');');
+ if (igfsNames.length > 0) {
+ res.line('// Set IGFS caches.');
+ res.line('cfg.setCacheConfiguration(' + igfsNames.join(', ') + ');');
res.needEmptyLine = true;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/40a0b99b/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 36fb6e8..c1fccd3 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, isSrvCfg, res) {
+$generatorXml.cache = function(cache, res) {
if (!res)
res = $generatorCommon.builder();
res.startBlock('<bean class="org.apache.ignite.configuration.CacheConfiguration">');
- $generatorXml.cacheConfiguration(cache, isSrvCfg, res);
+ $generatorXml.cacheConfiguration(cache, res);
res.endBlock('</bean>');
@@ -1117,7 +1117,7 @@ $generatorXml.cache = function(cache, isSrvCfg, res) {
};
// Generate cache configs.
-$generatorXml.cacheConfiguration = function(cache, isSrvCfg, res) {
+$generatorXml.cacheConfiguration = function(cache, res) {
if (!res)
res = $generatorCommon.builder();
@@ -1127,8 +1127,7 @@ $generatorXml.cacheConfiguration = function(cache, isSrvCfg, res) {
$generatorXml.cacheQuery(cache, res);
- if (isSrvCfg)
- $generatorXml.cacheStore(cache, cache.metadatas, res);
+ $generatorXml.cacheStore(cache, cache.metadatas, res);
$generatorXml.cacheConcurrency(cache, res);
@@ -1155,7 +1154,7 @@ $generatorXml.clusterCaches = function(caches, igfss, isSrvCfg, res) {
res.startBlock('<list>');
_.forEach(caches, function(cache) {
- $generatorXml.cache(cache, isSrvCfg, res);
+ $generatorXml.cache(cache, res);
res.needEmptyLine = true;
});
@@ -1422,7 +1421,7 @@ $generatorXml.clusterConfiguration = function (cluster, clientNearCfg, res) {
if (!isSrvCfg) {
res.line('<property name="clientMode" value="true"/>');
- res.line();
+ res.needEmptyLine = true;
}
$generatorXml.clusterGeneral(cluster, res);