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/07/07 11:15:15 UTC
[1/2] incubator-ignite git commit: IGNITE-843 Added missing cache
properties and fixed XML/java generation.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-843 8ad2e2da4 -> 1a71cbad4
IGNITE-843 Added missing cache properties and fixed XML/java 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/d6e81c06
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d6e81c06
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d6e81c06
Branch: refs/heads/ignite-843
Commit: d6e81c0683f05bebb5407b1acc8af4eeda164028
Parents: 9ae8a13
Author: AKuznetsov <ak...@gridgain.com>
Authored: Tue Jul 7 16:14:53 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Tue Jul 7 16:14:53 2015 +0700
----------------------------------------------------------------------
modules/web-control-center/nodejs/utils/generatorJava.js | 7 +++++--
modules/web-control-center/nodejs/utils/generatorUtils.js | 2 --
modules/web-control-center/nodejs/utils/generatorXml.js | 7 +++++--
3 files changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d6e81c06/modules/web-control-center/nodejs/utils/generatorJava.js
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/utils/generatorJava.js b/modules/web-control-center/nodejs/utils/generatorJava.js
index e0569bc..2e32900 100644
--- a/modules/web-control-center/nodejs/utils/generatorJava.js
+++ b/modules/web-control-center/nodejs/utils/generatorJava.js
@@ -318,14 +318,15 @@ function generateCacheConfiguration(cacheCfg, varName, res) {
addProperty(res, cacheCfg, varName, 'atomicityMode', 'CacheAtomicityMode');
addProperty(res, cacheCfg, varName, 'backups');
- addProperty(res, cacheCfg, varName, 'readFromBackup');
addProperty(res, cacheCfg, varName, 'startSize');
+ addProperty(res, cacheCfg, varName, 'readFromBackup');
res.needEmptyLine = true;
addProperty(res, cacheCfg, varName, 'memoryMode', 'CacheMemoryMode');
addProperty(res, cacheCfg, varName, 'offHeapMaxMemory');
addProperty(res, cacheCfg, varName, 'swapEnabled');
+ addProperty(res, cacheCfg, varName, 'copyOnRead');
res.needEmptyLine = true;
@@ -412,7 +413,9 @@ function generateCacheConfiguration(cacheCfg, varName, res) {
addProperty(res, cacheCfg, varName, 'statisticsEnabled');
addProperty(res, cacheCfg, varName, 'managementEnabled');
- addProperty(res, cacheCfg, varName, 'copyOnRead');
+
+ res.needEmptyLine = true;
+
addProperty(res, cacheCfg, varName, 'maxConcurrentAsyncOperations');
return res;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d6e81c06/modules/web-control-center/nodejs/utils/generatorUtils.js
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/utils/generatorUtils.js b/modules/web-control-center/nodejs/utils/generatorUtils.js
index abae387..2469c2e 100644
--- a/modules/web-control-center/nodejs/utils/generatorUtils.js
+++ b/modules/web-control-center/nodejs/utils/generatorUtils.js
@@ -160,8 +160,6 @@ exports.evictionPolicies = {
};
exports.knownClasses = {
-
-
OracleDialect: new ClassDescriptor('org.apache.ignite.cache.store.jdbc.dialect.OracleDialect', {}),
BasicJdbcDialect: new ClassDescriptor('org.apache.ignite.cache.store.jdbc.dialect.BasicJdbcDialect', {}),
DB2Dialect: new ClassDescriptor('org.apache.ignite.cache.store.jdbc.dialect.DB2Dialect', {}),
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d6e81c06/modules/web-control-center/nodejs/utils/generatorXml.js
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/utils/generatorXml.js b/modules/web-control-center/nodejs/utils/generatorXml.js
index 6cfd401..e29d465 100644
--- a/modules/web-control-center/nodejs/utils/generatorXml.js
+++ b/modules/web-control-center/nodejs/utils/generatorXml.js
@@ -293,14 +293,15 @@ function generateCacheConfiguration(cacheCfg, res) {
addProperty(res, cacheCfg, 'atomicityMode');
addProperty(res, cacheCfg, 'backups');
- addProperty(res, cacheCfg, 'readFromBackup');
addProperty(res, cacheCfg, 'startSize');
+ addProperty(res, cacheCfg, 'readFromBackup');
res.needEmptyLine = true;
addProperty(res, cacheCfg, 'memoryMode');
addProperty(res, cacheCfg, 'offHeapMaxMemory');
addProperty(res, cacheCfg, 'swapEnabled');
+ addProperty(res, cacheCfg, 'copyOnRead');
res.needEmptyLine = true;
@@ -390,7 +391,9 @@ function generateCacheConfiguration(cacheCfg, res) {
addProperty(res, cacheCfg, 'statisticsEnabled');
addProperty(res, cacheCfg, 'managementEnabled');
- addProperty(res, cacheCfg, 'copyOnRead');
+
+ res.needEmptyLine = true;
+
addProperty(res, cacheCfg, 'maxConcurrentAsyncOperations');
res.endBlock('</bean>');
[2/2] incubator-ignite git commit: Merge remote-tracking branch
'origin/ignite-843' into ignite-843
Posted by ak...@apache.org.
Merge remote-tracking branch 'origin/ignite-843' into ignite-843
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1a71cbad
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1a71cbad
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1a71cbad
Branch: refs/heads/ignite-843
Commit: 1a71cbad488a2e7abe24cc7f1378070b5dae2ff6
Parents: d6e81c0 8ad2e2d
Author: AKuznetsov <ak...@gridgain.com>
Authored: Tue Jul 7 16:15:08 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Tue Jul 7 16:15:08 2015 +0700
----------------------------------------------------------------------
modules/web-control-center/nodejs/app.js | 15 ++++-
modules/web-control-center/nodejs/db.js | 3 +-
.../javascripts/controllers/adminController.js | 66 ++++++++++++++++++++
.../public/javascripts/controllers/common.js | 2 +-
.../web-control-center/nodejs/routes/admin.js | 61 ++++++++++++++++++
.../web-control-center/nodejs/routes/auth.js | 4 +-
.../nodejs/views/admin/userList.jade | 21 +++++++
.../nodejs/views/admin/userList_content.html | 53 ++++++++++++++++
.../web-control-center/nodejs/views/caches.jade | 2 +-
.../nodejs/views/clusters.jade | 2 +-
.../nodejs/views/includes/header.jade | 2 +
.../nodejs/views/persistence.jade | 2 +-
.../nodejs/views/summary.jade | 2 +-
13 files changed, 226 insertions(+), 9 deletions(-)
----------------------------------------------------------------------