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 2016/02/17 09:18:41 UTC
[1/3] ignite git commit: IGNITE-843 Transform dataSourceBean to valid
java name.
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc2 652d85f41 -> facec3ad4
IGNITE-843 Transform dataSourceBean to valid java name.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2dba12a1
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2dba12a1
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2dba12a1
Branch: refs/heads/ignite-843-rc2
Commit: 2dba12a1379bc5f2c49d1382f4e9dec7894c3a2e
Parents: aa5bf5c
Author: vsisko <vs...@gridgain.com>
Authored: Wed Feb 17 15:17:47 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Wed Feb 17 15:17:47 2016 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/common-module.js | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2dba12a1/modules/control-center-web/src/main/js/controllers/common-module.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/common-module.js b/modules/control-center-web/src/main/js/controllers/common-module.js
index 1e06cee..fe11359 100644
--- a/modules/control-center-web/src/main/js/controllers/common-module.js
+++ b/modules/control-center-web/src/main/js/controllers/common-module.js
@@ -730,6 +730,12 @@ consoleModule.service('$common', [
return DS_CHECK_SUCCESS;
}
+ function toJavaName(prefix, name) {
+ var javaName = name ? name.replace(/[^A-Za-z_0-9]+/g, '_') : 'dflt';
+
+ return prefix + javaName.charAt(0).toLocaleUpperCase() + javaName.slice(1);
+ }
+
return {
getModel: getModel,
joinTip: function (arr) {
@@ -1095,7 +1101,7 @@ consoleModule.service('$common', [
cacheStoreFactory: {
kind: 'CacheJdbcPojoStoreFactory',
CacheJdbcPojoStoreFactory: {
- dataSourceBean: 'ds' + cache.name,
+ dataSourceBean: toJavaName('ds', cache.name),
dialect: 'Generic'
}
},
[2/3] ignite git commit: IGNITE-843 Optimize server side: removed not
needed sorting.
Posted by ak...@apache.org.
IGNITE-843 Optimize server side: removed not needed sorting.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/bcd61bf9
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/bcd61bf9
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/bcd61bf9
Branch: refs/heads/ignite-843-rc2
Commit: bcd61bf97bf58881f26df1c99cc7e62dc823f29b
Parents: 2dba12a
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Wed Feb 17 15:18:28 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Wed Feb 17 15:18:28 2016 +0700
----------------------------------------------------------------------
modules/control-center-web/src/main/js/serve/routes/clusters.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/bcd61bf9/modules/control-center-web/src/main/js/serve/routes/clusters.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/serve/routes/clusters.js b/modules/control-center-web/src/main/js/serve/routes/clusters.js
index d05002d..3fcfca4 100644
--- a/modules/control-center-web/src/main/js/serve/routes/clusters.js
+++ b/modules/control-center-web/src/main/js/serve/routes/clusters.js
@@ -44,7 +44,7 @@ module.exports.factory = function(_, express, mongo) {
result.spaces = spaces;
spaceIds = spaces.map((space) => space._id);
- return mongo.DomainModel.find({space: {$in: spaceIds}}).sort('valueType').lean().exec();
+ return mongo.DomainModel.find({space: {$in: spaceIds}}).lean().exec();
})
.then((_domains) => {
domains = _domains.reduce((map, obj) => {
[3/3] ignite git commit: Merge remote-tracking branch
'origin/ignite-843-rc2' into ignite-843-rc2
Posted by ak...@apache.org.
Merge remote-tracking branch 'origin/ignite-843-rc2' into ignite-843-rc2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/facec3ad
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/facec3ad
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/facec3ad
Branch: refs/heads/ignite-843-rc2
Commit: facec3ad46f72042800884fb162743b0f615d459
Parents: bcd61bf 652d85f
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Wed Feb 17 15:19:01 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Wed Feb 17 15:19:01 2016 +0700
----------------------------------------------------------------------
.../src/main/js/public/stylesheets/style.scss | 4 +
.../src/main/js/views/signin.jade | 235 ++++++++++---------
2 files changed, 122 insertions(+), 117 deletions(-)
----------------------------------------------------------------------