You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by an...@apache.org on 2015/07/16 09:45:16 UTC
incubator-ignite git commit: # ignite-843 Fixed generation for client
configuration.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-843 dc895c637 -> 400bc564c
# ignite-843 Fixed generation for client configuration.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/400bc564
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/400bc564
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/400bc564
Branch: refs/heads/ignite-843
Commit: 400bc564c691d111b7e041e2f4516418fece5049
Parents: dc895c6
Author: Andrey <an...@gridgain.com>
Authored: Thu Jul 16 14:45:58 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Thu Jul 16 14:45:58 2015 +0700
----------------------------------------------------------------------
.../nodejs/routes/generator/java.js | 3 ---
.../web-control-center/nodejs/routes/generator/xml.js | 14 ++++++++++++++
.../nodejs/views/includes/controls.jade | 12 ++++++------
3 files changed, 20 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/400bc564/modules/web-control-center/nodejs/routes/generator/java.js
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/routes/generator/java.js b/modules/web-control-center/nodejs/routes/generator/java.js
index 75f6052..f237086 100644
--- a/modules/web-control-center/nodejs/routes/generator/java.js
+++ b/modules/web-control-center/nodejs/routes/generator/java.js
@@ -160,9 +160,6 @@ exports.generateClusterConfiguration = function(cluster, javaClass, clientCache)
names.push(cacheName);
- if (clientCache)
- _.merge(cache, clientCache);
-
generateCacheConfiguration(cache, cacheName, res);
res.needEmptyLine = true;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/400bc564/modules/web-control-center/nodejs/routes/generator/xml.js
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/routes/generator/xml.js b/modules/web-control-center/nodejs/routes/generator/xml.js
index 9e45111..8004c95 100644
--- a/modules/web-control-center/nodejs/routes/generator/xml.js
+++ b/modules/web-control-center/nodejs/routes/generator/xml.js
@@ -26,6 +26,20 @@ exports.generateClusterConfiguration = function(cluster, clientCache) {
res.datasources = [];
res.deep = 1;
+ if (clientCache && clientCache.nearConfiguration) {
+ res.startBlock('<bean id="nearCacheBean" class="org.apache.ignite.configuration.NearCacheConfiguration">');
+
+ if (clientCache.nearConfiguration.nearStartSize)
+ addProperty(res, clientCache.nearConfiguration, 'nearStartSize');
+
+ if (clientCache.nearConfiguration.nearEvictionPolicy && clientCache.nearConfiguration.nearEvictionPolicy.kind)
+ createEvictionPolicy(res, clientCache.nearConfiguration.nearEvictionPolicy, 'nearEvictionPolicy');
+
+ res.endBlock('</bean>');
+
+ res.line();
+ }
+
// Generate Ignite Configuration.
res.startBlock('<bean class="org.apache.ignite.configuration.IgniteConfiguration">');
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/400bc564/modules/web-control-center/nodejs/views/includes/controls.jade
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/views/includes/controls.jade b/modules/web-control-center/nodejs/views/includes/controls.jade
index eba1b81..74481e8 100644
--- a/modules/web-control-center/nodejs/views/includes/controls.jade
+++ b/modules/web-control-center/nodejs/views/includes/controls.jade
@@ -112,19 +112,19 @@ mixin form-row-custom(lblClasses, fieldClasses)
+tipLabel('field.tip')
div(ng-switch-when='text' ng-hide=fieldHide)
label(class=lblClasses ng-class=fieldRequiredClass) {{field.label}}:
- .col-sm-4
+ div(class=fieldClasses)
+tipField('field.tip')
.input-tip
input.form-control(type='text' placeholder='{{field.placeholder}}')&attributes(fieldCommon)
div(ng-switch-when='password' ng-hide=fieldHide)
label(class=lblClasses ng-class=fieldRequiredClass) {{field.label}}:
- .col-sm-4
+ div(class=fieldClasses)
+tipField('field.tip')
.input-tip
input.form-control(type='password' placeholder='{{field.placeholder}}')&attributes(fieldCommon)
div(ng-switch-when='number' ng-hide=fieldHide)
label(class=lblClasses ng-class=fieldRequiredClass) {{field.label}}:
- .col-sm-4
+ div(class=fieldClasses)
+tipField('field.tip')
.input-tip
input.form-control(name='{{field.model}}' type='number' placeholder='{{field.placeholder}}' min='{{field.min ? field.min : 0}}' max='{{field.max ? field.max : Number.MAX_VALUE}}')&attributes(fieldCommon)
@@ -133,13 +133,13 @@ mixin form-row-custom(lblClasses, fieldClasses)
+exclamation('{{field.model}}', 'number', 'Invalid value. Only numbers allowed.')
div(ng-switch-when='dropdown' ng-hide=fieldHide)
label(class=lblClasses ng-class=fieldRequiredClass) {{field.label}}:
- .col-sm-4
+ div(class=fieldClasses)
+tipField('field.tip')
.input-tip
button.form-control(bs-select data-placeholder='{{field.placeholder}}' bs-options='item.value as item.label for item in {{field.items}}')&attributes(fieldCommon)
div(ng-switch-when='dropdown-multiple' ng-hide=fieldHide)
label(class=lblClasses ng-class=fieldRequiredClass) {{field.label}}:
- .col-sm-4
+ div(class=fieldClasses)
+tipField('field.tip')
.input-tip
button.form-control(bs-select ng-disabled='{{field.items}}.length == 0' data-multiple='1' data-placeholder='{{field.placeholder}}' bs-options='item.value as item.label for item in {{field.items}}')&attributes(fieldCommon)
@@ -148,7 +148,7 @@ mixin form-row-custom(lblClasses, fieldClasses)
- var expanded = 'field.details[' + fieldMdl + '].expanded'
label(class=lblClasses ng-class=fieldRequiredClass) {{field.label}}:
- .col-sm-4
+ div(class=fieldClasses)
+tipField('field.tip')
.input-tip
button.form-control(bs-select data-placeholder='{{field.placeholder}}' bs-options='item.value as item.label for item in {{field.items}}')&attributes(fieldCommon)