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 2016/02/03 11:56:53 UTC
[28/50] ignite git commit: IGNITE-843 Minor.
IGNITE-843 Minor.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b0f0d4d1
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b0f0d4d1
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b0f0d4d1
Branch: refs/heads/ignite-843-rc3
Commit: b0f0d4d1b5593b66195fea2ec4cb9e9a18da01af
Parents: ecf4c43
Author: vsisko <vs...@gridgain.com>
Authored: Tue Feb 2 11:43:26 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Tue Feb 2 11:43:26 2016 +0700
----------------------------------------------------------------------
.../states/configuration/clusters/atomic.jade | 2 +-
.../configuration/clusters/deployment.jade | 2 +-
.../states/configuration/clusters/events.jade | 2 +-
.../states/configuration/clusters/general.jade | 4 +--
.../states/configuration/clusters/igfs.jade | 2 +-
.../configuration/clusters/marshaller.jade | 10 +++---
.../states/configuration/clusters/ssl.jade | 8 ++---
.../states/configuration/clusters/swap.jade | 10 +++---
.../configuration/clusters/transactions.jade | 38 ++++++++++----------
.../main/js/controllers/clusters-controller.js | 3 --
modules/control-center-web/src/main/js/db.js | 2 +-
.../js/helpers/generator/generator-common.js | 10 +++---
.../main/js/helpers/generator/generator-java.js | 2 +-
.../main/js/helpers/generator/generator-xml.js | 2 +-
.../main/js/views/configuration/summary.jade | 12 +++----
15 files changed, 54 insertions(+), 55 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/b0f0d4d1/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/atomic.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/atomic.jade b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/atomic.jade
index e2c1b81..525c79c 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/atomic.jade
+++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/atomic.jade
@@ -39,7 +39,7 @@ form.panel.panel-default(name='atomics' novalidate)
ignite-form-field-dropdown(
data-id='cacheMode'
data-name='cacheMode'
- data-options="cacheModes"
+ data-options='cacheModes'
data-ng-model='#{model}.cacheMode'
data-placeholder='PARTITIONED'
)
http://git-wip-us.apache.org/repos/asf/ignite/blob/b0f0d4d1/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/deployment.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/deployment.jade b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/deployment.jade
index 3f823f2..17ddcd9 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/deployment.jade
+++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/deployment.jade
@@ -51,7 +51,7 @@ form.panel.panel-default(name='#{form}' novalidate)
ignite-form-field-dropdown(
data-id='deploymentMode'
data-name='deploymentMode'
- data-options="deploymentModes"
+ data-options='deploymentModes'
data-ng-model='#{model}.deploymentMode'
data-placeholder='SHARED'
)
http://git-wip-us.apache.org/repos/asf/ignite/blob/b0f0d4d1/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/events.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/events.jade b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/events.jade
index 8f0527a..be891f4 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/events.jade
+++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/events.jade
@@ -36,7 +36,7 @@ form.panel.panel-default(name='events' novalidate)
ignite-form-field-dropdown(
data-id='includeEventTypes'
data-name='includeEventTypes'
- data-options="eventGroups"
+ data-options='eventGroups'
data-multiple='true'
data-ng-model='#{model}.includeEventTypes'
data-placeholder='Choose recorded event types'
http://git-wip-us.apache.org/repos/asf/ignite/blob/b0f0d4d1/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/general.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/general.jade b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/general.jade
index b80f8d6..6dbf36d 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/general.jade
+++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/general.jade
@@ -46,7 +46,7 @@ form.panel.panel-default(name='general' novalidate)
ignite-form-field-dropdown(
data-id='caches'
data-name='caches'
- data-options="caches"
+ data-options='caches'
data-multiple='true'
data-ng-model='#{model}.caches'
data-ng-disabled='!caches.length'
@@ -73,7 +73,7 @@ form.panel.panel-default(name='general' novalidate)
ignite-form-field-dropdown(
data-id='discovery'
data-name='discovery'
- data-options="discoveries"
+ data-options='discoveries'
data-ng-model='#{model}.discovery.kind'
data-placeholder='Choose marshaller'
)
http://git-wip-us.apache.org/repos/asf/ignite/blob/b0f0d4d1/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/igfs.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/igfs.jade b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/igfs.jade
index 6742146..a40c0ec 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/igfs.jade
+++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/igfs.jade
@@ -35,7 +35,7 @@ form.panel.panel-default(name='igfs' novalidate)
ignite-form-field-dropdown(
data-id='igfss'
data-name='igfss'
- data-options="igfss"
+ data-options='igfss'
data-multiple='true'
data-ng-model='#{model}.igfss'
data-ng-disabled='!igfss.length'
http://git-wip-us.apache.org/repos/asf/ignite/blob/b0f0d4d1/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/marshaller.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/marshaller.jade b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/marshaller.jade
index 1486487..3f41200 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/marshaller.jade
+++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/marshaller.jade
@@ -37,11 +37,11 @@ form.panel.panel-default(name='marshaller' novalidate)
ignite-form-field-dropdown(
data-id='kind'
data-name='kind'
- data-options="[\
- {value: 'OptimizedMarshaller', label: 'OptimizedMarshaller'},\
- {value: 'JdkMarshaller', label: 'JdkMarshaller'},\
- {value: undefined, label: 'Not set'}\
- ]"
+ data-options='[\
+ {value: "OptimizedMarshaller", label: "OptimizedMarshaller"},\
+ {value: "JdkMarshaller", label: "JdkMarshaller"},\
+ {value: undefined, label: "Not set"}\
+ ]'
data-ng-model='#{model}.kind'
data-placeholder='Choose marshaller'
)
http://git-wip-us.apache.org/repos/asf/ignite/blob/b0f0d4d1/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/ssl.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/ssl.jade b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/ssl.jade
index 15b27a9..4ae5aeb 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/ssl.jade
+++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/ssl.jade
@@ -58,7 +58,7 @@ form.panel.panel-default(name='#{form}' novalidate)
ignite-form-field-input-datalist(
data-id='keyAlgorithm'
data-name='keyAlgorithm'
- data-options="['SumX509', 'X509']"
+ data-options='["SumX509", "X509"]'
data-ng-model='#{model}.keyAlgorithm'
data-placeholder='SumX509'
data-ng-disabled='!#{enabled}'
@@ -89,7 +89,7 @@ form.panel.panel-default(name='#{form}' novalidate)
ignite-form-field-input-datalist(
data-id='keyStoreType'
data-name='keyStoreType'
- data-options="['JKS', 'PCKS11', 'PCKS12']"
+ data-options='["JKS", "PCKS11", "PCKS12"]'
data-ng-model='#{model}.keyStoreType'
data-placeholder='JKS'
data-ng-disabled='!#{enabled}'
@@ -104,7 +104,7 @@ form.panel.panel-default(name='#{form}' novalidate)
ignite-form-field-input-datalist(
data-id='protocol'
data-name='protocol'
- data-options="['TSL', 'SSL']"
+ data-options='["TSL", "SSL"]'
data-ng-model='#{model}.protocol'
data-placeholder='TSL'
data-ng-disabled='!#{enabled}'
@@ -214,7 +214,7 @@ form.panel.panel-default(name='#{form}' novalidate)
ignite-form-field-input-datalist(
data-id='trustStoreType'
data-name='trustStoreType'
- data-options="['JKS', 'PCKS11', 'PCKS12']"
+ data-options='["JKS", "PCKS11", "PCKS12"]'
data-ng-model='#{model}.trustStoreType'
data-placeholder='JKS'
data-ng-disabled='!#{enabled}'
http://git-wip-us.apache.org/repos/asf/ignite/blob/b0f0d4d1/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/swap.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/swap.jade b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/swap.jade
index 1ffc85a..83cb652 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/swap.jade
+++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/swap.jade
@@ -36,10 +36,10 @@ form.panel.panel-default(name='swapSpaceSpi' novalidate)
ignite-form-field-dropdown(
data-id='swapSpaceSpi'
data-name='swapSpaceSpi'
- data-options="[\
- {value: 'FileSwapSpaceSpi', label: 'File-based swap'},\
- {value: undefined, label: 'Not set'}\
- ]"
+ data-options='[\
+ {value: "FileSwapSpaceSpi", label: "File-based swap"},\
+ {value: undefined, label: "Not set"}\
+ ]'
data-ng-model='#{model}.kind'
data-placeholder='Choose swap SPI'
)
@@ -87,6 +87,8 @@ form.panel.panel-default(name='swapSpaceSpi' novalidate)
data-name='maximumSparsity'
data-ng-model='#{model}.FileSwapSpaceSpi.maximumSparsity'
data-placeholder='0.5'
+ data-max=0.999
+ data-min=0
)
.details-row
ignite-form-field
http://git-wip-us.apache.org/repos/asf/ignite/blob/b0f0d4d1/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/transactions.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/transactions.jade b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/transactions.jade
index d8cf463..2b55360 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/transactions.jade
+++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/transactions.jade
@@ -38,11 +38,11 @@ form.panel.panel-default(name='transactionConfiguration' novalidate)
ignite-form-field-dropdown(
data-id='defaultTxConcurrency'
data-name='defaultTxConcurrency'
- data-options="[\
- {value: 'OPTIMISTIC', label: 'OPTIMISTIC'},\
- {value: 'PESSIMISTIC', label: 'PESSIMISTIC'}\
- ]"
- data-ng-model='#{model}.defaultTxConcurrency'
+ data-options='[\
+ {value: "OPTIMISTIC", label: "OPTIMISTIC"},\
+ {value: "PESSIMISTIC", label: "PESSIMISTIC"}\
+ ]'
+ data-ng-model="#{model}.defaultTxConcurrency"
data-placeholder='PESSIMISTIC'
)
.settings-row
@@ -52,14 +52,14 @@ form.panel.panel-default(name='transactionConfiguration' novalidate)
ignite-form-field-tooltip
| Default transaction isolation
ignite-form-field-dropdown(
- data-id='transactionIsolation'
- data-name='transactionIsolation'
- data-options="[\
- {value: 'READ_COMMITTED', label: 'READ_COMMITTED'},\
- {value: 'REPEATABLE_READ', label: 'REPEATABLE_READ'},\
- {value: 'SERIALIZABLE', label: 'SERIALIZABLE'}\
- ]"
- data-ng-model='#{model}.transactionIsolation'
+ data-id='defaultTxIsolation'
+ data-name='defaultTxIsolation'
+ data-options='[\
+ {value: "READ_COMMITTED", label: "READ_COMMITTED"},\
+ {value: "REPEATABLE_READ", label: "REPEATABLE_READ"},\
+ {value: "SERIALIZABLE", label: "SERIALIZABLE"}\
+ ]'
+ data-ng-model='#{model}.defaultTxIsolation'
data-placeholder='REPEATABLE_READ'
)
.settings-row
@@ -101,13 +101,13 @@ form.panel.panel-default(name='transactionConfiguration' novalidate)
.settings-row
ignite-form-field
ignite-form-field-label
- | Manager lookup
+ | Manager factory
ignite-form-field-tooltip
- | Class name of transaction manager finder for integration for JEE app servers
- ignite-form-field-input-text(
- data-id='txManagerLookupClassName'
- data-name='txManagerLookupClassName'
- data-ng-model='#{model}.txManagerLookupClassName'
+ | Class name of transaction manager factory for integration with JEE app servers
+ ignite-form-field-java-class(
+ data-id='txManagerFactory'
+ data-name='txManagerFactory'
+ data-ng-model='#{model}.txManagerFactory'
data-placeholder='Enter fully qualified class name'
)
.col-sm-6
http://git-wip-us.apache.org/repos/asf/ignite/blob/b0f0d4d1/modules/control-center-web/src/main/js/controllers/clusters-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/clusters-controller.js b/modules/control-center-web/src/main/js/controllers/clusters-controller.js
index f3ae1e1..b224584 100644
--- a/modules/control-center-web/src/main/js/controllers/clusters-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/clusters-controller.js
@@ -42,12 +42,9 @@ consoleModule.controller('clustersController', function ($http, $timeout, $scope
$scope.ui.activePanels = [0];
$scope.ui.topPanels = [0];
- $scope.joinTip = $common.joinTip;
- $scope.getModel = $common.getModel;
$scope.compactJavaName = $common.compactJavaName;
$scope.widthIsSufficient = $common.widthIsSufficient;
$scope.saveBtnTipText = $common.saveBtnTipText;
- $scope.panelExpanded = $common.panelExpanded;
var previews = [];
http://git-wip-us.apache.org/repos/asf/ignite/blob/b0f0d4d1/modules/control-center-web/src/main/js/db.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/db.js b/modules/control-center-web/src/main/js/db.js
index c2200c7..ea859e1 100644
--- a/modules/control-center-web/src/main/js/db.js
+++ b/modules/control-center-web/src/main/js/db.js
@@ -446,7 +446,7 @@ var ClusterSchema = new Schema({
pessimisticTxLogLinger: Number,
pessimisticTxLogSize: Number,
txSerializableEnabled: Boolean,
- txManagerLookupClassName: String
+ txManagerFactory: String
},
sslEnabled: Boolean,
sslContextFactory: {
http://git-wip-us.apache.org/repos/asf/ignite/blob/b0f0d4d1/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 2464d07..bb04f13 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
@@ -380,13 +380,13 @@ $generatorCommon.SWAP_SPACE_SPI = {
$generatorCommon.TRANSACTION_CONFIGURATION = {
className: 'org.apache.ignite.configuration.TransactionConfiguration',
fields: {
- defaultTxConcurrency: {type: 'enum', enumClass: 'org.apache.ignite.transactions.TransactionConcurrency'},
- defaultTxIsolation: {type: 'enum', enumClass: 'org.apache.ignite.transactions.TransactionIsolation'},
- defaultTxTimeout: null,
- pessimisticTxLogLinger: null,
+ defaultTxConcurrency: {type: 'enum', enumClass: 'org.apache.ignite.transactions.TransactionConcurrency', dflt: 'PESSIMISTIC'},
+ defaultTxIsolation: {type: 'enum', enumClass: 'org.apache.ignite.transactions.TransactionIsolation', dflt: 'REPEATABLE_READ'},
+ defaultTxTimeout: {dflt: 0},
+ pessimisticTxLogLinger: {dflt: 10000},
pessimisticTxLogSize: null,
txSerializableEnabled: null,
- txManagerLookupClassName: null
+ txManagerFactory: {type: 'bean'}
}
};
http://git-wip-us.apache.org/repos/asf/ignite/blob/b0f0d4d1/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 9dfef12..2076b37 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
@@ -941,7 +941,7 @@ $generatorJava.clusterTransactions = function (cluster, res) {
$generatorJava.beanProperty(res, 'cfg', cluster.transactionConfiguration, 'transactionConfiguration',
'transactionConfiguration', $generatorCommon.TRANSACTION_CONFIGURATION.className,
- $generatorCommon.TRANSACTION_CONFIGURATION.fields);
+ $generatorCommon.TRANSACTION_CONFIGURATION.fields, true);
return res;
};
http://git-wip-us.apache.org/repos/asf/ignite/blob/b0f0d4d1/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 2b17099..8039e59 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
@@ -690,7 +690,7 @@ $generatorXml.clusterTransactions = function (cluster, res) {
if (!res)
res = $generatorCommon.builder();
- $generatorXml.beanProperty(res, cluster.transactionConfiguration, 'transactionConfiguration', $generatorCommon.TRANSACTION_CONFIGURATION);
+ $generatorXml.beanProperty(res, cluster.transactionConfiguration, 'transactionConfiguration', $generatorCommon.TRANSACTION_CONFIGURATION, true);
res.needEmptyLine = true;
http://git-wip-us.apache.org/repos/asf/ignite/blob/b0f0d4d1/modules/control-center-web/src/main/js/views/configuration/summary.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/configuration/summary.jade b/modules/control-center-web/src/main/js/views/configuration/summary.jade
index f67aeea..e4b461d 100644
--- a/modules/control-center-web/src/main/js/views/configuration/summary.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/summary.jade
@@ -85,12 +85,12 @@ mixin ignite-form-field-tooltip(message)
+ignite-form-field-tooltip("Cache expiration policy")
ignite-form-field-dropdown(
data-name='evictionPolicies'
- data-options="[\
- {value: 'LRU', label: 'LRU'},\
- {value: 'FIFO', label: 'FIFO'},\
- {value: 'SORTED', label: 'Sorted'},\
- {value: undefined, label: 'Not set'}\
- ]"
+ data-options='[\
+ {value: "LRU", label: "LRU"},\
+ {value: "FIFO", label: "FIFO"},\
+ {value: "SORTED", label: "Sorted"},\
+ {value: undefined, label: "Not set"}\
+ ]'
data-ng-model='#{nearCfg}.nearEvictionPolicy.kind'
)
span(ng-if='#{nearCfg}.nearEvictionPolicy.kind')