Repository: incubator-ignite Updated Branches: refs/heads/ignite-843 136be5506 -> 7cf713cb1
IGNITE-843: Fixed code generation. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7cf713cb Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7cf713cb Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7cf713cb Branch: refs/heads/ignite-843 Commit: 7cf713cb1bf35ceb755e821b965575bf9d3c9d78 Parents: 136be55 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Mon Aug 17 10:48:27 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Mon Aug 17 10:48:27 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/controllers/models/clusters.json | 2 +- modules/control-center-web/src/main/js/db.js | 1 + modules/control-center-web/src/main/js/routes/generator/java.js | 5 +++-- modules/control-center-web/src/main/js/routes/generator/xml.js | 3 ++- 4 files changed, 7 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7cf713cb/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 8ff582a..1233f91 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 @@ -286,7 +286,7 @@ "type": "text", "required": true, "path": "discovery.GoogleStorage", - "model": "accountId", + "model": "serviceAccountId", "tip": [ "Service account ID (typically an e-mail address)." ] http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7cf713cb/modules/control-center-web/src/main/js/db.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/db.js b/modules/control-center-web/src/main/js/db.js index 0d53028..431eccc 100644 --- a/modules/control-center-web/src/main/js/db.js +++ b/modules/control-center-web/src/main/js/db.js @@ -237,6 +237,7 @@ var ClusterSchema = new Schema({ projectName: String, bucketName: String, serviceAccountP12FilePath: String, + serviceAccountId: String, addrReqAttempts: String }, Jdbc: { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7cf713cb/modules/control-center-web/src/main/js/routes/generator/java.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/routes/generator/java.js b/modules/control-center-web/src/main/js/routes/generator/java.js index 06b8a2a..4186573 100644 --- a/modules/control-center-web/src/main/js/routes/generator/java.js +++ b/modules/control-center-web/src/main/js/routes/generator/java.js @@ -124,7 +124,8 @@ exports.generateClusterConfiguration = function (cluster, javaClass, clientNearC 'TcpDiscoveryGoogleStorageIpFinder', { projectName: null, bucketName: null, - serviceAccountP12FilePath: null + serviceAccountP12FilePath: null, + serviceAccountId: null }, true); //if (d.GoogleStorage.addrReqAttempts) todo ???? @@ -137,7 +138,7 @@ exports.generateClusterConfiguration = function (cluster, javaClass, clientNearC declareVariable(res, true, 'ipFinder', 'org.apache.ignite.spi.discovery.tcp.ipfinder.jdbc.TcpDiscoveryJdbcIpFinder'); - res.line('ipFinder.setInitSchema(' + (d.Jdbc.initSchema != null || d.Jdbc.initSchema) + ');'); + res.line('ipFinder.setInitSchema(' + (generatorCommon.isDefined(d.Jdbc.initSchema) && d.Jdbc.initSchema) + ');'); res.line('discovery.setIpFinder(ipFinder);'); res.needEmptyLine = true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7cf713cb/modules/control-center-web/src/main/js/routes/generator/xml.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/routes/generator/xml.js b/modules/control-center-web/src/main/js/routes/generator/xml.js index 7c5d045..34f964d 100644 --- a/modules/control-center-web/src/main/js/routes/generator/xml.js +++ b/modules/control-center-web/src/main/js/routes/generator/xml.js @@ -115,6 +115,7 @@ exports.generateClusterConfiguration = function (cluster, clientNearConfiguratio addProperty(res, d.GoogleStorage, 'projectName'); addProperty(res, d.GoogleStorage, 'bucketName'); addProperty(res, d.GoogleStorage, 'serviceAccountP12FilePath'); + addProperty(res, d.GoogleStorage, 'serviceAccountId'); //if (d.GoogleStorage.addrReqAttempts) todo ???? // res.line('<property name="serviceAccountP12FilePath" value="' + escapeAttr(d.GoogleStorage.addrReqAttempts) + '"/>'); @@ -125,7 +126,7 @@ exports.generateClusterConfiguration = function (cluster, clientNearConfiguratio case 'Jdbc': res.startBlock('<bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.jdbc.TcpDiscoveryJdbcIpFinder">'); - res.line('<property name="initSchema" value="' + (d.Jdbc.initSchema != null || d.Jdbc.initSchema) + '"/>'); + res.line('<property name="initSchema" value="' + (generatorCommon.isDefined(d.Jdbc.initSchema) && d.Jdbc.initSchema) + '"/>'); res.endBlock('</bean>'); break;
