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/11/24 05:37:00 UTC
[1/2] ignite git commit: IGNITE-1981 Minor fix.
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc1 e283455fa -> 609a1f025
IGNITE-1981 Minor fix.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1de7e03f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1de7e03f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1de7e03f
Branch: refs/heads/ignite-843-rc1
Commit: 1de7e03fb83a4ca2cfbd3cf3d3c98593ad18c8f3
Parents: f639220
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Tue Nov 24 11:33:19 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Tue Nov 24 11:33:19 2015 +0700
----------------------------------------------------------------------
.../main/js/controllers/clusters-controller.js | 28 +++++--
.../src/main/js/controllers/common-module.js | 4 +-
.../src/main/js/controllers/igfs-controller.js | 79 ++++++++++++--------
.../main/js/helpers/generator/generator-java.js | 2 +-
4 files changed, 71 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/1de7e03f/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 a729f32..96a42a7 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
@@ -388,20 +388,36 @@ consoleModule.controller('clustersController', [
var c = item.communication;
if ($common.isDefined(c)) {
- if (!$common.isEmptyString(c.listener) && !$common.isValidJavaClass('Communication listener', c.listener, false, 'comListener', false, $scope.panels, 'communication'))
+ if (!$common.isEmptyString(c.listener) && !$common.isValidJavaClass('Communication listener', c.listener, false, 'comListener', false, $scope.panels, 'communication')) {
+ $scope.ui.expanded = true;
+
return false;
+ }
+
+ if (!$common.isEmptyString(c.addressResolver) && !$common.isValidJavaClass('Address resolver', c.addressResolver, false, 'comAddressResolver', false, $scope.panels, 'communication')) {
+ $scope.ui.expanded = true;
- if (!$common.isEmptyString(c.addressResolver) && !$common.isValidJavaClass('Address resolver', c.addressResolver, false, 'comAddressResolver', false, $scope.panels, 'communication'))
return false;
+ }
if ($common.isDefined(c.unacknowledgedMessagesBufferSize)) {
if ($common.isDefined(c.messageQueueLimit))
- if (c.unacknowledgedMessagesBufferSize < 5 * c.messageQueueLimit)
- return showPopoverMessage($scope.panels, 'communication', 'unacknowledgedMessagesBufferSize', 'Maximum number of stored unacknowledged messages should be at least 5 * message queue limit');
+ if (c.unacknowledgedMessagesBufferSize < 5 * c.messageQueueLimit) {
+ $scope.ui.expanded = true;
+
+ showPopoverMessage($scope.panels, 'communication', 'unacknowledgedMessagesBufferSize', 'Maximum number of stored unacknowledged messages should be at least 5 * message queue limit');
+
+ return false;
+ }
if ($common.isDefined(c.ackSendThreshold))
- if (c.unacknowledgedMessagesBufferSize < 5 * c.ackSendThreshold)
- return showPopoverMessage($scope.panels, 'communication', 'unacknowledgedMessagesBufferSize', 'Maximum number of stored unacknowledged messages should be at least 5 * ack send threshold');
+ if (c.unacknowledgedMessagesBufferSize < 5 * c.ackSendThreshold) {
+ $scope.ui.expanded = true;
+
+ showPopoverMessage($scope.panels, 'communication', 'unacknowledgedMessagesBufferSize', 'Maximum number of stored unacknowledged messages should be at least 5 * ack send threshold');
+
+ return false;
+ }
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/1de7e03f/modules/control-center-web/src/main/js/controllers/common-module.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/common-module.js b/modules/control-center-web/src/main/js/controllers/common-module.js
index 57ac0dd..e6ba96c 100644
--- a/modules/control-center-web/src/main/js/controllers/common-module.js
+++ b/modules/control-center-web/src/main/js/controllers/common-module.js
@@ -533,7 +533,7 @@ consoleModule.service('$common', [
popover = newPopover;
- $timeout(function () { newPopover.$promise.then(newPopover.show); });
+ $timeout(function () { newPopover.$promise.then(newPopover.show); }, 400);
$timeout(function () { newPopover.hide(); }, 5000);
@@ -1896,7 +1896,7 @@ consoleModule.factory('$focus', function ($timeout) {
elem[0].focus();
}
- });
+ }, 100);
};
});
http://git-wip-us.apache.org/repos/asf/ignite/blob/1de7e03f/modules/control-center-web/src/main/js/controllers/igfs-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/igfs-controller.js b/modules/control-center-web/src/main/js/controllers/igfs-controller.js
index ff92b2b..7175c45 100644
--- a/modules/control-center-web/src/main/js/controllers/igfs-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/igfs-controller.js
@@ -264,16 +264,29 @@ consoleModule.controller('igfsController', [
return showPopoverMessage($scope.panels, 'general', 'igfsName', 'Name should not be empty');
if (!$common.isEmptyString(item.dualModePutExecutorService) &&
- !$common.isValidJavaClass('Put executor service', item.dualModePutExecutorService, false, 'dualModePutExecutorService', false, $scope.panels, 'dualMode'))
+ !$common.isValidJavaClass('Put executor service', item.dualModePutExecutorService, false, 'dualModePutExecutorService', false, $scope.panels, 'dualMode')) {
+ $scope.ui.expanded = true;
+
return false;
+ }
+
+ if (!item.secondaryFileSystemEnabled && (!item.defaultMode || item.defaultMode != 'PRIMARY')) {
+ $scope.ui.expanded = true;
+
+ showPopoverMessage($scope.panels, 'secondaryFileSystem', 'secondaryFileSystem-title', 'Secondary file system should be configured for not "PRIMARY" IGFS mode');
- if (!item.secondaryFileSystemEnabled && (!item.defaultMode || item.defaultMode != 'PRIMARY'))
- return showPopoverMessage($scope.panels, 'secondaryFileSystem', 'secondaryFileSystem-title', 'Secondary file system should be configured for not "PRIMARY" IGFS mode');
+ return false;
+ }
if (item.pathModes) {
for (var pathIx = 0; pathIx < item.pathModes.length; pathIx ++) {
- if (!item.secondaryFileSystemEnabled && item.pathModes[pathIx].mode != 'PRIMARY')
- return showPopoverMessage($scope.panels, 'misc', 'secondaryFileSystem-title', 'Secondary file system should be configured for not "PRIMARY" path mode');
+ if (!item.secondaryFileSystemEnabled && item.pathModes[pathIx].mode != 'PRIMARY') {
+ $scope.ui.expanded = true;
+
+ showPopoverMessage($scope.panels, 'misc', 'secondaryFileSystem-title', 'Secondary file system should be configured for not "PRIMARY" path mode');
+
+ return false;
+ }
}
}
@@ -339,30 +352,30 @@ consoleModule.controller('igfsController', [
$confirm.confirm('Are you sure you want to remove IGFS: "' + selectedItem.name + '"?')
.then(function () {
- var _id = selectedItem._id;
+ var _id = selectedItem._id;
- $http.post('igfs/remove', {_id: _id})
- .success(function () {
- $common.showInfo('IGFS has been removed: ' + selectedItem.name);
+ $http.post('igfs/remove', {_id: _id})
+ .success(function () {
+ $common.showInfo('IGFS has been removed: ' + selectedItem.name);
- var igfss = $scope.igfss;
+ var igfss = $scope.igfss;
- var idx = _.findIndex(igfss, function (igfs) {
- return igfs._id == _id;
- });
+ var idx = _.findIndex(igfss, function (igfs) {
+ return igfs._id == _id;
+ });
- if (idx >= 0) {
- igfss.splice(idx, 1);
+ if (idx >= 0) {
+ igfss.splice(idx, 1);
- if (igfss.length > 0)
- $scope.selectItem(igfss[0]);
- else
- $scope.selectItem(undefined, undefined);
- }
- })
- .error(function (errMsg) {
- $common.showError(errMsg);
- });
+ if (igfss.length > 0)
+ $scope.selectItem(igfss[0]);
+ else
+ $scope.selectItem(undefined, undefined);
+ }
+ })
+ .error(function (errMsg) {
+ $common.showError(errMsg);
+ });
});
};
@@ -372,17 +385,17 @@ consoleModule.controller('igfsController', [
$confirm.confirm('Are you sure you want to remove all IGFS?')
.then(function () {
- $http.post('igfs/remove/all')
- .success(function () {
- $common.showInfo('All IGFS have been removed');
+ $http.post('igfs/remove/all')
+ .success(function () {
+ $common.showInfo('All IGFS have been removed');
- $scope.igfss = [];
+ $scope.igfss = [];
- $scope.selectItem(undefined, undefined);
- })
- .error(function (errMsg) {
- $common.showError(errMsg);
- });
+ $scope.selectItem(undefined, undefined);
+ })
+ .error(function (errMsg) {
+ $common.showError(errMsg);
+ });
});
};
http://git-wip-us.apache.org/repos/asf/ignite/blob/1de7e03f/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 c1a2915..33dce60 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
@@ -801,7 +801,7 @@ $generatorJava.cacheMemory = function (cache, varName, res) {
if (!res)
res = $generatorCommon.builder();
- $generatorJava.property(res, varName, cache, 'memoryMode', 'CacheMemoryMode');
+ $generatorJava.property(res, varName, cache, 'memoryMode', 'org.apache.ignite.cache.CacheMemoryMode');
$generatorJava.property(res, varName, cache, 'offHeapMaxMemory');
res.needEmptyLine = true;
[2/2] ignite git commit: Merge remote-tracking branch
'origin/ignite-843-rc1' into ignite-843-rc1
Posted by ak...@apache.org.
Merge remote-tracking branch 'origin/ignite-843-rc1' into ignite-843-rc1
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/609a1f02
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/609a1f02
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/609a1f02
Branch: refs/heads/ignite-843-rc1
Commit: 609a1f0251e48db053b5dbdc62e97011d72f663a
Parents: 1de7e03 e283455
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Tue Nov 24 11:37:30 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Tue Nov 24 11:37:30 2015 +0700
----------------------------------------------------------------------
modules/control-center-web/src/main/js/app.js | 27 ++----------------
modules/control-center-web/src/main/js/db.js | 10 +++++++
.../src/main/js/helpers/configuration-loader.js | 30 ++++++++++++++++++++
.../main/js/views/configuration/summary.jade | 2 +-
4 files changed, 43 insertions(+), 26 deletions(-)
----------------------------------------------------------------------