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 2016/02/08 04:51:50 UTC
[1/3] ignite git commit: IGNITE-843 getting started.
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc2 721a11654 -> 63f677887
IGNITE-843 getting started.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f29c2fd2
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f29c2fd2
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f29c2fd2
Branch: refs/heads/ignite-843-rc2
Commit: f29c2fd29419098041ff21ba58547f253c87c9fa
Parents: 9073514
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Mon Feb 8 10:50:56 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Mon Feb 8 10:50:56 2016 +0700
----------------------------------------------------------------------
.../src/main/js/app/data/getting-started.json | 39 +++++++-------------
.../src/main/js/public/stylesheets/style.scss | 8 ++++
.../js/views/templates/getting-started.jade | 2 +-
3 files changed, 23 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/f29c2fd2/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 71c152d..7bc8a0e 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
@@ -1,15 +1,8 @@
[
{
- "title": "What is Apache Ignite",
+ "title": "With Apache Ignite Web Console You Can",
"message": [
- "<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%' ng-click='console.log(\"click\")' />"
- ]
- },
- {
- "title": "What is Apache Ignite Web Console",
- "message": [
- "<p>You will be able to<p>",
+ "<img src='/images/ignite-puzzle.png' width='100%' />",
"<ul>",
"<li>Generate cluster configuration</li>",
"<li>Import domain model from database</li>",
@@ -42,10 +35,8 @@
"</div>",
"<div class='col-xs-5'>",
"<ul>",
- "<li>Import domain model from database</li>",
- "<li>Try it in <span class='getting-started-demo'>Demo</span> mode</li>",
- "<li>Associate domain model with caches</li>",
- "<li>Configure SQL queries</li>",
+ "<li>Import database schemas</li>",
+ "<li>Try in <span class='getting-started-demo'>Demo</span> mode</li>",
"</ul>",
"</div>"
]
@@ -58,10 +49,8 @@
"</div>",
"<div class='col-xs-5'>",
"<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>Configure memory settings</li>",
+ "<li>Configure persistence</li>",
"</ul>",
"</div>"
]
@@ -88,11 +77,11 @@
"</div>",
"<div class='col-xs-5'>",
"<ul>",
- "<li>Preview cluster XML configuration</li>",
- "<li>Preview generated Java code</li>",
+ "<li>Preview XML Configuration</li>",
+ "<li>Preview code configuration</li>",
"<li>Preview Docker file</li>",
- "<li>Preview pom.xml</li>",
- "<li>Download ZIP with fully functional project</li>",
+ "<li>Preview POM dependencies</li>",
+ "<li>Download ready-to-use project</li>",
"</ul>",
"</div>"
]
@@ -105,10 +94,10 @@
"</div>",
"<div class='col-xs-5'>",
"<ul>",
- "<li>Execute SQL queries</li>",
- "<li>View execution plan</li>",
- "<li>View data in tabular format and charts</li>",
- "<li>View streaming charts</li>",
+ "<li>Execute SQL Queries</li>",
+ "<li>View Execution Paln</li>",
+ "<li>View In-Memory Schema</li>",
+ "<li>View Streaming Charts</li>",
"</ul>",
"</div>"
]
http://git-wip-us.apache.org/repos/asf/ignite/blob/f29c2fd2/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 a1c4347..e8b5a77 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
@@ -1811,6 +1811,14 @@ treecontrol.tree-classic {
background-image: none;
}
+.getting-started {
+ margin: 15px 15px 300px;
+
+ ul {
+ padding-left: 20px;
+ }
+}
+
.getting-started-demo {
color: $brand-info;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f29c2fd2/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 54185cc..b6a4392 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') ×
h4.modal-title {{title}}
- .import-domain-model-wizard-page(style='margin-bottom: 280px')
+ .getting-started
.col-xs-12(ng-bind-html='message')
.modal-footer
.checkbox
[2/3] ignite git commit: IGNITE-843 Caches min values.
Posted by ak...@apache.org.
IGNITE-843 Caches min values.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/57b82a1d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/57b82a1d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/57b82a1d
Branch: refs/heads/ignite-843-rc2
Commit: 57b82a1dfc780b22af6670e24416a017496301fd
Parents: f29c2fd
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Mon Feb 8 10:51:22 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Mon Feb 8 10:51:22 2016 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/caches-controller.js | 4 ++++
.../src/main/js/controllers/models/caches.json | 3 +++
2 files changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/57b82a1d/modules/control-center-web/src/main/js/controllers/caches-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/caches-controller.js b/modules/control-center-web/src/main/js/controllers/caches-controller.js
index 4ad6f77..7b8055a 100644
--- a/modules/control-center-web/src/main/js/controllers/caches-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/caches-controller.js
@@ -572,6 +572,10 @@ consoleModule.controller('cachesController', [
}
}
+ if (item.writeBehindFlushSize === 0 && item.writeBehindFlushFrequency === 0)
+ return showPopoverMessage($scope.ui, 'store', 'writeBehindFlushSize',
+ 'Both \'Flush frequency\' and \'Flush size\' are not allowed as 0');
+
if (item.cacheMode !== 'LOCAL' && item.rebalanceMode !== 'NONE' && item.rebalanceBatchSize === 0)
return showPopoverMessage($scope.ui, 'rebalance', 'rebalanceBatchSize',
'Batch size should be more than 0 for not "NONE" rebalance mode', 10000);
http://git-wip-us.apache.org/repos/asf/ignite/blob/57b82a1d/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 9c9ef73..1853cf2 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
@@ -335,6 +335,7 @@
"type": "number",
"model": "sqlOnheapRowCacheSize",
"placeholder": 10240,
+ "min": 1,
"tip": [
"Number of SQL rows which will be cached onheap to avoid deserialization on each SQL index access"
]
@@ -690,6 +691,7 @@
"model": "writeBehindBatchSize",
"disabled": "!backupItem.writeBehindEnabled",
"placeholder": 512,
+ "min": 1,
"tip": [
"Maximum batch size for write-behind cache store operations",
"Store operations (get or remove) are combined in a batch of this size to be passed to cache store"
@@ -725,6 +727,7 @@
"model": "writeBehindFlushThreadCount",
"disabled": "!backupItem.writeBehindEnabled",
"placeholder": 1,
+ "min": 1,
"tip": [
"Number of threads that will perform cache flushing"
]
[3/3] ignite git commit: Merge remote-tracking branch
'origin/ignite-843-rc2' into ignite-843-rc2
Posted by ak...@apache.org.
Merge remote-tracking branch 'origin/ignite-843-rc2' into ignite-843-rc2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/63f67788
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/63f67788
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/63f67788
Branch: refs/heads/ignite-843-rc2
Commit: 63f6778879f0b1f4b4f400e993e8818806fbc6a2
Parents: 57b82a1 721a116
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Mon Feb 8 10:51:54 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Mon Feb 8 10:51:54 2016 +0700
----------------------------------------------------------------------
.../src/main/js/agents/agent-manager.js | 351 ------------
.../src/main/js/agents/agent-server.js | 64 ---
modules/control-center-web/src/main/js/app.js | 164 ------
.../src/main/js/config/default.json | 26 -
modules/control-center-web/src/main/js/db.js | 534 ------------------
.../src/main/js/helpers/configuration-loader.js | 75 ---
.../src/main/js/keys/test.crt | 13 -
.../src/main/js/keys/test.key | 18 -
.../src/main/js/routes/admin.js | 119 ----
.../src/main/js/routes/agent.js | 298 ----------
.../src/main/js/routes/caches.js | 182 ------
.../src/main/js/routes/clusters.js | 167 ------
.../src/main/js/routes/domains.js | 277 ----------
.../src/main/js/routes/igfs.js | 143 -----
.../src/main/js/routes/notebooks.js | 151 -----
.../src/main/js/routes/profile.js | 85 ---
.../src/main/js/routes/public.js | 231 --------
modules/control-center-web/src/main/js/serve.js | 164 +++---
.../src/main/js/serve/agent.js | 380 +++++++++++++
.../control-center-web/src/main/js/serve/app.js | 33 ++
.../src/main/js/serve/config/default.json | 26 +
.../src/main/js/serve/configure.js | 67 +++
.../src/main/js/serve/keys/test.crt | 13 +
.../src/main/js/serve/keys/test.key | 18 +
.../src/main/js/serve/mongo.js | 551 +++++++++++++++++++
.../src/main/js/serve/routes/admin.js | 126 +++++
.../src/main/js/serve/routes/agent.js | 331 +++++++++++
.../src/main/js/serve/routes/caches.js | 196 +++++++
.../src/main/js/serve/routes/clusters.js | 181 ++++++
.../src/main/js/serve/routes/domains.js | 285 ++++++++++
.../src/main/js/serve/routes/igfs.js | 154 ++++++
.../src/main/js/serve/routes/notebooks.js | 159 ++++++
.../src/main/js/serve/routes/profile.js | 93 ++++
.../src/main/js/serve/routes/public.js | 250 +++++++++
.../src/main/js/serve/routes/routes.js | 106 ++++
.../src/main/js/serve/settings.js | 78 +++
36 files changed, 3122 insertions(+), 2987 deletions(-)
----------------------------------------------------------------------