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-843 Fixed generation.
Date Thu, 28 Jan 2016 07:36:02 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 b9f18ea98 -> b5c7b18b1


IGNITE-843 Fixed generation.


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

Branch: refs/heads/ignite-843-rc2
Commit: b5c7b18b1633c7d472e072e3f08dcf29d9201f55
Parents: b9f18ea
Author: Andrey <anovikov@gridgain.com>
Authored: Thu Jan 28 14:36:45 2016 +0700
Committer: Andrey <anovikov@gridgain.com>
Committed: Thu Jan 28 14:36:45 2016 +0700

----------------------------------------------------------------------
 .../src/main/js/app/data/event-types.json       | 169 +++++++++++++++++++
 .../configuration/include-event-types/main.js   |  36 +---
 .../states/configuration/clusters/events.jade   |   2 +-
 .../main/js/controllers/clusters-controller.js  |   6 +-
 .../js/helpers/generator/generator-common.js    |  41 +++++
 .../main/js/helpers/generator/generator-java.js |  41 +++--
 .../main/js/helpers/generator/generator-xml.js  |   9 +-
 .../src/main/js/views/settings/profile.jade     |   4 +-
 8 files changed, 253 insertions(+), 55 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/b5c7b18b/modules/control-center-web/src/main/js/app/data/event-types.json
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/data/event-types.json b/modules/control-center-web/src/main/js/app/data/event-types.json
new file mode 100644
index 0000000..8d0c878
--- /dev/null
+++ b/modules/control-center-web/src/main/js/app/data/event-types.json
@@ -0,0 +1,169 @@
+[
+  {
+    "label": "EVTS_CHECKPOINT",
+    "value": "EVTS_CHECKPOINT",
+    "class": "org.apache.ignite.events.EventType",
+    "events": [
+      "EVT_CHECKPOINT_SAVED",
+      "EVT_CHECKPOINT_LOADED",
+      "EVT_CHECKPOINT_REMOVED"
+    ]
+  },
+  {
+    "label": "EVTS_DEPLOYMENT",
+    "value": "EVTS_DEPLOYMENT",
+    "class": "org.apache.ignite.events.EventType",
+    "events": [
+      "EVT_CLASS_DEPLOYED",
+      "EVT_CLASS_UNDEPLOYED",
+      "EVT_CLASS_DEPLOY_FAILED",
+      "EVT_TASK_DEPLOYED",
+      "EVT_TASK_UNDEPLOYED",
+      "EVT_TASK_DEPLOY_FAILED"
+    ]
+  },
+  {
+    "label": "EVTS_ERROR",
+    "value": "EVTS_ERROR",
+    "class": "org.apache.ignite.events.EventType",
+    "events": [
+      "EVT_JOB_TIMEDOUT",
+      "EVT_JOB_FAILED",
+      "EVT_JOB_FAILED_OVER",
+      "EVT_JOB_REJECTED",
+      "EVT_JOB_CANCELLED",
+      "EVT_TASK_TIMEDOUT",
+      "EVT_TASK_FAILED",
+      "EVT_CLASS_DEPLOY_FAILED",
+      "EVT_TASK_DEPLOY_FAILED",
+      "EVT_TASK_DEPLOYED",
+      "EVT_TASK_UNDEPLOYED",
+      "EVT_CACHE_REBALANCE_STARTED",
+      "EVT_CACHE_REBALANCE_STOPPED"
+    ]
+  },
+  {
+    "label": "EVTS_DISCOVERY",
+    "value": "EVTS_DISCOVERY",
+    "class": "org.apache.ignite.events.EventType",
+    "events": [
+      "EVT_NODE_JOINED",
+      "EVT_NODE_LEFT",
+      "EVT_NODE_FAILED",
+      "EVT_NODE_SEGMENTED",
+      "EVT_CLIENT_NODE_DISCONNECTED",
+      "EVT_CLIENT_NODE_RECONNECTED"
+    ]
+  },
+  {
+    "label": "EVTS_JOB_EXECUTION",
+    "value": "EVTS_JOB_EXECUTION",
+    "class": "org.apache.ignite.events.EventType",
+    "events": [
+      "EVT_JOB_MAPPED",
+      "EVT_JOB_RESULTED",
+      "EVT_JOB_FAILED_OVER",
+      "EVT_JOB_STARTED",
+      "EVT_JOB_FINISHED",
+      "EVT_JOB_TIMEDOUT",
+      "EVT_JOB_REJECTED",
+      "EVT_JOB_FAILED",
+      "EVT_JOB_QUEUED",
+      "EVT_JOB_CANCELLED"
+    ]
+  },
+  {
+    "label": "EVTS_TASK_EXECUTION",
+    "value": "EVTS_TASK_EXECUTION",
+    "class": "org.apache.ignite.events.EventType",
+    "events": [
+      "EVT_TASK_STARTED",
+      "EVT_TASK_FINISHED",
+      "EVT_TASK_FAILED",
+      "EVT_TASK_TIMEDOUT",
+      "EVT_TASK_SESSION_ATTR_SET",
+      "EVT_TASK_REDUCED"
+    ]
+  },
+  {
+    "label": "EVTS_CACHE",
+    "value": "EVTS_CACHE",
+    "class": "org.apache.ignite.events.EventType",
+    "events": [
+      "EVT_CACHE_ENTRY_CREATED",
+      "EVT_CACHE_ENTRY_DESTROYED",
+      "EVT_CACHE_OBJECT_PUT",
+      "EVT_CACHE_OBJECT_READ",
+      "EVT_CACHE_OBJECT_REMOVED",
+      "EVT_CACHE_OBJECT_LOCKED",
+      "EVT_CACHE_OBJECT_UNLOCKED",
+      "EVT_CACHE_OBJECT_SWAPPED",
+      "EVT_CACHE_OBJECT_UNSWAPPED",
+      "EVT_CACHE_OBJECT_EXPIRED"
+    ]
+  },
+  {
+    "label": "EVTS_CACHE_REBALANCE",
+    "value": "EVTS_CACHE_REBALANCE",
+    "class": "org.apache.ignite.events.EventType",
+    "events": [
+      "EVT_CACHE_REBALANCE_STARTED",
+      "EVT_CACHE_REBALANCE_STOPPED",
+      "EVT_CACHE_REBALANCE_PART_LOADED",
+      "EVT_CACHE_REBALANCE_PART_UNLOADED",
+      "EVT_CACHE_REBALANCE_OBJECT_LOADED",
+      "EVT_CACHE_REBALANCE_OBJECT_UNLOADED",
+      "EVT_CACHE_REBALANCE_PART_DATA_LOST"
+    ]
+  },
+  {
+    "label": "EVTS_CACHE_LIFECYCLE",
+    "value": "EVTS_CACHE_LIFECYCLE",
+    "class": "org.apache.ignite.events.EventType",
+    "events": [
+      "EVT_CACHE_STARTED",
+      "EVT_CACHE_STOPPED",
+      "EVT_CACHE_NODES_LEFT"
+    ]
+  },
+  {
+    "label": "EVTS_CACHE_QUERY",
+    "value": "EVTS_CACHE_QUERY",
+    "class": "org.apache.ignite.events.EventType",
+    "events": [
+      "EVT_CACHE_QUERY_EXECUTED",
+      "EVT_CACHE_QUERY_OBJECT_READ"
+    ]
+  },
+  {
+    "label": "EVTS_SWAPSPACE",
+    "value": "EVTS_SWAPSPACE",
+    "class": "org.apache.ignite.events.EventType",
+    "events": [
+      "EVT_SWAP_SPACE_CLEARED",
+      "EVT_SWAP_SPACE_DATA_REMOVED",
+      "EVT_SWAP_SPACE_DATA_READ",
+      "EVT_SWAP_SPACE_DATA_STORED",
+      "EVT_SWAP_SPACE_DATA_EVICTED"
+    ]
+  },
+  {
+    "label": "EVTS_IGFS",
+    "value": "EVTS_IGFS",
+    "class": "org.apache.ignite.events.EventType",
+    "events": [
+      "EVT_IGFS_FILE_CREATED",
+      "EVT_IGFS_FILE_RENAMED",
+      "EVT_IGFS_FILE_DELETED",
+      "EVT_IGFS_FILE_OPENED_READ",
+      "EVT_IGFS_FILE_OPENED_WRITE",
+      "EVT_IGFS_FILE_CLOSED_WRITE",
+      "EVT_IGFS_FILE_CLOSED_READ",
+      "EVT_IGFS_FILE_PURGED",
+      "EVT_IGFS_META_UPDATED",
+      "EVT_IGFS_DIR_CREATED",
+      "EVT_IGFS_DIR_RENAMED",
+      "EVT_IGFS_DIR_DELETED"
+    ]
+  }
+]

