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/08 12:16:00 UTC
ignite git commit: IGNITE-843: Reworked pom.xml generation - fixed
version and add plugin support for repositories list.
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc2 3db025231 -> 87a4e8d84
IGNITE-843: Reworked pom.xml generation - fixed version and add plugin support for repositories list.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/87a4e8d8
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/87a4e8d8
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/87a4e8d8
Branch: refs/heads/ignite-843-rc2
Commit: 87a4e8d84f10862ae02894c01264cb93a198c780
Parents: 3db0252
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Tue Dec 8 18:16:35 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Tue Dec 8 18:16:35 2015 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/common-module.js | 14 ++++++-------
.../main/js/controllers/summary-controller.js | 2 +-
.../src/main/js/helpers/common-utils.js | 7 +++++++
.../main/js/helpers/generator/generator-pom.js | 21 +++++++++++++-------
4 files changed, 29 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/87a4e8d8/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 fb96f24..1c4f242 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
@@ -750,17 +750,17 @@ consoleModule.service('$common', [
return true;
},
metadataForQueryConfigured: function (meta) {
- var isEmpty = !isDefined(meta) || (isEmptyArray(meta.fields)
- && isEmptyArray(meta.aliases)
- && isEmptyArray(meta.indexes));
+ var isEmpty = !isDefined(meta) || (isEmptyArray(meta.fields) &&
+ isEmptyArray(meta.aliases) &&
+ isEmptyArray(meta.indexes));
return !isEmpty;
},
metadataForStoreConfigured: function (meta) {
- var isEmpty = !isDefined(meta) || (isEmptyString(meta.databaseSchema)
- && isEmptyString(meta.databaseTable)
- && isEmptyArray(meta.keyFields)
- && isEmptyArray(meta.valueFields));
+ var isEmpty = !isDefined(meta) || (isEmptyString(meta.databaseSchema) &&
+ isEmptyString(meta.databaseTable) &&
+ isEmptyArray(meta.keyFields) &&
+ isEmptyArray(meta.valueFields));
return !isEmpty;
},
http://git-wip-us.apache.org/repos/asf/ignite/blob/87a4e8d8/modules/control-center-web/src/main/js/controllers/summary-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/summary-controller.js b/modules/control-center-web/src/main/js/controllers/summary-controller.js
index b1b1351..b5ca1f0 100644
--- a/modules/control-center-web/src/main/js/controllers/summary-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/summary-controller.js
@@ -19,7 +19,7 @@
consoleModule.controller('summaryController', [
'$scope', '$http', '$common', '$loading', '$table',
function ($scope, $http, $common, $loading, $table) {
- var igniteVersion = '1.5.0';
+ var igniteVersion = '1.5.0-b1';
$loading.start('loadingSummaryScreen');
$scope.panelExpanded = $common.panelExpanded;
http://git-wip-us.apache.org/repos/asf/ignite/blob/87a4e8d8/modules/control-center-web/src/main/js/helpers/common-utils.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/helpers/common-utils.js b/modules/control-center-web/src/main/js/helpers/common-utils.js
index dca450c..f1d46fa 100644
--- a/modules/control-center-web/src/main/js/helpers/common-utils.js
+++ b/modules/control-center-web/src/main/js/helpers/common-utils.js
@@ -26,6 +26,13 @@ $commonUtils.isDefined = function (v) {
return !(v === undefined || v === null);
};
+$commonUtils.isEmptyArray = function(arr) {
+ if ($commonUtils.isDefined(arr))
+ return arr.length === 0;
+
+ return true;
+};
+
/**
* @param v Value to check.
* @returns {boolean} 'true' if value defined and not empty string.
http://git-wip-us.apache.org/repos/asf/ignite/blob/87a4e8d8/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 aff8307..71baa8b 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
@@ -62,10 +62,11 @@ $generatorPom.dependencies = function (res, cluster, deps) {
*
* @param cluster Cluster to take info about dependencies.
* @param igniteVersion Ignite version for Ignite dependencies.
+ * @param mvnRepositories, List of repositories to add to generated pom.
* @param res Resulting output with generated pom.
* @returns {string} Generated content.
*/
-$generatorPom.pom = function (cluster, igniteVersion, res) {
+$generatorPom.pom = function (cluster, igniteVersion, mvnRepositories, res) {
if (!res)
res = $generatorCommon.builder();
@@ -126,12 +127,18 @@ $generatorPom.pom = function (cluster, igniteVersion, res) {
res.needEmptyLine = true;
- res.startBlock('<repositories>');
- res.startBlock('<repository>');
- $generatorPom.addProperty(res, 'id', 'GridGain External Repository');
- $generatorPom.addProperty(res, 'url', 'http://www.gridgainsystems.com/nexus/content/repositories/gridgain_staging-1584');
- res.endBlock('</repository>');
- res.endBlock('</repositories>');
+ if (!$commonUtils.isEmptyArray(mvnRepositories)) {
+ res.startBlock('<repositories>');
+
+ _.forEach(mvnRepositories, function (repo) {
+ res.startBlock('<repository>');
+ $generatorPom.addProperty(res, 'id', repo.id);
+ $generatorPom.addProperty(res, 'url', repo.url);
+ res.endBlock('</repository>');
+ });
+
+ res.endBlock('</repositories>');
+ }
res.needEmptyLine = true;