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 2016/02/10 10:20:56 UTC
[1/7] ignite git commit: IGNITE-2599 Do not show unsaved changes
dialog on clone.
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc3 528204254 -> c8932348b
IGNITE-2599 Do not show unsaved changes dialog on clone.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/18d18a60
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/18d18a60
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/18d18a60
Branch: refs/heads/ignite-843-rc3
Commit: 18d18a60a92a967e42db300346f2601dc1b00407
Parents: 5282042
Author: Andrey <an...@gridgain.com>
Authored: Wed Feb 10 09:30:50 2016 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Wed Feb 10 09:30:50 2016 +0700
----------------------------------------------------------------------
.../main/js/controllers/caches-controller.js | 20 ++++++++------------
.../main/js/controllers/clusters-controller.js | 18 +++++++-----------
.../main/js/controllers/domains-controller.js | 20 ++++++++------------
.../src/main/js/controllers/igfs-controller.js | 18 +++++++-----------
4 files changed, 30 insertions(+), 46 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/18d18a60/modules/control-center-web/src/main/js/controllers/caches-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/caches-controller.js b/modules/control-center-web/src/main/js/controllers/caches-controller.js
index 006704c..c1837c8 100644
--- a/modules/control-center-web/src/main/js/controllers/caches-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/caches-controller.js
@@ -621,22 +621,18 @@ consoleModule.controller('cachesController', [
// Save cache with new name.
$scope.cloneItem = function () {
- function cloneItem() {
- if ($scope.tableReset(true) && validate($scope.backupItem)) {
- $clone.confirm($scope.backupItem.name, _cacheNames()).then(function (newName) {
- var item = angular.copy($scope.backupItem);
+ if ($scope.tableReset(true) && validate($scope.backupItem)) {
+ $clone.confirm($scope.backupItem.name, _cacheNames()).then(function (newName) {
+ var item = angular.copy($scope.backupItem);
- delete item._id;
- delete item.demo;
+ delete item._id;
+ delete item.demo;
- item.name = newName;
+ item.name = newName;
- save(item);
- });
- }
+ save(item);
+ });
}
-
- $common.confirmUnsavedChanges($scope.ui.isDirty(), cloneItem);
};
// Remove cache from db.
http://git-wip-us.apache.org/repos/asf/ignite/blob/18d18a60/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 a893a42..465f7aa 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
@@ -447,20 +447,16 @@ consoleModule.controller('clustersController', function ($http, $timeout, $scope
// Copy cluster with new name.
$scope.cloneItem = function () {
- function cloneItem() {
- if (validate($scope.backupItem)) {
- $clone.confirm($scope.backupItem.name, _clusterNames()).then(function (newName) {
- var item = angular.copy($scope.backupItem);
+ if (validate($scope.backupItem)) {
+ $clone.confirm($scope.backupItem.name, _clusterNames()).then(function (newName) {
+ var item = angular.copy($scope.backupItem);
- delete item._id;
- item.name = newName;
+ delete item._id;
+ item.name = newName;
- save(item);
- });
- }
+ save(item);
+ });
}
-
- $common.confirmUnsavedChanges($scope.backupItem && $scope.ui.inputForm.$dirty, cloneItem);
};
// Remove cluster from db.
http://git-wip-us.apache.org/repos/asf/ignite/blob/18d18a60/modules/control-center-web/src/main/js/controllers/domains-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/domains-controller.js b/modules/control-center-web/src/main/js/controllers/domains-controller.js
index a6624bf..96ee87d 100644
--- a/modules/control-center-web/src/main/js/controllers/domains-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/domains-controller.js
@@ -1380,21 +1380,17 @@ consoleModule.controller('domainsController', function ($filter, $http, $timeout
// Save domain model with new name.
$scope.cloneItem = function () {
- function cloneItem() {
- if ($scope.tableReset(true) && validate($scope.backupItem)) {
- $clone.confirm($scope.backupItem.valueType, _domainNames()).then(function (newName) {
- var item = angular.copy($scope.backupItem);
+ if ($scope.tableReset(true) && validate($scope.backupItem)) {
+ $clone.confirm($scope.backupItem.valueType, _domainNames()).then(function (newName) {
+ var item = angular.copy($scope.backupItem);
- delete item._id;
- delete item.demo;
- item.valueType = newName;
+ delete item._id;
+ delete item.demo;
+ item.valueType = newName;
- save(item);
- });
- }
+ save(item);
+ });
}
-
- $common.confirmUnsavedChanges($scope.ui.isDirty(), cloneItem);
};
// Remove domain model from db.
http://git-wip-us.apache.org/repos/asf/ignite/blob/18d18a60/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 0af5fc2..4644c3d 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
@@ -359,20 +359,16 @@ consoleModule.controller('igfsController', [
// Save IGFS with new name.
$scope.cloneItem = function () {
- function cloneItem() {
- if ($scope.tableReset(true) && validate($scope.backupItem)) {
- $clone.confirm($scope.backupItem.name).then(function (newName) {
- var item = angular.copy($scope.backupItem);
+ if ($scope.tableReset(true) && validate($scope.backupItem)) {
+ $clone.confirm($scope.backupItem.name).then(function (newName) {
+ var item = angular.copy($scope.backupItem);
- delete item._id;
- item.name = newName;
+ delete item._id;
+ item.name = newName;
- save(item);
- });
- }
+ save(item);
+ });
}
-
- $common.confirmUnsavedChanges($scope.ui.isDirty(), cloneItem);
};
// Remove IGFS from db.
[7/7] ignite git commit: IGNITE-843 minor jade template fix.
Posted by ak...@apache.org.
IGNITE-843 minor jade template fix.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c8932348
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c8932348
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c8932348
Branch: refs/heads/ignite-843-rc3
Commit: c8932348be13e35b5856e09507d738cf27d648fd
Parents: 2ae3bce
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Wed Feb 10 16:13:58 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Wed Feb 10 16:13:58 2016 +0700
----------------------------------------------------------------------
.../src/main/js/views/includes/controls.jade | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/c8932348/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 f08c9dd..557f121 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
@@ -530,16 +530,16 @@ mixin main-table(title, rows, focusId, click, rowTemplate, searchField)
lable.labelHeader.labelFormField #{title}:
.col-sm-3.pull-right(style='padding: 0')
input.form-control(type='text' st-search='#{searchField}' placeholder='Filter #{title}...')
- tbody
- tr
- td
- .scrollable-y(ng-show='displayedRows.length > 0' style='max-height: 200px')
- table
- tbody
- tr(ng-repeat='row in displayedRows track by row._id' ignite-bs-affix-update)
- td
- a(ng-class='{active: row._id == selectedItem._id}' on-click-focus=focusId ng-click=click) #{rowTemplate}
- label.placeholder(ng-show='displayedRows.length == 0') No #{rows} found
+ tbody
+ tr
+ td
+ .scrollable-y(ng-show='displayedRows.length > 0' style='max-height: 200px')
+ table
+ tbody
+ tr(ng-repeat='row in displayedRows track by row._id' ignite-bs-affix-update)
+ td
+ a(ng-class='{active: row._id == selectedItem._id}' on-click-focus=focusId ng-click=click) #{rowTemplate}
+ label.placeholder(ng-show='displayedRows.length == 0') No #{rows} found
mixin groups(groups, dataSource)
.panel.panel-default(ng-repeat='group in #{groups}' ng-click='triggerDigest=true' ng-hide='{{group.hide}}')
[2/7] ignite git commit: IGNITE-843 Fixed clone dialog and XML
generation + getting started image.
Posted by ak...@apache.org.
IGNITE-843 Fixed clone dialog and XML generation + getting started image.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/42f67c63
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/42f67c63
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/42f67c63
Branch: refs/heads/ignite-843-rc3
Commit: 42f67c6333f3263f0ada93c3dc2c515bbeafdf9c
Parents: 18d18a6
Author: vsisko <vs...@gridgain.com>
Authored: Wed Feb 10 10:59:43 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Wed Feb 10 10:59:43 2016 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/common-module.js | 28 ++++++++++++++-----
.../main/js/controllers/domains-controller.js | 6 +++-
.../main/js/helpers/generator/generator-xml.js | 4 +--
.../src/main/js/public/images/ignite-puzzle.png | Bin 197079 -> 71974 bytes
4 files changed, 27 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/42f67c63/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 d2625d0..758fab0 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
@@ -1251,26 +1251,40 @@ consoleModule.service('$clone', function ($modal, $rootScope, $q) {
var scope = $rootScope.$new();
var deferred;
+ var _names = [];
+ var _validator;
scope.ok = function (newName) {
- deferred.resolve(newName);
+ if (!_validator || _validator(newName)) {
+ deferred.resolve(_nextAvailableName(newName));
- cloneModal.hide();
+ cloneModal.hide();
+ }
};
var cloneModal = $modal({templateUrl: '/templates/clone.html', scope: scope, placement: 'center', show: false});
- cloneModal.confirm = function (oldName, names) {
+ function _nextAvailableName(name) {
var num = 1;
- scope.newName = oldName + '(' + num.toString() + ')';
+ var tmpName = name;
- while(_.includes(names, scope.newName)) {
- num++;
+ while(_.includes(_names, tmpName)) {
+ tmpName = name + '_' + num.toString();
- scope.newName = oldName + '(' + num.toString() + ')';
+ num++;
}
+ return tmpName;
+ }
+
+ cloneModal.confirm = function (oldName, names, validator) {
+ _names = names;
+
+ scope.newName = _nextAvailableName(oldName);
+
+ _validator = validator;
+
deferred = $q.defer();
cloneModal.show();
http://git-wip-us.apache.org/repos/asf/ignite/blob/42f67c63/modules/control-center-web/src/main/js/controllers/domains-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/domains-controller.js b/modules/control-center-web/src/main/js/controllers/domains-controller.js
index 96ee87d..14e5b4b 100644
--- a/modules/control-center-web/src/main/js/controllers/domains-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/domains-controller.js
@@ -1378,10 +1378,14 @@ consoleModule.controller('domainsController', function ($filter, $http, $timeout
});
}
+ function _newNameIsValidJavaClass(newName) {
+ return $common.isValidJavaClass('New name for value type', newName, false, 'copy-new-name');
+ }
+
// Save domain model with new name.
$scope.cloneItem = function () {
if ($scope.tableReset(true) && validate($scope.backupItem)) {
- $clone.confirm($scope.backupItem.valueType, _domainNames()).then(function (newName) {
+ $clone.confirm($scope.backupItem.valueType, _domainNames(), _newNameIsValidJavaClass).then(function (newName) {
var item = angular.copy($scope.backupItem);
delete item._id;
http://git-wip-us.apache.org/repos/asf/ignite/blob/42f67c63/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 830dca7..7d89026 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
@@ -1184,9 +1184,7 @@ $generatorXml.domainStore = function(domain, res) {
res.needEmptyLine = true;
- if (!$dataStructures.isJavaBuiltInClass(domain.keyType))
- $generatorXml.domainModelDatabaseFields(res, domain, 'keyFields');
-
+ $generatorXml.domainModelDatabaseFields(res, domain, 'keyFields');
$generatorXml.domainModelDatabaseFields(res, domain, 'valueFields');
res.needEmptyLine = true;
http://git-wip-us.apache.org/repos/asf/ignite/blob/42f67c63/modules/control-center-web/src/main/js/public/images/ignite-puzzle.png
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/public/images/ignite-puzzle.png b/modules/control-center-web/src/main/js/public/images/ignite-puzzle.png
index 712f4bd..0989d29 100644
Binary files a/modules/control-center-web/src/main/js/public/images/ignite-puzzle.png and b/modules/control-center-web/src/main/js/public/images/ignite-puzzle.png differ
[3/7] ignite git commit: IGNITE-2608 Fixed domain model import in
special case.
Posted by ak...@apache.org.
IGNITE-2608 Fixed domain model import in special case.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/58efcbae
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/58efcbae
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/58efcbae
Branch: refs/heads/ignite-843-rc3
Commit: 58efcbaeeb1142097b80c175cb680f65928373e1
Parents: 42f67c6
Author: vsisko <vs...@gridgain.com>
Authored: Wed Feb 10 13:45:14 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Wed Feb 10 13:45:14 2016 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/domains-controller.js | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/58efcbae/modules/control-center-web/src/main/js/controllers/domains-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/domains-controller.js b/modules/control-center-web/src/main/js/controllers/domains-controller.js
index 14e5b4b..c427307 100644
--- a/modules/control-center-web/src/main/js/controllers/domains-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/domains-controller.js
@@ -889,6 +889,10 @@ consoleModule.controller('domainsController', function ($filter, $http, $timeout
newDomain.valueFields = valFields;
newDomain.demo = $scope.importDomain.demo;
+ // If value fields not found - copy key fields.
+ if ($common.isEmptyArray(valFields))
+ newDomain.valueFields = keyFields.slice();
+
// Use Java built-in type for key.
if ($scope.ui.builtinKeys && newDomain.keyFields.length === 1)
newDomain.keyType = newDomain.keyFields[0].jdbcType.javaType;
[5/7] ignite git commit: IGNITE-843 Fixed docker.
Posted by ak...@apache.org.
IGNITE-843 Fixed docker.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f983f421
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f983f421
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f983f421
Branch: refs/heads/ignite-843-rc3
Commit: f983f4210ac638ec2debdc76410ab6a67d268a82
Parents: a405009
Author: Andrey <an...@gridgain.com>
Authored: Wed Feb 10 15:17:31 2016 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Wed Feb 10 15:17:31 2016 +0700
----------------------------------------------------------------------
.../configuration/summary/summary.controller.js | 2 ++
.../js/helpers/generator/generator-docker.js | 34 +++++++++++---------
.../main/js/helpers/generator/generator-pom.js | 21 +++++++++++-
3 files changed, 40 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/f983f421/modules/control-center-web/src/main/js/app/modules/states/configuration/summary/summary.controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/summary/summary.controller.js b/modules/control-center-web/src/main/js/app/modules/states/configuration/summary/summary.controller.js
index b53bf0c..46d9f0d 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/configuration/summary/summary.controller.js
+++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/summary/summary.controller.js
@@ -119,6 +119,7 @@ export default [
}
]
},
+ { type: 'file', name: '.dockerignore' },
{ type: 'file', name: 'Dockerfile' },
{ type: 'file', name: 'pom.xml' },
{ type: 'file', name: 'README.txt' }
@@ -229,6 +230,7 @@ export default [
const zip = new JSZip();
zip.file('Dockerfile', ctrl.data.docker);
+ zip.file('.dockerignore', $generatorDocker.ignoreFile());
const builder = $generatorProperties.generateProperties(cluster);
http://git-wip-us.apache.org/repos/asf/ignite/blob/f983f421/modules/control-center-web/src/main/js/helpers/generator/generator-docker.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/helpers/generator/generator-docker.js b/modules/control-center-web/src/main/js/helpers/generator/generator-docker.js
index fff6453..c45b25b 100644
--- a/modules/control-center-web/src/main/js/helpers/generator/generator-docker.js
+++ b/modules/control-center-web/src/main/js/helpers/generator/generator-docker.js
@@ -24,17 +24,6 @@ $generatorDocker.from = function(cluster, version) {
'FROM apacheignite/ignite:' + version
};
-// Generate secret properties if needed.
-$generatorDocker.secret = function(cluster) {
- if ($generatorCommon.secretPropertiesNeeded(cluster))
- return '# Append secret.properties file to container.\n' +
- 'ADD ./src/main/resources/secret.properties $IGNITE_HOME/config/secret.properties\n\n' +
- '# Add secret.properties file to classpath.\n' +
- 'ENV USER_LIBS $IGNITE_HOME/config';
-
- return '';
-};
-
// Generate Docker file for cluster.
$generatorDocker.clusterDocker = function (cluster, version) {
return $generatorDocker.from(cluster, version) + '\n\n' +
@@ -42,9 +31,22 @@ $generatorDocker.clusterDocker = function (cluster, version) {
'ENV CONFIG_URI config/' + cluster.name + '-server.xml\n\n' +
'# Copy ignite-http-rest from optional.\n' +
'ENV OPTION_LIBS ignite-rest-http\n\n' +
- '# Append config file to container.\n' +
- 'ADD ./config $IGNITE_HOME/config\n\n' +
- '# Append jdbc drivers to container.\n' +
- 'ADD ./jdbc-drivers $IGNITE_HOME/libs/jdbc-drivers\n\n' +
- $generatorDocker.secret(cluster) + '\n';
+ '# Update packages and install maven, cpio.\n' +
+ 'RUN \\\n' +
+ ' apt-get update && \\\n' +
+ ' apt-get install -y maven cpio\n\n' +
+ '# Append project to container.\n' +
+ 'ADD . ' + cluster.name + '\n\n' +
+ '# Build project in container container.\n' +
+ 'RUN mvn -f ' + cluster.name + '/pom.xml clean package -DskipTests\n\n' +
+ '# Copy project jars to node classpath.\n' +
+ 'RUN mkdir $IGNITE_HOME/libs/' + cluster.name + ' && \\\n' +
+ '(cd ' + cluster.name +'/target && find . -name "*.jar" -type f | cpio -updm $IGNITE_HOME/libs/' + cluster.name + ') && \\\n' +
+ 'cp -r ' + cluster.name + '/config/* $IGNITE_HOME/config\n'
+};
+
+
+$generatorDocker.ignoreFile = function() {
+ return 'target\n' +
+ 'Dockerfile';
};
http://git-wip-us.apache.org/repos/asf/ignite/blob/f983f421/modules/control-center-web/src/main/js/helpers/generator/generator-pom.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/helpers/generator/generator-pom.js b/modules/control-center-web/src/main/js/helpers/generator/generator-pom.js
index 2909b5f..7995d0a 100644
--- a/modules/control-center-web/src/main/js/helpers/generator/generator-pom.js
+++ b/modules/control-center-web/src/main/js/helpers/generator/generator-pom.js
@@ -84,6 +84,7 @@ $generatorPom.pom = function (cluster, igniteVersion, mvnRepositories, res) {
});
var dependencies = [];
+ var excludeGroupIds = ['org.apache.ignite'];
function addDependency(groupId, artifactId, version, jar) {
dependencies.push({
@@ -195,7 +196,7 @@ $generatorPom.pom = function (cluster, igniteVersion, mvnRepositories, res) {
if (dialect.SQLServer)
addDependency('microsoft', 'jdbc', '4.1', 'sqljdbc41.jar');
- $generatorPom.dependencies(res, cluster, dependencies);
+ $generatorPom.dependencies(res, cluster, dependencies, excludeGroupIds);
res.needEmptyLine = true;
@@ -207,6 +208,24 @@ $generatorPom.pom = function (cluster, igniteVersion, mvnRepositories, res) {
res.startBlock('<plugins>');
res.startBlock('<plugin>');
+ $generatorPom.addProperty(res, 'artifactId', 'maven-dependency-plugin');
+ res.startBlock('<executions>');
+ res.startBlock('<execution>');
+ $generatorPom.addProperty(res, 'id', 'copy-libs');
+ $generatorPom.addProperty(res, 'phase', 'test-compile');
+ res.startBlock('<goals>');
+ $generatorPom.addProperty(res, 'goal', 'copy-dependencies');
+ res.endBlock('</goals>');
+ res.startBlock('<configuration>');
+ $generatorPom.addProperty(res, 'excludeGroupIds', excludeGroupIds.join(','));
+ $generatorPom.addProperty(res, 'outputDirectory', 'target/libs');
+ $generatorPom.addProperty(res, 'includeScope', 'runtime');
+ $generatorPom.addProperty(res, 'excludeTransitive', 'true');
+ res.endBlock('</configuration>');
+ res.endBlock('</execution>');
+ res.endBlock('</executions>');
+ res.endBlock('</plugin>');
+ res.startBlock('<plugin>');
$generatorPom.addProperty(res, 'artifactId', 'maven-compiler-plugin');
$generatorPom.addProperty(res, 'version', '3.1');
res.startBlock('<configuration>');
[6/7] ignite git commit: IGNITE-2612 Fixed filtration on clusters
screen.
Posted by ak...@apache.org.
IGNITE-2612 Fixed filtration on clusters screen.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2ae3bce1
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2ae3bce1
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2ae3bce1
Branch: refs/heads/ignite-843-rc3
Commit: 2ae3bce11c5049c2b330ecfda785652f58e61227
Parents: f983f42
Author: Dmitriyff <dm...@gmail.com>
Authored: Wed Feb 10 16:10:05 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Wed Feb 10 16:10:05 2016 +0700
----------------------------------------------------------------------
modules/control-center-web/src/main/js/app/index.js | 3 +++
.../src/main/js/controllers/clusters-controller.js | 2 +-
.../src/main/js/views/configuration/clusters.jade | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2ae3bce1/modules/control-center-web/src/main/js/app/index.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/index.js b/modules/control-center-web/src/main/js/app/index.js
index 3e91ff6..30dc3ba 100644
--- a/modules/control-center-web/src/main/js/app/index.js
+++ b/modules/control-center-web/src/main/js/app/index.js
@@ -164,6 +164,9 @@ angular
$locationProvider.html5Mode(true);
}])
+.run(['$rootScope', ($root) => {
+ $root._ = _;
+}])
.run(['$rootScope', '$state', 'Auth', 'User', ($root, $state, Auth, User) => {
$root.$state = $state;
http://git-wip-us.apache.org/repos/asf/ignite/blob/2ae3bce1/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 465f7aa..41df7ab 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
@@ -169,7 +169,7 @@ consoleModule.controller('clustersController', function ($http, $timeout, $scope
$scope.selectItem = function (item, backup) {
function selectItem() {
- $scope.selectedItem = angular.copy(item);
+ $scope.selectedItem = item;
try {
if (item && item._id)
http://git-wip-us.apache.org/repos/asf/ignite/blob/2ae3bce1/modules/control-center-web/src/main/js/views/configuration/clusters.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/configuration/clusters.jade b/modules/control-center-web/src/main/js/views/configuration/clusters.jade
index e5a3a07..e3556ac 100644
--- a/modules/control-center-web/src/main/js/views/configuration/clusters.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/clusters.jade
@@ -50,7 +50,7 @@ include ../includes/infos
hr
.bs-affix-fix
div(bs-collapse='' data-allow-multiple='true' ng-model='ui.activePanels')
- form.form-horizontal(name='ui.inputForm' ng-show='backupItem' novalidate)
+ form.form-horizontal(name='ui.inputForm' ng-show='backupItem && _.includes(displayedRows, selectedItem)' novalidate)
.panel-group(ng-click='triggerDigest = true')
ignite-configuration-clusters-general
.advanced-options
[4/7] ignite git commit: IGNITE-843 Fixed/added links to
documentation.
Posted by ak...@apache.org.
IGNITE-843 Fixed/added links to documentation.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a4050094
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a4050094
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a4050094
Branch: refs/heads/ignite-843-rc3
Commit: a40500940ecc3c8c6073fd79b0efb9746cb96504
Parents: 58efcba
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Wed Feb 10 15:01:52 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Wed Feb 10 15:01:52 2016 +0700
----------------------------------------------------------------------
.../control-center-web/src/main/js/views/includes/infos.jade | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/a4050094/modules/control-center-web/src/main/js/views/includes/infos.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/includes/infos.jade b/modules/control-center-web/src/main/js/views/includes/infos.jade
index d7f692d..ec2c99e 100644
--- a/modules/control-center-web/src/main/js/views/includes/infos.jade
+++ b/modules/control-center-web/src/main/js/views/includes/infos.jade
@@ -31,14 +31,14 @@ mixin ignite-domains-information
mixin ignite-caches-information
ignite-information
ul
- li Configure memory settings
+ li Configure #[a(href='https://apacheignite.readme.io/docs/data-grid' target='_blank') memory] settings
li Configure persistence
mixin ignite-igfs-information
ignite-information(data-title='Configure IGFS only if you are going to use In-memory File System')
ul
- li Ignite File System (IGFS) is an in-memory file system allowing work with files and directories over existing cache infrastructure
- li IGFS can either work as purely in-memory file system, or delegate to another file system (e.g. various Hadoop file system implementations) acting as a caching layer (see #[a(href='https://apacheignite.readme.io/docs/secondary-file-system' target='_blank') secondary file system] for more detail)
+ li Ignite File System (#[a(href='https://apacheignite-fs.readme.io/docs/in-memory-file-system' target='_blank') IGFS]) is an in-memory file system allowing work with files and directories over existing cache infrastructure
+ li IGFS can either work as purely in-memory file system, or delegate to another file system (e.g. various Hadoop file system implementations) acting as a caching layer (see #[a(href='https://apacheignite-fs.readme.io/docs/secondary-file-system' target='_blank') secondary file system] for more detail)
li In addition IGFS provides API to execute map-reduce tasks over file system data
mixin ignite-summary-information