http://git-wip-us.apache.org/repos/asf/ignite/blob/b5c7b18b/modules/control-center-web/src/main/js/app/modules/configuration/include-event-types/main.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/configuration/include-event-types/main.js
b/modules/control-center-web/src/main/js/app/modules/configuration/include-event-types/main.js
index 17d7d3a..c75e0ae 100644
--- a/modules/control-center-web/src/main/js/app/modules/configuration/include-event-types/main.js
+++ b/modules/control-center-web/src/main/js/app/modules/configuration/include-event-types/main.js
@@ -15,6 +15,9 @@
  * limitations under the License.
  */
 
+// Events groups.
+import GROUPS from 'app/data/event-types.json!';
+
 import angular from 'angular';
 
 // Ignite events groups.
@@ -23,38 +26,11 @@ angular
 
     ])
 .provider('igniteIncludeEventGroups', function() {
-    const items = {
-        EVTS_CHECKPOINT: ['EVT_CHECKPOINT_SAVED', 'EVT_CHECKPOINT_LOADED', 'EVT_CHECKPOINT_REMOVED'],
-        EVTS_DEPLOYMENT: ['EVT_CLASS_DEPLOYED', 'EVT_CLASS_UNDEPLOYED', 'EVT_CLASS_DEPLOY_FAILED',
'EVT_TASK_DEPLOYED',
-            'EVT_TASK_UNDEPLOYED', 'EVT_TASK_DEPLOY_FAILED'],
-        EVTS_ERROR: ['EVT_JOB_TIMEDOUT', 'EVT_JOB_FAILED', 'EVT_JOB_FAILED_OVER', 'EVT_JOB_REJECTED',
'EVT_JOB_CANCELLED',
-            'EVT_TASK_TIMEDOUT', 'EVT_TASK_FAILED', 'EVT_CLASS_DEPLOY_FAILED', 'EVT_TASK_DEPLOY_FAILED',
-            'EVT_TASK_DEPLOYED', 'EVT_TASK_UNDEPLOYED', 'EVT_CACHE_REBALANCE_STARTED', 'EVT_CACHE_REBALANCE_STOPPED'],
-        EVTS_DISCOVERY: ['EVT_NODE_JOINED', 'EVT_NODE_LEFT', 'EVT_NODE_FAILED', 'EVT_NODE_SEGMENTED',
-            'EVT_CLIENT_NODE_DISCONNECTED', 'EVT_CLIENT_NODE_RECONNECTED'],
-        EVTS_JOB_EXECUTION: ['EVT_JOB_MAPPED', 'EVT_JOB_RESULTED', 'EVT_JOB_FAILED_OVER',
'EVT_JOB_STARTED',
-            'EVT_JOB_FINISHED', 'EVT_JOB_TIMEDOUT', 'EVT_JOB_REJECTED', 'EVT_JOB_FAILED',
'EVT_JOB_QUEUED',
-            'EVT_JOB_CANCELLED'],
-        EVTS_TASK_EXECUTION: ['EVT_TASK_STARTED', 'EVT_TASK_FINISHED', 'EVT_TASK_FAILED',
'EVT_TASK_TIMEDOUT',
-            'EVT_TASK_SESSION_ATTR_SET', 'EVT_TASK_REDUCED'],
-        EVTS_CACHE: ['EVT_CACHE_ENTRY_CREATED', 'EVT_CACHE_ENTRY_DESTROYED', 'EVT_CACHE_OBJECT_PUT',
-            'EVT_CACHE_OBJECT_READ', 'EVT_CACHE_OBJECT_REMOVED', 'EVT_CACHE_OBJECT_LOCKED',
'EVT_CACHE_OBJECT_UNLOCKED',
-            'EVT_CACHE_OBJECT_SWAPPED', 'EVT_CACHE_OBJECT_UNSWAPPED', 'EVT_CACHE_OBJECT_EXPIRED'],
-        EVTS_CACHE_REBALANCE: ['EVT_CACHE_REBALANCE_STARTED', 'EVT_CACHE_REBALANCE_STOPPED',
-            'EVT_CACHE_REBALANCE_PART_LOADED', 'EVT_CACHE_REBALANCE_PART_UNLOADED', 'EVT_CACHE_REBALANCE_OBJECT_LOADED',
-            'EVT_CACHE_REBALANCE_OBJECT_UNLOADED', 'EVT_CACHE_REBALANCE_PART_DATA_LOST'],
-        EVTS_CACHE_LIFECYCLE: ['EVT_CACHE_STARTED', 'EVT_CACHE_STOPPED', 'EVT_CACHE_NODES_LEFT'],
-        EVTS_CACHE_QUERY: ['EVT_CACHE_QUERY_EXECUTED', 'EVT_CACHE_QUERY_OBJECT_READ'],
-        EVTS_SWAPSPACE: ['EVT_SWAP_SPACE_CLEARED', 'EVT_SWAP_SPACE_DATA_REMOVED', 'EVT_SWAP_SPACE_DATA_READ',
-            'EVT_SWAP_SPACE_DATA_STORED', 'EVT_SWAP_SPACE_DATA_EVICTED'],
-        EVTS_IGFS: ['EVT_IGFS_FILE_CREATED', 'EVT_IGFS_FILE_RENAMED', 'EVT_IGFS_FILE_DELETED',
'EVT_IGFS_FILE_OPENED_READ',
-            'EVT_IGFS_FILE_OPENED_WRITE', 'EVT_IGFS_FILE_CLOSED_WRITE', 'EVT_IGFS_FILE_CLOSED_READ',
'EVT_IGFS_FILE_PURGED',
-            'EVT_IGFS_META_UPDATED', 'EVT_IGFS_DIR_CREATED', 'EVT_IGFS_DIR_RENAMED', 'EVT_IGFS_DIR_DELETED']
-    };
+    const groups = GROUPS;
 
-    this.push = (data) => items.push(data);
+    this.push = (data) => groups.push(data);
 
     this.$get = [() => {
-        return items;
+        return groups;
     }];
 });

