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/09/08 15:54:40 UTC
[1/4] ignite git commit: IGNITE-843 Added "gridName" for XML and java
generation.
Repository: ignite
Updated Branches:
refs/heads/ignite-843 a9080e5fe -> 9f96779f5
IGNITE-843 Added "gridName" for XML and java generation.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/19b4edc6
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/19b4edc6
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/19b4edc6
Branch: refs/heads/ignite-843
Commit: 19b4edc605e69624742a91ef941476b39a8560db
Parents: a9080e5
Author: AKuznetsov <ak...@gridgain.com>
Authored: Tue Sep 8 20:51:29 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Tue Sep 8 20:51:29 2015 +0700
----------------------------------------------------------------------
.../src/main/js/routes/generator/generator-java.js | 3 +++
.../src/main/js/routes/generator/generator-xml.js | 4 +++-
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/19b4edc6/modules/control-center-web/src/main/js/routes/generator/generator-java.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/routes/generator/generator-java.js b/modules/control-center-web/src/main/js/routes/generator/generator-java.js
index 877c10c..4f4aeab 100644
--- a/modules/control-center-web/src/main/js/routes/generator/generator-java.js
+++ b/modules/control-center-web/src/main/js/routes/generator/generator-java.js
@@ -312,6 +312,9 @@ $generatorJava.clusterGeneral = function (cluster, clientNearCfg, res) {
$generatorJava.declareVariable(res, true, 'cfg', 'org.apache.ignite.configuration.IgniteConfiguration');
+ $generatorJava.property(res, 'cfg', cluster, 'name', null, 'gridName');
+ res.needEmptyLine = true;
+
if (clientNearCfg) {
res.line('cfg.setClientMode(true);');
http://git-wip-us.apache.org/repos/asf/ignite/blob/19b4edc6/modules/control-center-web/src/main/js/routes/generator/generator-xml.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/routes/generator/generator-xml.js b/modules/control-center-web/src/main/js/routes/generator/generator-xml.js
index 1f7a30d..f5d6971 100644
--- a/modules/control-center-web/src/main/js/routes/generator/generator-xml.js
+++ b/modules/control-center-web/src/main/js/routes/generator/generator-xml.js
@@ -118,7 +118,7 @@ $generatorXml.beanProperty = function (res, bean, beanPropName, desc, createBean
tmpRes.emptyLineIfNeeded();
tmpRes.startBlock('<property name="' + beanPropName + '">');
tmpRes.startBlock('<bean class="' + desc.className + '">');
-
+
var hasData = false;
for (var propName in props) {
@@ -202,6 +202,8 @@ $generatorXml.clusterGeneral = function (cluster, res) {
if (!res)
res = $generatorCommon.builder();
+ $generatorXml.property(res, cluster, 'name', 'gridName');
+
if (cluster.discovery) {
res.startBlock('<property name="discoverySpi">');
res.startBlock('<bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi">');
[3/4] ignite git commit: IGNITE-843 Removed read of unused json.
Posted by ak...@apache.org.
IGNITE-843 Removed read of unused json.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/48c0f1aa
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/48c0f1aa
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/48c0f1aa
Branch: refs/heads/ignite-843
Commit: 48c0f1aaa65d4567a82a4960a6f874c516ebcfe8
Parents: 0f89ebc
Author: AKuznetsov <ak...@gridgain.com>
Authored: Tue Sep 8 20:53:04 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Tue Sep 8 20:53:04 2015 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/models/sql.json | 8 --------
.../src/main/js/controllers/sql-controller.js | 9 ---------
2 files changed, 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/48c0f1aa/modules/control-center-web/src/main/js/controllers/models/sql.json
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/models/sql.json b/modules/control-center-web/src/main/js/controllers/models/sql.json
deleted file mode 100644
index c83352a..0000000
--- a/modules/control-center-web/src/main/js/controllers/models/sql.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "screenTip": [
- "Select cache and execute SQL queries."
- ],
- "missingClientTip": [
- "Please download and install <a href='/agent/agent.zip' target='_self'>client</a>."
- ]
-}
http://git-wip-us.apache.org/repos/asf/ignite/blob/48c0f1aa/modules/control-center-web/src/main/js/controllers/sql-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/sql-controller.js b/modules/control-center-web/src/main/js/controllers/sql-controller.js
index fb76a5e..d763a97 100644
--- a/modules/control-center-web/src/main/js/controllers/sql-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/sql-controller.js
@@ -258,15 +258,6 @@ controlCenterModule.controller('sqlController', ['$scope', '$window','$controlle
);
};
- $http.get('/models/sql.json')
- .success(function (data) {
- $scope.screenTip = data.screenTip;
- $scope.missingClientTip = data.missingClientTip;
- })
- .error(function (errMsg) {
- $common.showError(errMsg);
- });
-
$http.post('/agent/topology')
.success(function (nodes) {
$scope.caches = [];
[4/4] ignite git commit: IGNITE-843 Added wizard step description for
metadata load dialog.
Posted by ak...@apache.org.
IGNITE-843 Added wizard step description for metadata load dialog.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9f96779f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9f96779f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9f96779f
Branch: refs/heads/ignite-843
Commit: 9f96779f5ea75bfe41e6f5b97dce7f5883c567f8
Parents: 48c0f1a
Author: AKuznetsov <ak...@gridgain.com>
Authored: Tue Sep 8 20:54:33 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Tue Sep 8 20:54:33 2015 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/metadata-controller.js | 10 ++++++++--
.../src/main/js/public/stylesheets/style.scss | 7 ++++++-
.../src/main/js/views/configuration/metadata-load.jade | 12 ++++++------
3 files changed, 20 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f96779f/modules/control-center-web/src/main/js/controllers/metadata-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/metadata-controller.js b/modules/control-center-web/src/main/js/controllers/metadata-controller.js
index a336fa4..7622571 100644
--- a/modules/control-center-web/src/main/js/controllers/metadata-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/metadata-controller.js
@@ -263,7 +263,8 @@ controlCenterModule.controller('metadataController', [
allSchemasSelected: false,
tables: [],
allTablesSelected: false,
- button: 'Next'
+ button: 'Next',
+ info: 'Configure connection to database'
};
// Get available JDBC drivers via agent.
@@ -303,6 +304,7 @@ controlCenterModule.controller('metadataController', [
.success(function (schemas) {
$scope.loadMeta.schemas = _.map(schemas, function (schema) { return {use: false, name: schema}});
$scope.loadMeta.action = 'schemas';
+ $scope.loadMeta.info = 'Select schemas to load tables';
})
.error(function (errMsg) {
$common.showError(errMsg);
@@ -311,6 +313,7 @@ controlCenterModule.controller('metadataController', [
function _loadMetadata() {
$scope.loadMeta.allTablesSelected = false;
+ $scope.loadMeta.info = 'Select tables to import as cache type metadata';
$scope.preset.schemas = [];
@@ -546,9 +549,12 @@ controlCenterModule.controller('metadataController', [
if ($scope.loadMeta.action == 'tables') {
$scope.loadMeta.action = 'schemas';
$scope.loadMeta.button = 'Next';
+ $scope.loadMeta.info = 'Select schemas to load tables';
}
- else if ($scope.loadMeta.action == 'schemas')
+ else if ($scope.loadMeta.action == 'schemas') {
$scope.loadMeta.action = 'connect';
+ $scope.loadMeta.info = 'Configure connection to database';
+ }
};
function generatePreview(val) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f96779f/modules/control-center-web/src/main/js/public/stylesheets/style.scss
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/public/stylesheets/style.scss b/modules/control-center-web/src/main/js/public/stylesheets/style.scss
index 1b05453..730f2b3 100644
--- a/modules/control-center-web/src/main/js/public/stylesheets/style.scss
+++ b/modules/control-center-web/src/main/js/public/stylesheets/style.scss
@@ -39,6 +39,7 @@ hr {
a.active {
font-weight: bold;
+ font-size: 1.2em;
}
.navbar-default .navbar-brand, .navbar-default .navbar-brand:hover {
@@ -663,7 +664,7 @@ h3 {
}
.metadata-content {
- margin: 15px;
+ margin: 15px 30px;
}
.metadata-scrollable {
@@ -830,6 +831,10 @@ div.affix.padding-top-dflt {
text-align: center;
}
+.tooltip.top .tooltip-arrow {
+ border-top-color: $brand-primary;
+}
+
.tooltip.right .tooltip-arrow {
border-right-color: $brand-primary;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f96779f/modules/control-center-web/src/main/js/views/configuration/metadata-load.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/configuration/metadata-load.jade b/modules/control-center-web/src/main/js/views/configuration/metadata-load.jade
index 93b2a38..eda9a2c 100644
--- a/modules/control-center-web/src/main/js/views/configuration/metadata-load.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/metadata-load.jade
@@ -25,11 +25,10 @@ mixin chk(mdl, change, tip)
#errors-container.modal-header.header
button.close(type='button' ng-click='$hide()' aria-hidden='true') ×
h4.modal-title Load metadata from database
- .metadata-content(ng-show='loadMeta.action == "connect"')
+ .metadata-content(ng-show='loadMeta.action == "connect"' style='margin-bottom: 60px')
form.form-horizontal(name='loadForm' novalidate)
- .modal-body
- .settings-row(ng-repeat='field in metadataDb')
- +form-row-custom(['col-xs-4 col-sm-3 col-md-3'], ['col-xs-8 col-sm-9 col-md-9'], 'preset')
+ .settings-row(ng-repeat='field in metadataDb')
+ +form-row-custom(['col-xs-4 col-sm-3 col-md-3'], ['col-xs-8 col-sm-9 col-md-9'], 'preset')
.metadata-content(ng-show='loadMeta.action == "schemas"')
table.table.metadata(st-table='displayedSchemas' st-safe-src='loadMeta.schemas')
thead
@@ -54,10 +53,10 @@ mixin chk(mdl, change, tip)
td
label {{::schema.name}}
.metadata-content(ng-show='loadMeta.action == "tables"')
- div.metadata-package-name
+ .metadata-package-name
label.required Package:
span
- input.form-control(type="text" ng-model='ui.packageName')
+ input.form-control(type="text" ng-model='ui.packageName' placeholder='Package for POJOs generation' bs-tooltip='' data-title='Package that will be used for POJOs generation' data-placement='top' data-trigger='hover')
table.table.metadata(st-table='displayedTables' st-safe-src='loadMeta.tables')
thead
tr
@@ -85,5 +84,6 @@ mixin chk(mdl, change, tip)
td
label {{::table.tbl}}
.modal-footer
+ label.labelField {{loadMeta.info}}
button.btn.btn-primary(ng-show='loadMeta.action != "connect"' ng-click='loadMetadataPrev()') Prev
a.btn.btn-primary(ng-click='loadMetadataNext()' ng-disabled='!nextAvailable()' bs-tooltip data-title='{{nextTooltipText()}}' data-placement='bottom') {{loadMeta.button}}
[2/4] ignite git commit: IGNITE-843 Update libs.
Posted by ak...@apache.org.
IGNITE-843 Update libs.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0f89ebce
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0f89ebce
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0f89ebce
Branch: refs/heads/ignite-843
Commit: 0f89ebceda5b5f65a0b0214b5d45ee2ea4b94031
Parents: 19b4edc
Author: AKuznetsov <ak...@gridgain.com>
Authored: Tue Sep 8 20:51:46 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Tue Sep 8 20:51:46 2015 +0700
----------------------------------------------------------------------
modules/control-center-web/src/main/js/package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0f89ebce/modules/control-center-web/src/main/js/package.json
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/package.json b/modules/control-center-web/src/main/js/package.json
index 501ef55..23ee952 100644
--- a/modules/control-center-web/src/main/js/package.json
+++ b/modules/control-center-web/src/main/js/package.json
@@ -46,7 +46,7 @@
"devDependencies": {
"morgan": "~1.6.1",
"supertest": "^1.1.0",
- "mocha": "~2.3.1",
+ "mocha": "~2.3.2",
"should": "~7.1.0"
}
}