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 Minor fixes after review.
Date Thu, 04 Feb 2016 09:04:15 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 aa1e493e4 -> 91c0762f3


IGNITE-843 Minor fixes after review.


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

Branch: refs/heads/ignite-843-rc2
Commit: 69236df3f2d7625665e22a338343043ac80b8ce1
Parents: 7eba2e2
Author: Alexey Kuznetsov <akuznetsov@apache.org>
Authored: Thu Feb 4 16:03:41 2016 +0700
Committer: Alexey Kuznetsov <akuznetsov@apache.org>
Committed: Thu Feb 4 16:03:41 2016 +0700

----------------------------------------------------------------------
 .../src/main/js/app/data/getting-started.json   | 47 +++++++-------------
 .../main/js/app/modules/getting-started/main.js |  7 +++
 .../app/modules/states/configuration/index.js   | 10 ++---
 .../main/js/app/modules/states/login/index.js   |  2 +-
 .../src/main/js/controllers/models/caches.json  |  6 +--
 .../main/js/controllers/profile-controller.js   |  4 +-
 .../js/helpers/generator/generator-common.js    |  6 +--
 .../main/js/helpers/generator/generator-java.js | 38 ++++++++--------
 .../js/helpers/generator/generator-readme.js    | 12 +++--
 .../main/js/helpers/generator/generator-xml.js  | 45 +++++++++----------
 .../src/main/js/public/stylesheets/style.scss   |  4 ++
 .../src/main/js/views/configuration/caches.jade |  2 +-
 .../main/js/views/configuration/clusters.jade   |  2 +-
 .../main/js/views/configuration/domains.jade    |  2 +-
 .../src/main/js/views/configuration/igfs.jade   |  2 +-
 .../src/main/js/views/includes/infos.jade       | 28 ++++++------
 .../src/main/js/views/login.jade                |  8 ++--
 .../js/views/templates/getting-started.jade     |  2 +-
 18 files changed, 115 insertions(+), 112 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/69236df3/modules/control-center-web/src/main/js/app/data/getting-started.json
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/data/getting-started.json b/modules/control-center-web/src/main/js/app/data/getting-started.json
index d0c4520..91e3562 100644
--- a/modules/control-center-web/src/main/js/app/data/getting-started.json
+++ b/modules/control-center-web/src/main/js/app/data/getting-started.json
@@ -2,21 +2,18 @@
     {
         "title": "What is Apache Ignite",
         "message": [
-            "<p><b>Apache Ignite</b>  is a high-performance, integrated
and distributed in-memory platform for computing and transacting on large-scale data sets
in real-time, orders of magnitude faster than possible with traditional disk-based or flash
technologies.</p>",
-            "<img src='/images/ignite-puzzle.png' width='100%' />",
-            "<p><b>Apache Ignite</b> is designed to deliver uncompromised
performance for a wide set of in-memory computing use cases from high performance computing,
to the industry most advanced data grid, highly available service grid, and streaming.</p>"
+            "<p><b>Apache Ignite</b> is designed to deliver uncompromised
performance for a wide set of in-memory computing use cases from high performance computing,
to the industry most advanced data grid, highly available service grid, and streaming.</p>",
+            "<img src='/images/ignite-puzzle.png' width='100%' />"
         ]
     },
     {
         "title": "What is Apache Ignite Web Console",
         "message": [
-            "<p><b>Apache Ignite Web Console</b> is a powerful tool for
configuration and management of your clusters.</p>",
-            "<p>With Apache Ignite Web Console you can:<p>",
+            "<p>You will be able to<p>",
             "<ul>",
-            "<li>Configure clusters</li>",
-            "<li>Import domain model from database or describe it manually</li>",
+            "<li>Generate cluster configuration</li>",
+            "<li>Import domain model from database</li>",
             "<li>Configure all needed caches</li>",
-            "<li>Configure IGFS in-memory file systems</li>",
             "<li>Preview generated XML and Java code in browser</li>",
             "<li>Download fully functional Maven project with generated XML and Java
code</li>",
             "<li>Execute SQL queries on real clusters</li>",
@@ -24,83 +21,74 @@
         ]
     },
     {
-        "title": "Cluster screen",
+        "title": "Clusters",
         "message": [
             "<div class='col-xs-7'>",
             "<img src='/images/cluster.png' width='100%' />",
             "</div>",
             "<div class='col-xs-5 padding-left-dflt'>",
-            "On <b>Clusters screen</b> you can:",
             "<ul>",
             "<li>Configure cluster properties</li>",
             "<li>Associate cluster with caches</li>",
-            "<li>Preview XML and Java code</li>",
             "</ul>",
             "</div>"
         ]
     },
     {
-        "title": "Domain model screen",
+        "title": "Domain Model",
         "message": [
             "<div class='col-xs-7'>",
             "<img src='/images/domains.png' width='100%' />",
             "</div>",
             "<div class='col-xs-5 padding-left-dflt'>",
-            "On <b>Domain model screen</b> you can:",
             "<ul>",
             "<li>Import domain model from database</li>",
-            "<li>Try demo import</li>",
+            "<li>Try it in <span class='getting-started-demo'>Demo</span>
mode</li>",
             "<li>Associate domain model with caches</li>",
-            "<li>Configure types for SQL queries</li>",
-            "<li>Preview XML and Java code</li>",
+            "<li>Configure SQL queries</li>",
             "</ul>",
             "</div>"
         ]
     },
     {
-        "title": "Caches screen",
+        "title": "Caches",
         "message": [
             "<div class='col-xs-7'>",
             "<img src='/images/cache.png' width='100%' />",
             "</div>",
             "<div class='col-xs-5 padding-left-dflt'>",
-            "On <b>Caches screen</b> you can:",
             "<ul>",
             "<li>Configure cache properties</li>",
             "<li>Associate cache with clusters</li>",
             "<li>Associate cache with domain model</li>",
             "<li>Configure cache store</li>",
-            "<li>Preview XML and Java code</li>",
             "</ul>",
             "</div>"
         ]
     },
     {
-        "title": "IGFS screen",
+        "title": "In-memory File System",
         "message": [
             "<div class='col-xs-7'>",
             "<img src='/images/igfs.png' width='100%' />",
             "</div>",
             "<div class='col-xs-5 padding-left-dflt'>",
-            "On <b>IGFS screen</b> you can:",
             "<ul>",
             "<li>Configure IGFS properties</li>",
             "<li>Associate IGFS with clusters</li>",
-            "<li>Preview XML and Java code</li>",
             "</ul>",
             "</div>"
         ]
     },
     {
-      "title": "Summary screen",
+      "title": "Summary",
       "message": [
           "<div class='col-xs-7'>",
           "<img src='/images/summary.png' width='100%' />",
           "</div>",
           "<div class='col-xs-5 padding-left-dflt'>",
-          "On <b>Summary screen</b> you can:",
           "<ul>",
-          "<li>Preview full XML configuration</li>",
+          "<li>Preview cluster XML configuration</li>",
           "<li>Preview generated Java code</li>",
           "<li>Preview Docker file</li>",
           "<li>Preview pom.xml</li>",
@@ -110,18 +98,17 @@
       ]
     },
     {
-        "title": "SQL screen",
+        "title": "SQL Queries",
         "message": [
             "<div class='col-xs-7'>",
             "<img src='/images/query-table.png' width='100%' />",
             "</div>",
             "<div class='col-xs-5 padding-left-dflt'>",
-            "On <b>SQL screen</b> you can:",
             "<ul>",
-            "<li>Execute any SQL against cluster</li>",
-            "<li>Explain SQL</li>",
+            "<li>Execute SQL queries</li>",
+            "<li>View execution plan</li>",
             "<li>View data in tabular format and charts</li>",
-            "<li>Execute any SQL with specified refresh rate</li>",
+            "<li>View streaming charts</li>",
             "</ul>",
             "</div>"
         ]

http://git-wip-us.apache.org/repos/asf/ignite/blob/69236df3/modules/control-center-web/src/main/js/app/modules/getting-started/main.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/getting-started/main.js b/modules/control-center-web/src/main/js/app/modules/getting-started/main.js
index 0fb3692..d3379a0 100644
--- a/modules/control-center-web/src/main/js/app/modules/getting-started/main.js
+++ b/modules/control-center-web/src/main/js/app/modules/getting-started/main.js
@@ -34,6 +34,13 @@ angular
                 items.splice(idx, 0, data);
         };
 