http://git-wip-us.apache.org/repos/asf/ignite/blob/b5c7b18b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/events.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/events.jade
b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/events.jade
index 8fb513d..8f0527a 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/events.jade
+++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/events.jade
@@ -36,7 +36,7 @@ form.panel.panel-default(name='events' novalidate)
                         ignite-form-field-dropdown(
                             data-id='includeEventTypes'
                             data-name='includeEventTypes'
-                            data-options="events"
+                            data-options="eventGroups"
                             data-multiple='true'
                             data-ng-model='#{model}.includeEventTypes'
                             data-placeholder='Choose recorded event types'

http://git-wip-us.apache.org/repos/asf/ignite/blob/b5c7b18b/modules/control-center-web/src/main/js/controllers/clusters-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/clusters-controller.js b/modules/control-center-web/src/main/js/controllers/clusters-controller.js
index 953f061..21135b2 100644
--- a/modules/control-center-web/src/main/js/controllers/clusters-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/clusters-controller.js
@@ -156,11 +156,7 @@ consoleModule.controller('clustersController', function ($http, $timeout,
$scope
             {value: undefined, label: 'Not set'}
         ];
 
-        $scope.events = [];
-
-        _.forEach(igniteIncludeEventGroups, function (evts, evtGrp) {
-            $scope.events.push({label: evtGrp, value: evtGrp});
-        });
+        $scope.eventGroups = igniteIncludeEventGroups;
 
         $scope.preview = {
             general: {xml: '', java: '', allDefaults: true},

http://git-wip-us.apache.org/repos/asf/ignite/blob/b5c7b18b/modules/control-center-web/src/main/js/helpers/generator/generator-common.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/helpers/generator/generator-common.js
b/modules/control-center-web/src/main/js/helpers/generator/generator-common.js
index b15e85a..2464d07 100644
--- a/modules/control-center-web/src/main/js/helpers/generator/generator-common.js
+++ b/modules/control-center-web/src/main/js/helpers/generator/generator-common.js
@@ -54,6 +54,7 @@ $generatorCommon.builder = function (deep) {
     res.lineStart = true;
     res.datasources = [];
     res.imports = {};
+    res.staticImports = {};
     res.vars = {};
 
     res.safeDeep = 0;
@@ -67,6 +68,7 @@ $generatorCommon.builder = function (deep) {
             res.datasources = fromRes.datasources;
 
             angular.extend(res.imports, fromRes.imports);
+            angular.extend(res.staticImports, fromRes.staticImports);
             angular.extend(res.vars, fromRes.vars);
         }
     };
@@ -86,6 +88,7 @@ $generatorCommon.builder = function (deep) {
         res.safeDeep = this.deep;
         this.safeNeedEmptyLine = this.needEmptyLine;
         this.safeImports = _.cloneDeep(this.imports);
+        this.safeStaticImports = _.cloneDeep(this.staticImports);
         this.safeDatasources = this.datasources.slice();
         this.safePoint = this.length;
     };
@@ -98,6 +101,7 @@ $generatorCommon.builder = function (deep) {
             this.needEmptyLine = this.safeNeedEmptyLine;
             this.datasources = this.safeDatasources;
             this.imports = this.safeImports;
+            this.staticImports = this.safeStaticImports;
             this.safePoint = -1;
         }
     };
@@ -191,6 +195,27 @@ $generatorCommon.builder = function (deep) {
     };
 
     /**
+     * Add class to imports.
+     *
+     * @param member Static member.
+     * @returns {String} Short class name or full class name in case of names conflict.
+     */
+    res.importStatic = function (member) {
+        var dotIdx = member.lastIndexOf('.');
+
+        var shortName = dotIdx > 0 ? member.substr(dotIdx + 1) : member;
+
+        if (this.staticImports[shortName]) {
+            if (this.staticImports[shortName] !== member)
+                return member; // Short class names conflict. Return full name.
+        }
+        else
+            this.staticImports[shortName] = member;
+
+        return shortName;
+    };
+
+    /**
      * @returns String with "java imports" section.
      */
     res.generateImports = function () {
@@ -206,6 +231,22 @@ $generatorCommon.builder = function (deep) {
         return res.join('\n');
     };
 
+    /**
+     * @returns String with "java imports" section.
+     */
+    res.generateStaticImports = function () {
+        var res = [];
+
+        for (var clsName in this.staticImports) {
+            if (this.staticImports.hasOwnProperty(clsName) && this.staticImports[clsName].lastIndexOf('java.lang.',
0) !== 0)
+                res.push('import static ' + this.staticImports[clsName] + ';');
+        }
+
+        res.sort();
+
+        return res.join('\n');
+    };
+
     return res;
 };
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/b5c7b18b/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 33f0d84..9bce81b 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
@@ -798,17 +798,24 @@ $generatorJava.clusterEvents = function (cluster, res) {
     if (cluster.includeEventTypes && cluster.includeEventTypes.length > 0) {
         res.emptyLineIfNeeded();
 
-        res.importClass('org.apache.ignite.events.EventType');
+        var evtGrps = angular.element(document.getElementById('app')).injector().get('igniteIncludeEventGroups');
+
+        var evtGrpDscr = _.find(evtGrps, {value: cluster.includeEventTypes[0]});
+
+        var evt = res.importStatic(evtGrpDscr.class + '.' + evtGrpDscr.value);
 
         if (cluster.includeEventTypes.length === 1)
-            res.line('cfg.setIncludeEventTypes(EventType.' + cluster.includeEventTypes[0]
+ ');');
+            res.line('cfg.setIncludeEventTypes(' + evt + ');');
         else {
-            res.line('int[] events = new int[EventType.' + cluster.includeEventTypes[0] +
'.length');
+            _.forEach(cluster.includeEventTypes, function(value, ix) {
+                var evtGrpDscr = _.find(evtGrps, {value: value});
 
-            _.forEach(cluster.includeEventTypes, function(e, ix) {
-                if (ix > 0) {
-                    res.line('    + EventType.' + e + '.length');
-                }
+                var evt = res.importStatic(evtGrpDscr.class + '.' + evtGrpDscr.value);
+
+                if (ix === 0)
+                    res.line('int[] events = new int[' + evt + '.length');
+                else
+                    res.line('    + ' + evt + '.length');
             });
 
             res.line('];');
@@ -817,11 +824,15 @@ $generatorJava.clusterEvents = function (cluster, res) {
 
             res.line('int k = 0;');
 
-            _.forEach(cluster.includeEventTypes, function(e) {
+            _.forEach(cluster.includeEventTypes, function(value) {
                 res.needEmptyLine = true;
 
-                res.line('System.arraycopy(EventType.' + e + ', 0, events, k, EventType.'
+ e + '.length);');
-                res.line('k += EventType.' + e + '.length;');
+                var evtGrpDscr = _.find(evtGrps, {value: value});
+
+                evt = res.importStatic(evtGrpDscr.class + '.' + value);
+
+                res.line('System.arraycopy(' + evt + ', 0, events, k, ' + evt + '.length);');
+                res.line('k += ' + evt + '.length;');
             });
 
             res.needEmptyLine = true;
@@ -1755,7 +1766,9 @@ $generatorJava.clusterCacheUse = function (caches, igfss, res) {
     });
 
     if (names.length > 0 || igfsNames.length > 0) {
-        names.push(igfsNames);
+        _.forEach(igfsNames, function (igfsName) {
+            names.push(igfsName);
+        });
 
         res.line('cfg.setCacheConfiguration(' + names.join(', ') + ');');
 
@@ -2004,7 +2017,7 @@ $generatorJava.javaClassCode = function (domain, key, pkg, useConstructor,
inclu
 
     res.endBlock('}');
 
-    return 'package ' + pkg + ';' + '\n\n' + res.generateImports() + '\n\n' + res.asString();
+    return 'package ' + pkg + ';' + '\n\n' + res.generateImports() + '\n\n' + res.generateStaticImports()
+ '\n\n' + res.asString();
 };
 
 /**
@@ -2453,7 +2466,7 @@ $generatorJava.cluster = function (cluster, pkg, javaClass, clientNearCfg)
{
 
         res.endBlock('}');
 
-        return 'package ' + pkg + ';\n\n' + res.generateImports() + '\n\n' + res.asString();
+        return 'package ' + pkg + ';\n\n' + res.generateImports() + '\n\n' + res.generateStaticImports()
 + '\n\n' + res.asString();
     }
 
     return res.asString();
@@ -2826,5 +2839,5 @@ $generatorJava.nodeStartup = function (cluster, pkg, cls, cfg, factoryCls,
clien
 
     res.endBlock('}');
 
-    return 'package ' + pkg + ';\n\n' + res.generateImports() + '\n\n' + res.asString();
+    return 'package ' + pkg + ';\n\n' + res.generateImports() + '\n\n' + res.generateStaticImports()
+ '\n\n' + res.asString();
 };

http://git-wip-us.apache.org/repos/asf/ignite/blob/b5c7b18b/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 67024c9..cbc693b 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
@@ -583,9 +583,12 @@ $generatorXml.clusterEvents = function (cluster, res) {
 
                 res.line('<!-- EventType.' + eventGroup + ' -->');
 
-                _.forEach(evtGrps[eventGroup], function(event) {
-                    res.line('<util:constant static-field="org.apache.ignite.events.EventType.'
+ event + '"/>');
-                });
+                var evtGrp = _.find(evtGrps, {value: eventGroup});
+
+                if (evtGrp)
+                    _.forEach(evtGrp.events, function(event) {
+                        res.line('<util:constant static-field="' + evtGrp.class + '.'
+ event + '"/>');
+                    });
             });
 
             res.endBlock('</list>');

http://git-wip-us.apache.org/repos/asf/ignite/blob/b5c7b18b/modules/control-center-web/src/main/js/views/settings/profile.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/settings/profile.jade b/modules/control-center-web/src/main/js/views/settings/profile.jade
index 7cc72c3..048115e 100644
--- a/modules/control-center-web/src/main/js/views/settings/profile.jade
+++ b/modules/control-center-web/src/main/js/views/settings/profile.jade
@@ -34,11 +34,11 @@ mixin lbl(txt)
                         .col-xs-5.col-sm-4
                             input#profile-email.form-control(type='email' ng-model='profileUser.email'
placeholder='you@domain.com' required)
                     .details-row
-                        label.col-sm-2.required.labelFormField Company:
+                        label.col-sm-2.labelFormField Company:
                         .col-xs-5.col-sm-4
                             input#profile-company.form-control(type='text' ng-model='profileUser.company'
placeholder='You company name')
                     .details-row
-                        label.col-sm-2.required.labelFormField Country:
+                        label.col-sm-2.labelFormField Country:
                         .col-xs-5.col-sm-4
                             button#profile-country.select-toggle.form-control(bs-select bs-options='item
for item in countries' type='text' ng-model='profileUser.country' placeholder='Choose you
country')
                     .details-row


Mime
View raw message