ignite git commit: IGNITE-843 Fixed PostgreSQL datasource java code generation.

2015-12-15 Thread akuznetsov 
Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 454c3fa4a -> 95670873c


IGNITE-843 Fixed PostgreSQL datasource java code generation.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/95670873
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/95670873
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/95670873

Branch: refs/heads/ignite-843-rc2
Commit: 95670873c760edfc94f24942419694f1a34a67eb
Parents: 454c3fa
Author: Alexey Kuznetsov 
Authored: Tue Dec 15 16:32:25 2015 +0700
Committer: Alexey Kuznetsov 
Committed: Tue Dec 15 16:32:25 2015 +0700

--
 .../src/main/js/helpers/generator/generator-java.js   | 7 +++
 1 file changed, 7 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/95670873/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
--
diff --git 
a/modules/control-center-web/src/main/js/helpers/generator/generator-java.js 
b/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
index ef30cb5..5a24002 100644
--- a/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
+++ b/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
@@ -926,6 +926,13 @@ $generatorJava.cacheStore = function (cache, metadatas, 
cacheVarName, res) {
 
 break;
 
+case 'PostgreSQL':
+res.line('dataSource.setDataSourceName("' + 
dataSourceBean + '"));');
+
res.line('dataSource.setServerName(props.getProperty("' + dataSourceBean + 
'.jdbc.server_name"));');
+
res.line('dataSource.setDatabaseName(props.getProperty("' + dataSourceBean + 
'.jdbc.database_name"));');
+
+break;
+
 default:
 res.line('dataSource.setURL(props.getProperty("' + 
dataSourceBean + '.jdbc.url"));');
 }

ignite git commit: IGNITE-843 Fixed PostgreSQL datasource java code generation.

2015-12-15 Thread akuznetsov 
Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 d9fb34ae6 -> f5c193d18


IGNITE-843 Fixed PostgreSQL datasource java code generation.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f5c193d1
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f5c193d1
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f5c193d1

Branch: refs/heads/ignite-843-rc2
Commit: f5c193d181e4e008ab4c200397825f8dacce3a9b
Parents: d9fb34a
Author: Alexey Kuznetsov 
Authored: Tue Dec 15 16:48:50 2015 +0700
Committer: Alexey Kuznetsov 
Committed: Tue Dec 15 16:48:50 2015 +0700

--
 .../src/main/js/helpers/generator/generator-java.js| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/f5c193d1/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
--
diff --git 
a/modules/control-center-web/src/main/js/helpers/generator/generator-java.js 
b/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
index 5a24002..a142dcb 100644
--- a/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
+++ b/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
@@ -927,7 +927,7 @@ $generatorJava.cacheStore = function (cache, metadatas, 
cacheVarName, res) {
 break;
 
 case 'PostgreSQL':
-res.line('dataSource.setDataSourceName("' + 
dataSourceBean + '"));');
+res.line('dataSource.setDataSourceName("' + 
dataSourceBean + '");');
 
res.line('dataSource.setServerName(props.getProperty("' + dataSourceBean + 
'.jdbc.server_name"));');
 
res.line('dataSource.setDatabaseName(props.getProperty("' + dataSourceBean + 
'.jdbc.database_name"));');

ignite git commit: IGNITE-843 Fixed PostgreSQL datasource java code generation.

2015-12-15 Thread akuznetsov 
Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 f5c193d18 -> 5b31c31d2


IGNITE-843 Fixed PostgreSQL datasource java code generation.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5b31c31d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5b31c31d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5b31c31d

Branch: refs/heads/ignite-843-rc2
Commit: 5b31c31d2f3b9adda1e010e3be1050b8ded10c5b
Parents: f5c193d
Author: Alexey Kuznetsov 
Authored: Tue Dec 15 17:04:05 2015 +0700
Committer: Alexey Kuznetsov 
Committed: Tue Dec 15 17:04:05 2015 +0700

--
 .../main/js/helpers/generator/generator-properties.js| 11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/5b31c31d/modules/control-center-web/src/main/js/helpers/generator/generator-properties.js
--
diff --git 
a/modules/control-center-web/src/main/js/helpers/generator/generator-properties.js
 
b/modules/control-center-web/src/main/js/helpers/generator/generator-properties.js
index 1eb70e4..c867559 100644
--- 
a/modules/control-center-web/src/main/js/helpers/generator/generator-properties.js
+++ 
b/modules/control-center-web/src/main/js/helpers/generator/generator-properties.js
@@ -68,10 +68,17 @@ $generatorProperties.dataSourcesProperties = function 
(cluster, res) {
 
 switch (storeFactory.dialect) {
 case 'DB2':
-res.line(beanId + 
'.jdbc.server_name=YOUR_JDBC_SERVER_NAME');
+res.line(beanId + 
'.jdbc.server_name=YOUR_DATABASE_SERVER_NAME');
 res.line(beanId + 
'.jdbc.port_number=YOUR_JDBC_PORT_NUMBER');
-res.line(beanId + 
'.jdbc.database_name=YOUR_JDBC_DATABASE_TYPE');
+res.line(beanId + 
'.jdbc.database_name=YOUR_DATABASE_NAME');
 res.line(beanId + 
'.jdbc.driver_type=YOUR_JDBC_DRIVER_TYPE');
+
+break;
+
+case 'PostgreSQL':
+res.line(beanId + 
'.jdbc.server_name=YOUR_DATABASE_SERVER_NAME');
+res.line(beanId + 
'.jdbc.database_name=YOUR_DATABASE_NAME');
+
 break;
 
 default: