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-1927 Added pom.xml to Summary screen.
Date Wed, 18 Nov 2015 10:20:33 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc1 6b3dbbd85 -> 5ed01cf12


IGNITE-1927 Added pom.xml to Summary screen.


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

Branch: refs/heads/ignite-843-rc1
Commit: 5ed01cf120d2d9a73fc77247cc5b1b30ef0bc31e
Parents: 6b3dbbd
Author: vsisko <vsisko@gridgain.com>
Authored: Wed Nov 18 17:20:56 2015 +0700
Committer: Alexey Kuznetsov <akuznetsov@apache.org>
Committed: Wed Nov 18 17:20:56 2015 +0700

----------------------------------------------------------------------
 .../src/main/js/controllers/summary-controller.js   |  6 +++++-
 .../src/main/js/helpers/generator/generator-xml.js  |  2 +-
 .../main/js/views/configuration/summary-tabs.jade   |  1 +
 .../src/main/js/views/configuration/summary.jade    | 16 ++++++++++------
 4 files changed, 17 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/5ed01cf1/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 2147b45..163e7f6 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,6 +19,8 @@
 consoleModule.controller('summaryController', [
     '$scope', '$http', '$common', '$loading', '$message', '$table',
     function ($scope, $http, $common, $loading, $message, $table) {
+    var igniteVersion = '1.5.0-IWC';
+
     $scope.panelExpanded = $common.panelExpanded;
     $scope.tableVisibleRow = $table.tableVisibleRow;
     $scope.joinTip = $common.joinTip;
@@ -181,6 +183,8 @@ consoleModule.controller('summaryController', [
 
         $scope.xmlServer = $generatorXml.cluster(cluster);
 
+        $scope.pom = $generatorPom.pom(cluster, igniteVersion).asString();
+
         $scope.generateJavaServer();
 
         $scope.generateDockerServer();
@@ -218,7 +222,7 @@ consoleModule.controller('summaryController', [
         zip.file(srcPath + 'ClientConfigurationFactory.java', $generatorJava.cluster(cluster,
'ClientConfigurationFactory', clientNearConfiguration, true));
         zip.file(srcPath + 'NodeStartup.java', $generatorJava.nodeStartup(cluster));
 
-        zip.file('pom.xml', $generatorPom.pom(cluster, '1.5.0-IWC').asString());
+        zip.file('pom.xml', $generatorPom.pom(cluster, igniteVersion).asString());
 
         zip.file('README.txt', $generatorReadme.readme().asString());
         zip.file('jdbc-drivers/README.txt', $generatorReadme.readmeJdbc().asString());

http://git-wip-us.apache.org/repos/asf/ignite/blob/5ed01cf1/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 767d463..3e3455e 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
@@ -1467,7 +1467,7 @@ $generatorXml.cluster = function (cluster, clientNearCfg) {
         // 1. Add header.
         var xml = '<?xml version="1.0" encoding="UTF-8"?>\n\n';
 
-        xml += '<!-- ' + $generatorCommon.mainComment() + ' -->\n';
+        xml += '<!-- ' + $generatorCommon.mainComment() + ' -->\n\n';
         xml += '<beans xmlns="http://www.springframework.org/schema/beans"\n';
         xml += '       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n';
         xml += '       xmlns:util="http://www.springframework.org/schema/util"\n';

http://git-wip-us.apache.org/repos/asf/ignite/blob/5ed01cf1/modules/control-center-web/src/main/js/views/configuration/summary-tabs.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/configuration/summary-tabs.jade
b/modules/control-center-web/src/main/js/views/configuration/summary-tabs.jade
index 86d7153..2b97acd 100644
--- a/modules/control-center-web/src/main/js/views/configuration/summary-tabs.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/summary-tabs.jade
@@ -19,6 +19,7 @@ ul.nav(ng-class='$navClass', role='tablist')
         a.summary-tab(ng-show='$pane.title != "POJO" || pojoAvailable()' ng-switch='$pane.title'
role='tab' data-toggle='tab' ng-click='!$pane.disabled && $setActive($pane.name ||
$index)' data-index='{{ $index }}' aria-controls='$pane.title') {{$pane.title}}
             img(ng-switch-when='XML' src='/images/xml.png')
             img(ng-switch-when='Java' src='/images/java.png')
+            img(ng-switch-when='POM' src='/images/xml.png')
             img(ng-switch-when='POJO' src='/images/java.png')
             img(ng-switch-when='Dockerfile' src='/images/docker.png')
 .tab-content(ng-transclude style='fontSize: 12px; min-height: 25em')

http://git-wip-us.apache.org/repos/asf/ignite/blob/5ed01cf1/modules/control-center-web/src/main/js/views/configuration/summary.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/configuration/summary.jade b/modules/control-center-web/src/main/js/views/configuration/summary.jade
index 11e8452..e04fde9 100644
--- a/modules/control-center-web/src/main/js/views/configuration/summary.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/summary.jade
@@ -45,7 +45,7 @@ mixin pojos(side)
             .col-xs-10.col-sm-10.col-md-10
                 input(type='checkbox' ng-model='configServer.includeKeyFields')
                 | Include key fields
-        div(ui-ace='{ onLoad: aceInit, mode: "java" }' ng-model='config#{side}.pojoClassBody')
+        div(ui-ace='{onLoad: aceInit, mode: "java"}' ng-model='config#{side}.pojoClassBody')
 
 block content
     .docs-header
@@ -69,14 +69,16 @@ block content
                     .panel-collapse(id='server' role='tabpanel' bs-collapse-target)
                         .summary-tabs(bs-tabs data-bs-active-pane="tabsServer.activeTab"
ng-show='selectedItem' template='summary/summary-tabs')
                             div(bs-pane title='XML')
-                                div(ui-ace='{ onLoad: aceInit, mode: "xml" }' ng-model='xmlServer')
+                                div(ui-ace='{onLoad: aceInit, mode: "xml"}' ng-model='xmlServer')
                             div(bs-pane title='Java')
                                 .details-row
                                     .col-xs-2.col-sm-2.col-md-1
                                         label Generate:
                                     .col-xs-4.col-sm-3.col-md-3
                                         button.select-toggle.form-control(ng-model='configServer.javaClassServer'
bs-select bs-options='item.value as item.label for item in javaClassItems' data-sort='false')
-                                div(ui-ace='{ onLoad: aceInit, mode: "java" }' ng-model='javaServer')
+                                div(ui-ace='{onLoad: aceInit, mode: "java"}' ng-model='javaServer')
+                            div(bs-pane title='POM')
+                                div(ui-ace='{onLoad: aceInit, mode: "xml"}' ng-model='pom')
                             div(bs-pane title='Dockerfile')
                                 .details-row
                                     p
@@ -92,7 +94,7 @@ block content
                                         label(for='os') Operation System:
                                     .col-xs-5.col-sm-4
                                         input#os.form-control(type='text' ng-model='configServer.os'
placeholder='debian:8' data-min-length='0' data-html='1' data-auto-select='true' bs-typeahead
retain-selection bs-options='os for os in oss')
-                                div(ui-ace='{ onLoad: aceInit, mode: "dockerfile" }' ng-model='dockerServer')
+                                div(ui-ace='{onLoad: aceInit, mode: "dockerfile"}' ng-model='dockerServer')
                 .panel.panel-default
                     .panel-heading(role='tab' bs-collapse-toggle)
                         i.fa(ng-class='panelExpanded(panels, "client") ? "fa-chevron-circle-up"
: "fa-chevron-circle-down"')
@@ -103,12 +105,14 @@ block content
                                 +form-row-custom(['col-xs-4 col-sm-4 col-md-3'], ['col-xs-4
col-sm-4 col-md-3'], 'backupItem')
                             .summary-tabs(bs-tabs data-bs-active-pane="tabsClient.activeTab"
template='summary/summary-tabs')
                                 div(bs-pane title='XML')
-                                    div(ui-ace='{ onLoad: aceInit, mode: "xml" }' ng-model='xmlClient')
+                                    div(ui-ace='{onLoad: aceInit, mode: "xml"}' ng-model='xmlClient')
                                 div(bs-pane title='Java')
                                     .details-row
                                         .col-xs-2.col-sm-2.col-md-1
                                             label Generate:
                                         .col-xs-4.col-sm-3.col-md-3
                                             button.select-toggle.form-control(ng-model='backupItem.javaClassClient'
bs-select bs-options='item.value as item.label for item in javaClassItems' data-sort='false')
-                                    div(ui-ace='{ onLoad: aceInit, mode: "java" }' ng-model='javaClient')
+                                    div(ui-ace='{onLoad: aceInit, mode: "java"}' ng-model='javaClient')
+                                div(bs-pane title='POM')
+                                    div(ui-ace='{onLoad: aceInit, mode: "xml"}' ng-model='pom')
                                 +pojos('Client')


Mime
View raw message