ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject [1/2] ignite git commit: IGNITE-843 WIP on preview.
Date Tue, 25 Aug 2015 10:40:09 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843 f4ad4b1fd -> aab27a713


IGNITE-843 WIP on preview.


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

Branch: refs/heads/ignite-843
Commit: b9923df7e6f75b8d613d5e0c01ed52ff2271151e
Parents: e48ee8d
Author: Alexey Kuznetsov <akuznetsov@apache.org>
Authored: Tue Aug 25 17:33:33 2015 +0700
Committer: Alexey Kuznetsov <akuznetsov@apache.org>
Committed: Tue Aug 25 17:33:33 2015 +0700

----------------------------------------------------------------------
 .../src/main/js/controllers/common-module.js    |   4 +-
 .../main/js/routes/generator/generator-xml.js   | 204 ++++++++++---------
 2 files changed, 114 insertions(+), 94 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/b9923df7/modules/control-center-web/src/main/js/controllers/common-module.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/common-module.js b/modules/control-center-web/src/main/js/controllers/common-module.js
index afdd7f0..a983ebf 100644
--- a/modules/control-center-web/src/main/js/controllers/common-module.js
+++ b/modules/control-center-web/src/main/js/controllers/common-module.js
@@ -489,11 +489,11 @@ controlCenterModule.service('$common', [
 
                 var parent = right.parent();
 
-                var parentHeight = Math.max(75, left.height() - parent.css('marginTop').replace("px",
""));
+                var parentHeight = Math.max(75, left.height() - 2 * parent.css('marginTop').replace("px",
""));
 
                 parent.outerHeight(parentHeight);
 
-                right.height(parentHeight - scrollHeight);
+                right.height(parentHeight - scrollHeight / 2);
 
                 right.resize();
             }

http://git-wip-us.apache.org/repos/asf/ignite/blob/b9923df7/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 d03a337..19b1275 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
@@ -75,6 +75,8 @@ function _addListProperty(res, obj, propName, listType, rowFactory) {
 
         res.endBlock('</' + listType + '>');
         res.endBlock('</property>');
+
+        res.needEmptyLine = true;
     }
 }
 
@@ -622,67 +624,8 @@ $generatorXml.cacheMemory = function(cache, res) {
     if (!res)
         res = $generatorCommon.builder();
 
-    return res;
-};
-
-$generatorXml.cacheQuery = function(cache, res) {
-    if (!res)
-        res = $generatorCommon.builder();
-
-    return res;
-};
-
-$generatorXml.cacheStore = function(cache, res) {
-    if (!res)
-        res = $generatorCommon.builder();
-
-    return res;
-};
-
-$generatorXml.cacheConcurrency = function(cache, res) {
-    if (!res)
-        res = $generatorCommon.builder();
-
-    return res;
-};
-
-$generatorXml.cacheRebalance = function(cache, res) {
-    if (!res)
-        res = $generatorCommon.builder();
-
-    return res;
-};
-
-$generatorXml.serverNearCache = function(cache, res) {
-    if (!res)
-        res = $generatorCommon.builder();
-
-    return res;
-};
-
-$generatorXml.statistics = function(cache, res) {
-    if (!res)
-        res = $generatorCommon.builder();
-
-    return res;
-};
-
-// Generate caches configs.
-$generatorXml.cache = function(cache, res) {
-    if (!res)
-        res = $generatorCommon.builder();
-
-    res.startBlock('<bean class="org.apache.ignite.configuration.CacheConfiguration">');
-
-    $generatorXml.cacheGeneral(cache, res);
-
-    _addProperty(res, cache, 'startSize');
-
-    res.needEmptyLine = true;
-
     _addProperty(res, cache, 'memoryMode');
     _addProperty(res, cache, 'offHeapMaxMemory');
-    _addProperty(res, cache, 'swapEnabled');
 
     res.needEmptyLine = true;
 
@@ -690,26 +633,20 @@ $generatorXml.cache = function(cache, res) {
 
     res.needEmptyLine = true;
 
-    if (cache.nearCacheEnabled) {
-        res.emptyLineIfNeeded();
-
-        res.startBlock('<property name="nearConfiguration">');
-        res.startBlock('<bean class="org.apache.ignite.configuration.NearCacheConfiguration">');
-
-        if (cache.nearConfiguration && cache.nearConfiguration.nearStartSize)
-            _addProperty(res, cache.nearConfiguration, 'nearStartSize');
+    _addProperty(res, cache, 'swapEnabled');
+    _addProperty(res, cache, 'startSize');
 
-        if (cache.nearConfiguration && cache.nearConfiguration.nearEvictionPolicy.kind)
-            _createEvictionPolicy(res, cache.nearConfiguration.nearEvictionPolicy, 'nearEvictionPolicy');
+    res.needEmptyLine = true;
 
-        res.endBlock('</bean>');
-        res.endBlock('</property>');
-    }
+    return res;
+};
 
-    res.needEmptyLine = true;
+$generatorXml.cacheQuery = function(cache, res) {
+    if (!res)
+        res = $generatorCommon.builder();
 
-    _addProperty(res, cache, 'sqlEscapeAll');
     _addProperty(res, cache, 'sqlOnheapRowCacheSize');
+
     _addProperty(res, cache, 'longQueryWarningTimeout');
 
     if (cache.indexedTypes && cache.indexedTypes.length > 0) {
@@ -725,23 +662,22 @@ $generatorXml.cache = function(cache, res) {
 
         res.endBlock('</list>');
         res.endBlock('</property>');
+
+        res.needEmptyLine = true;
     }
 
     _addListProperty(res, cache, 'sqlFunctionClasses', 'array');
 
+    _addProperty(res, cache, 'sqlEscapeAll');
+
     res.needEmptyLine = true;
 
-    if (cache.cacheMode != 'LOCAL') {
-        _addProperty(res, cache, 'rebalanceMode');
-        _addProperty(res, cache, 'rebalanceThreadPoolSize');
-        _addProperty(res, cache, 'rebalanceBatchSize');
-        _addProperty(res, cache, 'rebalanceOrder');
-        _addProperty(res, cache, 'rebalanceDelay');
-        _addProperty(res, cache, 'rebalanceTimeout');
-        _addProperty(res, cache, 'rebalanceThrottle');
+    return res;
+};
 
-        res.needEmptyLine = true;
-    }
+$generatorXml.cacheStore = function(cache, res) {
+    if (!res)
+        res = $generatorCommon.builder();
 
     if (cache.cacheStoreFactory && cache.cacheStoreFactory.kind) {
         var storeFactory = cache.cacheStoreFactory[cache.cacheStoreFactory.kind];
@@ -760,9 +696,9 @@ $generatorXml.cache = function(cache, res) {
                 });
             }
         }
-    }
 
