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/01/19 11:58:59 UTC
ignite git commit: IGNITE-843 Generate cache with data source bean
name + dialect.
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc2 838dcb343 -> cd566ca82
IGNITE-843 Generate cache with data source bean name + dialect.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cd566ca8
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cd566ca8
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cd566ca8
Branch: refs/heads/ignite-843-rc2
Commit: cd566ca82e3e3250ca3aa5b0ecfbe3bf06120c14
Parents: 838dcb3
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Tue Jan 19 17:59:16 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Tue Jan 19 17:59:16 2016 +0700
----------------------------------------------------------------------
.../main/js/controllers/domains-controller.js | 25 +++++++-------------
1 file changed, 8 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/cd566ca8/modules/control-center-web/src/main/js/controllers/domains-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/domains-controller.js b/modules/control-center-web/src/main/js/controllers/domains-controller.js
index 2178ed4..02e61ba 100644
--- a/modules/control-center-web/src/main/js/controllers/domains-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/domains-controller.js
@@ -577,12 +577,6 @@ consoleModule.controller('domainsController', function ($filter, $http, $timeout
name: 'PARTITIONED',
cacheMode: 'PARTITIONED',
atomicityMode: 'ATOMIC',
- cacheStoreFactory: {
- kind: 'CacheJdbcPojoStoreFactory',
- CacheJdbcPojoStoreFactory: {
- dataSourceBean: 'dataSource'
- }
- },
readThrough: true,
writeThrough: true
}
@@ -595,12 +589,6 @@ consoleModule.controller('domainsController', function ($filter, $http, $timeout
name: 'REPLICATED',
cacheMode: 'REPLICATED',
atomicityMode: 'ATOMIC',
- cacheStoreFactory: {
- kind: 'CacheJdbcPojoStoreFactory',
- CacheJdbcPojoStoreFactory: {
- dataSourceBean: 'dataSource'
- }
- },
readThrough: true,
writeThrough: true
}
@@ -948,14 +936,17 @@ consoleModule.controller('domainsController', function ($filter, $http, $timeout
// POJO store factory is not defined in template.
if (!newDomain.newCache.cacheStoreFactory ||
- newDomain.newCache.cacheStoreFactory.kind !== 'CacheJdbcPojoStoreFactory')
+ newDomain.newCache.cacheStoreFactory.kind !== 'CacheJdbcPojoStoreFactory') {
+ var dialect = $scope.importDomain.demo ? 'H2' : $scope.selectedPreset.db;
+
newDomain.newCache.cacheStoreFactory = {
kind: 'CacheJdbcPojoStoreFactory',
- CacheJdbcPojoStoreFactory: { dataSourceBean: 'dataSource' }
+ CacheJdbcPojoStoreFactory: {
+ dataSourceBean: 'dataSource' + dialect,
+ dialect: dialect
+ }
};
-
- newDomain.newCache.cacheStoreFactory.CacheJdbcPojoStoreFactory.dialect =
- $scope.importDomain.demo ? 'H2' : $scope.selectedPreset.db
+ }
}
else if (table.cache !== IMPORT_DM_DO_NOT_GENERATE._id)
newDomain.caches = [table.cache];