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/23 09:07:33 UTC
ignite git commit: IGNITE-843 WIP on binary configuration and minor
fixes.
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc2 52f9559d3 -> bdae67138
IGNITE-843 WIP on binary configuration and minor fixes.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/bdae6713
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/bdae6713
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/bdae6713
Branch: refs/heads/ignite-843-rc2
Commit: bdae671387409c5a7fe3f228ed6f636d53e41742
Parents: 52f9559
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Wed Dec 23 15:08:31 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Wed Dec 23 15:08:31 2015 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/clusters-controller.js | 5 +++++
.../src/main/js/controllers/common-module.js | 2 +-
.../src/main/js/controllers/models/clusters.json | 2 +-
.../src/main/js/helpers/generator/generator-java.js | 12 +++++++++++-
.../main/js/helpers/generator/generator-properties.js | 2 +-
.../src/main/js/helpers/generator/generator-xml.js | 10 ++++++++++
6 files changed, 29 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/bdae6713/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 a9b23d9..dfa8b9d 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
@@ -94,6 +94,7 @@ consoleModule.controller('clustersController', [
$scope.preview = {
general: {xml: '', java: '', allDefaults: true},
atomics: {xml: '', java: '', allDefaults: true},
+ binary: {xml: '', java: '', allDefaults: true},
communication: {xml: '', java: '', allDefaults: true},
connector: {xml: '', java: '', allDefaults: true},
deployment: {xml: '', java: '', allDefaults: true},
@@ -261,6 +262,10 @@ consoleModule.controller('clustersController', [
$scope.preview.atomics.java = $generatorJava.clusterAtomics(val).asString();
$scope.preview.atomics.allDefaults = $common.isEmptyString($scope.preview.atomics.xml);
+ $scope.preview.binary.xml = $generatorXml.clusterBinary(val).asString();
+ $scope.preview.binary.java = $generatorJava.clusterBinary(val).asString();
+ $scope.preview.binary.allDefaults = $common.isEmptyString($scope.preview.binary.xml);
+
$scope.preview.communication.xml = $generatorXml.clusterCommunication(val).asString();
$scope.preview.communication.java = $generatorJava.clusterCommunication(val).asString();
$scope.preview.communication.allDefaults = $common.isEmptyString($scope.preview.communication.xml);
http://git-wip-us.apache.org/repos/asf/ignite/blob/bdae6713/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 2357a02..3de0fe0 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
@@ -1067,7 +1067,7 @@ consoleModule.service('$confirmBatch', function ($rootScope, $modal, $q) {
var deferred;
- var stepConfirmModal = $modal({templateUrl: '/template/batch-confirm.html', scope: scope, placement: 'center', show: false});
+ var stepConfirmModal = $modal({templateUrl: '/templates/batch-confirm.html', scope: scope, placement: 'center', show: false});
function _done(cancel) {
if (cancel)
http://git-wip-us.apache.org/repos/asf/ignite/blob/bdae6713/modules/control-center-web/src/main/js/controllers/models/clusters.json
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/models/clusters.json b/modules/control-center-web/src/main/js/controllers/models/clusters.json
index da7b23b..70878e3 100644
--- a/modules/control-center-web/src/main/js/controllers/models/clusters.json
+++ b/modules/control-center-web/src/main/js/controllers/models/clusters.json
@@ -398,7 +398,7 @@
},
{
"label": "Binary configuration",
- "group": "atomics",
+ "group": "binary",
"tip": [
"Configuration for Ignite Binary Objects"
],
http://git-wip-us.apache.org/repos/asf/ignite/blob/bdae6713/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/helpers/generator/generator-java.js b/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
index 9eec2c0..5c93e07 100644
--- a/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
+++ b/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
@@ -541,6 +541,16 @@ $generatorJava.clusterAtomics = function (cluster, res) {
return res;
};
+// Generate binary group.
+$generatorJava.clusterBinary = function (cluster, res) {
+ if (!res)
+ res = $generatorCommon.builder();
+
+ res.line('// TODO');
+
+ return res;
+};
+
// Generate communication group.
$generatorJava.clusterCommunication = function (cluster, res) {
if (!res)
@@ -976,7 +986,7 @@ $generatorJava.cacheStore = function (cache, metadatas, cacheVarName, res) {
res.line('setDataSource(dataSource);');
res.line('');
res.line('return super.create();');
- res.endBlock('};');
+ res.endBlock('}');
res.endBlock('};');
res.needEmptyLine = true;
http://git-wip-us.apache.org/repos/asf/ignite/blob/bdae6713/modules/control-center-web/src/main/js/helpers/generator/generator-properties.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/helpers/generator/generator-properties.js b/modules/control-center-web/src/main/js/helpers/generator/generator-properties.js
index a8dfd3f..3fb2a8a 100644
--- a/modules/control-center-web/src/main/js/helpers/generator/generator-properties.js
+++ b/modules/control-center-web/src/main/js/helpers/generator/generator-properties.js
@@ -70,8 +70,8 @@ $generatorProperties.dataSourcesProperties = function (cluster, res) {
case 'DB2':
res.line(beanId + '.jdbc.server_name=YOUR_DATABASE_SERVER_NAME');
res.line(beanId + '.jdbc.port_number=YOUR_JDBC_PORT_NUMBER');
- res.line(beanId + '.jdbc.database_name=YOUR_DATABASE_NAME');
res.line(beanId + '.jdbc.driver_type=YOUR_JDBC_DRIVER_TYPE');
+ res.line(beanId + '.jdbc.database_name=YOUR_DATABASE_NAME');
break;
http://git-wip-us.apache.org/repos/asf/ignite/blob/bdae6713/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 d9c75cd..c9fddbd 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
@@ -379,6 +379,16 @@ $generatorXml.clusterAtomics = function (cluster, res) {
return res;
};
+// Generate binary group.
+$generatorXml.clusterBinary = function (cluster, res) {
+ if (!res)
+ res = $generatorCommon.builder();
+
+ res.line('<todo>TODO</todo>');
+
+ return res;
+};
+
// Generate communication group.
$generatorXml.clusterCommunication = function (cluster, res) {
if (!res)