You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by an...@apache.org on 2015/06/16 06:16:21 UTC
incubator-ignite git commit: # ignite-843 Cleanup. Update caches.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-843 7373fe518 -> c1c348ca6
# ignite-843 Cleanup. Update caches.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c1c348ca
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c1c348ca
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c1c348ca
Branch: refs/heads/ignite-843
Commit: c1c348ca6dcc82964e92910564075edeb8c554f3
Parents: 7373fe5
Author: Andrey <an...@gridgain.com>
Authored: Tue Jun 16 11:16:14 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Tue Jun 16 11:16:14 2015 +0700
----------------------------------------------------------------------
.../nodejs/public/form-models/caches.json | 8 +--
.../nodejs/public/form-models/clusters.json | 10 ++--
.../public/javascripts/controllers/caches.js | 26 +++++-----
.../public/javascripts/controllers/clusters.js | 54 ++++++++++----------
modules/webconfig/nodejs/views/caches.jade | 38 +++++++++-----
modules/webconfig/nodejs/views/clusters.jade | 8 +--
6 files changed, 77 insertions(+), 67 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1c348ca/modules/webconfig/nodejs/public/form-models/caches.json
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/public/form-models/caches.json b/modules/webconfig/nodejs/public/form-models/caches.json
index 19e7403..ac1a1c7 100644
--- a/modules/webconfig/nodejs/public/form-models/caches.json
+++ b/modules/webconfig/nodejs/public/form-models/caches.json
@@ -11,7 +11,7 @@
"label": "Mode",
"type": "dropdown",
"model": "mode",
- "placeholder": "Choose mode",
+ "placeholder": "PARTITIONED",
"items": "modes",
"tip": [
"Cache modes:",
@@ -24,7 +24,7 @@
"label": "Atomicity",
"type": "dropdown",
"model": "atomicityMode",
- "placeholder": "Choose atomicity",
+ "placeholder": "ATOMIC",
"items": "atomicities",
"tip": [
"Atomicity:",
@@ -50,7 +50,7 @@
"label": "Mode",
"type": "dropdown",
"model": "memoryMode",
- "placeholder": "Choose mode",
+ "placeholder": "ONHEAP_TIERED",
"items": "memoryModes",
"tip": [
"Memory modes:",
@@ -143,7 +143,7 @@
"label": "Mode",
"type": "dropdown",
"model": "rebalanceMode",
- "placeholder": "Choose mode",
+ "placeholder": "ASYNC",
"items": "rebalanceModes",
"tip": [
"Rebalance modes:",
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1c348ca/modules/webconfig/nodejs/public/form-models/clusters.json
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/public/form-models/clusters.json b/modules/webconfig/nodejs/public/form-models/clusters.json
index 019e260..3dcee93 100644
--- a/modules/webconfig/nodejs/public/form-models/clusters.json
+++ b/modules/webconfig/nodejs/public/form-models/clusters.json
@@ -236,7 +236,7 @@
"label": "Cache mode",
"type": "dropdown",
"model": "cacheMode",
- "placeholder": "partitioned",
+ "placeholder": "PARTITIONED",
"items": "cacheModes",
"tip": [
"Cache modes:",
@@ -326,7 +326,7 @@
"label": "Mode",
"type": "dropdown",
"model": "deploymentMode",
- "placeholder": "shared",
+ "placeholder": "SHARED",
"items": "deploymentModes",
"tip": [
"Task classes and resources sharing mode."
@@ -556,7 +556,7 @@
"label": "Cache concurrency",
"type": "dropdown",
"model": "defaultTxConcurrency",
- "placeholder": "pessimistic",
+ "placeholder": "PESSIMISTIC",
"items": "transactionConcurrency",
"tip": [
"Cache transaction concurrency to use when one is not explicitly specified."
@@ -566,7 +566,7 @@
"label": "Isolation",
"type": "dropdown",
"model": "transactionIsolation",
- "placeholder": "repeatable_read",
+ "placeholder": "REPEATABLE_READ",
"items": "transactionIsolation",
"tip": [
"Default transaction isolation."
@@ -617,7 +617,7 @@
"label": "Policy",
"type": "dropdown",
"model": "segmentationPolicy",
- "placeholder": "stop",
+ "placeholder": "STOP",
"items": "segmentationPolicy"
},
{
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1c348ca/modules/webconfig/nodejs/public/javascripts/controllers/caches.js
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/public/javascripts/controllers/caches.js b/modules/webconfig/nodejs/public/javascripts/controllers/caches.js
index a4d1578..782ef7a 100644
--- a/modules/webconfig/nodejs/public/javascripts/controllers/caches.js
+++ b/modules/webconfig/nodejs/public/javascripts/controllers/caches.js
@@ -17,25 +17,25 @@
configuratorModule.controller('cachesController', ['$scope', '$modal', '$http', function ($scope, $modal, $http) {
$scope.templates = [
- {value: {mode: 'PARTITIONED', atomicityMode: 'ATOMIC'}, label: 'Partitioned'},
- {value: {mode: 'REPLICATED', atomicityMode: 'ATOMIC'}, label: 'Replicated'},
- {value: {mode: 'LOCAL', atomicityMode: 'ATOMIC'}, label: 'Local'}
+ {value: {mode: 'PARTITIONED', atomicityMode: 'ATOMIC'}, label: 'partitioned'},
+ {value: {mode: 'REPLICATED', atomicityMode: 'ATOMIC'}, label: 'replicated'},
+ {value: {mode: 'LOCAL', atomicityMode: 'ATOMIC'}, label: 'local'}
];
$scope.atomicities = [
- {value: 'ATOMIC', label: 'Atomic'},
- {value: 'TRANSACTIONAL', label: 'Transactional'}
+ {value: 'ATOMIC', label: 'ATOMIC'},
+ {value: 'TRANSACTIONAL', label: 'TRANSACTIONAL'}
];
$scope.modes = [
- {value: 'PARTITIONED', label: 'Partitioned'},
- {value: 'REPLICATED', label: 'Replicated'},
- {value: 'LOCAL', label: 'Local'}
+ {value: 'PARTITIONED', label: 'PARTITIONED'},
+ {value: 'REPLICATED', label: 'REPLICATED'},
+ {value: 'LOCAL', label: 'LOCAL'}
];
$scope.atomicWriteOrderModes = [
- {value: 'CLOCK', label: 'Clock'},
- {value: 'PRIMARY', label: 'Primary'}
+ {value: 'CLOCK', label: 'CLOCK'},
+ {value: 'PRIMARY', label: 'PRIMARY'}
];
$scope.memoryModes = [
@@ -52,9 +52,9 @@ configuratorModule.controller('cachesController', ['$scope', '$modal', '$http',
];
$scope.rebalanceModes = [
- {value: 'SYNC', label: 'Synchronous'},
- {value: 'ASYNC', label: 'Asynchronous'},
- {value: 'NONE', label: 'None'}
+ {value: 'SYNC', label: 'SYNC'},
+ {value: 'ASYNC', label: 'ASYNC'},
+ {value: 'NONE', label: 'NONE'}
];
$scope.general = [];
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1c348ca/modules/webconfig/nodejs/public/javascripts/controllers/clusters.js
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/public/javascripts/controllers/clusters.js b/modules/webconfig/nodejs/public/javascripts/controllers/clusters.js
index 6dbac73..8c7f0c0 100644
--- a/modules/webconfig/nodejs/public/javascripts/controllers/clusters.js
+++ b/modules/webconfig/nodejs/public/javascripts/controllers/clusters.js
@@ -33,48 +33,48 @@ configuratorModule.controller('clustersController', ['$scope', '$modal', '$http'
];
$scope.events = [
- {value: 'EVTS_CHECKPOINT', label: 'evts_checkpoint'},
- {value: 'EVTS_DEPLOYMENT', label: 'evts_deployment'},
- {value: 'EVTS_ERROR', label: 'evts_error'},
- {value: 'EVTS_DISCOVERY', label: 'evts_discovery'},
- {value: 'EVTS_JOB_EXECUTION', label: 'evts_job_execution'},
- {value: 'EVTS_TASK_EXECUTION', label: 'evts_task_execution'},
- {value: 'EVTS_CACHE', label: 'evts_cache'},
- {value: 'EVTS_CACHE_REBALANCE', label: 'evts_cache_rebalance'},
- {value: 'EVTS_CACHE_LIFECYCLE', label: 'evts_cache_lifecycle'},
- {value: 'EVTS_CACHE_QUERY', label: 'evts_cache_query'},
- {value: 'EVTS_SWAPSPACE', label: 'evts_swapspace'},
- {value: 'EVTS_IGFS', label: 'evts_igfs'}
+ {value: 'EVTS_CHECKPOINT', label: 'EVTS_CHECKPOINT'},
+ {value: 'EVTS_DEPLOYMENT', label: 'EVTS_DEPLOYMENT'},
+ {value: 'EVTS_ERROR', label: 'EVTS_ERROR'},
+ {value: 'EVTS_DISCOVERY', label: 'EVTS_DISCOVERY'},
+ {value: 'EVTS_JOB_EXECUTION', label: 'EVTS_JOB_EXECUTION'},
+ {value: 'EVTS_TASK_EXECUTION', label: 'EVTS_TASK_EXECUTION'},
+ {value: 'EVTS_CACHE', label: 'EVTS_CACHE'},
+ {value: 'EVTS_CACHE_REBALANCE', label: 'EVTS_CACHE_REBALANCE'},
+ {value: 'EVTS_CACHE_LIFECYCLE', label: 'EVTS_CACHE_LIFECYCLE'},
+ {value: 'EVTS_CACHE_QUERY', label: 'EVTS_CACHE_QUERY'},
+ {value: 'EVTS_SWAPSPACE', label: 'EVTS_SWAPSPACE'},
+ {value: 'EVTS_IGFS', label: 'EVTS_IGFS'}
];
$scope.cacheModes = [
- {value: 'LOCAL', label: 'local'},
- {value: 'REPLICATED', label: 'replicated'},
- {value: 'PARTITIONED', label: 'partitioned'}
+ {value: 'LOCAL', label: 'LOCAL'},
+ {value: 'REPLICATED', label: 'REPLICATED'},
+ {value: 'PARTITIONED', label: 'PARTITIONED'}
];
$scope.deploymentModes = [
- {value: 'PRIVATE', label: 'private'},
- {value: 'ISOLATED', label: 'isolated'},
- {value: 'SHARED', label: 'shared'},
- {value: 'CONTINUOUS', label: 'continuous'}
+ {value: 'PRIVATE', label: 'PRIVATE'},
+ {value: 'ISOLATED', label: 'ISOLATED'},
+ {value: 'SHARED', label: 'SHARED'},
+ {value: 'CONTINUOUS', label: 'CONTINUOUS'}
];
$scope.transactionConcurrency = [
- {value: 'OPTIMISTIC', label: 'optimistic'},
- {value: 'PESSIMISTIC', label: 'pessimistic'}
+ {value: 'OPTIMISTIC', label: 'OPTIMISTIC'},
+ {value: 'PESSIMISTIC', label: 'PESSIMISTIC'}
];
$scope.transactionIsolation = [
- {value: 'READ_COMMITTED', label: 'read_committed'},
- {value: 'REPEATABLE_READ', label: 'repeatable_read'},
- {value: 'SERIALIZABLE', label: 'serializable'}
+ {value: 'READ_COMMITTED', label: 'READ_COMMITTED'},
+ {value: 'REPEATABLE_READ', label: 'REPEATABLE_READ'},
+ {value: 'SERIALIZABLE', label: 'SERIALIZABLE'}
];
$scope.segmentationPolicy = [
- {value: 'RESTART_JVM', label: 'restart_jvm'},
- {value: 'STOP', label: 'stop'},
- {value: 'NOOP', label: 'noop'}
+ {value: 'RESTART_JVM', label: 'RESTART_JVM'},
+ {value: 'STOP', label: 'STOP'},
+ {value: 'NOOP', label: 'NOOP'}
];
$scope.clusters = [];
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1c348ca/modules/webconfig/nodejs/views/caches.jade
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/views/caches.jade b/modules/webconfig/nodejs/views/caches.jade
index de17b897..86f34be 100644
--- a/modules/webconfig/nodejs/views/caches.jade
+++ b/modules/webconfig/nodejs/views/caches.jade
@@ -36,20 +36,30 @@ block content
button(ng-click='createItem()' class=['btn', 'btn-primary'] ng-disabled='!create.template')  Add cache
span(style='margin-left: 15px; margin-right: 5px') Use template: 
button.btn.btn-default(ng-init='create.template = templates[0].value' ng-model='create.template' data-template='/select' data-placeholder='Choose cache template' bs-options='item.value as item.label for item in templates' bs-select)
- .row.col-sm-12
- hr
+ hr
form.form-horizontal(name='cachesForm' ng-if='backupItem')
- h3 General
- .settings-row(ng-repeat='field in general')
- +form-row
- .panel(bs-collapse data-start-collapsed='true')
+ div(bs-collapse data-start-collapsed='false')
+ .panel.panel-default
+ .panel-heading
+ h3
+ a(bs-collapse-toggle) General
+ .panel-collapse(bs-collapse-target)
+ .panel-body
+ .settings-row(ng-repeat='field in general')
+ +form-row
+ div(bs-collapse data-start-collapsed='true')
.panel-collapse(bs-collapse-target)
- div(ng-repeat='group in advanced')
- h3 {{group.label}}
- .settings-row(ng-repeat='field in group.fields')
- +form-row
- .panel-heading
- .panel-title
+ .span(bs-collapse data-start-collapsed='true' data-allow-multiple='true')
+ .panel.panel-default(ng-repeat='group in advanced')
+ .panel-heading
+ h3
+ a(bs-collapse-toggle) {{group.label}}
+ .panel-collapse(bs-collapse-target)
+ .panel-body
+ .settings-row(ng-repeat='field in group.fields')
+ +form-row
+ .panel-title
+ h3
a(bs-collapse-toggle ng-init='expanded=false; lbl="Show advanced settings..."' ng-click='expanded = !expanded; lbl=expanded ? "Hide advanced settings... " : "Show advanced settings..."') {{lbl}}
- button.btn.btn-primary(ng-click='saveItem()' ng-disabled='cachesForm.$invalid') Save
- button.btn.btn-primary(ng-click='removeItem()' ng-show='backupItem._id') Remove
+ button.btn.btn-primary(ng-disabled='cachesForm.$invalid' ng-click='saveItem()') Save
+ button.btn.btn-primary(ng-show='backupItem._id' ng-click='removeItem()') Remove
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1c348ca/modules/webconfig/nodejs/views/clusters.jade
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/views/clusters.jade b/modules/webconfig/nodejs/views/clusters.jade
index 1ee92ea..733f551 100644
--- a/modules/webconfig/nodejs/views/clusters.jade
+++ b/modules/webconfig/nodejs/views/clusters.jade
@@ -38,7 +38,7 @@ block content
button.btn.btn-default(ng-init='create.template = templates[0].value' ng-model='create.template' data-template='/select' data-placeholder='Choose cluster template' bs-options='item.value as item.label for item in templates' bs-select)
hr
form.form-horizontal(name='clustersForm' ng-if='backupItem')
- div(data-start-collapsed='false' bs-collapse)
+ div(bs-collapse data-start-collapsed='false')
.panel.panel-default
.panel-heading
h3
@@ -49,7 +49,7 @@ block content
+form-row
div(bs-collapse data-start-collapsed='true')
.panel-collapse(bs-collapse-target)
- .span(data-allow-multiple='true' aria-multiselectable='true' role='tablist' bs-collapse)
+ .span(bs-collapse data-start-collapsed='true' data-allow-multiple='true')
.panel.panel-default(ng-repeat='group in advanced')
.panel-heading
h3
@@ -61,5 +61,5 @@ block content
.panel-title
h3
a(bs-collapse-toggle ng-init='expanded=false; lbl="Show advanced settings..."' ng-click='expanded = !expanded; lbl=expanded ? "Hide advanced settings... " : "Show advanced settings..."') {{lbl}}
- button.btn.btn-primary(ng-click='saveItem()' ng-disabled='clustersForm.$invalid') Save
- button.btn.btn-primary(ng-click='removeItem()' ng-show='backupItem._id') Remove
\ No newline at end of file
+ button.btn.btn-primary(ng-disabled='clustersForm.$invalid' ng-click='saveItem()') Save
+ button.btn.btn-primary(ng-show='backupItem._id' ng-click='removeItem()') Remove
\ No newline at end of file