Repository: ignite Updated Branches: refs/heads/ignite-843 ac82d2cac -> c708316c0
IGNITE-843 WIP on preview java. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c708316c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c708316c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c708316c Branch: refs/heads/ignite-843 Commit: c708316c0759a35f8d2a4240453b52b10591562d Parents: ac82d2c Author: Alexey Kuznetsov <akuznet...@apache.org> Authored: Wed Aug 26 15:42:30 2015 +0700 Committer: Alexey Kuznetsov <akuznet...@apache.org> Committed: Wed Aug 26 15:42:30 2015 +0700 ---------------------------------------------------------------------- .../main/js/controllers/caches-controller.js | 5 +- .../main/js/controllers/clusters-controller.js | 5 +- .../main/js/controllers/metadata-controller.js | 5 +- .../main/js/routes/generator/generator-java.js | 90 ++++++++++++-------- .../main/js/routes/generator/generator-xml.js | 70 ++++++++------- 5 files changed, 104 insertions(+), 71 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/c708316c/modules/control-center-web/src/main/js/controllers/caches-controller.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/controllers/caches-controller.js b/modules/control-center-web/src/main/js/controllers/caches-controller.js index d464265..184adef 100644 --- a/modules/control-center-web/src/main/js/controllers/caches-controller.js +++ b/modules/control-center-web/src/main/js/controllers/caches-controller.js @@ -314,7 +314,10 @@ controlCenterModule.controller('cachesController', [ // Add new cache. $scope.createItem = function () { $table.tableReset(); - $common.ensureActivePanel($scope.panels, 'general-data'); + + $timeout(function () { + $common.ensureActivePanel($scope.panels, 'general-data'); + }); var newItem = { space: $scope.spaces[0]._id, http://git-wip-us.apache.org/repos/asf/ignite/blob/c708316c/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 7ed6b95..a87bc23 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 @@ -262,7 +262,10 @@ controlCenterModule.controller('clustersController', ['$scope', '$http', '$timeo // Add new cluster. $scope.createItem = function () { $table.tableReset(); - $common.ensureActivePanel($scope.panels, "general-data"); + + $timeout(function () { + $common.ensureActivePanel($scope.panels, "general-data"); + }); var newItem = angular.copy($scope.template); newItem.caches = []; http://git-wip-us.apache.org/repos/asf/ignite/blob/c708316c/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 bc9cd14..b37969b 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 @@ -543,7 +543,10 @@ controlCenterModule.controller('metadataController', [ // Add new metadata. $scope.createItem = function () { $table.tableReset(); - $common.ensureActivePanel($scope.panels, 'metadata-data'); + + $timeout(function () { + $common.ensureActivePanel($scope.panels, 'metadata-data'); + }); $scope.selectedItem = undefined; http://git-wip-us.apache.org/repos/asf/ignite/blob/c708316c/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 bd22777..5a4c2f2 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 @@ -596,23 +596,29 @@ $generatorJava.clusterGeneral = function (cluster, res) { case 'Multicast': res.importClass('org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder'); - $generatorJava._addBeanWithProperties(res, 'discovery', d.Multicast, 'ipFinder', 'ipFinder', - 'TcpDiscoveryMulticastIpFinder', { - multicastGroup: null, - multicastPort: null, - responseWaitTime: null, - addressRequestAttempts: null, - localAddress: null - }, true); + if (d.Multicast) + $generatorJava._addBeanWithProperties(res, 'discovery', d.Multicast, 'ipFinder', 'ipFinder', + 'TcpDiscoveryMulticastIpFinder', { + multicastGroup: null, + multicastPort: null, + responseWaitTime: null, + addressRequestAttempts: null, + localAddress: null + }, true); + else + res.line('discovery.setIpFinder(new TcpDiscoveryMulticastIpFinder());'); + break; case 'Vm': res.importClass('org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder'); - $generatorJava._addBeanWithProperties(res, 'discovery', d.Vm, 'ipFinder', 'ipFinder', 'TcpDiscoveryVmIpFinder', { - addresses: {type: 'list'} - }, true); + if (d.Vm) + $generatorJava._addBeanWithProperties(res, 'discovery', d.Vm, 'ipFinder', 'ipFinder', + 'TcpDiscoveryVmIpFinder', {addresses: {type: 'list'}}, true); + else + res.line('discovery.setIpFinder(new TcpDiscoveryVmIpFinder());'); break; @@ -620,8 +626,8 @@ $generatorJava.clusterGeneral = function (cluster, res) { res.importClass('org.apache.ignite.spi.discovery.tcp.ipfinder.s3.TcpDiscoveryS3IpFinder'); if (d.S3) - $generatorJava._addBeanWithProperties(res, 'discovery', d.S3, 'ipFinder', 'ipFinder', 'TcpDiscoveryS3IpFinder', - {bucketName: null}, true); + $generatorJava._addBeanWithProperties(res, 'discovery', d.S3, 'ipFinder', 'ipFinder', + 'TcpDiscoveryS3IpFinder', {bucketName: null}, true); else res.line('discovery.setIpFinder(new TcpDiscoveryS3IpFinder());'); @@ -630,49 +636,59 @@ $generatorJava.clusterGeneral = function (cluster, res) { case 'Cloud': res.importClass('org.apache.ignite.spi.discovery.tcp.ipfinder.cloud.TcpDiscoveryCloudIpFinder'); - $generatorJava._addBeanWithProperties(res, 'discovery', d.Cloud, 'ipFinder', 'ipFinder', 'TcpDiscoveryCloudIpFinder', { - credential: null, - credentialPath: null, - identity: null, - provider: null, - regions: {type: 'list'}, - zones: {type: 'list'} - }, true); + if (d.Cloud) + $generatorJava._addBeanWithProperties(res, 'discovery', d.Cloud, 'ipFinder', 'ipFinder', + 'TcpDiscoveryCloudIpFinder', { + credential: null, + credentialPath: null, + identity: null, + provider: null, + regions: {type: 'list'}, + zones: {type: 'list'} + }, true); + else + res.line('discovery.setIpFinder(new TcpDiscoveryCloudIpFinder());'); break; case 'GoogleStorage': res.importClass('org.apache.ignite.spi.discovery.tcp.ipfinder.gce.TcpDiscoveryGoogleStorageIpFinder'); - $generatorJava._addBeanWithProperties(res, 'discovery', d.GoogleStorage, 'ipFinder', 'ipFinder', - 'TcpDiscoveryGoogleStorageIpFinder', { - projectName: null, - bucketName: null, - serviceAccountP12FilePath: null, - serviceAccountId: null - }, true); - - //if (d.GoogleStorage.addrReqAttempts) todo ???? - // res.line('<property name="serviceAccountP12FilePath" value="' + escapeAttr(d.GoogleStorage.addrReqAttempts) + '"/>'); + if (d.GoogleStorage) + $generatorJava._addBeanWithProperties(res, 'discovery', d.GoogleStorage, 'ipFinder', 'ipFinder', + 'TcpDiscoveryGoogleStorageIpFinder', { + projectName: null, + bucketName: null, + serviceAccountP12FilePath: null, + serviceAccountId: null + }, true); + else + res.line('discovery.setIpFinder(new TcpDiscoveryGoogleStorageIpFinder());'); break; case 'Jdbc': res.line(); - $generatorJava._declareVariable(res, true, 'ipFinder', 'org.apache.ignite.spi.discovery.tcp.ipfinder.jdbc.TcpDiscoveryJdbcIpFinder'); + if (d.Jdbc) { + $generatorJava._declareVariable(res, true, 'ipFinder', 'org.apache.ignite.spi.discovery.tcp.ipfinder.jdbc.TcpDiscoveryJdbcIpFinder'); - res.line('ipFinder.setInitSchema(' + ($commonUtils.isDefined(d.Jdbc.initSchema) && d.Jdbc.initSchema) + ');'); - res.line('discovery.setIpFinder(ipFinder);'); - res.needEmptyLine = true; + res.line('ipFinder.setInitSchema(' + ($commonUtils.isDefined(d.Jdbc.initSchema) && d.Jdbc.initSchema) + ');'); + res.line('discovery.setIpFinder(ipFinder);'); + } + else + res.line('discovery.setIpFinder(new TcpDiscoveryJdbcIpFinder());'); break; case 'SharedFs': res.importClass('org.apache.ignite.spi.discovery.tcp.ipfinder.sharedfs.TcpDiscoverySharedFsIpFinder'); - $generatorJava._addBeanWithProperties(res, 'discovery', d.SharedFs, 'ipFinder', 'ipFinder', - 'TcpDiscoverySharedFsIpFinder', {path: null}, true); + if (d.SharedFs) + $generatorJava._addBeanWithProperties(res, 'discovery', d.SharedFs, 'ipFinder', 'ipFinder', + 'TcpDiscoverySharedFsIpFinder', {path: null}, true); + else + res.line('discovery.setIpFinder(new TcpDiscoverySharedFsIpFinder());'); break; http://git-wip-us.apache.org/repos/asf/ignite/blob/c708316c/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 0307d28..d5ad4fd 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 @@ -276,35 +276,36 @@ $generatorXml.clusterGeneral = function (cluster, res) { case 'Multicast': res.startBlock('<bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder">'); - $generatorXml._addProperty(res, d.Multicast, 'multicastGroup'); - $generatorXml._addProperty(res, d.Multicast, 'multicastPort'); - $generatorXml._addProperty(res, d.Multicast, 'responseWaitTime'); - $generatorXml._addProperty(res, d.Multicast, 'addressRequestAttempts'); - $generatorXml._addProperty(res, d.Multicast, 'localAddress'); + if (d.Multicast) { + $generatorXml._addProperty(res, d.Multicast, 'multicastGroup'); + $generatorXml._addProperty(res, d.Multicast, 'multicastPort'); + $generatorXml._addProperty(res, d.Multicast, 'responseWaitTime'); + $generatorXml._addProperty(res, d.Multicast, 'addressRequestAttempts'); + $generatorXml._addProperty(res, d.Multicast, 'localAddress'); + } res.endBlock('</bean>'); break; case 'Vm': - if (d.Vm.addresses.length > 0) { - res.startBlock('<bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">'); + res.startBlock('<bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">'); + if (d.Vm) { $generatorXml._addListProperty(res, d.Vm, 'addresses'); - - res.endBlock('</bean>'); - } - else { - res.line('<bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"/>'); } + res.endBlock('</bean>'); + break; case 'S3': res.startBlock('<bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.s3.TcpDiscoveryS3IpFinder">'); - if (d.S3 && d.S3.bucketName) - res.line('<property name="bucketName" value="' + $generatorXml._escapeAttr(d.S3.bucketName) + '" />'); + if (d.S3) { + if (d.S3.bucketName) + res.line('<property name="bucketName" value="' + $generatorXml._escapeAttr(d.S3.bucketName) + '" />'); + } res.endBlock('</bean>'); @@ -313,12 +314,14 @@ $generatorXml.clusterGeneral = function (cluster, res) { case 'Cloud': res.startBlock('<bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.cloud.TcpDiscoveryCloudIpFinder">'); - $generatorXml._addProperty(res, d.Cloud, 'credential'); - $generatorXml._addProperty(res, d.Cloud, 'credentialPath'); - $generatorXml._addProperty(res, d.Cloud, 'identity'); - $generatorXml._addProperty(res, d.Cloud, 'provider'); - $generatorXml._addListProperty(res, d.Cloud, 'regions'); - $generatorXml._addListProperty(res, d.Cloud, 'zones'); + if (d.Cloud) { + $generatorXml._addProperty(res, d.Cloud, 'credential'); + $generatorXml._addProperty(res, d.Cloud, 'credentialPath'); + $generatorXml._addProperty(res, d.Cloud, 'identity'); + $generatorXml._addProperty(res, d.Cloud, 'provider'); + $generatorXml._addListProperty(res, d.Cloud, 'regions'); + $generatorXml._addListProperty(res, d.Cloud, 'zones'); + } res.endBlock('</bean>'); @@ -327,10 +330,12 @@ $generatorXml.clusterGeneral = function (cluster, res) { case 'GoogleStorage': res.startBlock('<bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.gce.TcpDiscoveryGoogleStorageIpFinder">'); - $generatorXml._addProperty(res, d.GoogleStorage, 'projectName'); - $generatorXml._addProperty(res, d.GoogleStorage, 'bucketName'); - $generatorXml._addProperty(res, d.GoogleStorage, 'serviceAccountP12FilePath'); - $generatorXml._addProperty(res, d.GoogleStorage, 'serviceAccountId'); + if (d.GoogleStorage) { + $generatorXml._addProperty(res, d.GoogleStorage, 'projectName'); + $generatorXml._addProperty(res, d.GoogleStorage, 'bucketName'); + $generatorXml._addProperty(res, d.GoogleStorage, 'serviceAccountP12FilePath'); + $generatorXml._addProperty(res, d.GoogleStorage, 'serviceAccountId'); + } //if (d.GoogleStorage.addrReqAttempts) todo ???? // res.line('<property name="serviceAccountP12FilePath" value="' + $generatorXml._escapeAttr(d.GoogleStorage.addrReqAttempts) + '"/>'); @@ -341,21 +346,24 @@ $generatorXml.clusterGeneral = function (cluster, res) { case 'Jdbc': res.startBlock('<bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.jdbc.TcpDiscoveryJdbcIpFinder">'); - res.line('<property name="initSchema" value="' + ($commonUtils.isDefined(d.Jdbc.initSchema) && d.Jdbc.initSchema) + '"/>'); + + if (d.Jdbc) { + res.line('<property name="initSchema" value="' + ($commonUtils.isDefined(d.Jdbc.initSchema) && d.Jdbc.initSchema) + '"/>'); + } + res.endBlock('</bean>'); break; case 'SharedFs': - if (d.SharedFs.path) { - res.startBlock('<bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.sharedfs.TcpDiscoverySharedFsIpFinder">'); + res.startBlock('<bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.sharedfs.TcpDiscoverySharedFsIpFinder">'); + + if (d.SharedFs) { $generatorXml._addProperty(res, d.SharedFs, 'path'); - res.endBlock('</bean>'); - } - else { - res.line('<bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.sharedfs.TcpDiscoverySharedFsIpFinder"/>'); } + res.endBlock('</bean>'); + break; default:
