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/20 08:49:27 UTC

[1/2] ignite git commit: IGNITE-2696 Reworked pom artifact name generation.

Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 75ad7be65 -> a78f2a5b5


IGNITE-2696 Reworked pom artifact name generation.


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

Branch: refs/heads/ignite-843-rc2
Commit: e52058de8ac486e991746dfbfe4783fc7e664a81
Parents: 75ad7be
Author: vsisko <vs...@gridgain.com>
Authored: Sat Feb 20 14:49:05 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Sat Feb 20 14:49:05 2016 +0700

----------------------------------------------------------------------
 .../src/main/js/helpers/generator/generator-pom.js          | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/e52058de/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 4d9724f..804b607 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
@@ -18,6 +18,13 @@
 // pom.xml generation entry point.
 $generatorPom = {};
 
+$generatorPom.escapeId = function (s) {
+    if (typeof(s) !== 'string')
+        return s;
+
+    return s.replace(/[^A-Za-z0-9_\-.]+/g, '_');
+};
+
 $generatorPom.addProperty = function (res, tag, val) {
     res.line('<' + tag + '>' + val + '</' + tag + '>');
 };
@@ -124,7 +131,7 @@ $generatorPom.pom = function (cluster, igniteVersion, mvnRepositories, res) {
     res.needEmptyLine = true;
 
     $generatorPom.addProperty(res, 'groupId', 'org.apache.ignite');
-    $generatorPom.addProperty(res, 'artifactId', 'ignite-generated-model');
+    $generatorPom.addProperty(res, 'artifactId', 'ignite-generated-' + $generatorPom.escapeId(cluster.name));
     $generatorPom.addProperty(res, 'version', igniteVersion);
 
     res.needEmptyLine = true;

[2/2] ignite git commit: IGNITE-2287 Fixed wrong package name.

Posted by ak...@apache.org.
IGNITE-2287 Fixed wrong package name.


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

Branch: refs/heads/ignite-843-rc2
Commit: a78f2a5b5e6c1a30c5b7b8742ede5ef4cd712962
Parents: e52058d
Author: vsisko <vs...@gridgain.com>
Authored: Sat Feb 20 14:49:47 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Sat Feb 20 14:49:47 2016 +0700

----------------------------------------------------------------------
 .../app/modules/states/configuration/summary/summary.controller.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/a78f2a5b/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 5b8aa31..adcc467 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
@@ -259,7 +259,7 @@ export default [
             zip.file(srcPath + 'config/ClientConfigurationFactory.java', $generatorJava.cluster(cluster, 'config', 'ClientConfigurationFactory', clientNearCfg));
 
             if ($generatorCommon.dataForExampleConfigured(cluster)) {
-                zip.file(srcPath + 'example/ExampleStartup.java', $generatorJava.nodeStartup(cluster, 'startup', 'ExampleStartup',
+                zip.file(srcPath + 'example/ExampleStartup.java', $generatorJava.nodeStartup(cluster, 'example', 'ExampleStartup',
                     'ServerConfigurationFactory.createConfiguration()', 'config.ServerConfigurationFactory'));
             }