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 10:30:57 UTC
[4/8] ignite git commit: IGNITE-843 Transform dataSourceBean to valid
java name.
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-rc3
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'
}
},