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/08/27 13:34:39 UTC
ignite git commit: IGNITE-843 Fixed
peerClassLoadingLocalClassPathExclude XML and Java generation.
Repository: ignite
Updated Branches:
refs/heads/ignite-843 9e45de04a -> e8a49543b
IGNITE-843 Fixed peerClassLoadingLocalClassPathExclude XML and Java generation.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e8a49543
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e8a49543
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e8a49543
Branch: refs/heads/ignite-843
Commit: e8a49543b6f57e463a3d6afd151a1c301d2cd949
Parents: 9e45de0
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Thu Aug 27 18:35:02 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Thu Aug 27 18:35:02 2015 +0700
----------------------------------------------------------------------
.../main/js/controllers/models/clusters.json | 4 +++-
modules/control-center-web/src/main/js/db.js | 2 +-
.../main/js/routes/generator/generator-java.js | 24 ++++++++++++++++----
.../main/js/routes/generator/generator-xml.js | 24 ++++++++++++++++----
.../src/main/js/views/includes/controls.jade | 2 +-
5 files changed, 43 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e8a49543/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 a4b0b33..5801591 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
@@ -648,7 +648,7 @@
"label": "Local class path exclude",
"type": "text",
"model": "peerClassLoadingLocalClassPathExclude",
- "placeholder": "[]",
+ "disabled": "!backupItem.peerClassLoadingEnabled",
"tip": [
"List of packages separated by comma from the system classpath that need to be peer-to-peer loaded from task originating node.",
"'*' is supported at the end of the package name which means that all sub-packages and their classes are included like in Java package import clause."
@@ -658,6 +658,7 @@
"label": "Missed resources cache size",
"type": "number",
"model": "peerClassLoadingMissedResourcesCacheSize",
+ "disabled": "!backupItem.peerClassLoadingEnabled",
"placeholder": 100,
"tip": [
"If size greater than 0, missed resources will be cached and next resource request ignored.",
@@ -668,6 +669,7 @@
"label": "Pool size",
"type": "number",
"model": "peerClassLoadingThreadPoolSize",
+ "disabled": "!backupItem.peerClassLoadingEnabled",
"placeholder": "availableProcessors",
"tip": [
"Thread pool size to use for peer class loading."
http://git-wip-us.apache.org/repos/asf/ignite/blob/e8a49543/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 edaf9dd..64c3d4f 100644
--- a/modules/control-center-web/src/main/js/db.js
+++ b/modules/control-center-web/src/main/js/db.js
@@ -296,7 +296,7 @@ var ClusterSchema = new Schema({
networkSendRetryDelay: Number,
networkSendRetryCount: Number,
peerClassLoadingEnabled: Boolean,
- peerClassLoadingLocalClassPathExclude: [String],
+ peerClassLoadingLocalClassPathExclude: String,
peerClassLoadingMissedResourcesCacheSize: Number,
peerClassLoadingThreadPoolSize: Number,
publicThreadPoolSize: Number,
http://git-wip-us.apache.org/repos/asf/ignite/blob/e8a49543/modules/control-center-web/src/main/js/routes/generator/generator-java.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/routes/generator/generator-java.js b/modules/control-center-web/src/main/js/routes/generator/generator-java.js
index 448301a..398824d 100644
--- a/modules/control-center-web/src/main/js/routes/generator/generator-java.js
+++ b/modules/control-center-web/src/main/js/routes/generator/generator-java.js
@@ -615,12 +615,26 @@ $generatorJava.clusterP2p = function (cluster, res) {
if (!res)
res = $generatorCommon.builder();
- $generatorJava._addProperty(res, 'cfg', cluster, 'peerClassLoadingEnabled');
- $generatorJava._addMultiparamProperty(res, 'cfg', cluster, 'peerClassLoadingLocalClassPathExclude');
- $generatorJava._addProperty(res, 'cfg', cluster, 'peerClassLoadingMissedResourcesCacheSize');
- $generatorJava._addProperty(res, 'cfg', cluster, 'peerClassLoadingThreadPoolSize');
+ var p2pEnabled = cluster.peerClassLoadingEnabled;
- res.needEmptyLine = true;
+ if ($commonUtils.isDefined(p2pEnabled)) {
+ $generatorJava._addProperty(res, 'cfg', cluster, 'peerClassLoadingEnabled');
+
+ if (p2pEnabled) {
+ var clsPathExclude = cluster.peerClassLoadingLocalClassPathExclude;
+
+ if (clsPathExclude && clsPathExclude.length > 0) {
+ var clsPathExcludeWrapper = {peerClassLoadingLocalClassPathExclude: clsPathExclude.split(',')};
+
+ $generatorJava._addMultiparamProperty(res, 'cfg', clsPathExcludeWrapper, 'peerClassLoadingLocalClassPathExclude');
+ }
+
+ $generatorJava._addProperty(res, 'cfg', cluster, 'peerClassLoadingMissedResourcesCacheSize');
+ $generatorJava._addProperty(res, 'cfg', cluster, 'peerClassLoadingThreadPoolSize');
+ }
+
+ res.needEmptyLine = true;
+ }
return res;
};
http://git-wip-us.apache.org/repos/asf/ignite/blob/e8a49543/modules/control-center-web/src/main/js/routes/generator/generator-xml.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/routes/generator/generator-xml.js b/modules/control-center-web/src/main/js/routes/generator/generator-xml.js
index 005fbcf..57477bd 100644
--- a/modules/control-center-web/src/main/js/routes/generator/generator-xml.js
+++ b/modules/control-center-web/src/main/js/routes/generator/generator-xml.js
@@ -505,12 +505,26 @@ $generatorXml.clusterP2p = function (cluster, res) {
if (!res)
res = $generatorCommon.builder();
- $generatorXml._addProperty(res, cluster, 'peerClassLoadingEnabled');
- $generatorXml._addListProperty(res, cluster, 'peerClassLoadingLocalClassPathExclude');
- $generatorXml._addProperty(res, cluster, 'peerClassLoadingMissedResourcesCacheSize');
- $generatorXml._addProperty(res, cluster, 'peerClassLoadingThreadPoolSize');
+ var p2pEnabled = cluster.peerClassLoadingEnabled;
- res.needEmptyLine = true;
+ if ($commonUtils.isDefined(p2pEnabled)) {
+ $generatorXml._addProperty(res, cluster, 'peerClassLoadingEnabled');
+
+ if (p2pEnabled) {
+ var clsPathExclude = cluster.peerClassLoadingLocalClassPathExclude;
+
+ if (clsPathExclude && clsPathExclude.length > 0) {
+ var clsPathExcludeWrapper = {peerClassLoadingLocalClassPathExclude: clsPathExclude.split(',')};
+
+ $generatorXml._addListProperty(res, clsPathExcludeWrapper, 'peerClassLoadingLocalClassPathExclude');
+ }
+
+ $generatorXml._addProperty(res, cluster, 'peerClassLoadingMissedResourcesCacheSize');
+ $generatorXml._addProperty(res, cluster, 'peerClassLoadingThreadPoolSize');
+ }
+
+ res.needEmptyLine = true;
+ }
return res;
};
http://git-wip-us.apache.org/repos/asf/ignite/blob/e8a49543/modules/control-center-web/src/main/js/views/includes/controls.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/includes/controls.jade b/modules/control-center-web/src/main/js/views/includes/controls.jade
index 1181e5d..db9d250 100644
--- a/modules/control-center-web/src/main/js/views/includes/controls.jade
+++ b/modules/control-center-web/src/main/js/views/includes/controls.jade
@@ -268,7 +268,7 @@ mixin form-row-custom(lblClasses, fieldClasses, dataSource)
div(class=fieldClasses)
+tipField('field.tip')
.input-tip
- input.form-control(id='{{::field.id}}' type='text' placeholder='{{::field.placeholder}}' ng-focus='tableReset()')&attributes(fieldCommon)
+ input.form-control(id='{{::field.id}}' type='text' ng-disabled=fieldDisabled placeholder='{{::field.placeholder}}' ng-focus='tableReset()')&attributes(fieldCommon)
div(ng-switch-when='withJavaBuildInTypes' ng-hide=fieldHide)
label(class=lblClasses ng-class=fieldRequiredClass) {{::field.label}}:
div(class=fieldClasses)