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/07/03 10:48:43 UTC
[1/3] incubator-ignite git commit: IGNITE-843 Fixed text on summary
page.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-843 25c4f24f1 -> d38e5de68
IGNITE-843 Fixed text on summary page.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/841538b9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/841538b9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/841538b9
Branch: refs/heads/ignite-843
Commit: 841538b98da15a5ae14e497e321ac5215f3a9dc8
Parents: 25c4f24
Author: AKuznetsov <ak...@gridgain.com>
Authored: Fri Jul 3 15:42:51 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Fri Jul 3 15:42:51 2015 +0700
----------------------------------------------------------------------
.../web-control-center/nodejs/views/summary.jade | 17 +++++------------
1 file changed, 5 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/841538b9/modules/web-control-center/nodejs/views/summary.jade
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/views/summary.jade b/modules/web-control-center/nodejs/views/summary.jade
index b8706e7..0a31374 100644
--- a/modules/web-control-center/nodejs/views/summary.jade
+++ b/modules/web-control-center/nodejs/views/summary.jade
@@ -61,35 +61,28 @@ block content
a(href, ng-click='cfgLang = "docker"')
img(src='images/docker.png', width='16px' height='16px')
| Dockerfile
-
-
.settings-row
#xmlResult(ng-show="cfgLang == 'xml'")
button.btn.btn-primary.pull-right(style='margin-right: 0px;margin-top: -45px' ng-click='download(xmlData, selectedItem.name + ".xml")') Download
-
#xmlResultDiv
#javaResult(ng-show="cfgLang == 'java'")
.col-sm-1
label Generate:
.col-sm-3
button.form-control(ng-model='generateJavaClass' bs-select data-placeholder='{{detail.placeholder}}' bs-options='item.value as item.label for item in generateJavaItems')
-
button.btn.btn-primary.pull-right(style='margin-right: 0px;margin-top: -40px' ng-click='downloadJava()') Download
-
#javaResultDiv
#dockerResult(ng-show="cfgLang == 'docker'")
button.btn.btn-primary.pull-right(style='margin-right: 0px;margin-top: -40px' ng-click='downloadDocker()') Download
-
p
- a(href='https://docs.docker.com/reference/builder') Dockerfile
- |  is a text file with instructions to create Docker image. To build image you have to
- | store following Docker file with your xml ignite configurations to the same directory.
-
+ a(href='https://docs.docker.com/reference/builder') Docker
+ | file is a text file with instructions to create Docker image.<br/>
+ | To build image you have to store following Docker file with your Ignite XML configuration to the same directory.<br>
+ | Also you could use predefined
+ a(href='https://ignite.incubator.apache.org/download.html#docker') Apache Ignite docker image.
.col-sm-2
label(for='os') Operation System:
.col-sm-4
input#os.form-control(type='text', ng-model='dockerArg.os' placeholder='debian:8' data-min-length="0" data-html="1" data-auto-select="true" data-animation="am-flip-x" bs-typeahead bs-options='os for os in oss')
-
.settings-row#dockerResultDiv(style='margin-top: 15px')
-
div(ng-show='generateError') {{generateError}}
[2/3] incubator-ignite git commit: IGNITE-843 Changed text in footer.
Posted by ak...@apache.org.
IGNITE-843 Changed text in footer.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6ecfc5e5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6ecfc5e5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6ecfc5e5
Branch: refs/heads/ignite-843
Commit: 6ecfc5e55ffd28e9e19664bbd42440e6f4df7b91
Parents: 841538b
Author: AKuznetsov <ak...@gridgain.com>
Authored: Fri Jul 3 15:43:08 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Fri Jul 3 15:43:08 2015 +0700
----------------------------------------------------------------------
modules/web-control-center/nodejs/views/includes/footer.jade | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6ecfc5e5/modules/web-control-center/nodejs/views/includes/footer.jade
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/views/includes/footer.jade b/modules/web-control-center/nodejs/views/includes/footer.jade
index 3cc0f86..73005bb 100644
--- a/modules/web-control-center/nodejs/views/includes/footer.jade
+++ b/modules/web-control-center/nodejs/views/includes/footer.jade
@@ -17,7 +17,4 @@
.container.container-footer
footer
center
- p
- | Powered by
- a(href='http://ignite.incubator.apache.org') Apache Ignite
- | , version 1.1.0
\ No newline at end of file
+ p Apache Ignite Control Center, version 1.0.0
\ No newline at end of file
[3/3] incubator-ignite git commit: IGNITE-843 Regrouped properties.
Posted by ak...@apache.org.
IGNITE-843 Regrouped properties.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d38e5de6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d38e5de6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d38e5de6
Branch: refs/heads/ignite-843
Commit: d38e5de685a837450537b731edaad726fd024003
Parents: 6ecfc5e
Author: AKuznetsov <ak...@gridgain.com>
Authored: Fri Jul 3 15:48:38 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Fri Jul 3 15:48:38 2015 +0700
----------------------------------------------------------------------
.../nodejs/public/form-models/caches.json | 131 +++++++++++--------
.../public/javascripts/controllers/caches.js | 2 +-
2 files changed, 76 insertions(+), 57 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d38e5de6/modules/web-control-center/nodejs/public/form-models/caches.json
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/public/form-models/caches.json b/modules/web-control-center/nodejs/public/form-models/caches.json
index a1d1989..f401006 100644
--- a/modules/web-control-center/nodejs/public/form-models/caches.json
+++ b/modules/web-control-center/nodejs/public/form-models/caches.json
@@ -44,12 +44,38 @@
"tip": [
"Number of nodes used to back up single partition for partitioned cache."
]
+ },
+ {
+ "label": "Read from backup",
+ "type": "check",
+ "model": "readFromBackup",
+ "tip": [
+ "Flag indicating whether data can be read from backup.",
+ "If not set then always get data from primary node (never from backup)."
+ ]
}
],
"advanced": [
{
+ "label": "Async back pressure control",
+ "fields": [
+ {
+ "label": "Max async concurrency",
+ "type": "number",
+ "model": "maxConcurrentAsyncOperations",
+ "placeholder": "500",
+ "tip": [
+ "Maximum number of allowed concurrent asynchronous operations.",
+ "If 0 then number of concurrent asynchronous operations is unlimited."
+ ]
+ }
+ ]
+ },
+ {
"label": "Memory",
- "tip": ["Cache memory settings."],
+ "tip": [
+ "Cache memory settings."
+ ],
"fields": [
{
"label": "Mode",
@@ -218,12 +244,23 @@
"tip": [
"Flag indicating whether swap storage is enabled or not for this cache."
]
+ },
+ {
+ "label": "Copy on read",
+ "type": "check",
+ "model": "copyOnRead",
+ "tip": [
+ "Flag indicating whether copy of of the value stored in cache should be created for cache operation implying return value.",
+ "Also if this flag is set copies are created for values passed to CacheInterceptor and to CacheEntryProcessor."
+ ]
}
]
},
{
"label": "Near cache",
- "tip": ["Near cache settings."],
+ "tip": [
+ "Near cache settings."
+ ],
"fields": [
{
"label": "Start size",
@@ -363,7 +400,9 @@
},
{
"label": "Query",
- "tip": ["Cache query settings."],
+ "tip": [
+ "Cache query settings."
+ ],
"fields": [
{
"label": "Escape all",
@@ -414,7 +453,9 @@
},
{
"label": "Rebalance",
- "tip": ["Cache rebalance settings."],
+ "tip": [
+ "Cache rebalance settings."
+ ],
"fields": [
{
"label": "Mode",
@@ -490,8 +531,31 @@
]
},
{
+ "label": "Statistics",
+ "fields": [
+ {
+ "label": "Statistics enabled",
+ "type": "check",
+ "model": "statisticsEnabled",
+ "tip": [
+ "Flag indicating whether statistics gathering is enabled on a cache."
+ ]
+ },
+ {
+ "label": "Management enabled",
+ "type": "check",
+ "model": "managementEnabled",
+ "tip": [
+ "Flag indicating whether management is enabled on this cache."
+ ]
+ }
+ ]
+ },
+ {
"label": "Store",
- "tip": ["Cache store settings."],
+ "tip": [
+ "Cache store settings."
+ ],
"fields": [
{
"label": "Store factory",
@@ -668,7 +732,9 @@
},
{
"label": "Transaction",
- "tip": ["Cache transactions settings."],
+ "tip": [
+ "Cache transactions settings."
+ ],
"fields": [
{
"label": "Invalidate",
@@ -701,7 +767,9 @@
},
{
"label": "Write behind",
- "tip": ["Cache write behind settings."],
+ "tip": [
+ "Cache write behind settings."
+ ],
"fields": [
{
"label": "Enabled",
@@ -750,55 +818,6 @@
]
}
]
- },
- {
- "label": "Misc",
- "fields": [
- {
- "label": "Statistics enabled",
- "type": "check",
- "model": "statisticsEnabled",
- "tip": [
- "Flag indicating whether statistics gathering is enabled on a cache."
- ]
- },
- {
- "label": "Management enabled",
- "type": "check",
- "model": "managementEnabled",
- "tip": [
- "Flag indicating whether management is enabled on this cache."
- ]
- },
- {
- "label": "Read from backup",
- "type": "check",
- "model": "readFromBackup",
- "tip": [
- "Flag indicating whether data can be read from backup.",
- "If not set then always get data from primary node (never from backup)."
- ]
- },
- {
- "label": "Copy on read",
- "type": "check",
- "model": "copyOnRead",
- "tip": [
- "Flag indicating whether copy of of the value stored in cache should be created for cache operation implying return value.",
- "Also if this flag is set copies are created for values passed to CacheInterceptor and to CacheEntryProcessor."
- ]
- },
- {
- "label": "Max async concurrency",
- "type": "number",
- "model": "maxConcurrentAsyncOperations",
- "placeholder": "500",
- "tip": [
- "Maximum number of allowed concurrent asynchronous operations.",
- "If 0 then number of concurrent asynchronous operations is unlimited."
- ]
- }
- ]
}
]
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d38e5de6/modules/web-control-center/nodejs/public/javascripts/controllers/caches.js
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/public/javascripts/controllers/caches.js b/modules/web-control-center/nodejs/public/javascripts/controllers/caches.js
index 006f065..45c4f9a 100644
--- a/modules/web-control-center/nodejs/public/javascripts/controllers/caches.js
+++ b/modules/web-control-center/nodejs/public/javascripts/controllers/caches.js
@@ -43,7 +43,7 @@ configuratorModule.controller('cachesController', ['$scope', '$alert', '$http',
];
$scope.evictionPolicies = [
- {value: 'LRU', label: 'Least Recently Used'},
+ {value: 'LRU', label: 'LRU'},
{value: 'RND', label: 'Random'},
{value: 'FIFO', label: 'FIFO'},
{value: 'SORTED', label: 'Sorted'},