+        this.update = (before, data) => {
+            const idx = _.findIndex(items, {title: before});
+
+            if (idx >= 0)
+                items[idx] = data;
+        };
+
         this.$get = [function() {
             return items;
         }];

http://git-wip-us.apache.org/repos/asf/ignite/blob/69236df3/modules/control-center-web/src/main/js/app/modules/states/configuration/index.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/index.js
b/modules/control-center-web/src/main/js/app/modules/states/configuration/index.js
index c2c189f..b0ae059 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/configuration/index.js
+++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/index.js
@@ -92,7 +92,7 @@ angular
         },
         resolve: {
             $title: () => {
-                return 'Configure Clusters - Ignite Console';
+                return 'Configure Clusters';
             }
         }
     })
@@ -107,7 +107,7 @@ angular
         },
         resolve: {
             $title: () => {
-                return 'Configure Caches - Ignite Console';
+                return 'Configure Caches';
             }
         }
     })
@@ -122,7 +122,7 @@ angular
         },
         resolve: {
             $title: () => {
-                return 'Configure Domain Models - Ignite Console';
+                return 'Configure Domain Models';
             }
         }
     })
@@ -137,7 +137,7 @@ angular
         },
         resolve: {
             $title: () => {
-                return 'Configure IGFS - Ignite Console';
+                return 'Configure IGFS';
             }
         }
     })
