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/08/31 13:06:37 UTC
ignite git commit: IGNITE-843 WIP: preview with defaults.
Repository: ignite
Updated Branches:
refs/heads/ignite-843 32cc92652 -> 09d3a7bf9
IGNITE-843 WIP: preview with defaults.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/09d3a7bf
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/09d3a7bf
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/09d3a7bf
Branch: refs/heads/ignite-843
Commit: 09d3a7bf93aefb29af87095f54cc5f5deb60f904
Parents: 32cc926
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Mon Aug 31 18:07:04 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Mon Aug 31 18:07:04 2015 +0700
----------------------------------------------------------------------
.../main/js/controllers/clusters-controller.js | 10 +-
.../main/js/controllers/metadata-controller.js | 1 -
.../main/js/controllers/models/clusters.json | 7 --
.../main/js/controllers/models/metadata.json | 8 --
.../main/js/routes/generator/generator-xml.js | 106 +++++++++++--------
5 files changed, 66 insertions(+), 66 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/09d3a7bf/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 09d2700..a568189 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
@@ -50,8 +50,6 @@ controlCenterModule.controller('clustersController', ['$scope', '$controller', '
var showPopoverMessage = $common.showPopoverMessage;
- $scope.template = {discovery: {kind: 'Multicast', Vm: {addresses: ['127.0.0.1:47500..47510']}, Multicast: {}}};
-
$scope.discoveries = [
{value: 'Vm', label: 'static IPs'},
{value: 'Multicast', label: 'multicast'},
@@ -151,8 +149,6 @@ controlCenterModule.controller('clustersController', ['$scope', '$controller', '
$http.get('/models/clusters.json')
.success(function (data) {
$scope.screenTip = data.screenTip;
- $scope.templateTip = data.templateTip;
-
$scope.general = data.general;
$scope.advanced = data.advanced;
})
@@ -326,7 +322,11 @@ controlCenterModule.controller('clustersController', ['$scope', '$controller', '
$common.ensureActivePanel($scope.panels, "general", 'clusterName');
});
- var newItem = angular.copy($scope.template);
+ var newItem = {
+ discovery: {kind: 'Multicast', Vm: {addresses: ['127.0.0.1:47500..47510']}, Multicast: {}},
+ deploymentMode: 'SHARED'
+ };
+
newItem.caches = [];
newItem.space = $scope.spaces[0]._id;
http://git-wip-us.apache.org/repos/asf/ignite/blob/09d3a7bf/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 2179c32..13b5392 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
@@ -186,7 +186,6 @@ controlCenterModule.controller('metadataController', [
$http.get('/models/metadata.json')
.success(function (data) {
$scope.screenTip = data.screenTip;
- $scope.templateTip = data.templateTip;
$scope.metadata = data.metadata;
$scope.metadataDb = data.metadataDb;
})
http://git-wip-us.apache.org/repos/asf/ignite/blob/09d3a7bf/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 37e0240..b9ef7f9 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
@@ -15,13 +15,6 @@
"</ul>"
]
},
- "templateTip": [
- "Use following template to add a new cluster:",
- "<ul>",
- " <li>multicast - cluster with multicast discovery.</li>",
- " <li>local - cluster with static ips discovery and pre-configured list of IP addresses.</li>",
- "</ul>"
- ],
"general": [
{
"label": "General",
http://git-wip-us.apache.org/repos/asf/ignite/blob/09d3a7bf/modules/control-center-web/src/main/js/controllers/models/metadata.json
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/models/metadata.json b/modules/control-center-web/src/main/js/controllers/models/metadata.json
index de630e3..5df55e8 100644
--- a/modules/control-center-web/src/main/js/controllers/models/metadata.json
+++ b/modules/control-center-web/src/main/js/controllers/models/metadata.json
@@ -16,14 +16,6 @@
"</ul>"
]
},
- "templateTip": [
- "Use following template for metadata:",
- "<ul>",
- " <li>query - Create cache type metadata to use with queries only.</li>",
- " <li>store - Create cache type metadata to use with JDBC POJO store only.</li>",
- " <li>both - Create cache type metadata to use with query and store.</li>",
- "</ul>"
- ],
"metadata": [
{
"label": "Metadata common",
http://git-wip-us.apache.org/repos/asf/ignite/blob/09d3a7bf/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 eeaf33f..b5f8a07 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
@@ -52,13 +52,22 @@ $generatorXml.element = function (res, tag, attr1, val1, attr2, val2) {
};
// Add property.
-$generatorXml.property = function (res, obj, propName, setterName) {
+$generatorXml.property = function (res, obj, propName, setterName, dflt) {
if ($commonUtils.isDefined(obj)) {
var val = obj[propName];
- if ($commonUtils.isDefined(val))
- $generatorXml.element(res, 'property', 'name', setterName ? setterName : propName, 'value', $generatorXml.escape(val));
+ if ($commonUtils.isDefined(val)) {
+ var hasDflt = $commonUtils.isDefined(dflt);
+
+ if (!hasDflt || (hasDflt && val != dflt)) {
+ $generatorXml.element(res, 'property', 'name', setterName ? setterName : propName, 'value', $generatorXml.escape(val));
+
+ return true;
+ }
+ }
}
+
+ return false;
};
// Add property for class name.
@@ -98,11 +107,19 @@ $generatorXml.listProperty = function (res, obj, propName, listType, rowFactory)
};
// Add bean property.
-$generatorXml.beanProperty = function (res, bean, beanPropName, beanClass, props, createBeanAlthoughNoProps) {
+$generatorXml.beanProperty = function (res, bean, beanPropName, desc, createBeanAlthoughNoProps) {
+ var props = desc.fields;
+
if (bean && $commonUtils.hasProperty(bean, props)) {
- res.emptyLineIfNeeded();
- res.startBlock('<property name="' + beanPropName + '">');
- res.startBlock('<bean class="' + beanClass + '">');
+ var tmpRes = $generatorCommon.builder();
+
+ tmpRes.deep = res.deep;
+
+ tmpRes.emptyLineIfNeeded();
+ tmpRes.startBlock('<property name="' + beanPropName + '">');
+ tmpRes.startBlock('<bean class="' + desc.className + '">');
+
+ var hasData = false;
for (var propName in props) {
if (props.hasOwnProperty(propName)) {
@@ -110,51 +127,64 @@ $generatorXml.beanProperty = function (res, bean, beanPropName, beanClass, props
if (descr) {
if (descr.type == 'list') {
- $generatorXml.listProperty(res, bean, propName, descr.setterName);
+ $generatorXml.listProperty(tmpRes, bean, propName, descr.setterName);
}
else if (descr.type == 'jdbcDialect') {
if (bean[propName]) {
- res.startBlock('<property name="' + propName + '">');
- res.line('<bean class="' + $generatorCommon.jdbcDialectClassName(bean[propName]) + '"/>');
- res.endBlock('</property>');
+ tmpRes.startBlock('<property name="' + propName + '">');
+ tmpRes.line('<bean class="' + $generatorCommon.jdbcDialectClassName(bean[propName]) + '"/>');
+ tmpRes.endBlock('</property>');
+
+ hasData = true;
}
}
else if (descr.type == 'propertiesAsList') {
var val = bean[propName];
if (val && val.length > 0) {
- res.startBlock('<property name="' + propName + '">');
- res.startBlock('<props>');
+ tmpRes.startBlock('<property name="' + propName + '">');
+ tmpRes.startBlock('<props>');
for (var i = 0; i < val.length; i++) {
var nameAndValue = val[i];
var eqIndex = nameAndValue.indexOf('=');
if (eqIndex >= 0) {
- res.line('<prop key="' + $generatorXml.escape(nameAndValue.substring(0, eqIndex)) + '">' +
+ tmpRes.line('<prop key="' + $generatorXml.escape(nameAndValue.substring(0, eqIndex)) + '">' +
$generatorXml.escape(nameAndValue.substr(eqIndex + 1)) + '</prop>');
}
}
- res.endBlock('</props>');
- res.endBlock('</property>');
+ tmpRes.endBlock('</props>');
+ tmpRes.endBlock('</property>');
+
+ hasData = true;
}
}
- else
- $generatorXml.property(res, bean, propName, descr.setterName);
+ else {
+ if ($generatorXml.property(tmpRes, bean, propName, descr.setterName, descr.dflt))
+ hasData = true;
+ }
}
else
- $generatorXml.property(res, bean, propName);
+ if ($generatorXml.property(tmpRes, bean, propName))
+ hasData = true;
}
}
- res.endBlock('</bean>');
- res.endBlock('</property>');
+ tmpRes.endBlock('</bean>');
+ tmpRes.endBlock('</property>');
+
+ if (hasData)
+ _.forEach(tmpRes, function (line) {
+ res.push(line);
+ });
+
}
else if (createBeanAlthoughNoProps) {
res.emptyLineIfNeeded();
res.line('<property name="' + beanPropName + '">');
- res.line(' <bean class="' + beanClass + '"/>');
+ res.line(' <bean class="' + desc.className + '"/>');
res.line('</property>');
}
};
@@ -162,11 +192,8 @@ $generatorXml.beanProperty = function (res, bean, beanPropName, beanClass, props
// Generate eviction policy.
$generatorXml.evictionPolicy = function (res, evtPlc, propName) {
if (evtPlc && evtPlc.kind) {
- var e = $generatorCommon.EVICTION_POLICIES[evtPlc.kind];
-
- var obj = evtPlc[evtPlc.kind.toUpperCase()];
-
- $generatorXml.beanProperty(res, obj, propName, e.className, e.fields, true);
+ $generatorXml.beanProperty(res, evtPlc[evtPlc.kind.toUpperCase()], propName,
+ $generatorCommon.EVICTION_POLICIES[evtPlc.kind], true);
}
};
@@ -292,9 +319,7 @@ $generatorXml.clusterAtomics = function (cluster, res) {
if (!res)
res = $generatorCommon.builder();
- var atomicCfg = $generatorCommon.ATOMIC_CONFIGURATION;
-
- $generatorXml.beanProperty(res, cluster.atomicConfiguration, 'atomicConfiguration', atomicCfg.className, atomicCfg.fields);
+ $generatorXml.beanProperty(res, cluster.atomicConfiguration, 'atomicConfiguration', $generatorCommon.ATOMIC_CONFIGURATION);
res.needEmptyLine = true;
@@ -323,9 +348,8 @@ $generatorXml.clusterDeployment = function (cluster, res) {
if (!res)
res = $generatorCommon.builder();
- $generatorXml.property(res, cluster, 'deploymentMode');
-
- res.needEmptyLine = true;
+ if ($generatorXml.property(res, cluster, 'deploymentMode', null, 'SHARED'))
+ res.needEmptyLine = true;
return res;
};
@@ -379,9 +403,7 @@ $generatorXml.clusterMarshaller = function (cluster, res) {
var marshaller = cluster.marshaller;
if (marshaller && marshaller.kind) {
- var marshallerDesc = $generatorCommon.MARSHALLERS[marshaller.kind];
-
- $generatorXml.beanProperty(res, marshaller[marshaller.kind], 'marshaller', marshallerDesc.className, marshallerDesc.fields, true);
+ $generatorXml.beanProperty(res, marshaller[marshaller.kind], 'marshaller', $generatorCommon.MARSHALLERS[marshaller.kind], true);
res.needEmptyLine = true;
}
@@ -437,11 +459,9 @@ $generatorXml.clusterSwap = function (cluster, res) {
if (!res)
res = $generatorCommon.builder();
- var swapSpaceSpi = $generatorCommon.SWAP_SPACE_SPI;
-
if (cluster.swapSpaceSpi && cluster.swapSpaceSpi.kind == 'FileSwapSpaceSpi') {
$generatorXml.beanProperty(res, cluster.swapSpaceSpi.FileSwapSpaceSpi, 'swapSpaceSpi',
- swapSpaceSpi.className, swapSpaceSpi.fields, true);
+ $generatorCommon.SWAP_SPACE_SPI, true);
res.needEmptyLine = true;
}
@@ -484,9 +504,7 @@ $generatorXml.clusterTransactions = function (cluster, res) {
if (!res)
res = $generatorCommon.builder();
- var trnCfg = $generatorCommon.TRANSACTION_CONFIGURATION;
-
- $generatorXml.beanProperty(res, cluster.transactionConfiguration, 'transactionConfiguration', trnCfg.className, trnCfg.fields);
+ $generatorXml.beanProperty(res, cluster.transactionConfiguration, 'transactionConfiguration', $generatorCommon.TRANSACTION_CONFIGURATION);
res.needEmptyLine = true;
@@ -578,9 +596,7 @@ $generatorXml.cacheStore = function(cache, res) {
var storeFactory = cache.cacheStoreFactory[cache.cacheStoreFactory.kind];
if (storeFactory) {
- var storeFactoryDesc = $generatorCommon.STORE_FACTORIES[cache.cacheStoreFactory.kind];
-
- $generatorXml.beanProperty(res, storeFactory, 'cacheStoreFactory', storeFactoryDesc.className, storeFactoryDesc.fields, true);
+ $generatorXml.beanProperty(res, storeFactory, 'cacheStoreFactory', $generatorCommon.STORE_FACTORIES[cache.cacheStoreFactory.kind], true);
if (storeFactory.dialect) {
if (_.findIndex(res.datasources, function (ds) {