ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject [1/4] ignite git commit: IGNITE-843 Added "gridName" for XML and java generation.
Date Tue, 08 Sep 2015 13:54:40 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843 a9080e5fe -> 9f96779f5


IGNITE-843 Added "gridName" for XML and java generation.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/19b4edc6
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/19b4edc6
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/19b4edc6

Branch: refs/heads/ignite-843
Commit: 19b4edc605e69624742a91ef941476b39a8560db
Parents: a9080e5
Author: AKuznetsov <akuznetsov@gridgain.com>
Authored: Tue Sep 8 20:51:29 2015 +0700
Committer: AKuznetsov <akuznetsov@gridgain.com>
Committed: Tue Sep 8 20:51:29 2015 +0700

----------------------------------------------------------------------
 .../src/main/js/routes/generator/generator-java.js               | 3 +++
 .../src/main/js/routes/generator/generator-xml.js                | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/19b4edc6/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 877c10c..4f4aeab 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
@@ -312,6 +312,9 @@ $generatorJava.clusterGeneral = function (cluster, clientNearCfg, res)
{
 
     $generatorJava.declareVariable(res, true, 'cfg', 'org.apache.ignite.configuration.IgniteConfiguration');
 
+    $generatorJava.property(res, 'cfg', cluster, 'name', null, 'gridName');
+    res.needEmptyLine = true;
+
     if (clientNearCfg) {
         res.line('cfg.setClientMode(true);');
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/19b4edc6/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 1f7a30d..f5d6971 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
@@ -118,7 +118,7 @@ $generatorXml.beanProperty = function (res, bean, beanPropName, desc,
createBean
         tmpRes.emptyLineIfNeeded();
         tmpRes.startBlock('<property name="' + beanPropName + '">');
         tmpRes.startBlock('<bean class="' + desc.className + '">');
-        
+
         var hasData = false;
 
         for (var propName in props) {
@@ -202,6 +202,8 @@ $generatorXml.clusterGeneral = function (cluster, res) {
     if (!res)
         res = $generatorCommon.builder();
 
+    $generatorXml.property(res, cluster, 'name', 'gridName');
+
     if (cluster.discovery) {
         res.startBlock('<property name="discoverySpi">');
         res.startBlock('<bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi">');


Mime
View raw message