ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anovi...@apache.org
Subject ignite git commit: ignite-1219 Trust managers.
Date Fri, 02 Oct 2015 10:27:49 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843 cf51ee9dc -> df0d03251


ignite-1219 Trust managers.


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

Branch: refs/heads/ignite-843
Commit: df0d03251d21961ff8b6c61be125f7d829278c65
Parents: cf51ee9
Author: Andrey <anovikov@gridgain.com>
Authored: Fri Oct 2 17:27:41 2015 +0700
Committer: Andrey <anovikov@gridgain.com>
Committed: Fri Oct 2 17:27:41 2015 +0700

----------------------------------------------------------------------
 .../src/main/js/routes/generator/generator-java.js  | 10 +++++-----
 .../js/routes/generator/generator-properties.js     |  2 +-
 .../src/main/js/routes/generator/generator-xml.js   | 16 ++++++++++++----
 3 files changed, 18 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/df0d0325/modules/control-center-web/src/main/js/routes/generator/generator-java.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/routes/generator/generator-java.js b/modules/control-center-web/src/main/js/routes/generator/generator-java.js
index e9dbca8..cee4860 100644
--- a/modules/control-center-web/src/main/js/routes/generator/generator-java.js
+++ b/modules/control-center-web/src/main/js/routes/generator/generator-java.js
@@ -204,17 +204,17 @@ $generatorJava.listProperty = function (res, varName, obj, propName,
dataType, s
  * @param dataType Optional data type.
  * @param setterName Optional setter name.
  */
-$generatorJava.arrayProperty = function (res, varName, obj, propName, dataType, setterName)
{
+$generatorJava.arrayProperty = function (res, varName, obj, propName, setterName) {
     var val = obj[propName];
 
     if (val && val.length > 0) {
         res.emptyLineIfNeeded();
 
-        res.line(varName + '.' + $generatorJava.setterName(propName, setterName) + '(' +
+        res.line(varName + '.' + $generatorJava.setterName(propName, setterName) + '({ '
+
             _.map(val, function (v) {
-                return $generatorJava.toJavaCode(v, dataType)
+                return 'new ' + res.importClass(v) + '()'
             }).join(', ') +
-        ');');
+        ' });');
 
         res.needEmptyLine = true;
     }
@@ -277,7 +277,7 @@ $generatorJava.beanProperty = function (res, varName, bean, beanPropName,
beanVa
                             break;
 
                         case 'array':
-                            $generatorJava.arrayProperty(res, beanVarName, bean, propName,
descr.elementsType, descr.setterName);
+                            $generatorJava.arrayProperty(res, beanVarName, bean, propName,
descr.setterName);
                             break;
 
                         case 'enum':

http://git-wip-us.apache.org/repos/asf/ignite/blob/df0d0325/modules/control-center-web/src/main/js/routes/generator/generator-properties.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/routes/generator/generator-properties.js
b/modules/control-center-web/src/main/js/routes/generator/generator-properties.js
index b499634..1aaf735 100644
--- a/modules/control-center-web/src/main/js/routes/generator/generator-properties.js
+++ b/modules/control-center-web/src/main/js/routes/generator/generator-properties.js
@@ -58,7 +58,7 @@ $generatorProperties.dataSourcesProperties = function (cluster, res) {
                                 res.line(beanId + '.jdbc.server_name=YOUR_JDBC_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.driverType=YOUR_JDBC_DRIVER_TYPE');
+                                res.line(beanId + '.jdbc.driver_type=YOUR_JDBC_DRIVER_TYPE');
                                 break;
 
                             default:

http://git-wip-us.apache.org/repos/asf/ignite/blob/df0d0325/modules/control-center-web/src/main/js/routes/generator/generator-xml.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/routes/generator/generator-xml.js b/modules/control-center-web/src/main/js/routes/generator/generator-xml.js
index e4d2b13..892643d 100644
--- a/modules/control-center-web/src/main/js/routes/generator/generator-xml.js
+++ b/modules/control-center-web/src/main/js/routes/generator/generator-xml.js
@@ -108,7 +108,7 @@ $generatorXml.listProperty = function (res, obj, propName, listType, rowFactory)
 };
 
 // Add array property
-$generatorXml.arrayProperty = function (res, obj, propName, rowFactory) {
+$generatorXml.arrayProperty = function (res, obj, propName, descr, rowFactory) {
     var val = obj[propName];
 
     if (val && val.length > 0) {
@@ -116,10 +116,18 @@ $generatorXml.arrayProperty = function (res, obj, propName, rowFactory)
{
 
         if (!rowFactory)
             rowFactory = function (val) {
-                return $generatorXml.escape(val);
+                return '<bean class="' + val + '"/>';
             };
 
-        res.line('<property name="' + propName + '" value="' + _.map(val, function (v)
{ return rowFactory(v) }).join(',') +'"/>');
+        res.startBlock('<property name="' + propName + '">');
+        res.startBlock('<list>');
+
+        _.forEach(val, function (v) {
+            res.append(rowFactory(v))
+        });
+
+        res.endBlock('</list>');
+        res.endBlock('</property>');
     }
 }
 
@@ -144,7 +152,7 @@ $generatorXml.beanProperty = function (res, bean, beanPropName, desc,
createBean
                     if (descr.type == 'list')
                         $generatorXml.listProperty(res, bean, propName, descr.setterName);
                     else if (descr.type == 'array')
-                        $generatorXml.arrayProperty(res, bean, propName);
+                        $generatorXml.arrayProperty(res, bean, propName, descr);
                     else if (descr.type == 'jdbcDialect') {
                         if (bean[propName]) {
                             res.startBlock('<property name="' + propName + '">');


Mime
View raw message