ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject ignite git commit: IGNITE-2001 Fixed XML and java code generation for JDBC types: added missing cacheName.
Date Thu, 26 Nov 2015 03:54:34 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc1 2f6de8a8e -> 27e8b8957


IGNITE-2001 Fixed XML and java code generation for JDBC types: added missing cacheName.


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

Branch: refs/heads/ignite-843-rc1
Commit: 27e8b8957be8e38cd04c2e825110687e079aa1cd
Parents: 2f6de8a
Author: Alexey Kuznetsov <akuznetsov@apache.org>
Authored: Thu Nov 26 10:55:03 2015 +0700
Committer: Alexey Kuznetsov <akuznetsov@apache.org>
Committed: Thu Nov 26 10:55:03 2015 +0700

----------------------------------------------------------------------
 .../src/main/js/helpers/generator/generator-java.js                | 2 ++
 .../src/main/js/helpers/generator/generator-xml.js                 | 2 ++
 .../control-center-web/src/main/js/views/includes/controls.jade    | 2 ++
 3 files changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/27e8b895/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 4a9b76e..6e760d8 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
@@ -933,6 +933,8 @@ $generatorJava.cacheStore = function (cache, metadatas, cacheVarName,
res) {
 
                         res.needEmptyLine = true;
 
+                        $generatorJava.property(res, 'jdbcType', cache, 'name', undefined,
'setCacheName');
+
                         $generatorJava.metadataStore(meta, true, res);
 
                         res.needEmptyLine = true;

http://git-wip-us.apache.org/repos/asf/ignite/blob/27e8b895/modules/control-center-web/src/main/js/helpers/generator/generator-xml.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/helpers/generator/generator-xml.js b/modules/control-center-web/src/main/js/helpers/generator/generator-xml.js
index 6bfae51..ce00b90 100644
--- a/modules/control-center-web/src/main/js/helpers/generator/generator-xml.js
+++ b/modules/control-center-web/src/main/js/helpers/generator/generator-xml.js
@@ -756,6 +756,8 @@ $generatorXml.cacheStore = function(cache, metadatas, res) {
                     _.forEach(metadatas, function (meta) {
                         res.startBlock('<bean class="org.apache.ignite.cache.store.jdbc.JdbcType">');
 
+                        $generatorXml.property(res, cache, 'name', 'cacheName');
+
                         $generatorXml.classNameProperty(res, meta, 'keyType');
                         $generatorXml.property(res, meta, 'valueType');
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/27e8b895/modules/control-center-web/src/main/js/views/includes/controls.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/includes/controls.jade b/modules/control-center-web/src/main/js/views/includes/controls.jade
index ec78928..7bf7bb5 100644
--- a/modules/control-center-web/src/main/js/views/includes/controls.jade
+++ b/modules/control-center-web/src/main/js/views/includes/controls.jade
@@ -417,6 +417,8 @@ mixin form-row-custom(lblClasses, fieldClasses, dataSource)
             +table-pair('Index key-value type pairs', fieldMdl, 'keyClass', 'valueClass',
'Key full class name', 'Value class full name', true, true, '/')
         div(ng-switch-when='fields' ng-hide=fieldHide)
             +table-pair('{{::field.label}}', fieldMdl, 'name', 'className', 'Field name',
'Field full class name', false, true, '/')
+        .group-section(ng-switch-when='aliases' ng-hide=fieldHide)
+            +table-pair('{{::field.label}}', fieldMdl, 'field', 'alias', 'Field name', 'Field
Alias', false, false, '->')
         .group-section(ng-switch-when='pathModes' ng-hide=fieldHide)
             +table-igfs-path-mode('{{::field.label}}', fieldMdl, 'path', 'mode', 'Path',
'Mode')
         .group-section(ng-switch-when='table-db-fields' ng-hide=fieldHide)


Mime
View raw message