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/06/23 08:44:08 UTC
incubator-ignite git commit: # IGNITE-843 WIP cache store.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-843 ba1bc7b65 -> b9ace91dd
# IGNITE-843 WIP cache store.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b9ace91d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b9ace91d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b9ace91d
Branch: refs/heads/ignite-843
Commit: b9ace91dd95fbff103dde9ea5520f383f45c20d1
Parents: ba1bc7b
Author: AKuznetsov <ak...@gridgain.com>
Authored: Tue Jun 23 13:44:00 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Tue Jun 23 13:44:00 2015 +0700
----------------------------------------------------------------------
.../nodejs/public/form-models/caches.json | 38 +++++++++++++++++---
.../public/javascripts/controllers/caches.js | 9 +++++
2 files changed, 43 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b9ace91d/modules/webconfig/nodejs/public/form-models/caches.json
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/public/form-models/caches.json b/modules/webconfig/nodejs/public/form-models/caches.json
index 827817d..29f426e 100644
--- a/modules/webconfig/nodejs/public/form-models/caches.json
+++ b/modules/webconfig/nodejs/public/form-models/caches.json
@@ -335,20 +335,24 @@
"type": "text",
"model": "dataSourceBean",
"required": true,
- "placeholder": "Data surce bean"
+ "placeholder": "Bean name in Spring context",
+ "tip": [
+ "Name of the data source bean in Spring context."
+ ]
},
{
"label": "Dialect",
"type": "dropdown",
"model": "dialect",
"placeholder": "Choose JDBC dialect",
- "items": "dialects",
+ "items": "cacheStoreJdbcDialects",
"tip": [
"Dialect of SQL implemented by a particular RDBMS:",
"<ul>",
" <li>Generic JDBC dialect.</li>",
- " <li>Oracle.</li>",
+ " <li>Oracle database.</li>",
" <li>IBM DB2.</li>",
+ " <li>Microsoft SQL Server.</li>",
" <li>My SQL.</li>",
" <li>H2 database.</li>",
"</ul>"
@@ -358,7 +362,33 @@
},
"CacheJdbcBlobStoreFactory": {
"expanded": true,
- "fields": []
+ "fields": [
+ {
+ "label": "user",
+ "type": "text",
+ "model": "user",
+ "tip": [
+ "User name for database access."
+ ]
+ },
+ {
+ "label": "Data source bean",
+ "type": "text",
+ "model": "dataSourceBean",
+ "placeholder": "Bean name in Spring context",
+ "tip": [
+ "Name of the data source bean in Spring context."
+ ]
+ },
+ {
+ "label": "Init schema",
+ "type": "check",
+ "model": "initSchema",
+ "tip": [
+ "Flag indicating whether DB schema should be initialized by Ignite (default behaviour) or was explicitly created by user."
+ ]
+ }
+ ]
},
"CacheHibernateBlobStoreFactory": {
"expanded": true,
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b9ace91d/modules/webconfig/nodejs/public/javascripts/controllers/caches.js
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/public/javascripts/controllers/caches.js b/modules/webconfig/nodejs/public/javascripts/controllers/caches.js
index b5a1108..28ee892 100644
--- a/modules/webconfig/nodejs/public/javascripts/controllers/caches.js
+++ b/modules/webconfig/nodejs/public/javascripts/controllers/caches.js
@@ -63,6 +63,15 @@ configuratorModule.controller('cachesController', ['$scope', '$alert', '$http',
{value: 'CacheHibernateBlobStoreFactory', label: 'Hibernate BLOB store factory'}
];
+ $scope.cacheStoreJdbcDialects = [
+ {value: 'BasicJdbcDialect', label: 'Generic JDBC dialect'},
+ {value: 'OracleDialect', label: 'Oracle'},
+ {value: 'DB2Dialect', label: 'IBM DB2'},
+ {value: 'SQLServerDialect', label: 'Microsoft SQL Server'},
+ {value: 'MySQLDialect', label: 'My SQL'},
+ {value: 'H2Dialect', label: 'H2 database'}
+ ];
+
$scope.general = [];
$scope.advanced = [];