-    res.needEmptyLine = true;
+        res.needEmptyLine = true;
+    }
 
     _addProperty(res, cache, 'loadPreviousValue');
     _addProperty(res, cache, 'readThrough');
@@ -770,11 +706,6 @@ $generatorXml.cache = function(cache, res) {
 
     res.needEmptyLine = true;
 
-    _addProperty(res, cache, 'defaultLockTimeout');
-    _addProperty(res, cache, 'transactionManagerLookupClassName');
-
-    res.needEmptyLine = true;
-
     _addProperty(res, cache, 'writeBehindEnabled');
     _addProperty(res, cache, 'writeBehindBatchSize');
     _addProperty(res, cache, 'writeBehindFlushSize');
@@ -783,12 +714,101 @@ $generatorXml.cache = function(cache, res) {
 
     res.needEmptyLine = true;
 
+    return res;
+};
+
+$generatorXml.cacheConcurrency = function(cache, res) {
+    if (!res)
+        res = $generatorCommon.builder();
+
+    _addProperty(res, cache, 'maxConcurrentAsyncOperations');
+    _addProperty(res, cache, 'defaultLockTimeout');
+    _addProperty(res, cache, 'atomicWriteOrderMode');
+
+    res.needEmptyLine = true;
+
+    return res;
+};
+
+$generatorXml.cacheRebalance = function(cache, res) {
+    if (!res)
+        res = $generatorCommon.builder();
+
+    if (cache.cacheMode != 'LOCAL') {
+        _addProperty(res, cache, 'rebalanceMode');
+        _addProperty(res, cache, 'rebalanceThreadPoolSize');
+        _addProperty(res, cache, 'rebalanceBatchSize');
+        _addProperty(res, cache, 'rebalanceOrder');
+        _addProperty(res, cache, 'rebalanceDelay');
+        _addProperty(res, cache, 'rebalanceTimeout');
+        _addProperty(res, cache, 'rebalanceThrottle');
+
+        res.needEmptyLine = true;
+    }
+
+    return res;
+};
+
+$generatorXml.serverNearCache = function(cache, res) {
+    if (!res)
+        res = $generatorCommon.builder();
+
+    if (cache.nearCacheEnabled) {
+        res.emptyLineIfNeeded();
+
+        res.startBlock('<property name="nearConfiguration">');
+        res.startBlock('<bean class="org.apache.ignite.configuration.NearCacheConfiguration">');
+
+        if (cache.nearConfiguration && cache.nearConfiguration.nearStartSize)
+            _addProperty(res, cache.nearConfiguration, 'nearStartSize');
+
+        if (cache.nearConfiguration && cache.nearConfiguration.nearEvictionPolicy.kind)
+            _createEvictionPolicy(res, cache.nearConfiguration.nearEvictionPolicy, 'nearEvictionPolicy');
+
+        res.endBlock('</bean>');
+        res.endBlock('</property>');
+    }
+
+    res.needEmptyLine = true;
+
+    return res;
+};
+
+$generatorXml.statistics = function(cache, res) {
+    if (!res)
+        res = $generatorCommon.builder();
+
     _addProperty(res, cache, 'statisticsEnabled');
     _addProperty(res, cache, 'managementEnabled');
 
     res.needEmptyLine = true;
 
-    _addProperty(res, cache, 'maxConcurrentAsyncOperations');
+    return res;
+};
+
+// Generate caches configs.
+$generatorXml.cache = function(cache, res) {
+    if (!res)
+        res = $generatorCommon.builder();
+
+    res.startBlock('<bean class="org.apache.ignite.configuration.CacheConfiguration">');
+
+    $generatorXml.cacheGeneral(cache, res);
+
+    $generatorXml.cacheMemory(cache, res);
+
+    $generatorXml.cacheQuery(cache, res);
+
+    $generatorXml.cacheStore(cache, res);
+
+    $generatorXml.cacheConcurrency(cache, res);
+
+    $generatorXml.cacheRebalance(cache, res);
+
+    $generatorXml.serverNearCache(cache, res);
+
+    $generatorXml.statistics(cache, res);
+
 
     // Generate cache type metadata configs.
     if ((cache.queryMetadata && cache.queryMetadata.length > 0) ||


Mime
View raw message