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/12/30 10:24:27 UTC
[2/2] ignite git commit: IGNITE-843 Minor fixes.
IGNITE-843 Minor fixes.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/783ca521
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/783ca521
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/783ca521
Branch: refs/heads/ignite-843-rc2
Commit: 783ca5215f15f94d15d5af700b45f425adf01bfc
Parents: aa3d330
Author: vsisko <vs...@gridgain.com>
Authored: Wed Dec 30 16:24:18 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Wed Dec 30 16:24:18 2015 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/models/clusters.json | 2 +-
modules/control-center-web/src/main/js/db.js | 2 +-
.../main/js/helpers/generator/generator-common.js | 5 +----
.../src/main/js/helpers/generator/generator-java.js | 15 ++++++---------
.../src/main/js/helpers/generator/generator-xml.js | 2 +-
5 files changed, 10 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/783ca521/modules/control-center-web/src/main/js/controllers/models/clusters.json
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/models/clusters.json b/modules/control-center-web/src/main/js/controllers/models/clusters.json
index 7c3ea1e..8f8c560 100644
--- a/modules/control-center-web/src/main/js/controllers/models/clusters.json
+++ b/modules/control-center-web/src/main/js/controllers/models/clusters.json
@@ -1861,7 +1861,7 @@
"id": "transactionIsolation",
"type": "dropdown",
"path": "transactionConfiguration",
- "model": "transactionIsolation",
+ "model": "defaultTxIsolation",
"placeholder": "REPEATABLE_READ",
"items": "transactionIsolation",
"tip": [
http://git-wip-us.apache.org/repos/asf/ignite/blob/783ca521/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 e11ba28..45744e9 100644
--- a/modules/control-center-web/src/main/js/db.js
+++ b/modules/control-center-web/src/main/js/db.js
@@ -430,7 +430,7 @@ var ClusterSchema = new Schema({
timeServerPortRange: Number,
transactionConfiguration: {
defaultTxConcurrency: {type: String, enum: ['OPTIMISTIC', 'PESSIMISTIC']},
- transactionIsolation: {type: String, enum: ['READ_COMMITTED', 'REPEATABLE_READ', 'SERIALIZABLE']},
+ defaultTxIsolation: {type: String, enum: ['READ_COMMITTED', 'REPEATABLE_READ', 'SERIALIZABLE']},
defaultTxTimeout: Number,
pessimisticTxLogLinger: Number,
pessimisticTxLogSize: Number,
http://git-wip-us.apache.org/repos/asf/ignite/blob/783ca521/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 45f30f5..55da41d 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
@@ -342,10 +342,7 @@ $generatorCommon.TRANSACTION_CONFIGURATION = {
className: 'org.apache.ignite.configuration.TransactionConfiguration',
fields: {
defaultTxConcurrency: {type: 'enum', enumClass: 'org.apache.ignite.transactions.TransactionConcurrency'},
- transactionIsolation: {
- type: 'org.apache.ignite.transactions.TransactionIsolation',
- setterName: 'defaultTxIsolation'
- },
+ defaultTxIsolation: {type: 'enum', enumClass: 'org.apache.ignite.transactions.TransactionIsolation'},
defaultTxTimeout: null,
pessimisticTxLogLinger: null,
pessimisticTxLogSize: null,
http://git-wip-us.apache.org/repos/asf/ignite/blob/783ca521/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 b68f821..7d741cc 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
@@ -517,7 +517,7 @@ $generatorJava.clusterAtomics = function (cluster, res) {
$generatorJava.declareVariable(res, 'atomicCfg', 'org.apache.ignite.configuration.AtomicConfiguration');
- $generatorJava.property(res, 'atomicCfg', atomics, 'cacheMode');
+ $generatorJava.property(res, 'atomicCfg', atomics, 'cacheMode', 'org.apache.ignite.cache.CacheMode');
var cacheMode = atomics.cacheMode ? atomics.cacheMode : 'PARTITIONED';
@@ -789,19 +789,16 @@ $generatorJava.clusterEvents = function (cluster, res) {
if (cluster.includeEventTypes && cluster.includeEventTypes.length > 0) {
res.emptyLineIfNeeded();
- if (cluster.includeEventTypes.length === 1) {
- res.importClass('org.apache.ignite.events.EventType');
+ res.importClass('org.apache.ignite.events.EventType');
+ if (cluster.includeEventTypes.length === 1)
res.line('cfg.setIncludeEventTypes(EventType.' + cluster.includeEventTypes[0] + ');');
- }
else {
- res.append('int[] events = new int[EventType.' + cluster.includeEventTypes[0] + '.length');
+ res.line('int[] events = new int[EventType.' + cluster.includeEventTypes[0] + '.length');
_.forEach(cluster.includeEventTypes, function(e, ix) {
if (ix > 0) {
- res.needEmptyLine = true;
-
- res.append(' + EventType.' + e + '.length');
+ res.line(' + EventType.' + e + '.length');
}
});
@@ -849,7 +846,7 @@ $generatorJava.clusterMarshaller = function (cluster, res) {
$generatorJava.property(res, 'cfg', cluster, 'marshalLocalJobs', null, null, false);
$generatorJava.property(res, 'cfg', cluster, 'marshallerCacheKeepAliveTime');
- $generatorJava.property(res, 'cfg', cluster, 'marshallerCacheThreadPoolSize');
+ $generatorJava.property(res, 'cfg', cluster, 'marshallerCacheThreadPoolSize', null, 'setMarshallerCachePoolSize');
res.needEmptyLine = true;
http://git-wip-us.apache.org/repos/asf/ignite/blob/783ca521/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 39c9d28..6077de0 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
@@ -602,7 +602,7 @@ $generatorXml.clusterMarshaller = function (cluster, res) {
$generatorXml.property(res, cluster, 'marshalLocalJobs', null, false);
$generatorXml.property(res, cluster, 'marshallerCacheKeepAliveTime');
- $generatorXml.property(res, cluster, 'marshallerCacheThreadPoolSize');
+ $generatorXml.property(res, cluster, 'marshallerCacheThreadPoolSize', 'marshallerCachePoolSize');
res.needEmptyLine = true;