ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject ignite git commit: IGNITE-843 Rework peerClassLoadingLocalClassPathExclude to use simple table for input items.
Date Mon, 31 Aug 2015 03:49:07 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843 d39b66b18 -> bbb1495cd


IGNITE-843 Rework peerClassLoadingLocalClassPathExclude to use simple table for input items.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/bbb1495c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/bbb1495c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/bbb1495c

Branch: refs/heads/ignite-843
Commit: bbb1495cde6fedf73d96b35d53d44151b0060069
Parents: d39b66b
Author: Alexey Kuznetsov <akuznetsov@apache.org>
Authored: Mon Aug 31 10:49:34 2015 +0700
Committer: Alexey Kuznetsov <akuznetsov@apache.org>
Committed: Mon Aug 31 10:49:34 2015 +0700

----------------------------------------------------------------------
 .../src/main/js/controllers/clusters-controller.js          | 4 +++-
 .../src/main/js/controllers/models/clusters.json            | 9 ++++++---
 modules/control-center-web/src/main/js/db.js                | 2 +-
 .../src/main/js/public/stylesheets/style.scss               | 4 ++--
 .../src/main/js/routes/generator/generator-java.js          | 9 +--------
 .../src/main/js/routes/generator/generator-xml.js           | 9 +--------
 6 files changed, 14 insertions(+), 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/bbb1495c/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 67e5895..e26e32b 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
@@ -23,6 +23,7 @@ controlCenterModule.controller('clustersController', ['$scope', '$controller',
'
 
         $scope.joinTip = $common.joinTip;
         $scope.getModel = $common.getModel;
+        $scope.compactJavaName = $common.compactJavaName;
 
         $scope.tableReset = $table.tableReset;
         $scope.tableNewItem = $table.tableNewItem;
@@ -120,7 +121,8 @@ controlCenterModule.controller('clustersController', ['$scope', '$controller',
'
         var simpleTables = {
             addresses: {msg: 'Such IP address already exists!', id: 'IpAddress'},
             regions: {msg: 'Such region already exists!', id: 'Region'},
-            zones: {msg: 'Such zone already exists!', id: 'Zone'}
+            zones: {msg: 'Such zone already exists!', id: 'Zone'},
+            peerClassLoadingLocalClassPathExclude: {msg: 'Such package already exists!',
id: 'PeerClsPathExclude'}
         };
 
         $scope.tableSimpleValid = function (item, field, val, index) {

http://git-wip-us.apache.org/repos/asf/ignite/blob/bbb1495c/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 284eb34..c82019b 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
@@ -658,11 +658,14 @@
         {
           "label": "Local class path exclude",
           "id": "peerClassLoadingLocalClassPathExclude",
-          "type": "text",
+          "type": "table-simple",
           "model": "peerClassLoadingLocalClassPathExclude",
           "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.",
+          "focusId": "PeerClsPathExclude",
+          "addTip": "Add package name.",
+          "removeTip": "Remove package name.",
+          "tableTip": [
+            "List of packages 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."
           ]
         },

http://git-wip-us.apache.org/repos/asf/ignite/blob/bbb1495c/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 64c3d4f..edaf9dd 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/bbb1495c/modules/control-center-web/src/main/js/public/stylesheets/style.scss
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/public/stylesheets/style.scss b/modules/control-center-web/src/main/js/public/stylesheets/style.scss
index 628e1d5..eb458ef 100644
--- a/modules/control-center-web/src/main/js/public/stylesheets/style.scss
+++ b/modules/control-center-web/src/main/js/public/stylesheets/style.scss
@@ -859,7 +859,7 @@ table tr:hover {
 }
 
 div.affix.padding-top-dflt {
-    z-index: 10000;
+    z-index: 910;
     background-color: white;
 }
 
@@ -1398,7 +1398,7 @@ a {
     overflow: visible;
     position: absolute;
     width: 92%;
-    z-index: 999;
+    z-index: 900;
 
     label {
         padding: 0 5px 0 5px;

http://git-wip-us.apache.org/repos/asf/ignite/blob/bbb1495c/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 610f7a5..04f2679 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
@@ -574,14 +574,7 @@ $generatorJava.clusterP2p = function (cluster, res) {
         $generatorJava.property(res, 'cfg', cluster, 'peerClassLoadingEnabled');
 
         if (p2pEnabled) {
-            var clsPathExclude = cluster.peerClassLoadingLocalClassPathExclude;
-
-            if (clsPathExclude && clsPathExclude.length > 0) {
-                var clsPathExcludeWrapper = {peerClassLoadingLocalClassPathExclude: clsPathExclude.split(',')};
-
-                $generatorJava.multiparamProperty(res, 'cfg', clsPathExcludeWrapper, 'peerClassLoadingLocalClassPathExclude');
-            }
-
+            $generatorJava.multiparamProperty(res, 'cfg', cluster, 'peerClassLoadingLocalClassPathExclude');
             $generatorJava.property(res, 'cfg', cluster, 'peerClassLoadingMissedResourcesCacheSize');
             $generatorJava.property(res, 'cfg', cluster, 'peerClassLoadingThreadPoolSize');
         }

http://git-wip-us.apache.org/repos/asf/ignite/blob/bbb1495c/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 724159a..479f372 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
@@ -421,14 +421,7 @@ $generatorXml.clusterP2p = function (cluster, res) {
         $generatorXml.property(res, cluster, 'peerClassLoadingEnabled');
 
         if (p2pEnabled) {
-            var clsPathExclude = cluster.peerClassLoadingLocalClassPathExclude;
-
-            if (clsPathExclude && clsPathExclude.length > 0) {
-                var clsPathExcludeWrapper = {peerClassLoadingLocalClassPathExclude: clsPathExclude.split(',')};
-
-                $generatorXml.listProperty(res, clsPathExcludeWrapper, 'peerClassLoadingLocalClassPathExclude');
-            }
-
+            $generatorXml.listProperty(res, cluster, 'peerClassLoadingLocalClassPathExclude');
             $generatorXml.property(res, cluster, 'peerClassLoadingMissedResourcesCacheSize');
             $generatorXml.property(res, cluster, 'peerClassLoadingThreadPoolSize');
         }


Mime
View raw message