Repository: ignite Updated Branches: refs/heads/ignite-843-rc1 591e0c551 -> 0c3a8960d
IGNITE-1750 WIP: Fixed some placeholders and code generation with default values. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0c3a8960 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0c3a8960 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0c3a8960 Branch: refs/heads/ignite-843-rc1 Commit: 0c3a8960de32188bd0da7a474377ab153b42af94 Parents: 591e0c5 Author: vsisko <vsi...@gridgain.com> Authored: Mon Oct 26 17:27:33 2015 +0700 Committer: Alexey Kuznetsov <akuznet...@apache.org> Committed: Mon Oct 26 17:27:33 2015 +0700 ---------------------------------------------------------------------- .../main/js/controllers/models/clusters.json | 1 + .../js/routes/generator/generator-common.js | 32 ++++++++++---------- .../main/js/routes/generator/generator-java.js | 14 ++++----- .../main/js/routes/generator/generator-xml.js | 12 +++----- 4 files changed, 28 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0c3a8960/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 325c4c9..5739ea3 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 @@ -643,6 +643,7 @@ "type": "number", "path": "communication", "model": "unacknowledgedMessagesBufferSize", + "placeholder": 0, "tip": [ "Maximum number of stored unacknowledged messages per connection to node" ] http://git-wip-us.apache.org/repos/asf/ignite/blob/0c3a8960/modules/control-center-web/src/main/js/routes/generator/generator-common.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/routes/generator/generator-common.js b/modules/control-center-web/src/main/js/routes/generator/generator-common.js index 46213b8..866ebbd 100644 --- a/modules/control-center-web/src/main/js/routes/generator/generator-common.js +++ b/modules/control-center-web/src/main/js/routes/generator/generator-common.js @@ -347,23 +347,23 @@ $generatorCommon.COMMUNICATION_CONFIGURATION = { fields: { listener: {type: 'bean'}, localAddress: null, - localPort: 47100, - localPortRange: 100, - sharedMemoryPort: 48100, - directBuffer: null, - directSendBuffer: null, - idleConnectionTimeout: 30000, - connectTimeout: 5000, - maxConnectTimeout: 600000, - reconnectCount: 10, - socketSendBuffer: 32768, - socketReceiveBuffer: 32768, - messageQueueLimit: 1024, + localPort: {dflt: 47100}, + localPortRange: {dflt: 100}, + sharedMemoryPort: {dflt: 48100}, + directBuffer: {dflt: false}, + directSendBuffer: {dflt: false}, + idleConnectionTimeout: {dflt: 30000}, + connectTimeout: {dflt: 5000}, + maxConnectTimeout: {dflt: 600000}, + reconnectCount: {dflt: 10}, + socketSendBuffer: {dflt: 32768}, + socketReceiveBuffer: {dflt: 32768}, + messageQueueLimit: {dflt: 1024}, slowClientQueueLimit: null, - tcpNoDelay: true, - ackSendThreshold: 16, - unacknowledgedMessagesBufferSize: null, - socketWriteTimeout: 2000, + tcpNoDelay: {dflt: true}, + ackSendThreshold: {dflt: 16}, + unacknowledgedMessagesBufferSize: {dflt: 0}, + socketWriteTimeout: {dflt: 2000}, selectorsCount: null, addressResolver: {type: 'bean'} } http://git-wip-us.apache.org/repos/asf/ignite/blob/0c3a8960/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 1eb56aa..f34dedc 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 @@ -265,10 +265,8 @@ $generatorJava.beanProperty = function (res, varName, bean, beanPropName, beanVa $generatorJava.declareVariable(res, true, beanVarName, beanClass); - _.forEach(props, function(propName) { + _.forIn(props, function(descr, propName) { if (props.hasOwnProperty(propName)) { - var descr = props[propName]; - if (descr) { switch (descr.type) { case 'list': @@ -331,7 +329,7 @@ $generatorJava.beanProperty = function (res, varName, bean, beanPropName, beanVa break; default: - $generatorJava.property(res, beanVarName, bean, propName, null, descr.setterName); + $generatorJava.property(res, beanVarName, bean, propName, null, descr.setterName, descr.dflt); } } else { @@ -525,12 +523,12 @@ $generatorJava.clusterCommunication = function (cluster, res) { res.needEmptyLine = false; - $generatorJava.property(res, 'cfg', cluster, 'networkTimeout'); - $generatorJava.property(res, 'cfg', cluster, 'networkSendRetryDelay'); - $generatorJava.property(res, 'cfg', cluster, 'networkSendRetryCount'); + $generatorJava.property(res, 'cfg', cluster, 'networkTimeout', undefined, undefined, 5000); + $generatorJava.property(res, 'cfg', cluster, 'networkSendRetryDelay', undefined, undefined, 1000); + $generatorJava.property(res, 'cfg', cluster, 'networkSendRetryCount', undefined, undefined, 3); $generatorJava.property(res, 'cfg', cluster, 'segmentCheckFrequency'); $generatorJava.property(res, 'cfg', cluster, 'waitForSegmentOnStart', null, null, false); - $generatorJava.property(res, 'cfg', cluster, 'discoveryStartupDelay'); + $generatorJava.property(res, 'cfg', cluster, 'discoveryStartupDelay', undefined, undefined, 600000); res.needEmptyLine = true; http://git-wip-us.apache.org/repos/asf/ignite/blob/0c3a8960/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 7bc9865..1ba43ee 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 @@ -145,10 +145,8 @@ $generatorXml.beanProperty = function (res, bean, beanPropName, desc, createBean var hasData = false; - _.forEach(props, function(propName) { + _.forIn(props, function(descr, propName) { if (props.hasOwnProperty(propName)) { - var descr = props[propName]; - if (descr) { switch (descr.type) { case 'list': @@ -402,12 +400,12 @@ $generatorXml.clusterCommunication = function (cluster, res) { $generatorXml.beanProperty(res, cluster.communication, 'communicationSpi', $generatorCommon.COMMUNICATION_CONFIGURATION); - $generatorXml.property(res, cluster, 'networkTimeout'); - $generatorXml.property(res, cluster, 'networkSendRetryDelay'); - $generatorXml.property(res, cluster, 'networkSendRetryCount'); + $generatorXml.property(res, cluster, 'networkTimeout', undefined, 5000); + $generatorXml.property(res, cluster, 'networkSendRetryDelay', undefined, 1000); + $generatorXml.property(res, cluster, 'networkSendRetryCount', undefined, 3); $generatorXml.property(res, cluster, 'segmentCheckFrequency'); $generatorXml.property(res, cluster, 'waitForSegmentOnStart', null, false); - $generatorXml.property(res, cluster, 'discoveryStartupDelay'); + $generatorXml.property(res, cluster, 'discoveryStartupDelay', undefined, 600000); res.needEmptyLine = true;