@@ -151,7 +151,7 @@ angular
         },
         resolve: {
             $title: () => {
-                return 'Configurations Summary - Ignite Console';
+                return 'Configurations Summary';
             }
         }
     });

http://git-wip-us.apache.org/repos/asf/ignite/blob/69236df3/modules/control-center-web/src/main/js/app/modules/states/login/index.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/login/index.js b/modules/control-center-web/src/main/js/app/modules/states/login/index.js
index 008ffb7..38cfb6b 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/login/index.js
+++ b/modules/control-center-web/src/main/js/app/modules/states/login/index.js
@@ -31,7 +31,7 @@ angular
         templateUrl: '/login.html',
         resolve: {
             $title: () => {
-                return 'Sign In - Ignite Console';
+                return 'Sign In';
             }
         }
     });

http://git-wip-us.apache.org/repos/asf/ignite/blob/69236df3/modules/control-center-web/src/main/js/controllers/models/caches.json
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/models/caches.json b/modules/control-center-web/src/main/js/controllers/models/caches.json
index 0b601a1..9c9ef73 100644
--- a/modules/control-center-web/src/main/js/controllers/models/caches.json
+++ b/modules/control-center-web/src/main/js/controllers/models/caches.json
@@ -785,7 +785,7 @@
           "id": "writeSynchronizationMode",
           "type": "dropdown",
           "model": "writeSynchronizationMode",
-          "placeholder": "Choose write synchronization mode",
+          "placeholder": "PRIMARY_SYNC",
           "items": "writeSynchronizationMode",
           "tip": [
             "Write synchronization mode",
@@ -911,7 +911,7 @@
           "type": "number",
           "path": "nearConfiguration",
           "model": "nearStartSize",
-          "hide": "!backupItem.nearCacheEnabled",
+          "disabled": "!backupItem.nearCacheEnabled",
           "placeholder": 375000,
           "tip": [
             "Initial cache size for near cache which will be used to pre-create internal
hash table after start"
@@ -926,7 +926,7 @@
           "model": "kind",
           "placeholder": "Choose eviction policy",
           "items": "evictionPolicies",
-          "hide": "!backupItem.nearCacheEnabled",
+          "disabled": "!backupItem.nearCacheEnabled",
           "tip": [
             "Cache expiration policy"
           ],

http://git-wip-us.apache.org/repos/asf/ignite/blob/69236df3/modules/control-center-web/src/main/js/controllers/profile-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/profile-controller.js b/modules/control-center-web/src/main/js/controllers/profile-controller.js
index 8fc5acd..1336784 100644
--- a/modules/control-center-web/src/main/js/controllers/profile-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/profile-controller.js
@@ -17,7 +17,7 @@
 
 // Controller for Profile screen.
 consoleModule.controller('profileController',
-    ['$rootScope', '$scope', '$http', '$common', '$focus', '$confirm', 'igniteCountries',
function ($rootScope, $scope, $http, $common, $focus, $confirm, countries) {
+    ['$rootScope', '$scope', '$http', '$common', '$focus', '$confirm', 'IgniteCountries',
function ($rootScope, $scope, $http, $common, $focus, $confirm, countries) {
     $scope.user = angular.copy($scope.$root.user);
 
     $scope.countries = countries;
@@ -37,7 +37,7 @@ consoleModule.controller('profileController',
         var cur = $scope.user;
 
         return !_.isEqual(old, cur) || ($scope.expandedPassword && !$common.isEmptyString($scope.newPassword));
-    };
+    }
 
     $scope.profileCouldBeSaved = function () {
         return $scope.profileForm.$valid && _profileChanged();

http://git-wip-us.apache.org/repos/asf/ignite/blob/69236df3/modules/control-center-web/src/main/js/helpers/generator/generator-common.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/helpers/generator/generator-common.js
b/modules/control-center-web/src/main/js/helpers/generator/generator-common.js
index bb04f13..2af69c9 100644
--- a/modules/control-center-web/src/main/js/helpers/generator/generator-common.js
+++ b/modules/control-center-web/src/main/js/helpers/generator/generator-common.js
@@ -254,15 +254,15 @@ $generatorCommon.builder = function (deep) {
 $generatorCommon.EVICTION_POLICIES = {
     LRU: {
         className: 'org.apache.ignite.cache.eviction.lru.LruEvictionPolicy',
-        fields: {batchSize: null, maxMemorySize: null, maxSize: null}
+        fields: {batchSize: {dflt: 1}, maxMemorySize: null, maxSize: {dflt: 100000}}
     },
     FIFO: {
         className: 'org.apache.ignite.cache.eviction.fifo.FifoEvictionPolicy',
-        fields: {batchSize: null, maxMemorySize: null, maxSize: null}
+        fields: {batchSize: {dflt: 1}, maxMemorySize: null, maxSize: {dflt: 100000}}
     },
     SORTED: {
         className: 'org.apache.ignite.cache.eviction.sorted.SortedEvictionPolicy',
-        fields: {batchSize: null, maxMemorySize: null, maxSize: null}
+        fields: {batchSize: {dflt: 1}, maxMemorySize: null, maxSize: {dflt: 100000}}
     }
 };
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/69236df3/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 9f4123e..fdca965 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
@@ -1004,15 +1004,15 @@ $generatorJava.cacheMemory = function (cache, varName, res) {
     if (!res)
         res = $generatorCommon.builder();
 
-    $generatorJava.enumProperty(res, varName, cache, 'memoryMode', 'org.apache.ignite.cache.CacheMemoryMode');
-    $generatorJava.property(res, varName, cache, 'offHeapMaxMemory');
+    $generatorJava.enumProperty(res, varName, cache, 'memoryMode', 'org.apache.ignite.cache.CacheMemoryMode',
null, 'ONHEAP_TIERED');
+    $generatorJava.property(res, varName, cache, 'offHeapMaxMemory', null, null, -1);
 
     res.needEmptyLine = true;
 
     $generatorJava.evictionPolicy(res, varName, cache.evictionPolicy, 'evictionPolicy');
 
-    $generatorJava.property(res, varName, cache, 'swapEnabled');
-    $generatorJava.property(res, varName, cache, 'startSize');
+    $generatorJava.property(res, varName, cache, 'swapEnabled', null, null, false);
+    $generatorJava.property(res, varName, cache, 'startSize', null, null, 1500000);
 
     res.needEmptyLine = true;
 
@@ -1025,8 +1025,8 @@ $generatorJava.cacheQuery = function (cache, varName, res) {
         res = $generatorCommon.builder();
 
     $generatorJava.property(res, varName, cache, 'sqlSchema');
-    $generatorJava.property(res, varName, cache, 'sqlOnheapRowCacheSize');
-    $generatorJava.property(res, varName, cache, 'longQueryWarningTimeout');
+    $generatorJava.property(res, varName, cache, 'sqlOnheapRowCacheSize', null, null, 10240);
+    $generatorJava.property(res, varName, cache, 'longQueryWarningTimeout', null, null, 3000);
     $generatorJava.property(res, varName, cache, 'snapshotableIndex', null, null, false);
 
     var indexedTypes = _.filter(cache.domains, function (domain) {
@@ -1052,7 +1052,7 @@ $generatorJava.cacheQuery = function (cache, varName, res) {
 
     $generatorJava.multiparamProperty(res, varName, cache, 'sqlFunctionClasses', 'class');
 
-    $generatorJava.property(res, varName, cache, 'sqlEscapeAll');
+    $generatorJava.property(res, varName, cache, 'sqlEscapeAll', null, null, false);
 
     res.needEmptyLine = true;
 
@@ -1303,11 +1303,13 @@ $generatorJava.cacheStore = function (cache, domains, cacheVarName,
res) {
 
     res.needEmptyLine = true;
 
-    $generatorJava.property(res, cacheVarName, cache, 'writeBehindEnabled');
-    $generatorJava.property(res, cacheVarName, cache, 'writeBehindBatchSize');
-    $generatorJava.property(res, cacheVarName, cache, 'writeBehindFlushSize');
-    $generatorJava.property(res, cacheVarName, cache, 'writeBehindFlushFrequency');
-    $generatorJava.property(res, cacheVarName, cache, 'writeBehindFlushThreadCount');
+    if (cache.writeBehindEnabled) {
+        $generatorJava.property(res, cacheVarName, cache, 'writeBehindEnabled', null, null,
false);
+        $generatorJava.property(res, cacheVarName, cache, 'writeBehindBatchSize', null, null,
512);
+        $generatorJava.property(res, cacheVarName, cache, 'writeBehindFlushSize', null, null,
10240);
+        $generatorJava.property(res, cacheVarName, cache, 'writeBehindFlushFrequency', null,
null, 5000);
+        $generatorJava.property(res, cacheVarName, cache, 'writeBehindFlushThreadCount',
null, null, 1);
+    }
 
     res.needEmptyLine = true;
 
@@ -1319,10 +1321,10 @@ $generatorJava.cacheConcurrency = function (cache, varName, res) {
     if (!res)
         res = $generatorCommon.builder();
 
-    $generatorJava.property(res, varName, cache, 'maxConcurrentAsyncOperations');
-    $generatorJava.property(res, varName, cache, 'defaultLockTimeout');
+    $generatorJava.property(res, varName, cache, 'maxConcurrentAsyncOperations', null, null,
500);
+    $generatorJava.property(res, varName, cache, 'defaultLockTimeout', null, null, 0);
     $generatorJava.enumProperty(res, varName, cache, 'atomicWriteOrderMode', 'org.apache.ignite.cache.CacheAtomicWriteOrderMode');
-    $generatorJava.enumProperty(res, varName, cache, 'writeSynchronizationMode', 'org.apache.ignite.cache.CacheWriteSynchronizationMode');
+    $generatorJava.enumProperty(res, varName, cache, 'writeSynchronizationMode', 'org.apache.ignite.cache.CacheWriteSynchronizationMode',
null, null, "PRIMARY_SYNC");
 
     res.needEmptyLine = true;
 
@@ -1370,7 +1372,7 @@ $generatorJava.cacheServerNearCache = function (cache, varName, res)
{
             res.needEmptyLine = true;
 
             if (cache.nearConfiguration.nearStartSize) {
-                $generatorJava.property(res, 'nearCfg', cache.nearConfiguration, 'nearStartSize');
+                $generatorJava.property(res, 'nearCfg', cache.nearConfiguration, 'nearStartSize',
null, null, 375000);
 
                 res.needEmptyLine = true;
             }
@@ -1395,8 +1397,8 @@ $generatorJava.cacheStatistics = function (cache, varName, res) {
     if (!res)
         res = $generatorCommon.builder();
 
-    $generatorJava.property(res, varName, cache, 'statisticsEnabled');
-    $generatorJava.property(res, varName, cache, 'managementEnabled');
+    $generatorJava.property(res, varName, cache, 'statisticsEnabled', null, null, false);
+    $generatorJava.property(res, varName, cache, 'managementEnabled', null, null, false);
 
     res.needEmptyLine = true;
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/69236df3/modules/control-center-web/src/main/js/helpers/generator/generator-readme.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/helpers/generator/generator-readme.js
b/modules/control-center-web/src/main/js/helpers/generator/generator-readme.js
index 021af6c..15b9a31 100644
--- a/modules/control-center-web/src/main/js/helpers/generator/generator-readme.js
+++ b/modules/control-center-web/src/main/js/helpers/generator/generator-readme.js
@@ -18,6 +18,13 @@
 // README.txt generation entry point.
 $generatorReadme = {};
 
+$generatorReadme.generatedBy = function (res) {
+    res.line('Content of this folder was generated by Apache Ignite Web Console');
+    res.line('=================================================================');
+
+    res.needEmptyLine = true;
+};
+
 /**
  * Generate README.txt.
  *
@@ -28,10 +35,7 @@ $generatorReadme.readme = function (res) {
     if (!res)
         res = $generatorCommon.builder();
 
-    res.line('Content of this folder was generated by Apache Ignite Web Console');
-    res.line('=================================================================');
-
-    res.needEmptyLine = true;
+    generatedBy(res);
 
     res.line('Project structure:');
     res.line('    /config - this folder contains client and server XML configurations.');

http://git-wip-us.apache.org/repos/asf/ignite/blob/69236df3/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 def6954..5dd2711 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
@@ -754,8 +754,8 @@ $generatorXml.cacheMemory = function(cache, res) {
     if (!res)
         res = $generatorCommon.builder();
 
-    $generatorXml.property(res, cache, 'memoryMode');
-    $generatorXml.property(res, cache, 'offHeapMaxMemory');
+    $generatorXml.property(res, cache, 'memoryMode', null, 'ONHEAP_TIERED');
+    $generatorXml.property(res, cache, 'offHeapMaxMemory', null, -1);
 
     res.needEmptyLine = true;
 
@@ -763,8 +763,8 @@ $generatorXml.cacheMemory = function(cache, res) {
 
     res.needEmptyLine = true;
 
-    $generatorXml.property(res, cache, 'swapEnabled');
-    $generatorXml.property(res, cache, 'startSize');
+    $generatorXml.property(res, cache, 'swapEnabled', null, false);
+    $generatorXml.property(res, cache, 'startSize', null, 1500000);
 
     res.needEmptyLine = true;
 
@@ -777,8 +777,8 @@ $generatorXml.cacheQuery = function(cache, res) {
         res = $generatorCommon.builder();
 
     $generatorXml.property(res, cache, 'sqlSchema');
-    $generatorXml.property(res, cache, 'sqlOnheapRowCacheSize');
-    $generatorXml.property(res, cache, 'longQueryWarningTimeout');
+    $generatorXml.property(res, cache, 'sqlOnheapRowCacheSize', null, 10240);
+    $generatorXml.property(res, cache, 'longQueryWarningTimeout', null, 3000);
     $generatorXml.property(res, cache, 'snapshotableIndex', null, false);
 
     var indexedTypes = _.filter(cache.domains, function (domain) {
@@ -802,7 +802,7 @@ $generatorXml.cacheQuery = function(cache, res) {
 
     $generatorXml.listProperty(res, cache, 'sqlFunctionClasses');
 
-    $generatorXml.property(res, cache, 'sqlEscapeAll');
+    $generatorXml.property(res, cache, 'sqlEscapeAll', null, false);
 
     res.needEmptyLine = true;
 
@@ -901,16 +901,18 @@ $generatorXml.cacheStore = function(cache, domains, res) {
 
     $generatorXml.property(res, cache, 'storeKeepBinary', null, false);
     $generatorXml.property(res, cache, 'loadPreviousValue', null, false);
-    $generatorXml.property(res, cache, 'readThrough', null, null, false);
-    $generatorXml.property(res, cache, 'writeThrough', null, null, false);
+    $generatorXml.property(res, cache, 'readThrough', null, false);
+    $generatorXml.property(res, cache, 'writeThrough', null, false);
 
     res.needEmptyLine = true;
 
-    $generatorXml.property(res, cache, 'writeBehindEnabled');
-    $generatorXml.property(res, cache, 'writeBehindBatchSize');
-    $generatorXml.property(res, cache, 'writeBehindFlushSize');
-    $generatorXml.property(res, cache, 'writeBehindFlushFrequency');
-    $generatorXml.property(res, cache, 'writeBehindFlushThreadCount');
+    if (cache.writeBehindEnabled) {
+        $generatorXml.property(res, cache, 'writeBehindEnabled', null, false);
+        $generatorXml.property(res, cache, 'writeBehindBatchSize', null, 512);
+        $generatorXml.property(res, cache, 'writeBehindFlushSize', null, 10240);
+        $generatorXml.property(res, cache, 'writeBehindFlushFrequency', null, 5000);
+        $generatorXml.property(res, cache, 'writeBehindFlushThreadCount', null, 1);
+    }
 
     res.needEmptyLine = true;
 
@@ -922,10 +924,10 @@ $generatorXml.cacheConcurrency = function(cache, res) {
     if (!res)
         res = $generatorCommon.builder();
 
-    $generatorXml.property(res, cache, 'maxConcurrentAsyncOperations');
-    $generatorXml.property(res, cache, 'defaultLockTimeout');
+    $generatorXml.property(res, cache, 'maxConcurrentAsyncOperations', null, 500);
+    $generatorXml.property(res, cache, 'defaultLockTimeout', null, 0);
     $generatorXml.property(res, cache, 'atomicWriteOrderMode');
-    $generatorXml.property(res, cache, 'writeSynchronizationMode');
+    $generatorXml.property(res, cache, 'writeSynchronizationMode', null, "PRIMARY_SYNC");
 
     res.needEmptyLine = true;
 
@@ -974,14 +976,11 @@ $generatorXml.cacheServerNearCache = function(cache, res) {
 
         if (cache.nearConfiguration) {
             if (cache.nearConfiguration.nearStartSize)
-                $generatorXml.property(res, cache.nearConfiguration, 'nearStartSize');
-
+                $generatorXml.property(res, cache.nearConfiguration, 'nearStartSize', null,
375000);
 
             $generatorXml.evictionPolicy(res, cache.nearConfiguration.nearEvictionPolicy,
'nearEvictionPolicy');
         }
 
-
-
         res.endBlock('</bean>');
         res.endBlock('</property>');
     }
@@ -996,8 +995,8 @@ $generatorXml.cacheStatistics = function(cache, res) {
     if (!res)
         res = $generatorCommon.builder();
 
-    $generatorXml.property(res, cache, 'statisticsEnabled');
-    $generatorXml.property(res, cache, 'managementEnabled');
+    $generatorXml.property(res, cache, 'statisticsEnabled', null, false);
+    $generatorXml.property(res, cache, 'managementEnabled', null, false);
 
     res.needEmptyLine = true;
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/69236df3/modules/control-center-web/src/main/js/public/stylesheets/style.scss
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/public/stylesheets/style.scss b/modules/control-center-web/src/main/js/public/stylesheets/style.scss
index 975a3c4..f28516f 100644
--- a/modules/control-center-web/src/main/js/public/stylesheets/style.scss
+++ b/modules/control-center-web/src/main/js/public/stylesheets/style.scss
@@ -1815,6 +1815,10 @@ treecontrol.tree-classic {
     background-image: none;
 }
 
+.getting-started-demo {
+    color: $brand-info;
+}
+
 .home-panel {
     border-radius: 5px;
     border: thin dotted $panel-default-border;

http://git-wip-us.apache.org/repos/asf/ignite/blob/69236df3/modules/control-center-web/src/main/js/views/configuration/caches.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/configuration/caches.jade b/modules/control-center-web/src/main/js/views/configuration/caches.jade
index bbbf4df..518d90a 100644
--- a/modules/control-center-web/src/main/js/views/configuration/caches.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/caches.jade
@@ -18,7 +18,7 @@ include ../includes/controls
 include ../includes/infos
 
 .docs-header
-    h1 Create and Configure Ignite Caches
+    h1 Configure Ignite Caches
 .docs-body(ng-controller='cachesController')
     +ignite-caches-information
     div(dw-loading='loadingCachesScreen' dw-loading-options='{text: "Loading caches screen...",
className: "page-loading-overlay"}')

http://git-wip-us.apache.org/repos/asf/ignite/blob/69236df3/modules/control-center-web/src/main/js/views/configuration/clusters.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/configuration/clusters.jade b/modules/control-center-web/src/main/js/views/configuration/clusters.jade
index c6e00b0..01ea947 100644
--- a/modules/control-center-web/src/main/js/views/configuration/clusters.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/clusters.jade
@@ -18,7 +18,7 @@ include ../includes/controls
 include ../includes/infos
 
 .docs-header
-    h1 Create and Configure Ignite Clusters
+    h1 Configure Ignite Clusters
 .docs-body(ng-controller='clustersController')
     +ignite-clusters-information
     div(dw-loading='loadingClustersScreen' dw-loading-options='{text: "Loading clusters screen...",
className: "page-loading-overlay"}')

http://git-wip-us.apache.org/repos/asf/ignite/blob/69236df3/modules/control-center-web/src/main/js/views/configuration/domains.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/configuration/domains.jade b/modules/control-center-web/src/main/js/views/configuration/domains.jade
index ed70528..d595d46 100644
--- a/modules/control-center-web/src/main/js/views/configuration/domains.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/domains.jade
@@ -18,7 +18,7 @@ include ../includes/controls
 include ../includes/infos
 
 .docs-header
-    h1 Create and Configure Domain Models
+    h1 Configure Domain Models
 .docs-body(ng-controller='domainsController')
     +ignite-domains-information
     div(dw-loading='loadingDomainModelsScreen' dw-loading-options='{text: "Loading domain
models screen...", className: "page-loading-overlay"}')

http://git-wip-us.apache.org/repos/asf/ignite/blob/69236df3/modules/control-center-web/src/main/js/views/configuration/igfs.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/configuration/igfs.jade b/modules/control-center-web/src/main/js/views/configuration/igfs.jade
index 92d45e4..7398d45 100644
--- a/modules/control-center-web/src/main/js/views/configuration/igfs.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/igfs.jade
@@ -18,7 +18,7 @@ include ../includes/controls
 include ../includes/infos
 
 .docs-header
-    h1 Create and Configure IGFS
+    h1 Configure Ignite In-memory File Systems
 .docs-body(ng-controller='igfsController')
     +ignite-igfs-information
     div(dw-loading='loadingIgfsScreen' dw-loading-options='{text: "Loading IGFS screen...",
className: "page-loading-overlay"}')

http://git-wip-us.apache.org/repos/asf/ignite/blob/69236df3/modules/control-center-web/src/main/js/views/includes/infos.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/includes/infos.jade b/modules/control-center-web/src/main/js/views/includes/infos.jade
index d3ce42f..26683f0 100644
--- a/modules/control-center-web/src/main/js/views/includes/infos.jade
+++ b/modules/control-center-web/src/main/js/views/includes/infos.jade
@@ -17,24 +17,24 @@
 mixin ignite-clusters-information
     ignite-information(data-title='On this screen you can')
         ul
-            li Configure clusters
-            li Associate caches with clusters
-            li Preview XML and Java code for cluster configuration
+            li Configure #[a(href='https://apacheignite.readme.io/docs/clustering' target='_blank')
clusters] properties
+            li Associate clusters with caches and in-memory file systems
+            li Preview XML and Java code
 
 mixin ignite-caches-information
     ignite-information(data-title='On this screen you can')
         ul
-            li Configure caches
-            li Associate domain model with caches
-            li Preview XML and Java code for cache configuration
+            li Configure #[a(href='https://apacheignite.readme.io/docs/data-grid' target='_blank')
caches] properties
+            li Associate caches with clusters and domain model
+            li Preview XML and Java code
 
 mixin ignite-domains-information
     ignite-information(data-title='On this screen you can')
         ul
-            li Manually enter domain model descriptions
             li Import Domain model from database
             li Associate domain model with caches
-            li Preview XML and Java code for cluster configuration
+            li Configure #[a(href='https://apacheignite.readme.io/docs/sql-queries' target='_blank')
SQL queries]
+            li Preview XML and Java code
 
 mixin ignite-igfs-information
     ignite-information(data-title='Configure IGFS only if you are going to use In-memory
File System')
@@ -44,10 +44,10 @@ mixin ignite-igfs-information
             li In addition IGFS provides API to execute map-reduce tasks over file system
data
 
 mixin ignite-summary-information
-    ignite-information(data-title='On this screen you can preview')
+    ignite-information(data-title='On this screen you can')
         ul
-            li XML configurations for server and client nodes
-            li Java classes with server and client nodes configuration from code
-            li POJO classes generated for configured domain model
-            li Maven pom.xml for generated project
-            li Dockerfile for server node
+            li Preview XML configurations for server and client nodes
+            li Preview Java classes with server and client nodes configuration from code
+            li Preview Maven pom.xml
+            li Preview #[a(href='https://apacheignite.readme.io/docs/docker-deployment' target='_blank')
Dockerfile] for server node
+            li Download fully functional Maven project

http://git-wip-us.apache.org/repos/asf/ignite/blob/69236df3/modules/control-center-web/src/main/js/views/login.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/login.jade b/modules/control-center-web/src/main/js/views/login.jade
index 5ef5b55..9c3fe38 100644
--- a/modules/control-center-web/src/main/js/views/login.jade
+++ b/modules/control-center-web/src/main/js/views/login.jade
@@ -88,11 +88,11 @@ header#header.header
                             button#login.btn.btn-primary(ng-click='auth(action, user_info)'
ng-disabled='loginForm.$invalid') Sign In
 
                 .col-xs-12.col-md-11.home-panel
-                    p Apache Ignite Web Console is an interactive web management tool which
allows users to:
+                    p Web Console is an interactive management tool which allows to:
                     ul
-                        li Create and download various configurations for Apache Ignite
-                        li Automatically load SQL domain models from any RDBMS
-                        li Connect to Ignite cluster and run SQL analytics on it
+                        li Create and download cluster configurations
+                        li Automatically import domain model from any RDBMS
+                        li Connect to cluster and run SQL analytics on it
             .col-xs-12.col-md-6
                 #carousel.carousel.slide
                     // Indicators

http://git-wip-us.apache.org/repos/asf/ignite/blob/69236df3/modules/control-center-web/src/main/js/views/templates/getting-started.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/templates/getting-started.jade b/modules/control-center-web/src/main/js/views/templates/getting-started.jade
index a6b8beb..54185cc 100644
--- a/modules/control-center-web/src/main/js/views/templates/getting-started.jade
+++ b/modules/control-center-web/src/main/js/views/templates/getting-started.jade
@@ -18,7 +18,7 @@
     #errors-container.modal-header.header
         button.close(ng-click='close()' aria-hidden='true') &times;
         h4.modal-title {{title}}
-    .import-domain-model-wizard-page(style='margin-bottom: 310px')
+    .import-domain-model-wizard-page(style='margin-bottom: 280px')
         .col-xs-12(ng-bind-html='message')
     .modal-footer
         .checkbox


Mime
View raw message