You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by an...@apache.org on 2016/06/20 02:58:24 UTC

[01/50] [abbrv] ignite git commit: WIP webpack migration

Repository: ignite
Updated Branches:
  refs/heads/ignite-3262 [created] 4abab8954


http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/states/configuration/domains/store.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/domains/store.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/domains/store.directive.js
index 39dc184..a69b025 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/domains/store.directive.js
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/domains/store.directive.js
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import template from './store.jade!';
+import templateUrl from './store.jade';
 
 export default ['igniteConfigurationDomainsStore', [() => {
     return {
         scope: true,
         restrict: 'E',
-        template,
+        templateUrl,
         replace: true
     };
 }]];

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/states/configuration/igfs/dual.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/igfs/dual.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/igfs/dual.directive.js
index 109fa63..c5afc4e 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/igfs/dual.directive.js
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/igfs/dual.directive.js
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import template from './dual.jade!';
+import templateUrl from './dual.jade';
 
 export default ['igniteConfigurationIgfsDual', [() => {
     return {
         scope: true,
         restrict: 'E',
-        template,
+        templateUrl,
         replace: true
     };
 }]];

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/states/configuration/igfs/fragmentizer.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/igfs/fragmentizer.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/igfs/fragmentizer.directive.js
index f93c76c..d008933 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/igfs/fragmentizer.directive.js
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/igfs/fragmentizer.directive.js
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import template from './fragmentizer.jade!';
+import templateUrl from './fragmentizer.jade';
 
 export default ['igniteConfigurationIgfsFragmentizer', [() => {
     return {
         scope: true,
         restrict: 'E',
-        template,
+        templateUrl,
         replace: true
     };
 }]];

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/states/configuration/igfs/general.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/igfs/general.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/igfs/general.directive.js
index 294c3b8..bda5418 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/igfs/general.directive.js
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/igfs/general.directive.js
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import template from './general.jade!';
+import templateUrl from './general.jade';
 
 export default ['igniteConfigurationIgfsGeneral', [() => {
     return {
         scope: true,
         restrict: 'E',
-        template,
+        templateUrl,
         replace: true
     };
 }]];

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/states/configuration/igfs/ipc.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/igfs/ipc.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/igfs/ipc.directive.js
index a0bd44c..eb52e51 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/igfs/ipc.directive.js
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/igfs/ipc.directive.js
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import template from './ipc.jade!';
+import templateUrl from './ipc.jade';
 
 export default ['igniteConfigurationIgfsIpc', [() => {
     return {
         scope: true,
         restrict: 'E',
-        template,
+        templateUrl,
         replace: true
     };
 }]];

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/states/configuration/igfs/misc.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/igfs/misc.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/igfs/misc.directive.js
index 6a6ca12..810944f 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/igfs/misc.directive.js
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/igfs/misc.directive.js
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import template from './misc.jade!';
+import templateUrl from './misc.jade';
 
 export default ['igniteConfigurationIgfsMisc', [() => {
     return {
         scope: true,
         restrict: 'E',
-        template,
+        templateUrl,
         replace: true
     };
 }]];

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/states/configuration/igfs/secondary.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/igfs/secondary.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/igfs/secondary.directive.js
index 8b3b37b..69179c0 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/igfs/secondary.directive.js
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/igfs/secondary.directive.js
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import template from './secondary.jade!';
+import templateUrl from './secondary.jade';
 
 export default ['igniteConfigurationIgfsSecondary', [() => {
     return {
         scope: true,
         restrict: 'E',
-        template,
+        templateUrl,
         replace: true
     };
 }]];

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/states/configuration/preview-panel.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/preview-panel.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/preview-panel.directive.js
index fb67326..1e4a29e 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/preview-panel.directive.js
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/preview-panel.directive.js
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import ace from 'ace';
+import ace from 'brace';
 
 export default ['previewPanel', ['$interval', '$timeout', ($interval, $timeout) => {
     let animation = {editor: null, stage: 0, start: 0, stop: 0};

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/states/signin.state.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/signin.state.js b/modules/web-console/src/main/js/app/modules/states/signin.state.js
index 91c84a3..916040e 100644
--- a/modules/web-console/src/main/js/app/modules/states/signin.state.js
+++ b/modules/web-console/src/main/js/app/modules/states/signin.state.js
@@ -16,6 +16,7 @@
  */
 
 import angular from 'angular';
+import signinTemplateUrl from 'views/signin.jade';
 
 angular
 .module('ignite-console.states.login', [
@@ -28,7 +29,7 @@ angular
     $stateProvider
     .state('signin', {
         url: '/',
-        templateUrl: '/signin.html',
+        templateUrl: signinTemplateUrl,
         metaTags: {
         }
     });

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/services/ChartColors.service.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/services/ChartColors.service.js b/modules/web-console/src/main/js/app/services/ChartColors.service.js
index ec3f365..843aa5c 100644
--- a/modules/web-console/src/main/js/app/services/ChartColors.service.js
+++ b/modules/web-console/src/main/js/app/services/ChartColors.service.js
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import COLORS from 'app/data/colors.json!';
+import COLORS from 'app/data/colors.json';
 
 export default ['IgniteChartColors', function() {
     return COLORS;

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/services/Countries.service.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/services/Countries.service.js b/modules/web-console/src/main/js/app/services/Countries.service.js
index 87d11fd..5ad3e6a 100644
--- a/modules/web-console/src/main/js/app/services/Countries.service.js
+++ b/modules/web-console/src/main/js/app/services/Countries.service.js
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import COUNTRIES from 'app/data/countries.json!';
+import COUNTRIES from 'app/data/countries.json';
 
 export default ['IgniteCountries', function() {
     const indexByName = _.keyBy(COUNTRIES, 'name');

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/services/JavaTypes.service.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/services/JavaTypes.service.js b/modules/web-console/src/main/js/app/services/JavaTypes.service.js
index a755e13..d34d669 100644
--- a/modules/web-console/src/main/js/app/services/JavaTypes.service.js
+++ b/modules/web-console/src/main/js/app/services/JavaTypes.service.js
@@ -16,12 +16,12 @@
  */
 
 // Java built-in class names.
-import JAVA_CLASSES from 'app/data/java-classes.json!';
+import JAVA_CLASSES from 'app/data/java-classes.json';
 
 // Java build-in primitive.
-import JAVA_PRIMITIVES from 'app/data/java-primitives.json!';
+import JAVA_PRIMITIVES from 'app/data/java-primitives.json';
 
-import JAVA_KEYWORDS from 'app/data/java-keywords.json!';
+import JAVA_KEYWORDS from 'app/data/java-keywords.json';
 
 export default ['JavaTypes', function() {
     return {

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/config/manifest.json
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/config/manifest.json b/modules/web-console/src/main/js/config/manifest.json
new file mode 100644
index 0000000..1b08f72
--- /dev/null
+++ b/modules/web-console/src/main/js/config/manifest.json
@@ -0,0 +1 @@
+{"assets":{"app.map":"app.js.map","polyfill.map":"polyfill.js.map","vendor.map":"vendor.js.map","common.map":"common.js.map"},"publicPath":"/"}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/config/webpack/environments/development.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/config/webpack/environments/development.js b/modules/web-console/src/main/js/config/webpack/environments/development.js
new file mode 100644
index 0000000..e0593e5
--- /dev/null
+++ b/modules/web-console/src/main/js/config/webpack/environments/development.js
@@ -0,0 +1,26 @@
+'use strict';
+var webpack = require('webpack');
+var HtmlWebpackPlugin = require("html-webpack-plugin");
+var path = require('path');
+
+module.exports = function(_path) {
+  return {
+    context: _path,
+    debug: true,
+    devtool: 'cheap-source-map',
+    devServer: {
+      contentBase: './dist',
+      info: true,
+      hot: true,
+      inline: true
+    },
+    plugins: [
+      new webpack.HotModuleReplacementPlugin(),
+      new HtmlWebpackPlugin({
+        filename: 'index.html',
+        template: path.join(_path, 'views', 'index.html'),
+        title: 'DEBUG:Ignite Web Console'
+      })
+    ]
+  };
+};

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/config/webpack/environments/production.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/config/webpack/environments/production.js b/modules/web-console/src/main/js/config/webpack/environments/production.js
new file mode 100644
index 0000000..ce2a128
--- /dev/null
+++ b/modules/web-console/src/main/js/config/webpack/environments/production.js
@@ -0,0 +1,29 @@
+'use strict';
+var CleanWebpackPlugin = require('clean-webpack-plugin');
+var HtmlWebpackPlugin = require("html-webpack-plugin");
+var path = require('path');
+
+module.exports = function(_path) {
+  return {
+    context: _path,
+    debug: false,
+    devtool: 'cheap-source-map',
+    output: {
+      publicPath: '/',
+      filename: '[name].[chunkhash].js'
+    },
+    plugins: [
+      new CleanWebpackPlugin(['dist'], {
+        root: _path,
+        verbose: true,
+        dry: false
+      }),
+      new HtmlWebpackPlugin({
+        filename: 'index.html',
+        template: path.join(_path, 'views', 'index.html'),
+        title: 'Ignite Web Console',
+        favicon: path.join(_path, 'src', 'favicon.ico')
+      })
+    ]
+  };
+};
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/config/webpack/global.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/config/webpack/global.js b/modules/web-console/src/main/js/config/webpack/global.js
new file mode 100644
index 0000000..2a9a162
--- /dev/null
+++ b/modules/web-console/src/main/js/config/webpack/global.js
@@ -0,0 +1,197 @@
+'use strict';
+
+// Depends
+var path = require('path');
+var webpack = require('webpack');
+var autoprefixer = require('autoprefixer-core');
+var Manifest = require('manifest-revision-webpack-plugin');
+var ExtractTextPlugin = require("extract-text-webpack-plugin");
+
+var NODE_ENV = process.env.NODE_ENV || "production";
+var DEVELOPMENT = NODE_ENV === "production" ? false : true;
+var stylesLoader = 'css-loader?sourceMap!postcss-loader!sass-loader?outputStyle=expanded&sourceMap=true&sourceMapContents=true';
+
+
+module.exports = function (_path) {
+    var rootAssetPath = _path + 'src';
+
+    var webpackConfig = {
+        node: {
+            fs: 'empty'
+        },
+        // entry points
+        entry: {
+            vendor: _path + '/app/vendor.js',
+            app: _path + '/app/index.js',
+            polyfill: 'babel-polyfill'
+        },
+
+        // output system
+        output: {
+            path: 'dist',
+            filename: '[name].js',
+            publicPath: '/'
+        },
+
+        // resolves modules
+        resolve: {
+            extensions: ['', '.js'],
+            modulesDirectories: ['node_modules', './'],
+            alias: {
+                _appRoot: path.join(_path, 'app'),
+                _images: path.join(_path,  'app', 'assets', 'images'),
+                _stylesheets: path.join(_path, 'app', 'assets', 'styles'),
+                _scripts: path.join(_path,  'app', 'assets', 'js'),
+                ace: path.join(_path, 'node_modules','ace-builds','src')
+            }
+        },
+
+        // modules resolvers
+        module: {
+            noParse: [],
+            // preLoaders: [
+            //     {
+            //         test: /\.js$/,
+            //         exclude: [
+            //             path.resolve(_path, "node_modules")
+            //         ],
+            //         loader: 'eslint-loader'
+            //     }
+            // ],
+            loaders: [
+                {
+                    test: /\.json$/,
+                    loader: 'json-loader'
+                },
+                {
+                    test: /\.html$/,
+                    loaders: [
+                        'ngtemplate-loader?relativeTo=' + _path,
+                        'html-loader?attrs[]=img:src&attrs[]=img:data-src'
+                    ]
+                },
+                {
+                    test: /index\.jade$/,
+                    loader: 'jade'
+                },
+                {
+                    test: /\.jade$/,
+                    loaders: [
+                        'ngtemplate-loader?relativeTo=' + _path,
+                        'html-loader?attrs[]=img:src&attrs[]=img:data-src',
+                        'jade-html-loader'
+                    ]
+                }, {
+                    test: /\.js$/,
+                    loaders: [
+                        'baggage-loader?[file].html&[file].css'
+                    ]
+                }, {
+                    test: /\.js$/,
+                    exclude: [
+                        path.resolve(_path, "node_modules")
+                    ],
+                    loaders: [
+                        'ng-annotate-loader'
+                    ]
+                }, {
+                    test: /\.js$/,
+                    exclude: [
+                        path.resolve(_path, "node_modules")
+                    ],
+                    loader: 'babel-loader',
+                    query: {
+                        cacheDirectory: true,
+                        plugins: ['transform-runtime', 'add-module-exports'],
+                        presets: ['angular', 'es2017']
+                    }
+                }
+                , {
+                    test: /\.css$/,
+                    loaders: [
+                        'style-loader',
+                        'css-loader?sourceMap',
+                        'postcss-loader'
+                    ]
+                }, {
+                    test: /\.(scss|sass)$/,
+                    loader: DEVELOPMENT ? ('style-loader!' + stylesLoader) : ExtractTextPlugin.extract('style-loader', stylesLoader)
+                }, {
+                    test: /\.(woff2|woff|ttf|eot|svg)?(\?v=[0-9]\.[0-9]\.[0-9])?$/,
+                    loaders: [
+                        "url-loader?name=assets/fonts/[name]_[hash].[ext]"
+                    ]
+                }, {
+                    test: /\.(jpe?g|png|gif)$/i,
+                    loaders: [
+                        'url-loader?name=assets/images/[name]_[hash].[ext]'
+                    ]
+                }, {
+                    test: require.resolve("angular"),
+                    loaders: [
+                        "expose?angular"
+                    ]
+                    
+                },
+
+                {
+                    test: require.resolve("jquery"),
+                    loaders: [
+                        "expose?$",
+                        "expose?jQuery"
+                    ]
+                }
+
+            ]
+        },
+        
+        
+        
+
+        // post css
+        postcss: [autoprefixer({browsers: ['last 2 versions']})],
+
+        // load plugins
+        plugins: [
+            //new webpack.ContextReplacementPlugin(/moment[\/\\]locale$/, /en|hu/),
+            new webpack.ProvidePlugin({
+                $: 'jquery',
+                jQuery: 'jquery',
+                _: 'lodash'
+            }),
+            new webpack.DefinePlugin({
+                'NODE_ENV': JSON.stringify(NODE_ENV)
+            }),
+            new webpack.NoErrorsPlugin(),
+            new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/),
+            new webpack.optimize.DedupePlugin(),
+            new webpack.optimize.AggressiveMergingPlugin({
+                moveToParents: true
+            }),
+            new webpack.optimize.CommonsChunkPlugin({
+                name: 'common',
+                async: true,
+                children: true,
+                minChunks: Infinity
+            }),
+            new Manifest(path.join(_path + '/config', 'manifest.json'), {
+                rootAssetPath: rootAssetPath,
+                ignorePaths: ['.DS_Store']
+            }),
+            new ExtractTextPlugin('assets/styles/css/[name]' + (NODE_ENV === 'development' ? '' : '.[chunkhash]') + '.css', {allChunks: true})
+        ]
+    };
+
+    if (NODE_ENV !== 'development') {
+        webpackConfig.plugins = webpackConfig.plugins.concat([
+            new webpack.optimize.UglifyJsPlugin({
+                minimize: true,
+                warnings: false,
+                sourceMap: true
+            })
+        ]);
+    }
+
+    return webpackConfig;
+
+};

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/controllers/caches-controller.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/controllers/caches-controller.js b/modules/web-console/src/main/js/controllers/caches-controller.js
index 920b9f3..2966194 100644
--- a/modules/web-console/src/main/js/controllers/caches-controller.js
+++ b/modules/web-console/src/main/js/controllers/caches-controller.js
@@ -280,7 +280,7 @@ consoleModule.controller('cachesController', [
                     }
                 };
 
-                const msg = extractErrorMessage(errNameFull) || extractErrorMessage(errNameShort) || 'Invalid value!';
+                const msg = extractErrorMessage(errNameFull) || extractErrorMessage(errNameShort) || 'Invalid value';
 
                 return showPopoverMessage($scope.ui, firstError.$name, errNameFull, msg);
             }

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/controllers/clusters-controller.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/controllers/clusters-controller.js b/modules/web-console/src/main/js/controllers/clusters-controller.js
index 6daffad..2798ad8 100644
--- a/modules/web-console/src/main/js/controllers/clusters-controller.js
+++ b/modules/web-console/src/main/js/controllers/clusters-controller.js
@@ -368,7 +368,7 @@ consoleModule.controller('clustersController', [
                     }
                 };
 
-                const msg = extractErrorMessage(errNameFull) || extractErrorMessage(errNameShort) || 'Invalid value!';
+                const msg = extractErrorMessage(errNameFull) || extractErrorMessage(errNameShort) || 'Invalid value';
 
                 return showPopoverMessage($scope.ui, firstError.$name, errNameFull, msg);
             }
@@ -483,7 +483,7 @@ consoleModule.controller('clustersController', [
                     return showPopoverMessage($scope.ui, 'sslConfiguration', 'sslConfiguration-title', 'Trust storage file or managers should be configured!');
             }
 
-``            if (item.rebalanceThreadPoolSize && item.systemThreadPoolSize && item.systemThreadPoolSize <= item.rebalanceThreadPoolSize)
+            if (item.rebalanceThreadPoolSize && item.systemThreadPoolSize && item.systemThreadPoolSize <= item.rebalanceThreadPoolSize)
                 return showPopoverMessage($scope.ui, 'pools', 'rebalanceThreadPoolSize', 'Rebalance thread pool size exceed or equals System thread pool size!');
 
             return true;

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/controllers/common-module.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/controllers/common-module.js b/modules/web-console/src/main/js/controllers/common-module.js
index 1cce7f3..20de27a 100644
--- a/modules/web-console/src/main/js/controllers/common-module.js
+++ b/modules/web-console/src/main/js/controllers/common-module.js
@@ -31,7 +31,7 @@ const consoleModule = angular.module('ignite-console.legacy',
         /* endignite */
     ]);
 
-import alertTemplate from '../views/templates/alert.jade!';
+import alertTemplateUrl from '../views/templates/alert.jade';
 
 consoleModule.run(['$rootScope', '$http', '$state', '$common', 'Auth', 'User', 'gettingStarted',
     ($root, $http, $state, $common, Auth, User, gettingStarted) => {
@@ -100,7 +100,7 @@ consoleModule.config(['$alertProvider', ($alertProvider) => {
         container: 'body',
         placement: 'top-right',
         duration: '5',
-        template: alertTemplate(),
+        template: alertTemplateUrl,
         type: 'danger'
     });
 }]);

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/controllers/domains-controller.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/controllers/domains-controller.js b/modules/web-console/src/main/js/controllers/domains-controller.js
index c1523d5..9e648b9 100644
--- a/modules/web-console/src/main/js/controllers/domains-controller.js
+++ b/modules/web-console/src/main/js/controllers/domains-controller.js
@@ -1232,7 +1232,7 @@ consoleModule.controller('domainsController', [
                     }
                 };
 
-                const msg = extractErrorMessage(errNameFull) || extractErrorMessage(errNameShort) || 'Invalid value!';
+                const msg = extractErrorMessage(errNameFull) || extractErrorMessage(errNameShort) || 'Invalid value';
 
                 return showPopoverMessage($scope.ui, firstError.$name, errNameFull, msg);
             }

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/controllers/igfs-controller.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/controllers/igfs-controller.js b/modules/web-console/src/main/js/controllers/igfs-controller.js
index 265af84..c9e6a8a 100644
--- a/modules/web-console/src/main/js/controllers/igfs-controller.js
+++ b/modules/web-console/src/main/js/controllers/igfs-controller.js
@@ -297,7 +297,7 @@ consoleModule.controller('igfsController', [
                     }
                 };
 
-                const msg = extractErrorMessage(errNameFull) || extractErrorMessage(errNameShort) || 'Invalid value!';
+                const msg = extractErrorMessage(errNameFull) || extractErrorMessage(errNameShort) || 'Invalid value';
 
                 return showPopoverMessage($scope.ui, firstError.$name, errNameFull, msg);
             }

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/package.json
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/package.json b/modules/web-console/src/main/js/package.json
index 776ebdc..480f4b2 100644
--- a/modules/web-console/src/main/js/package.json
+++ b/modules/web-console/src/main/js/package.json
@@ -4,7 +4,8 @@
   "description": "Interactive Web console for configuration, executing SQL queries and monitoring of Apache Ignite Cluster",
   "private": true,
   "scripts": {
-    "start": "jspm i && gulp build --debug && node serve",
+    "dev": "cross-env NODE_ENV=development webpack-dev-server --progress",
+    "build": "cross-env NODE_ENV=production webpack -p --colors",
     "eslint": "node_modules/.bin/gulp eslint"
   },
   "author": "",
@@ -21,49 +22,103 @@
     "node": ">=0.12.4"
   },
   "dependencies": {
+    "angular": "^1.5.5",
+    "angular-animate": "^1.5.5",
+    "angular-aria": "^1.5.5",
+    "angular-cookies": "^1.5.5",
+    "angular-drag-and-drop-lists": "^1.4.0",
+    "angular-gridster": "^0.13.3",
+    "angular-messages": "^1.5.5",
+    "angular-motion": "^0.4.4",
+    "angular-nvd3": "^1.0.7",
+    "angular-resource": "^1.5.5",
+    "angular-retina": "^0.3.13",
+    "angular-sanitize": "^1.5.5",
+    "angular-smart-table": "^2.1.8",
+    "angular-socket-io": "^0.7.0",
+    "angular-strap": "^2.3.8",
+    "angular-touch": "^1.5.5",
+    "angular-tree-control": "^0.2.26",
+    "angular-ui-grid": "^3.1.1",
+    "angular-ui-router": "^0.2.18",
+    "assets-webpack-plugin": "^3.2.0",
     "async": "1.5.2",
+    "autoprefixer-core": "^5.2.1",
+    "babel-core": "^6.7.6",
+    "babel-eslint": "^6.0.4",
+    "babel-loader": "^6.2.4",
+    "babel-plugin-add-module-exports": "^0.1.2",
+    "babel-plugin-transform-runtime": "^6.7.5",
+    "babel-polyfill": "^6.7.4",
+    "babel-preset-angular": "^6.0.15",
+    "babel-preset-es2017": "^1.3.1",
+    "babel-runtime": "^6.6.1",
+    "baggage-loader": "^0.2.4",
     "body-parser": "^1.15.0",
+    "bootstrap-loader": "^1.0.10",
     "bootstrap-sass": "^3.3.6",
+    "brace": "^0.8.0",
+    "clean-webpack-plugin": "^0.1.8",
     "connect-mongo": "^1.1.0",
     "cookie-parser": "~1.4.0",
+    "cross-env": "^1.0.7",
+    "css-loader": "^0.23.0",
     "debug": "~2.2.0",
+    "es6-promise": "^3.0.2",
+    "eslint": "^2.9.0",
+    "eslint-loader": "^1.0.0",
+    "expose-loader": "^0.7.1",
     "express": "~4.13.3",
     "express-session": "^1.12.0",
+    "extract-text-webpack-plugin": "^0.9.1",
+    "file-loader": "^0.8.4",
+    "file-saver": "git://github.com/eligrey/FileSaver.js",
     "fire-up": "^1.0.0",
+    "font-awesome": "^4.6.1",
+    "font-awesome-webpack": "0.0.4",
+    "html-loader": "^0.3.0",
+    "html-webpack-plugin": "^1.7.0",
+    "imagemin-pngquant": "^4.2.0",
     "jade": "~1.11.0",
+    "jade-html-loader": "0.0.3",
+    "jquery": "^2.1.4",
+    "json-loader": "^0.5.4",
     "jszip": "^2.6.0",
+    "less": "^2.7.0",
     "lodash": "^4.8.2",
+    "manifest-revision-webpack-plugin": "~0.1.0",
     "mongoose": "^4.4.11",
     "mongoose-deep-populate": "^3.0.0",
     "nconf": "^0.8.2",
+    "ng-annotate-loader": "0.0.10",
+    "ngtemplate-loader": "^1.3.1",
+    "node-sass": "^3.4.2",
     "nodemailer": "^2.3.0",
+    "oclazyload": "^1.0.9",
     "passport": "^0.3.2",
     "passport-local": "^1.0.0",
     "passport-local-mongoose": "^4.0.0",
     "passport.socketio": "^3.6.1",
+    "pdfmake": "^0.1.18",
+    "postcss-loader": "^0.6.0",
+    "query-command-supported": "^1.0.0",
     "require-dir": "^0.3.0",
+    "resolve-url-loader": "^1.4.3",
+    "sass-loader": "^3.1.1",
     "socket.io": "^1.4.5",
+    "socket.io-client": "^1.4.6",
+    "style-loader": "^0.13.1",
+    "swagger-client-generator": "^0.2.13",
+    "ui-router-metatags": "^1.0.3",
+    "url": "^0.11.0",
+    "url-loader": "^0.5.6",
+    "webpack": "^1.12.12",
+    "webpack-dev-server": "1.14.0",
     "ws": "^0.8.0"
   },
   "devDependencies": {
-    "babel-core": "^6.7.2",
-    "babel-eslint": "^6.0.2",
-    "babel-preset-es2015": "^6.6.0",
-    "babel-register": "^6.7.2",
-    "gulp": "^3.9.0",
-    "gulp-cached": "^1.1.0",
-    "gulp-connect": "^3.2.2",
-    "gulp-environments": "^0.1.1",
-    "gulp-eslint": "^2.0.0",
-    "gulp-html-replace": "^1.5.5",
-    "gulp-ignore": "^2.0.1",
-    "gulp-inject": "^4.0.0",
-    "gulp-jade": "^1.1.0",
-    "gulp-rimraf": "^0.2.0",
-    "gulp-sass": "^2.1.0",
-    "gulp-sequence": "^0.4.1",
-    "gulp-util": "^3.0.7",
     "http-proxy-middleware": "^0.13.0",
+    "json-loader": "^0.5.4",
     "jspm": "^0.16.32",
     "mocha": "~2.4.5",
     "morgan": "^1.7.0",
@@ -76,21 +131,21 @@
     },
     "configFile": "build/system.config.js",
     "dependencies": {
-      "ace": "github:ajaxorg/ace-builds@1.2.3",
-      "angular": "github:angular/bower-angular@^1.5.0",
-      "angular-animate": "github:angular/bower-angular-animate@^1.5.0",
-      "angular-drag-and-drop-lists": "github:marceljuenemann/angular-drag-and-drop-lists@^1.3.0",
-      "angular-gridster": "github:ManifestWebDesign/angular-gridster@^0.13.5",
-      "angular-motion": "github:mgcrea/angular-motion@^0.4.3",
-      "angular-nvd3": "github:krispo/angular-nvd3@^1.0.4",
-      "angular-retina": "github:jrief/angular-retina@0.3.8",
-      "angular-sanitize": "github:angular/bower-angular-sanitize@^1.5.0",
-      "angular-smart-table": "github:lorenzofox3/Smart-Table@^2.1.4",
-      "angular-socket-io": "github:btford/angular-socket-io@^0.7.0",
-      "angular-strap": "github:mgcrea/angular-strap@2.3.8",
-      "angular-tree-control": "github:wix/angular-tree-control@^0.2.23",
-      "angular-ui-grid": "github:angular-ui/bower-ui-grid@^3.0.7",
-      "angular-ui-router": "github:angular-ui/ui-router@^0.2.15",
+      "#ace": "github:ajaxorg/ace-builds@1.2.3",
+      "#angular": "github:angular/bower-angular@^1.5.0",
+      "#angular-animate": "github:angular/bower-angular-animate@^1.5.0",
+      "#angular-drag-and-drop-lists": "github:marceljuenemann/angular-drag-and-drop-lists@^1.3.0",
+      "#angular-gridster": "github:ManifestWebDesign/angular-gridster@^0.13.5",
+      "#angular-motion": "github:mgcrea/angular-motion@^0.4.3",
+      "#angular-nvd3": "github:krispo/angular-nvd3@^1.0.4",
+      "#angular-retina": "github:jrief/angular-retina@0.3.8",
+      "#angular-sanitize": "github:angular/bower-angular-sanitize@^1.5.0",
+      "#angular-smart-table": "github:lorenzofox3/Smart-Table@^2.1.4",
+      "#angular-socket-io": "github:btford/angular-socket-io@^0.7.0",
+      "#angular-strap": "github:mgcrea/angular-strap@2.3.8",
+      "#angular-tree-control": "github:wix/angular-tree-control@^0.2.23",
+      "#angular-ui-grid": "github:angular-ui/bower-ui-grid@^3.0.7",
+      "#angular-ui-router": "github:angular-ui/ui-router@^0.2.15",
       "angular-ui-router-metatags": "github:tinusn/ui-router-metatags@^1.0.3",
       "blob": "github:eligrey/Blob.js@master",
       "bootstrap-carousel": "github:twbs/bootstrap@^3.3.6",
@@ -176,9 +231,6 @@
           }
         }
       },
-      "github:components/jquery@2.1.4": {
-        "format": "global"
-      },
       "github:ajaxorg/ace-builds@1.2.3": {
         "format": "global",
         "main": "theme-chrome",

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/serve/agent.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/serve/agent.js b/modules/web-console/src/main/js/serve/agent.js
index 456aba9..7a79cda 100644
--- a/modules/web-console/src/main/js/serve/agent.js
+++ b/modules/web-console/src/main/js/serve/agent.js
@@ -549,7 +549,7 @@ module.exports.factory = function(_, ws, fs, path, JSZip, socketio, settings, mo
          */
         attach(srv) {
             if (this._server)
-                throw 'Agent server already started!';
+                throw 'Agent server already started';
 
             this._server = srv;
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/views/index.html
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/views/index.html b/modules/web-console/src/main/js/views/index.html
new file mode 100644
index 0000000..62490ea
--- /dev/null
+++ b/modules/web-console/src/main/js/views/index.html
@@ -0,0 +1,45 @@
+<!doctype html>
+<html ng-app='ignite-console' id='app' ng-strict-di>
+<head>
+    <meta charset="utf-8">
+    <base href="/">
+    <title>{%=o.htmlWebpackPlugin.options.title%}</title>
+    <meta name="description" content="">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
+    <link rel="shortcut icon" href="/favicon.ico?v1" type="image/x-icon">
+
+    {% if (o.htmlWebpackPlugin.files.favicon) { %}
+    <link rel="shortcut icon" href="{%=o.htmlWebpackPlugin.files.favicon%}">
+    {% } %}
+
+    {% for (var css in o.htmlWebpackPlugin.files.css) { %}
+    <link href="{%=o.htmlWebpackPlugin.files.css[css] %}" rel="stylesheet">
+    {% } %}
+
+
+    {% for (var chunk in o.htmlWebpackPlugin.files.chunks) { %}
+    <script src="{%=o.htmlWebpackPlugin.files.chunks[chunk].entry %}"></script>
+    {% } %}
+
+</head>
+<body class="theme-line body-overlap greedy">
+<div hide-on-state-change="hide-on-state-change" class="splash splash-max-foreground">
+    <div class="splash-wrapper">
+        <div class="spinner">
+            <div class="bounce1"></div>
+            <div class="bounce2"></div>
+            <div class="bounce3"></div>
+        </div>
+        <div class="splash-wellcome">Loading...</div>
+    </div>
+</div>
+<div ng-cloak="ng-cloak" class="ribbon-wrapper right">
+    <div ng-style="IgniteDemoMode &amp;&amp; {&quot;background&quot;: &quot;#1b6d88&quot;}" class="ribbon">
+        <label>{{IgniteDemoMode ? "Demo" : "Beta" }}</label>
+    </div>
+</div>
+<div ui-view="" class="wrapper"></div>
+
+
+</body>
+</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/webpack.config.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/webpack.config.js b/modules/web-console/src/main/js/webpack.config.js
new file mode 100644
index 0000000..91b3c3b
--- /dev/null
+++ b/modules/web-console/src/main/js/webpack.config.js
@@ -0,0 +1,28 @@
+'use strict';
+
+var _ = require('lodash');
+var _configs = {
+
+  // global section
+  global: require(__dirname + '/config/webpack/global'),
+
+  // config by enviroments
+  production: require(__dirname + '/config/webpack/environments/production'),
+  development: require(__dirname + '/config/webpack/environments/development')
+};
+
+var _load = function() {
+  var ENV = process.env.NODE_ENV
+    ? process.env.NODE_ENV
+    : 'production';
+
+  console.log('Current Environment: ', ENV);
+
+  // load config file by environment
+  return _configs && _.merge(
+    _configs.global(__dirname),
+    _configs[ENV](__dirname)
+  );
+};
+
+module.exports = _load();


[08/50] [abbrv] ignite git commit: Merge remote-tracking branch 'community/web-console-staging' into web-console-staging

Posted by an...@apache.org.
Merge remote-tracking branch 'community/web-console-staging' into web-console-staging


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

Branch: refs/heads/ignite-3262
Commit: 6a8bb1ba8f5c1b7b89c985905f583c6a48054b2f
Parents: c3dda4c 5a005e7
Author: vsisko <vs...@gridgain.com>
Authored: Thu Jun 2 17:45:26 2016 +0700
Committer: vsisko <vs...@gridgain.com>
Committed: Thu Jun 2 17:45:26 2016 +0700

----------------------------------------------------------------------
 .../http/jetty/GridJettyJsonConfig.java         | 27 ++++++
 .../http/jetty/GridJettyRestHandler.java        |  6 +-
 .../ignite/console/demo/AgentClusterDemo.java   | 86 ++++++--------------
 .../src/main/js/app/helpers/jade/mixins.jade    |  8 +-
 .../src/main/js/controllers/common-module.js    |  2 +-
 .../src/main/js/public/stylesheets/style.scss   |  1 +
 6 files changed, 64 insertions(+), 66 deletions(-)
----------------------------------------------------------------------



[16/50] [abbrv] ignite git commit: IGNITE-3250 added fix to checkboxes

Posted by an...@apache.org.
IGNITE-3250 added fix to checkboxes


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

Branch: refs/heads/ignite-3262
Commit: c9ad35640f553f28239f93f45a5374edd0d92886
Parents: 512180a
Author: Dmitriyff <dm...@gmail.com>
Authored: Mon Jun 6 19:24:15 2016 +0700
Committer: Dmitriyff <dm...@gmail.com>
Committed: Mon Jun 6 19:24:15 2016 +0700

----------------------------------------------------------------------
 modules/web-console/src/main/js/app/services/cleanup.service.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/c9ad3564/modules/web-console/src/main/js/app/services/cleanup.service.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/services/cleanup.service.js b/modules/web-console/src/main/js/app/services/cleanup.service.js
index 380beda..bec9ea3 100644
--- a/modules/web-console/src/main/js/app/services/cleanup.service.js
+++ b/modules/web-console/src/main/js/app/services/cleanup.service.js
@@ -32,7 +32,9 @@ export default ['$cleanup', () => {
                     dist[key] = attr;
                 }
             });
-        } else if ((_.isString(original) && original.length) || _.isNumber(original) || _.isBoolean(original))
+        } else if (_.isBoolean(original) && original === true)
+            dist = original;
+        else if ((_.isString(original) && original.length) || _.isNumber(original))
             dist = original;
         else if (_.isArray(original) && original.length)
             dist = _.map(original, (value) => cleanup(value, {}));


[15/50] [abbrv] ignite git commit: Fixed several typos.

Posted by an...@apache.org.
Fixed several typos.


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

Branch: refs/heads/ignite-3262
Commit: 512180a5ab12d69f449ed1119d75941f9febdf54
Parents: 07b3d74
Author: AKuznetsov <ak...@gridgain.com>
Authored: Fri Jun 3 17:45:43 2016 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Fri Jun 3 17:45:43 2016 +0700

----------------------------------------------------------------------
 modules/web-agent/README.txt                                     | 4 ++--
 modules/web-console/README.txt                                   | 4 ++--
 .../main/js/app/modules/states/configuration/domains/store.jade  | 2 +-
 .../src/main/js/views/configuration/domains-import.jade          | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/512180a5/modules/web-agent/README.txt
----------------------------------------------------------------------
diff --git a/modules/web-agent/README.txt b/modules/web-agent/README.txt
index 0d8d4ac..0c95aad 100644
--- a/modules/web-agent/README.txt
+++ b/modules/web-agent/README.txt
@@ -55,7 +55,7 @@ How to build:
   mvn clean package -pl :ignite-web-agent -am -P web-console -DskipTests=true
 
 Demo of Ignite Web Agent:
- In order to simplify evaluation demo mode was implemented. To start demo, you need to to click button "Start demo".
+ In order to simplify evaluation demo mode was implemented. To start demo, you need to click button "Start demo".
  New tab will be open with prepared demo data.
 
  1) Demo for import domain model from database.
@@ -73,7 +73,7 @@ Demo of Ignite Web Agent:
      In this mode internal Ignite node will be started. Cache created and populated with data.
        2.1) Click "SQL" in Ignite Web Console top menu.
        2.2) "Demo" notebook with preconfigured queries will be opened.
-       2.3) You can also execute any SQL queries for tables: "Country, Department, Employee", "Parking, Car".
+       2.3) You can also execute any SQL queries for tables: "Country, Department, Employee, Parking, Car".
 
  For example:
    2.4) Enter SQL statement:

http://git-wip-us.apache.org/repos/asf/ignite/blob/512180a5/modules/web-console/README.txt
----------------------------------------------------------------------
diff --git a/modules/web-console/README.txt b/modules/web-console/README.txt
index ae509d6..286082c 100644
--- a/modules/web-console/README.txt
+++ b/modules/web-console/README.txt
@@ -7,7 +7,7 @@ The Apache Ignite Web Console includes an interactive configuration wizard which
  on your in-memory cache as well as view execution plans, in-memory schema, and streaming charts.
 
 In order to simplify evaluation of Web Console demo mode was implemented.
- To start demo, you need to to click button "Start demo". New tab will be open with prepared demo data on each screen.
+ To start demo, you need to click button "Start demo". New tab will be open with prepared demo data on each screen.
 
  Demo for import domain model from database.
   In this mode an in-memory H2 database will be started.
@@ -24,7 +24,7 @@ In order to simplify evaluation of Web Console demo mode was implemented.
     In this mode internal Ignite node will be started. Cache created and populated with data.
      1) Click "SQL" in Ignite Web Console top menu.
      2) "Demo" notebook with preconfigured queries will be opened.
-     3) You can also execute any SQL queries for tables: "Country, Department, Employee", "Parking, Car".
+     3) You can also execute any SQL queries for tables: "Country, Department, Employee, Parking, Car".
 
  For example:
   1) Enter SQL statement:

http://git-wip-us.apache.org/repos/asf/ignite/blob/512180a5/modules/web-console/src/main/js/app/modules/states/configuration/domains/store.jade
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/domains/store.jade b/modules/web-console/src/main/js/app/modules/states/configuration/domains/store.jade
index c6c3351..d2a1dc6 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/domains/store.jade
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/domains/store.jade
@@ -66,7 +66,7 @@ form.panel.panel-default(name=form novalidate)
         ignite-form-panel-chevron
         label Domain model for cache store
         ignite-form-field-tooltip.tipLabel
-            | Domain model properties for fields queries
+            | Domain model properties for binding database with cache via POJO cache store
         ignite-form-revert
     .panel-collapse(role='tabpanel' bs-collapse-target id=form)
         .panel-body(ng-if='ui.isPanelLoaded("#{form}")')

http://git-wip-us.apache.org/repos/asf/ignite/blob/512180a5/modules/web-console/src/main/js/views/configuration/domains-import.jade
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/views/configuration/domains-import.jade b/modules/web-console/src/main/js/views/configuration/domains-import.jade
index 46385f9..cdcd315 100644
--- a/modules/web-console/src/main/js/views/configuration/domains-import.jade
+++ b/modules/web-console/src/main/js/views/configuration/domains-import.jade
@@ -33,7 +33,7 @@ mixin td-ellipses-lbl(w, lbl)
                 | Domain model could not be imported
                 ul
                     li Agent failed to find JDBC drivers
-                    li Copy required JDBC drivers into agent '\jdbc-drivers' folder and try again
+                    li Copy required JDBC drivers into agent 'jdbc-drivers' folder and try again
                     li Refer to agent README.txt for more information
             .import-domain-model-wizard-page(ng-show='importDomain.action == "connect" && importDomain.demo' style='margin-bottom: 211px')
                 div(ng-if='demoConnection.db == "H2"')
@@ -47,7 +47,7 @@ mixin td-ellipses-lbl(w, lbl)
                     label Demo could not be started
                         ul
                             li Agent failed to resolve H2 database jar
-                            li Copy h2-x.x.x.jar into agent '\jdbc-drivers' folder and try again
+                            li Copy h2-x.x.x.jar into agent 'jdbc-drivers' folder and try again
                             li Refer to agent README.txt for more information
             .import-domain-model-wizard-page(ng-show='importDomain.action == "connect" && !importDomain.demo' style='margin-bottom: 90px')
                 form.form-horizontal(name='connectForm' novalidate)


[33/50] [abbrv] ignite git commit: IGNITE-2047 Fixed required field marker.

Posted by an...@apache.org.
IGNITE-2047 Fixed required field marker.


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

Branch: refs/heads/ignite-3262
Commit: af57914111c27bf87e8eadfcc8c697ca9cd6cef3
Parents: 4dd0f4c
Author: vsisko <vs...@gridgain.com>
Authored: Fri Jun 10 15:52:42 2016 +0700
Committer: vsisko <vs...@gridgain.com>
Committed: Fri Jun 10 15:52:42 2016 +0700

----------------------------------------------------------------------
 .../states/configuration/caches/store.jade      | 21 ++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/af579141/modules/web-console/src/main/js/app/modules/states/configuration/caches/store.jade
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/caches/store.jade b/modules/web-console/src/main/js/app/modules/states/configuration/caches/store.jade
index b52e022..cb26d03 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/caches/store.jade
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/caches/store.jade
@@ -20,7 +20,7 @@ include ../../../../../app/helpers/jade/mixins.jade
 -var model = 'backupItem'
 
 //- Mixin for DB dialect.
-mixin dialect(lbl, model, name, tipTitle, genericDialectName, placeholder)
+mixin dialect(lbl, model, name, required, tipTitle, genericDialectName, placeholder)
     ignite-form-field
         ignite-form-field-label
             | #{lbl}
@@ -46,7 +46,7 @@ mixin dialect(lbl, model, name, tipTitle, genericDialectName, placeholder)
                 {value: "H2", label: "H2 database"}\
             ]'
             data-ng-model=model
-            data-ng-required='true'
+            data-ng-required=required
             data-placeholder=placeholder
         )
 
@@ -102,13 +102,14 @@ form.panel.panel-default(name=form novalidate)
                         .panel-details(ng-show='__.expanded')
                             div(ng-show='#{storeFactoryKind} === "CacheJdbcPojoStoreFactory"')
                                 -var pojoStoreFactory = storeFactory + '.CacheJdbcPojoStoreFactory'
+                                -var required = storeFactoryKind + ' === "CacheJdbcPojoStoreFactory"'
 
                                 .details-row
                                     +text('Data source bean name:', pojoStoreFactory + '.dataSourceBean',
-                                        'pojoDataSourceBean', 'true', 'Input bean name',
+                                        'pojoDataSourceBean', required, 'Input bean name',
                                         'Name of the data source bean in Spring context')
                                 .details-row
-                                    +dialect('Dialect:', pojoStoreFactory + '.dialect', 'pojoDialect',
+                                    +dialect('Dialect:', pojoStoreFactory + '.dialect', 'pojoDialect', required,
                                         'Dialect of SQL implemented by a particular RDBMS:', 'Generic JDBC dialect',
                                         'Choose JDBC dialect')
                             div(ng-show='#{storeFactoryKind} === "CacheJdbcBlobStoreFactory"')
@@ -127,19 +128,23 @@ form.panel.panel-default(name=form novalidate)
                                             <li>Configured data source</li>\
                                         </ul>')
                                 div(ng-show='#{blobStoreFactoryVia} === "URL"')
+                                    -var required = storeFactoryKind + ' === "CacheJdbcBlobStoreFactory" && ' + blobStoreFactoryVia + ' === "URL"'
+
                                     .details-row
-                                        +text('Connection URL:', blobStoreFactory + '.connectionUrl', 'connectionUrl', 'true', 'Input URL',
+                                        +text('Connection URL:', blobStoreFactory + '.connectionUrl', 'connectionUrl', required, 'Input URL',
                                             'URL for database access, for example: jdbc:h2:mem:myDatabase')
                                     .details-row
-                                        +text('User:', blobStoreFactory + '.user', 'user', 'true', 'Input user name', 'User name for database access')
+                                        +text('User:', blobStoreFactory + '.user', 'user', required, 'Input user name', 'User name for database access')
                                     .details-row
                                         label Note, password will be generated as stub
                                 div(ng-show='#{blobStoreFactoryVia} !== "URL"')
+                                    -var required = storeFactoryKind + ' === "CacheJdbcBlobStoreFactory" && ' + blobStoreFactoryVia + '!== "URL"'
+
                                     .details-row
-                                        +text('Data source bean name:', blobStoreFactory + '.dataSourceBean', 'blobDataSourceBean', 'true', 'Input bean name',
+                                        +text('Data source bean name:', blobStoreFactory + '.dataSourceBean', 'blobDataSourceBean', required, 'Input bean name',
                                             'Name of the data source bean in Spring context')
                                     .details-row
-                                        +dialect('Database:', blobStoreFactory + '.dialect', 'blobDialect', 'Supported databases:', 'Generic database', 'Choose database')
+                                        +dialect('Database:', blobStoreFactory + '.dialect', 'blobDialect', required, 'Supported databases:', 'Generic database', 'Choose database')
                                 .details-row
                                     +checkbox('Init schema', blobStoreFactory + '.initSchema', 'initSchema',
                                         'Flag indicating whether DB schema should be initialized by Ignite (default behaviour) or was explicitly created by user')


[25/50] [abbrv] ignite git commit: IGNITE-3236 Array list generation by single way

Posted by an...@apache.org.
IGNITE-3236 Array list generation by single way


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

Branch: refs/heads/ignite-3262
Commit: 6a94675e7fca7d01cf687057c53fce386958582e
Parents: af63e89
Author: vsisko <vs...@gridgain.com>
Authored: Tue Jun 7 17:06:41 2016 +0700
Committer: vsisko <vs...@gridgain.com>
Committed: Tue Jun 7 17:06:41 2016 +0700

----------------------------------------------------------------------
 modules/web-console/src/main/js/generator/generator-java.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/6a94675e/modules/web-console/src/main/js/generator/generator-java.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/generator/generator-java.js b/modules/web-console/src/main/js/generator/generator-java.js
index a22a3bf..2b6ac2f 100644
--- a/modules/web-console/src/main/js/generator/generator-java.js
+++ b/modules/web-console/src/main/js/generator/generator-java.js
@@ -340,7 +340,7 @@ $generatorJava.multiparamProperty = function(res, varName, obj, propName, dataTy
 
     if (val && val.length > 0) {
         $generatorJava.fxVarArgs(res, varName + '.' + $generatorJava.setterName(propName, setterName), false,
-            _.map(val, (v, ix) => $generatorJava.toJavaCode(dataType === 'class' ? res.importClass(v) : v, dataType)));
+            _.map(val, (v) => $generatorJava.toJavaCode(dataType === 'class' ? res.importClass(v) : v, dataType)));
     }
 };
 
@@ -1879,9 +1879,8 @@ $generatorJava.domainModelGeneral = function(domain, res) {
                 else
                     types.push('???');
 
-                if ($generatorCommon.isDefinedAndNotEmpty(types)) {
+                if ($generatorCommon.isDefinedAndNotEmpty(types))
                     $generatorJava.fxVarArgs(res, 'cache.setIndexedTypes', false, types);
-                }
             }
 
             break;


[07/50] [abbrv] ignite git commit: IGNITE-2047 Cleared unnecessary check, Import of classes in specific case

Posted by an...@apache.org.
IGNITE-2047 Cleared unnecessary check, Import of classes in specific case


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

Branch: refs/heads/ignite-3262
Commit: c3dda4c7e9fd11e3ae7d2506ae1d092cb793669f
Parents: 9cfc937
Author: vsisko <vs...@gridgain.com>
Authored: Thu Jun 2 17:45:18 2016 +0700
Committer: vsisko <vs...@gridgain.com>
Committed: Thu Jun 2 17:45:18 2016 +0700

----------------------------------------------------------------------
 .../main/js/controllers/caches-controller.js    | 30 +++-----------------
 .../src/main/js/generator/generator-java.js     |  2 +-
 2 files changed, 5 insertions(+), 27 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/c3dda4c7/modules/web-console/src/main/js/controllers/caches-controller.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/controllers/caches-controller.js b/modules/web-console/src/main/js/controllers/caches-controller.js
index 920b9f3..e8714e7 100644
--- a/modules/web-console/src/main/js/controllers/caches-controller.js
+++ b/modules/web-console/src/main/js/controllers/caches-controller.js
@@ -288,7 +288,7 @@ consoleModule.controller('cachesController', [
             if (item.memoryMode === 'OFFHEAP_VALUES' && !_.isEmpty(item.domains))
                 return showPopoverMessage($scope.ui, 'memory', 'memoryMode', 'Query indexing could not be enabled while values are stored off-heap!');
 
-            if (item.memoryMode === 'OFFHEAP_TIERED' && !$common.isDefined(item.offHeapMaxMemory))
+            if (item.memoryMode === 'OFFHEAP_TIERED' && (!$common.isDefined(item.offHeapMaxMemory) || item.offHeapMaxMemory < 0))
                 return showPopoverMessage($scope.ui, 'memory', 'offHeapMaxMemory', 'Off-heap max memory should be specified!');
 
             const cacheStoreFactorySelected = item.cacheStoreFactory && item.cacheStoreFactory.kind;
@@ -297,37 +297,18 @@ consoleModule.controller('cachesController', [
                 const storeFactory = item.cacheStoreFactory[item.cacheStoreFactory.kind];
 
                 if (item.cacheStoreFactory.kind === 'CacheJdbcPojoStoreFactory') {
-                    if ($common.isEmptyString(storeFactory.dataSourceBean))
-                        return showPopoverMessage($scope.ui, 'store', 'dataSourceBean', 'Data source bean name should not be empty!');
-
-                    if (!$common.isValidJavaIdentifier('Data source bean', storeFactory.dataSourceBean, 'dataSourceBean', $scope.ui, 'store'))
+                    if (!$common.isValidJavaIdentifier('Data source bean', storeFactory.dataSourceBean, 'pojoDataSourceBean', $scope.ui, 'store'))
                         return false;
 
-                    if (!storeFactory.dialect)
-                        return showPopoverMessage($scope.ui, 'store', 'pojoDialect', 'Dialect should not be empty!');
-
                     if (!checkDataSources())
                         return false;
                 }
 
                 if (item.cacheStoreFactory.kind === 'CacheJdbcBlobStoreFactory') {
-                    if (storeFactory.connectVia === 'URL') {
-                        if ($common.isEmptyString(storeFactory.connectionUrl))
-                            return showPopoverMessage($scope.ui, 'store', 'connectionUrl', 'Connection URL should not be empty!');
-
-                        if ($common.isEmptyString(storeFactory.user))
-                            return showPopoverMessage($scope.ui, 'store', 'user', 'User should not be empty!');
-                    }
-                    else {
-                        if ($common.isEmptyString(storeFactory.dataSourceBean))
-                            return showPopoverMessage($scope.ui, 'store', 'dataSourceBean', 'Data source bean name should not be empty!');
-
-                        if (!$common.isValidJavaIdentifier('Data source bean', storeFactory.dataSourceBean, 'dataSourceBean', $scope.ui, 'store'))
+                    if (storeFactory.connectVia !== 'URL') {
+                        if (!$common.isValidJavaIdentifier('Data source bean', storeFactory.dataSourceBean, 'blobDataSourceBean', $scope.ui, 'store'))
                             return false;
 
-                        if (!storeFactory.dialect)
-                            return showPopoverMessage($scope.ui, 'store', 'blobDialect', 'Database should not be empty!');
-
                         if (!checkDataSources())
                             return false;
                     }
@@ -348,9 +329,6 @@ consoleModule.controller('cachesController', [
             if (item.writeBehindFlushSize === 0 && item.writeBehindFlushFrequency === 0)
                 return showPopoverMessage($scope.ui, 'store', 'writeBehindFlushSize', 'Both "Flush frequency" and "Flush size" are not allowed as 0!');
 
-            if (item.cacheMode !== 'LOCAL' && item.rebalanceMode !== 'NONE' && item.rebalanceBatchSize === 0)
-                return showPopoverMessage($scope.ui, 'rebalance', 'rebalanceBatchSize', 'Batch size should be more than 0 if rebalance mode is "SYNC" or "ASYNC" !', 10000);
-
             return true;
         }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/c3dda4c7/modules/web-console/src/main/js/generator/generator-java.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/generator/generator-java.js b/modules/web-console/src/main/js/generator/generator-java.js
index 6cb4e81..2df9a54 100644
--- a/modules/web-console/src/main/js/generator/generator-java.js
+++ b/modules/web-console/src/main/js/generator/generator-java.js
@@ -325,7 +325,7 @@ $generatorJava.multiparamProperty = function(res, varName, obj, propName, dataTy
         res.startBlock(varName + '.' + $generatorJava.setterName(propName, setterName) + '(');
 
         _.forEach(val, function(v, ix) {
-            res.append($generatorJava.toJavaCode(v, dataType) + (ix < val.length - 1 ? ', ' : ''));
+            res.append($generatorJava.toJavaCode(dataType === 'class' ? res.importClass(v) : v, dataType) + (ix < val.length - 1 ? ', ' : ''));
         });
 
         res.endBlock(');');


[10/50] [abbrv] ignite git commit: IGNITE-3223 Fixed hibernate properties tables

Posted by an...@apache.org.
IGNITE-3223 Fixed hibernate properties tables


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

Branch: refs/heads/ignite-3262
Commit: 2cf3241098587527786f4cbee85c04f13d8d7878
Parents: 6a8bb1b
Author: vsisko <vs...@gridgain.com>
Authored: Fri Jun 3 09:39:31 2016 +0700
Committer: vsisko <vs...@gridgain.com>
Committed: Fri Jun 3 09:39:31 2016 +0700

----------------------------------------------------------------------
 .../src/main/js/app/modules/states/configuration/caches/store.jade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/2cf32410/modules/web-console/src/main/js/app/modules/states/configuration/caches/store.jade
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/caches/store.jade b/modules/web-console/src/main/js/app/modules/states/configuration/caches/store.jade
index d4f698e..86f6870 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/caches/store.jade
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/caches/store.jade
@@ -60,7 +60,7 @@ mixin hibernateField(items, field, valid, save, newItem)
     -var onBlur = valid + ' && ( ' + save + '); ' + resetOnBlur + ';'
 
     ignite-form-field-input-text(
-        data-name=field
+        data-name='#{field}{{ $index || "" }}'
         data-ng-model=field
         data-ng-required='true'
         data-placeholder='key=value'


[49/50] [abbrv] ignite git commit: Merge remote-tracking branch 'origin/ignite-3262' into ignite-3262

Posted by an...@apache.org.
Merge remote-tracking branch 'origin/ignite-3262' into ignite-3262

# Conflicts:
#	modules/web-console/src/main/js/karma.conf.js
#	modules/web-console/src/main/js/test/unit/JavaTypes.test.js
#	modules/web-console/src/main/js/test/unit/test.js


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

Branch: refs/heads/ignite-3262
Commit: adb53baffa329a7554defe5fa26ce75c39d5b773
Parents: 4537158 b18f0f8
Author: Andrey Novikov <an...@apache.org>
Authored: Mon Jun 20 09:53:37 2016 +0700
Committer: Andrey Novikov <an...@apache.org>
Committed: Mon Jun 20 09:53:37 2016 +0700

----------------------------------------------------------------------
 .../main/js/app/services/JavaTypes.service.js   |  6 +-
 .../src/main/js/gulpfile.babel.js/tasks/test.js | 87 ++++++++++++++++++++
 modules/web-console/src/main/js/karma.conf.js   | 54 ++++++++----
 modules/web-console/src/main/js/package.json    |  4 +-
 .../src/main/js/test/unit/JavaTypes.test.js     | 60 +++++++++++---
 .../web-console/src/main/js/test/unit/test.js   | 20 -----
 6 files changed, 177 insertions(+), 54 deletions(-)
----------------------------------------------------------------------



[21/50] [abbrv] ignite git commit: IGNITE-3236 Fixed eslint complexity.

Posted by an...@apache.org.
IGNITE-3236 Fixed eslint complexity.


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

Branch: refs/heads/ignite-3262
Commit: 7ce3b4b69892a0b4fad4cc3c18232d24af0ac951
Parents: 1e78374
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Tue Jun 7 15:02:11 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Tue Jun 7 15:02:11 2016 +0700

----------------------------------------------------------------------
 .../web-console/src/main/js/generator/generator-common.js   | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/7ce3b4b6/modules/web-console/src/main/js/generator/generator-common.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/generator/generator-common.js b/modules/web-console/src/main/js/generator/generator-common.js
index 821fd41..10bd299 100644
--- a/modules/web-console/src/main/js/generator/generator-common.js
+++ b/modules/web-console/src/main/js/generator/generator-common.js
@@ -589,12 +589,6 @@ $generatorCommon.loggerConfigured = function(logger) {
         switch (logger.kind) {
             case 'Log4j2': return log && $generatorCommon.isDefinedAndNotEmpty(log.path);
 
-            case 'Java':
-            case 'Null':
-            case 'JCL':
-            case 'SLF4J':
-                return true;
-
             case 'Log4j':
                 if (!log || !log.mode)
                     return false;
@@ -607,9 +601,8 @@ $generatorCommon.loggerConfigured = function(logger) {
             case 'Custom': return log && $generatorCommon.isDefinedAndNotEmpty(log.class);
 
             default:
+                return true;
         }
-
-        return false;
     }
 
     return false;


[45/50] [abbrv] ignite git commit: Merge branch 'ignite-3319' of https://github.com/gridgain/apache-ignite into ignite-3319

Posted by an...@apache.org.
Merge branch 'ignite-3319' of https://github.com/gridgain/apache-ignite into ignite-3319


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

Branch: refs/heads/ignite-3262
Commit: 2b6834b7e6b3a30db98aa78fef3706e81f5cb88c
Parents: 0254f6a d075cca
Author: Maxim Afanasiev <ma...@gmail.com>
Authored: Thu Jun 16 16:27:19 2016 +0700
Committer: Maxim Afanasiev <ma...@gmail.com>
Committed: Thu Jun 16 16:27:19 2016 +0700

----------------------------------------------------------------------
 modules/web-console/src/main/js/.gitignore      |  1 -
 modules/web-console/src/main/js/app/app.js      |  6 +--
 .../src/main/js/gulpfile.babel.js/paths.js      | 57 ++++++++------------
 .../src/main/js/gulpfile.babel.js/tasks/copy.js | 12 ++---
 .../main/js/gulpfile.babel.js/tasks/watch.js    |  2 -
 .../main/js/gulpfile.babel.js/webpack/common.js | 31 ++++++-----
 .../webpack/environments/development.js         |  5 +-
 7 files changed, 52 insertions(+), 62 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/2b6834b7/modules/web-console/src/main/js/gulpfile.babel.js/webpack/common.js
----------------------------------------------------------------------


[37/50] [abbrv] ignite git commit: IGNITE-2047 Fixed rename, refactored functions, not closed by esc agent download dialog.

Posted by an...@apache.org.
IGNITE-2047 Fixed rename, refactored functions, not closed by esc agent download dialog.


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

Branch: refs/heads/ignite-3262
Commit: 9b7c7476c7c0be3bc0612428f800bd6d59727a38
Parents: e052899
Author: vsisko <vs...@gridgain.com>
Authored: Wed Jun 15 14:17:33 2016 +0700
Committer: vsisko <vs...@gridgain.com>
Committed: Wed Jun 15 14:17:33 2016 +0700

----------------------------------------------------------------------
 .../main/js/app/modules/agent/agent.module.js   |  3 +-
 .../src/main/js/controllers/sql-controller.js   | 36 ++++++++------------
 2 files changed, 17 insertions(+), 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/9b7c7476/modules/web-console/src/main/js/app/modules/agent/agent.module.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/agent/agent.module.js b/modules/web-console/src/main/js/app/modules/agent/agent.module.js
index 2353a5f..10fb090 100644
--- a/modules/web-console/src/main/js/app/modules/agent/agent.module.js
+++ b/modules/web-console/src/main/js/app/modules/agent/agent.module.js
@@ -31,7 +31,8 @@ class IgniteAgentMonitor {
             scope: this._scope,
             templateUrl: '/templates/agent-download.html',
             show: false,
-            backdrop: 'static'
+            backdrop: 'static',
+            keyboard: false
         });
 
         const _modalHide = this._downloadAgentModal.hide;

http://git-wip-us.apache.org/repos/asf/ignite/blob/9b7c7476/modules/web-console/src/main/js/controllers/sql-controller.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/controllers/sql-controller.js b/modules/web-console/src/main/js/controllers/sql-controller.js
index 7d3bbbe..38fcb97 100644
--- a/modules/web-console/src/main/js/controllers/sql-controller.js
+++ b/modules/web-console/src/main/js/controllers/sql-controller.js
@@ -786,7 +786,7 @@ consoleModule.controller('sqlController', [
 
         QueryNotebooks.read($state.params.noteId)
             .then(loadNotebook)
-            .catch(function() {
+            .catch(() => {
                 $scope.notebookLoadFailed = true;
 
                 $loading.finish('sqlLoading');
@@ -797,6 +797,8 @@ consoleModule.controller('sqlController', [
                 return;
 
             if ($scope.notebook.name !== name) {
+                const prevName = $scope.notebook.name;
+
                 $scope.notebook.name = name;
 
                 QueryNotebooks.save($scope.notebook)
@@ -813,7 +815,11 @@ consoleModule.controller('sqlController', [
 
                         $scope.notebook.edit = false;
                     })
-                    .catch(_handleException);
+                    .catch((err) => {
+                        $scope.notebook.name = prevName;
+
+                        _handleException(err);
+                    });
             }
             else
                 $scope.notebook.edit = false;
@@ -1192,9 +1198,7 @@ consoleModule.controller('sqlController', [
                 .then(() => _closeOldQuery(paragraph))
                 .then(() => agentMonitor.query(args.cacheName, args.pageSize, args.query))
                 .then(_processQueryResult.bind(this, paragraph))
-                .catch((err) => {
-                    paragraph.errMsg = err.message;
-                });
+                .catch((err) => paragraph.errMsg = err.message);
         };
 
         const _tryStartRefresh = function(paragraph) {
@@ -1241,9 +1245,7 @@ consoleModule.controller('sqlController', [
 
                     $scope.stopRefresh(paragraph);
                 })
-                .finally(function() {
-                    paragraph.ace.focus();
-                });
+                .finally(() => paragraph.ace.focus());
         };
 
         $scope.queryExecuted = function(paragraph) {
@@ -1286,9 +1288,7 @@ consoleModule.controller('sqlController', [
 
                     _showLoading(paragraph, false);
                 })
-                .finally(function() {
-                    paragraph.ace.focus();
-                });
+                .finally(() => paragraph.ace.focus());
         };
 
         $scope.scan = function(paragraph) {
@@ -1314,9 +1314,7 @@ consoleModule.controller('sqlController', [
 
                     _showLoading(paragraph, false);
                 })
-                .finally(function() {
-                    paragraph.ace.focus();
-                });
+                .finally(() => paragraph.ace.focus());
         };
 
         function _updatePieChartsWithData(paragraph, newDatum) {
@@ -1370,9 +1368,7 @@ consoleModule.controller('sqlController', [
 
                     _showLoading(paragraph, false);
                 })
-                .finally(function() {
-                    paragraph.ace.focus();
-                });
+                .finally(() => paragraph.ace.focus());
         };
 
         const _export = (fileName, columnFilter, meta, rows) => {
@@ -1541,10 +1537,8 @@ consoleModule.controller('sqlController', [
                         return cache;
                     }), 'name');
                 })
-                .catch((err) => _handleException(err))
-                .finally(function() {
-                    $loading.finish('loadingCacheMetadata');
-                });
+                .catch(_handleException)
+                .finally(() => $loading.finish('loadingCacheMetadata'));
         };
 
         $scope.showResultQuery = function(paragraph) {


[13/50] [abbrv] ignite git commit: IGNITE-3079 Minor refactoring.

Posted by an...@apache.org.
IGNITE-3079 Minor refactoring.


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

Branch: refs/heads/ignite-3262
Commit: 07b3d74c00e1f967048a164efb1004c581f0921f
Parents: 5bc6b45
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Fri Jun 3 15:32:01 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Fri Jun 3 15:32:01 2016 +0700

----------------------------------------------------------------------
 modules/web-console/src/main/js/app/helpers/jade/mixins.jade | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/07b3d74c/modules/web-console/src/main/js/app/helpers/jade/mixins.jade
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/helpers/jade/mixins.jade b/modules/web-console/src/main/js/app/helpers/jade/mixins.jade
index 56adfc6..3329a6d 100644
--- a/modules/web-console/src/main/js/app/helpers/jade/mixins.jade
+++ b/modules/web-console/src/main/js/app/helpers/jade/mixins.jade
@@ -466,8 +466,9 @@ mixin table-save-button(valid, save, newItem)
 //- Mixin for table remove button.
 mixin table-remove-conditional-button(items, show, tip)
     i.tipField.fa.fa-remove(
-        ng-hide='!(#{show} && !field.edit)'
-        bs-tooltip='"#{tip}"'
+        ng-hide='!#{show} || field.edit'
+        bs-tooltip
+        data-title=tip
         ng-click='#{items}.splice(#{items}.indexOf(model), 1)'
     )
 


[41/50] [abbrv] ignite git commit: IGNITE-3319 Cleanup code. Fixed small bugs.

Posted by an...@apache.org.
IGNITE-3319 Cleanup code. Fixed small bugs.


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

Branch: refs/heads/ignite-3262
Commit: 595a42fadfc1c299bbe1763bd5761dfe9e997aea
Parents: 2bc83e6
Author: Maxim Afanasiev <ma...@gmail.com>
Authored: Thu Jun 16 11:08:39 2016 +0700
Committer: Maxim Afanasiev <ma...@gmail.com>
Committed: Thu Jun 16 11:08:39 2016 +0700

----------------------------------------------------------------------
 modules/web-console/src/main/js/.gitignore      |   1 -
 modules/web-console/src/main/js/app/app.js      | 207 +++++++++++++++++++
 modules/web-console/src/main/js/app/index.js    | 207 -------------------
 modules/web-console/src/main/js/app/vendor.js   |  17 ++
 .../main/js/gulpfile.babel.js/webpack/common.js |  31 ++-
 .../webpack/environments/development.js         |  14 +-
 .../webpack/environments/production.js          |  10 -
 modules/web-console/src/main/js/package.json    |  21 +-
 8 files changed, 256 insertions(+), 252 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/595a42fa/modules/web-console/src/main/js/.gitignore
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/.gitignore b/modules/web-console/src/main/js/.gitignore
index c966a99..43f716c 100644
--- a/modules/web-console/src/main/js/.gitignore
+++ b/modules/web-console/src/main/js/.gitignore
@@ -2,7 +2,6 @@
 *.log
 .npmrc
 build/*
-!build/system.config.js
 node_modules
 ignite_modules_temp/*
 public/stylesheets/*.css

http://git-wip-us.apache.org/repos/asf/ignite/blob/595a42fa/modules/web-console/src/main/js/app/app.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/app.js b/modules/web-console/src/main/js/app/app.js
new file mode 100644
index 0000000..6fe84c2
--- /dev/null
+++ b/modules/web-console/src/main/js/app/app.js
@@ -0,0 +1,207 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import '../public/stylesheets/style.scss';
+
+import './decorator/select';
+import './decorator/tooltip';
+
+import './services/JavaTypes.service.js';
+import './modules/form/form.module';
+import './modules/agent/agent.module.js';
+import './modules/query-notebooks/query-notebooks.module';
+import './modules/Demo/Demo.module.js';
+
+import './modules/states/signin.state';
+import './modules/states/logout.state';
+import './modules/states/password.state';
+import './modules/states/configuration.state';
+import './modules/states/sql.state';
+import './modules/states/profile.state';
+import './modules/states/admin.state';
+
+// ignite:modules
+import './modules/user/user.module';
+import './modules/branding/branding.module';
+import './modules/navbar/navbar.module';
+import './modules/configuration/configuration.module';
+import './modules/getting-started/GettingStarted.provider';
+import './modules/dialog/dialog.module';
+import './modules/Version/Version.provider';
+import './modules/ace.module';
+import './modules/socket.module';
+import './modules/loading/loading.module';
+// endignite
+
+// Directives.
+import igniteHideOnStateChange from './directives/hide-on-state-change/hide-on-state-change.directive';
+import igniteInformation from './directives/information/information.directive';
+import igniteUiAceTabs from './directives/ui-ace-tabs.directive';
+import igniteUiAceXml from './directives/ui-ace-xml/ui-ace-xml.directive';
+import igniteUiAceJava from './directives/ui-ace-java/ui-ace-java.directive';
+import igniteUiAcePom from './directives/ui-ace-pom/ui-ace-pom.directive';
+import igniteUiAceDocker from './directives/ui-ace-docker/ui-ace-docker.directive';
+import igniteUiAcePojos from './directives/ui-ace-pojos/ui-ace-pojos.directive';
+import igniteBsAffixUpdate from './directives/bs-affix-update.directive';
+import ignite\u0421entered from './directives/centered/centered.directive.js';
+
+// Services.
+import cleanup from './services/cleanup.service';
+import confirm from './services/confirm.service';
+import IgniteInetAddress from './services/InetAddress.service';
+import IgniteCountries from './services/Countries.service';
+import IgniteChartColors from './services/ChartColors.service';
+import JavaTypes from './services/JavaTypes.service';
+
+// Providers.
+
+// Filters.
+import hasPojo from './filters/hasPojo.filter';
+import byName from './filters/byName.filter';
+
+// Generators
+import $generatorCommon from 'generator/generator-common';
+import $generatorJava from 'generator/generator-java';
+import $generatorOptional from 'generator/generator-optional';
+import $generatorProperties from 'generator/generator-properties';
+import $generatorReadme from 'generator/generator-readme';
+import $generatorXml from 'generator/generator-xml';
+
+window.$generatorCommon = $generatorCommon;
+window.$generatorJava = $generatorJava;
+window.$generatorOptional = $generatorOptional;
+window.$generatorProperties = $generatorProperties;
+window.$generatorReadme = $generatorReadme;
+window.$generatorXml = $generatorXml;
+
+// Add legacy logic;
+import consoleModule from 'controllers/common-module';
+window.consoleModule = consoleModule;
+
+import 'controllers/admin-controller';
+import 'controllers/caches-controller';
+import 'controllers/clusters-controller';
+import 'controllers/domains-controller';
+import 'controllers/igfs-controller';
+import 'controllers/profile-controller';
+import 'controllers/sql-controller';
+
+// Inject external modules.
+import 'ignite_modules_temp/index';
+
+
+import baseTemplate from '../views/base.jade';
+
+angular
+.module('ignite-console', [
+    'ngRetina',
+    'btford.socket-io',
+    'ngAnimate',
+    'ngSanitize',
+    'mgcrea.ngStrap',
+    'ui.router',
+    'gridster',
+    // Base modules.
+    'ignite-console.ace',
+    'ignite-console.Form',
+    'ignite-console.user',
+    'ignite-console.branding',
+    'ignite-console.socket',
+    'ignite-console.agent',
+    'ignite-console.query-notebooks',
+    'ignite-console.demo',
+    // States.
+    'ignite-console.states.login',
+    'ignite-console.states.logout',
+    'ignite-console.states.password',
+    'ignite-console.states.configuration',
+    'ignite-console.states.sql',
+    'ignite-console.states.profile',
+    'ignite-console.states.admin',
+    // Common modules.
+    'ignite-console.dialog',
+    'ignite-console.navbar',
+    'ignite-console.configuration',
+    'ignite-console.getting-started',
+    'ignite-console.version',
+    'ignite-console.loading',
+    // Ignite legacy module.
+    'ignite-console.legacy',
+    // Ignite modules.
+    'ignite-console.modules'
+])
+// Directives.
+.directive(...igniteHideOnStateChange)
+.directive(...igniteInformation)
+.directive(...igniteUiAceTabs)
+.directive(...igniteUiAceXml)
+.directive(...igniteUiAceJava)
+.directive(...igniteUiAcePom)
+.directive(...igniteUiAceDocker)
+.directive(...igniteUiAcePojos)
+.directive(...igniteBsAffixUpdate)
+.directive(...ignite\u0421entered)
+// Services.
+.service(...cleanup)
+.service(...confirm)
+.service(...IgniteInetAddress)
+.service(...IgniteCountries)
+.service(...IgniteChartColors)
+.service(...JavaTypes)
+// Providers.
+// Filters.
+.filter(...hasPojo)
+.filter(...byName)
+.config(['$stateProvider', '$locationProvider', '$urlRouterProvider', ($stateProvider, $locationProvider, $urlRouterProvider) => {
+    // Set up the states.
+    $stateProvider
+        .state('base', {
+            url: '',
+            abstract: true,
+            templateUrl: baseTemplate
+        })
+        .state('settings', {
+            url: '/settings',
+            abstract: true,
+            templateUrl: baseTemplate
+        });
+
+    $urlRouterProvider.otherwise('/');
+
+    $locationProvider.html5Mode(true);
+}])
+.config(['$animateProvider', ($animateProvider) => {
+    $animateProvider.classNameFilter(/^((?!(fa-spin)).)*$/);
+}])
+.run(['$rootScope', ($root) => {
+    $root._ = _;
+}])
+.run(['$rootScope', '$state', 'MetaTags', 'Auth', 'User', 'IgniteAgentMonitor', ($root, $state, $meta, Auth, User, agentMonitor) => {
+    $root.$state = $state;
+
+    $root.$meta = $meta;
+
+    if (Auth.authorized) {
+        User.read()
+            .then((user) => $root.$broadcast('user', user))
+            .then(() => Auth.authorized && agentMonitor.init());
+    }
+}])
+.run(['$rootScope', ($root) => {
+    $root.$on('$stateChangeStart', () => {
+        _.forEach(angular.element('.modal'), (m) => angular.element(m).scope().$hide());
+    });
+}]);

http://git-wip-us.apache.org/repos/asf/ignite/blob/595a42fa/modules/web-console/src/main/js/app/index.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/index.js b/modules/web-console/src/main/js/app/index.js
deleted file mode 100644
index 6fe84c2..0000000
--- a/modules/web-console/src/main/js/app/index.js
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import '../public/stylesheets/style.scss';
-
-import './decorator/select';
-import './decorator/tooltip';
-
-import './services/JavaTypes.service.js';
-import './modules/form/form.module';
-import './modules/agent/agent.module.js';
-import './modules/query-notebooks/query-notebooks.module';
-import './modules/Demo/Demo.module.js';
-
-import './modules/states/signin.state';
-import './modules/states/logout.state';
-import './modules/states/password.state';
-import './modules/states/configuration.state';
-import './modules/states/sql.state';
-import './modules/states/profile.state';
-import './modules/states/admin.state';
-
-// ignite:modules
-import './modules/user/user.module';
-import './modules/branding/branding.module';
-import './modules/navbar/navbar.module';
-import './modules/configuration/configuration.module';
-import './modules/getting-started/GettingStarted.provider';
-import './modules/dialog/dialog.module';
-import './modules/Version/Version.provider';
-import './modules/ace.module';
-import './modules/socket.module';
-import './modules/loading/loading.module';
-// endignite
-
-// Directives.
-import igniteHideOnStateChange from './directives/hide-on-state-change/hide-on-state-change.directive';
-import igniteInformation from './directives/information/information.directive';
-import igniteUiAceTabs from './directives/ui-ace-tabs.directive';
-import igniteUiAceXml from './directives/ui-ace-xml/ui-ace-xml.directive';
-import igniteUiAceJava from './directives/ui-ace-java/ui-ace-java.directive';
-import igniteUiAcePom from './directives/ui-ace-pom/ui-ace-pom.directive';
-import igniteUiAceDocker from './directives/ui-ace-docker/ui-ace-docker.directive';
-import igniteUiAcePojos from './directives/ui-ace-pojos/ui-ace-pojos.directive';
-import igniteBsAffixUpdate from './directives/bs-affix-update.directive';
-import ignite\u0421entered from './directives/centered/centered.directive.js';
-
-// Services.
-import cleanup from './services/cleanup.service';
-import confirm from './services/confirm.service';
-import IgniteInetAddress from './services/InetAddress.service';
-import IgniteCountries from './services/Countries.service';
-import IgniteChartColors from './services/ChartColors.service';
-import JavaTypes from './services/JavaTypes.service';
-
-// Providers.
-
-// Filters.
-import hasPojo from './filters/hasPojo.filter';
-import byName from './filters/byName.filter';
-
-// Generators
-import $generatorCommon from 'generator/generator-common';
-import $generatorJava from 'generator/generator-java';
-import $generatorOptional from 'generator/generator-optional';
-import $generatorProperties from 'generator/generator-properties';
-import $generatorReadme from 'generator/generator-readme';
-import $generatorXml from 'generator/generator-xml';
-
-window.$generatorCommon = $generatorCommon;
-window.$generatorJava = $generatorJava;
-window.$generatorOptional = $generatorOptional;
-window.$generatorProperties = $generatorProperties;
-window.$generatorReadme = $generatorReadme;
-window.$generatorXml = $generatorXml;
-
-// Add legacy logic;
-import consoleModule from 'controllers/common-module';
-window.consoleModule = consoleModule;
-
-import 'controllers/admin-controller';
-import 'controllers/caches-controller';
-import 'controllers/clusters-controller';
-import 'controllers/domains-controller';
-import 'controllers/igfs-controller';
-import 'controllers/profile-controller';
-import 'controllers/sql-controller';
-
-// Inject external modules.
-import 'ignite_modules_temp/index';
-
-
-import baseTemplate from '../views/base.jade';
-
-angular
-.module('ignite-console', [
-    'ngRetina',
-    'btford.socket-io',
-    'ngAnimate',
-    'ngSanitize',
-    'mgcrea.ngStrap',
-    'ui.router',
-    'gridster',
-    // Base modules.
-    'ignite-console.ace',
-    'ignite-console.Form',
-    'ignite-console.user',
-    'ignite-console.branding',
-    'ignite-console.socket',
-    'ignite-console.agent',
-    'ignite-console.query-notebooks',
-    'ignite-console.demo',
-    // States.
-    'ignite-console.states.login',
-    'ignite-console.states.logout',
-    'ignite-console.states.password',
-    'ignite-console.states.configuration',
-    'ignite-console.states.sql',
-    'ignite-console.states.profile',
-    'ignite-console.states.admin',
-    // Common modules.
-    'ignite-console.dialog',
-    'ignite-console.navbar',
-    'ignite-console.configuration',
-    'ignite-console.getting-started',
-    'ignite-console.version',
-    'ignite-console.loading',
-    // Ignite legacy module.
-    'ignite-console.legacy',
-    // Ignite modules.
-    'ignite-console.modules'
-])
-// Directives.
-.directive(...igniteHideOnStateChange)
-.directive(...igniteInformation)
-.directive(...igniteUiAceTabs)
-.directive(...igniteUiAceXml)
-.directive(...igniteUiAceJava)
-.directive(...igniteUiAcePom)
-.directive(...igniteUiAceDocker)
-.directive(...igniteUiAcePojos)
-.directive(...igniteBsAffixUpdate)
-.directive(...ignite\u0421entered)
-// Services.
-.service(...cleanup)
-.service(...confirm)
-.service(...IgniteInetAddress)
-.service(...IgniteCountries)
-.service(...IgniteChartColors)
-.service(...JavaTypes)
-// Providers.
-// Filters.
-.filter(...hasPojo)
-.filter(...byName)
-.config(['$stateProvider', '$locationProvider', '$urlRouterProvider', ($stateProvider, $locationProvider, $urlRouterProvider) => {
-    // Set up the states.
-    $stateProvider
-        .state('base', {
-            url: '',
-            abstract: true,
-            templateUrl: baseTemplate
-        })
-        .state('settings', {
-            url: '/settings',
-            abstract: true,
-            templateUrl: baseTemplate
-        });
-
-    $urlRouterProvider.otherwise('/');
-
-    $locationProvider.html5Mode(true);
-}])
-.config(['$animateProvider', ($animateProvider) => {
-    $animateProvider.classNameFilter(/^((?!(fa-spin)).)*$/);
-}])
-.run(['$rootScope', ($root) => {
-    $root._ = _;
-}])
-.run(['$rootScope', '$state', 'MetaTags', 'Auth', 'User', 'IgniteAgentMonitor', ($root, $state, $meta, Auth, User, agentMonitor) => {
-    $root.$state = $state;
-
-    $root.$meta = $meta;
-
-    if (Auth.authorized) {
-        User.read()
-            .then((user) => $root.$broadcast('user', user))
-            .then(() => Auth.authorized && agentMonitor.init());
-    }
-}])
-.run(['$rootScope', ($root) => {
-    $root.$on('$stateChangeStart', () => {
-        _.forEach(angular.element('.modal'), (m) => angular.element(m).scope().$hide());
-    });
-}]);

http://git-wip-us.apache.org/repos/asf/ignite/blob/595a42fa/modules/web-console/src/main/js/app/vendor.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/vendor.js b/modules/web-console/src/main/js/app/vendor.js
index cf90f4c..e899d23 100644
--- a/modules/web-console/src/main/js/app/vendor.js
+++ b/modules/web-console/src/main/js/app/vendor.js
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 import 'jquery';
 import 'angular';
 import 'angular-animate';

http://git-wip-us.apache.org/repos/asf/ignite/blob/595a42fa/modules/web-console/src/main/js/gulpfile.babel.js/webpack/common.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/common.js b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/common.js
index e686762..1369328 100644
--- a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/common.js
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/common.js
@@ -18,20 +18,22 @@
 import path from 'path';
 import webpack from 'webpack';
 import autoprefixer from 'autoprefixer-core';
+import jade from 'jade';
 import progressPlugin from './plugins/progress';
 
 //import  Manifest from 'manifest-revision-webpack-plugin';
 import ExtractTextPlugin from 'extract-text-webpack-plugin';
+import HtmlWebpackPlugin from 'html-webpack-plugin';
 
 import {srcDir, destDir, rootDir} from '../paths';
 
 const NODE_ENV = process.env.NODE_ENV || 'production';
-const IS_DEVELOPMENT = NODE_ENV === 'development';
-
+const development = NODE_ENV === 'development';
+const node_modules_path = path.resolve('node_modules');
 const stylesLoader = 'css-loader?sourceMap!postcss-loader!sass-loader?outputStyle=expanded&sourceMap=true&sourceMapContents=true';
 
+
 export default () => {
-    const NODE_MODULES_PATH = path.resolve('node_modules');
 
     const webpackConfig = {
         node: {
@@ -41,7 +43,7 @@ export default () => {
         // Entry points.
         entry: {
             polyfill: 'babel-polyfill',
-            app: path.join(srcDir, 'index.js'),
+            app: path.join(srcDir, 'app.js'),
             vendor: path.join(srcDir, 'vendor.js')
         },
         
@@ -56,7 +58,7 @@ export default () => {
         resolve: {
             extensions: ['', '.js'],
             root: [rootDir],
-            modulesDirectories: [NODE_MODULES_PATH, './'],
+            modulesDirectories: [node_modules_path, './'],
         },
         
         // Modules resolvers.
@@ -65,7 +67,7 @@ export default () => {
             preLoaders: [
                 {
                     test: /\.js$/,
-                    exclude: [NODE_MODULES_PATH],
+                    exclude: [node_modules_path],
                     loader: 'eslint-loader'
                 }
             ],
@@ -88,12 +90,12 @@ export default () => {
                 },
                 {
                     test: /\.js$/,
-                    exclude: [NODE_MODULES_PATH],
+                    exclude: [node_modules_path],
                     loaders: ['ng-annotate-loader']
                 },
                 {
                     test: /\.js$/,
-                    exclude: [NODE_MODULES_PATH],
+                    exclude: [node_modules_path],
                     loader: 'babel-loader',
                     query: {
                         cacheDirectory: true,
@@ -108,7 +110,7 @@ export default () => {
                 },
                 {
                     test: /\.(scss|sass)$/,
-                    loader: IS_DEVELOPMENT ? `style-loader!${stylesLoader}` : ExtractTextPlugin.extract('style-loader', stylesLoader)
+                    loader: development ? `style-loader!${stylesLoader}` : ExtractTextPlugin.extract('style-loader', stylesLoader)
                 },
                 {
                     test: /\.(woff2|woff|ttf|eot|svg)?(\?v=[0-9]\.[0-9]\.[0-9])?$/,
@@ -142,7 +144,7 @@ export default () => {
         // ESLint loader configuration.
         eslint: {
             failOnWarning: false,
-            failOnError: false
+            failOnError: !development
         },
 
         // Load plugins.
@@ -166,7 +168,14 @@ export default () => {
             //     rootAssetPath: rootAssetPath,
             //     ignorePaths: ['.DS_Store']
             // }),
-            new ExtractTextPlugin('assets/css/[name]' + (IS_DEVELOPMENT ? '' : '.[chunkhash]') + '.css', {allChunks: true}),
+            new ExtractTextPlugin('assets/css/[name]' + (development ? '' : '.[chunkhash]') + '.css', {allChunks: true}),
+            new HtmlWebpackPlugin({
+                filename: 'index.html',
+                templateContent: () => {
+                    return jade.renderFile(path.join(rootDir, 'views', 'index.jade'));
+                },
+                title: 'Ignite Web Console'
+            }),
             progressPlugin
         ]
     };

http://git-wip-us.apache.org/repos/asf/ignite/blob/595a42fa/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/development.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/development.js b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/development.js
index defbb77..766bda8 100644
--- a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/development.js
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/development.js
@@ -16,21 +16,11 @@
  */
 
 import webpack from 'webpack';
-import HtmlWebpackPlugin from 'html-webpack-plugin';
 import {destDir, rootDir} from '../../paths';
-import jade from 'jade';
-import path from 'path';
 
 export default () => {
     let plugins = [
-        new webpack.HotModuleReplacementPlugin(),
-        new HtmlWebpackPlugin({
-            filename: 'index.html',
-            templateContent: function () {
-                return jade.renderFile(path.join(rootDir, 'views', 'index.jade'));
-            },
-            title: 'DEBUG:Ignite Web Console'
-        })
+        new webpack.HotModuleReplacementPlugin()
     ];
 
     return {
@@ -64,7 +54,7 @@ export default () => {
                 aggregateTimeout: 1000,
                 poll: 1000
             },
-            stats: 'verbose',
+            stats: {colors: true},
             port: 9000
         },
         stats: {colors: true},

http://git-wip-us.apache.org/repos/asf/ignite/blob/595a42fa/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/production.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/production.js b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/production.js
index 9bb5e1d..b2bfe78 100644
--- a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/production.js
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/production.js
@@ -15,22 +15,12 @@
  * limitations under the License.
  */
 
-import HtmlWebpackPlugin from 'html-webpack-plugin';
 import webpack from 'webpack';
-import path from 'path';
-import jade from 'jade';
 
 import {destDir, rootDir} from '../../paths';
 
 export default () => {
     const plugins = [
-        new HtmlWebpackPlugin({
-            filename: 'index.html',
-            templateContent: () => {
-                return jade.renderFile(path.join(rootDir, 'views', 'index.jade'));
-            },
-            title: 'Ignite Web Console'
-        }),
         new webpack.optimize.DedupePlugin(),
         new webpack.optimize.UglifyJsPlugin({
             path: destDir,

http://git-wip-us.apache.org/repos/asf/ignite/blob/595a42fa/modules/web-console/src/main/js/package.json
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/package.json b/modules/web-console/src/main/js/package.json
index 1148cc6..0c8669c 100644
--- a/modules/web-console/src/main/js/package.json
+++ b/modules/web-console/src/main/js/package.json
@@ -43,14 +43,6 @@
     "assets-webpack-plugin": "^3.2.0",
     "async": "1.5.2",
     "autoprefixer-core": "^5.2.1",
-    "babel-core": "^6.7.6",
-    "babel-eslint": "^6.0.4",
-    "babel-loader": "^6.2.4",
-    "babel-plugin-add-module-exports": "^0.1.2",
-    "babel-plugin-transform-runtime": "^6.7.5",
-    "babel-polyfill": "^6.7.4",
-    "babel-preset-angular": "^6.0.15",
-    "babel-runtime": "^6.6.1",
     "baggage-loader": "^0.2.4",
     "body-parser": "^1.15.0",
     "bootstrap-loader": "^1.0.10",
@@ -108,7 +100,6 @@
     "url": "^0.11.0",
     "url-loader": "^0.5.6",
     "webpack": "^1.13.1",
-    "webpack-dev-server": "^1.14.1",
     "ws": "^0.8.0"
   },
   "devDependencies": {
@@ -118,7 +109,6 @@
     "gulp-environments": "^0.1.1",
     "gulp-eslint": "^2.0.0",
     "gulp-html-replace": "^1.5.5",
-    "gulp-ignore": "^2.0.1",
     "gulp-inject": "^4.0.0",
     "gulp-jade": "^1.1.0",
     "gulp-rimraf": "^0.2.0",
@@ -130,6 +120,15 @@
     "mocha": "~2.4.5",
     "morgan": "^1.7.0",
     "should": "^8.3.0",
-    "supertest": "^1.1.0"
+    "supertest": "^1.1.0",
+    "babel-core": "^6.7.6",
+    "babel-eslint": "^6.0.4",
+    "babel-loader": "^6.2.4",
+    "babel-plugin-add-module-exports": "^0.1.2",
+    "babel-plugin-transform-runtime": "^6.7.5",
+    "babel-polyfill": "^6.7.4",
+    "babel-preset-angular": "^6.0.15",
+    "babel-runtime": "^6.6.1",
+    "webpack-dev-server": "^1.14.1"
   }
 }


[05/50] [abbrv] ignite git commit: Removed cache and implemented population for non-demo caches.

Posted by an...@apache.org.
Removed <default> cache and implemented population for non-demo caches.


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

Branch: refs/heads/ignite-3262
Commit: 555fbb90ab500176f93114060e1806466eac5a26
Parents: a5a5be7
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Thu Jun 2 16:57:54 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Thu Jun 2 16:57:54 2016 +0700

----------------------------------------------------------------------
 .../ignite/console/demo/AgentClusterDemo.java   | 86 ++++++--------------
 1 file changed, 27 insertions(+), 59 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/555fbb90/modules/web-agent/src/main/java/org/apache/ignite/console/demo/AgentClusterDemo.java
----------------------------------------------------------------------
diff --git a/modules/web-agent/src/main/java/org/apache/ignite/console/demo/AgentClusterDemo.java b/modules/web-agent/src/main/java/org/apache/ignite/console/demo/AgentClusterDemo.java
index b0ffd33..bf0903a 100644
--- a/modules/web-agent/src/main/java/org/apache/ignite/console/demo/AgentClusterDemo.java
+++ b/modules/web-agent/src/main/java/org/apache/ignite/console/demo/AgentClusterDemo.java
@@ -18,10 +18,13 @@
 package org.apache.ignite.console.demo;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.Random;
+import java.util.Set;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
@@ -33,7 +36,6 @@ import org.apache.ignite.Ignite;
 import org.apache.ignite.IgniteCache;
 import org.apache.ignite.Ignition;
 import org.apache.ignite.cache.CacheAtomicityMode;
-import org.apache.ignite.cache.CacheMode;
 import org.apache.ignite.cache.QueryEntity;
 import org.apache.ignite.cache.QueryIndex;
 import org.apache.ignite.cache.QueryIndexType;
@@ -83,16 +85,24 @@ public class AgentClusterDemo {
 
     /** */
     private static final String COUNTRY_CACHE_NAME = "CountryCache";
+
     /** */
     private static final String DEPARTMENT_CACHE_NAME = "DepartmentCache";
+
     /** */
     private static final String EMPLOYEE_CACHE_NAME = "EmployeeCache";
+
     /** */
     private static final String PARKING_CACHE_NAME = "ParkingCache";
+
     /** */
     private static final String CAR_CACHE_NAME = "CarCache";
 
     /** */
+    private static final Set<String> DEMO_CACHES = new HashSet<>(Arrays.asList(COUNTRY_CACHE_NAME,
+        DEPARTMENT_CACHE_NAME, EMPLOYEE_CACHE_NAME, PARKING_CACHE_NAME, CAR_CACHE_NAME));
+
+    /** */
     private static final Random rnd = new Random();
 
     /** Countries count. */
@@ -110,9 +120,6 @@ public class AgentClusterDemo {
     /** Departments count */
     private static final int PARK_CNT = 10;
 
-    /** Departments count */
-    private static final int DEFAULT_CNT = 100;
-
     /** Counter for threads in pool. */
     private static final AtomicInteger THREAD_CNT = new AtomicInteger(0);
 
@@ -317,29 +324,6 @@ public class AgentClusterDemo {
     }
 
     /**
-     * Configure default cache.
-     */
-    private static <K, V> CacheConfiguration<K, V> cacheDefault() {
-        CacheConfiguration<K, V> ccfg = cacheConfiguration(null);
-
-        ccfg.setCacheMode(CacheMode.REPLICATED);
-
-        // Configure default cache types.
-        Collection<QueryEntity> qryEntities = new ArrayList<>();
-
-        QueryEntity type = new QueryEntity();
-
-        qryEntities.add(type);
-
-        type.setKeyType(Integer.class.getName());
-        type.setValueType(String.class.getName());
-
-        ccfg.setQueryEntities(qryEntities);
-
-        return ccfg;
-    }
-
-    /**
      * Configure node.
      * @param gridIdx Grid name index.
      * @param client If {@code true} then start client node.
@@ -374,13 +358,10 @@ public class AgentClusterDemo {
         cfg.setMetricsLogFrequency(0);
         cfg.getConnectorConfiguration().setPort(60700);
 
-        if (client) {
+        if (client)
             cfg.setClientMode(true);
-            cfg.setCacheConfiguration(cacheCountry(), cacheDepartment(), cacheEmployee(), cacheParking(), cacheCar());
-        }
-        else
-            cfg.setCacheConfiguration(cacheDefault(), cacheCountry(), cacheDepartment(), cacheEmployee(),
-                cacheParking(), cacheCar());
+
+        cfg.setCacheConfiguration(cacheCountry(), cacheDepartment(), cacheEmployee(), cacheParking(), cacheCar());
 
         return cfg;
     }
@@ -466,22 +447,6 @@ public class AgentClusterDemo {
     }
 
     /**
-     * @param ignite Ignite.
-     */
-    private static void populateCacheDefault(Ignite ignite) {
-        if (log.isDebugEnabled())
-            log.debug("DEMO: Start default cache population...");
-
-        IgniteCache<Integer, String> cacheDflt = ignite.cache(null);
-
-        for (int i = 0; i < DEFAULT_CNT; i++)
-            cacheDflt.put(i, "default-" + i);
-
-        if (log.isDebugEnabled())
-            log.debug("DEMO: Finished default cache population.");
-    }
-
-    /**
      * Creates a thread pool that can schedule commands to run after a given delay, or to execute periodically.
      *
      * @param corePoolSize Number of threads to keep in the pool, even if they are idle.
@@ -519,25 +484,28 @@ public class AgentClusterDemo {
 
         populateCacheEmployee(ignite, diff);
         populateCacheCar(ignite);
-        populateCacheDefault(ignite);
 
         ScheduledExecutorService cachePool = newScheduledThreadPool(2, "demo-sql-load-cache-tasks");
 
         cachePool.scheduleWithFixedDelay(new Runnable() {
             @Override public void run() {
                 try {
-                    IgniteCache<Integer, String> cacheDflt = ignite.cache(null);
+                    for (String cacheName : ignite.cacheNames()) {
+                        if (!DEMO_CACHES.contains(cacheName)) {
+                            IgniteCache<Integer, String> otherCache = ignite.cache(cacheName);
 
-                    if (cacheDflt != null) {
-                        for (int i = 0, n = 1; i < cnt; i++, n++) {
-                            Integer key = rnd.nextInt(1000);
+                            if (otherCache != null) {
+                                for (int i = 0, n = 1; i < cnt; i++, n++) {
+                                    Integer key = rnd.nextInt(1000);
 
-                            String val = cacheDflt.get(key);
+                                    String val = otherCache.get(key);
 
-                            if (val == null)
-                                cacheDflt.put(key, "default-" + key);
-                            else if (rnd.nextInt(100) < 30)
-                                cacheDflt.remove(key);
+                                    if (val == null)
+                                        otherCache.put(key, "other-" + key);
+                                    else if (rnd.nextInt(100) < 30)
+                                        otherCache.remove(key);
+                                }
+                            }
                         }
                     }
 


[26/50] [abbrv] ignite git commit: IGNITE-2047 Fixed required condition

Posted by an...@apache.org.
IGNITE-2047 Fixed required condition


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

Branch: refs/heads/ignite-3262
Commit: 592e2745f933e42800bf2bf02562761a390d45f1
Parents: 6a94675
Author: vsisko <vs...@gridgain.com>
Authored: Wed Jun 8 11:19:07 2016 +0700
Committer: vsisko <vs...@gridgain.com>
Committed: Wed Jun 8 11:19:07 2016 +0700

----------------------------------------------------------------------
 .../clusters/general/discovery/zookeeper/retrypolicy/custom.jade   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/592e2745/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/custom.jade
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/custom.jade b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/custom.jade
index 7f41378..6e631ab 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/custom.jade
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/custom.jade
@@ -18,7 +18,7 @@ include ../../../../../../../../../app/helpers/jade/mixins.jade
 
 -var model = 'backupItem.discovery.ZooKeeper.retryPolicy'
 -var retry = model + '.Custom'
--var required = 'backupItem.discovery.ZooKeeper.retryPolicy.kind === "Custom"'
+-var required = 'backupItem.discovery.kind === "ZooKeeper" && backupItem.discovery.ZooKeeper.retryPolicy.kind === "Custom"'
 
 .details-row
     +java-class('Class name:', retry + '.className', 'customClassName', 'true', required, 'Custom retry policy implementation class name')


[14/50] [abbrv] ignite git commit: WIP webpack migration

Posted by an...@apache.org.
WIP webpack migration


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

Branch: refs/heads/ignite-3262
Commit: 5f425aab7bd431ff20555ca8b1fc7b0ff3b21691
Parents: 002452b
Author: Maxim Afanasiev <ma...@gmail.com>
Authored: Fri Jun 3 17:35:21 2016 +0700
Committer: Maxim Afanasiev <ma...@gmail.com>
Committed: Fri Jun 3 17:35:21 2016 +0700

----------------------------------------------------------------------
 .../src/main/js/config/manifest.json            |   1 -
 .../config/webpack/environments/development.js  |  50 -----
 .../config/webpack/environments/production.js   |  29 ---
 .../src/main/js/config/webpack/global.js        | 193 -------------------
 .../src/main/js/gulpfile.babel.js/paths.js      |   2 +-
 .../main/js/gulpfile.babel.js/tasks/build.js    |   2 +-
 .../main/js/gulpfile.babel.js/tasks/bundle.js   |  49 ++---
 .../src/main/js/gulpfile.babel.js/tasks/copy.js |  16 +-
 .../main/js/gulpfile.babel.js/tasks/watch.js    |  12 +-
 .../webpack/environments/development.js         |  85 ++++++++
 .../webpack/environments/production.js          |  29 +++
 .../main/js/gulpfile.babel.js/webpack/global.js | 193 +++++++++++++++++++
 .../js/gulpfile.babel.js/webpack/manifest.json  |   1 +
 .../web-console/src/main/js/webpack.config.js   |   6 +-
 14 files changed, 344 insertions(+), 324 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/5f425aab/modules/web-console/src/main/js/config/manifest.json
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/config/manifest.json b/modules/web-console/src/main/js/config/manifest.json
deleted file mode 100644
index 1b08f72..0000000
--- a/modules/web-console/src/main/js/config/manifest.json
+++ /dev/null
@@ -1 +0,0 @@
-{"assets":{"app.map":"app.js.map","polyfill.map":"polyfill.js.map","vendor.map":"vendor.js.map","common.map":"common.js.map"},"publicPath":"/"}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/5f425aab/modules/web-console/src/main/js/config/webpack/environments/development.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/config/webpack/environments/development.js b/modules/web-console/src/main/js/config/webpack/environments/development.js
deleted file mode 100644
index 2968095..0000000
--- a/modules/web-console/src/main/js/config/webpack/environments/development.js
+++ /dev/null
@@ -1,50 +0,0 @@
-'use strict';
-var webpack = require('webpack');
-var HtmlWebpackPlugin = require("html-webpack-plugin");
-var path = require('path');
-var glob = require('glob');
-var jade = require('jade');
-
-module.exports = function (_path) {
-    var plugins = [
-        new webpack.HotModuleReplacementPlugin(),
-        new HtmlWebpackPlugin({
-            filename: 'index.html',
-            templateContent: function () {
-                return jade.renderFile(path.join(_path, 'views', 'index.jade'));
-            },
-            title: 'DEBUG:Ignite Web Console'
-        })
-    ];
-
-    glob.sync(path.join(_path, 'views') + '/**/*.jade').map(function (file) {
-        plugins.push(
-            new HtmlWebpackPlugin({
-                filename: 'templates/'+path.basename(file).replace('.jade', '.html'),
-                templateContent: function () {
-                    return jade.renderFile(file);
-                }
-            }))
-    });
-
-    return {
-        context: _path,
-        debug: true,
-        devtool: 'cheap-source-map',
-        devServer: {
-            contentBase: './dist',
-            info: true,
-            hot: true,
-            inline: false,
-            proxy: {
-                '/api/*': {
-                    target: 'http://localhost:3000'
-                }
-            },
-            stats: {colors: true},
-            port: 9000
-        },
-
-        plugins: plugins
-    };
-};

http://git-wip-us.apache.org/repos/asf/ignite/blob/5f425aab/modules/web-console/src/main/js/config/webpack/environments/production.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/config/webpack/environments/production.js b/modules/web-console/src/main/js/config/webpack/environments/production.js
deleted file mode 100644
index ce2a128..0000000
--- a/modules/web-console/src/main/js/config/webpack/environments/production.js
+++ /dev/null
@@ -1,29 +0,0 @@
-'use strict';
-var CleanWebpackPlugin = require('clean-webpack-plugin');
-var HtmlWebpackPlugin = require("html-webpack-plugin");
-var path = require('path');
-
-module.exports = function(_path) {
-  return {
-    context: _path,
-    debug: false,
-    devtool: 'cheap-source-map',
-    output: {
-      publicPath: '/',
-      filename: '[name].[chunkhash].js'
-    },
-    plugins: [
-      new CleanWebpackPlugin(['dist'], {
-        root: _path,
-        verbose: true,
-        dry: false
-      }),
-      new HtmlWebpackPlugin({
-        filename: 'index.html',
-        template: path.join(_path, 'views', 'index.html'),
-        title: 'Ignite Web Console',
-        favicon: path.join(_path, 'src', 'favicon.ico')
-      })
-    ]
-  };
-};
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/5f425aab/modules/web-console/src/main/js/config/webpack/global.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/config/webpack/global.js b/modules/web-console/src/main/js/config/webpack/global.js
deleted file mode 100644
index 9cdf686..0000000
--- a/modules/web-console/src/main/js/config/webpack/global.js
+++ /dev/null
@@ -1,193 +0,0 @@
-'use strict';
-
-// Depends
-var path = require('path');
-var webpack = require('webpack');
-var autoprefixer = require('autoprefixer-core');
-var Manifest = require('manifest-revision-webpack-plugin');
-var ExtractTextPlugin = require("extract-text-webpack-plugin");
-
-var NODE_ENV = process.env.NODE_ENV || "production";
-var DEVELOPMENT = NODE_ENV === "production" ? false : true;
-var stylesLoader = 'css-loader?sourceMap!postcss-loader!sass-loader?outputStyle=expanded&sourceMap=true&sourceMapContents=true';
-
-
-module.exports = function (_path) {
-    var rootAssetPath = _path + 'src';
-
-    var webpackConfig = {
-        node: {
-            fs: 'empty'
-        },
-        // entry points
-        entry: {
-            vendor: _path + '/app/vendor.js',
-            app: _path + '/app/index.js',
-            polyfill: 'babel-polyfill'
-        },
-
-        // output system
-        output: {
-            path: 'dist',
-            filename: '[name].js',
-            publicPath: '/'
-        },
-
-        // resolves modules
-        resolve: {
-            extensions: ['', '.js'],
-            modulesDirectories: ['node_modules', './'],
-            alias: {
-                _appRoot: path.join(_path, 'app'),
-                _images: path.join(_path,  'app', 'assets', 'images'),
-                _stylesheets: path.join(_path, 'app', 'assets', 'styles'),
-                _scripts: path.join(_path,  'app', 'assets', 'js'),
-                ace: path.join(_path, 'node_modules','ace-builds','src')
-            }
-        },
-
-        // modules resolvers
-        module: {
-            noParse: [],
-            // preLoaders: [
-            //     {
-            //         test: /\.js$/,
-            //         exclude: [
-            //             path.resolve(_path, "node_modules")
-            //         ],
-            //         loader: 'eslint-loader'
-            //     }
-            // ],
-            loaders: [
-                {
-                    test: /\.json$/,
-                    loader: 'json-loader'
-                },
-                {
-                    test: /\.html$/,
-                    loaders: [
-                        'ngtemplate-loader?relativeTo=' + _path,
-                        'html-loader?attrs[]=img:src&attrs[]=img:data-src'
-                    ]
-                },
-                {
-                    test: /\.jade$/,
-                    loaders: [
-                        'ngtemplate-loader?relativeTo=' + _path,
-                        'html-loader?attrs[]=img:src&attrs[]=img:data-src',
-                        'jade-html-loader'
-                    ]
-                }, {
-                    test: /\.js$/,
-                    loaders: [
-                        'baggage-loader?[file].html&[file].css'
-                    ]
-                }, {
-                    test: /\.js$/,
-                    exclude: [
-                        path.resolve(_path, "node_modules")
-                    ],
-                    loaders: [
-                        'ng-annotate-loader'
-                    ]
-                }, {
-                    test: /\.js$/,
-                    exclude: [
-                        path.resolve(_path, "node_modules")
-                    ],
-                    loader: 'babel-loader',
-                    query: {
-                        cacheDirectory: true,
-                        plugins: ['transform-runtime', 'add-module-exports'],
-                        presets: ['angular', 'es2017']
-                    }
-                }
-                , {
-                    test: /\.css$/,
-                    loaders: [
-                        'style-loader',
-                        'css-loader?sourceMap',
-                        'postcss-loader'
-                    ]
-                }, {
-                    test: /\.(scss|sass)$/,
-                    loader: DEVELOPMENT ? ('style-loader!' + stylesLoader) : ExtractTextPlugin.extract('style-loader', stylesLoader)
-                }, {
-                    test: /\.(woff2|woff|ttf|eot|svg)?(\?v=[0-9]\.[0-9]\.[0-9])?$/,
-                    loaders: [
-                        "url-loader?name=assets/fonts/[name]_[hash].[ext]"
-                    ]
-                }, {
-                    test: /\.(jpe?g|png|gif)$/i,
-                    loaders: [
-                        'url-loader?name=assets/images/[name]_[hash].[ext]'
-                    ]
-                }, {
-                    test: require.resolve("angular"),
-                    loaders: [
-                        "expose?angular"
-                    ]
-                    
-                },
-
-                {
-                    test: require.resolve("jquery"),
-                    loaders: [
-                        "expose?$",
-                        "expose?jQuery"
-                    ]
-                }
-
-            ]
-        },
-        
-        
-        
-
-        // post css
-        postcss: [autoprefixer({browsers: ['last 2 versions']})],
-
-        // load plugins
-        plugins: [
-            //new webpack.ContextReplacementPlugin(/moment[\/\\]locale$/, /en|hu/),
-            new webpack.ProvidePlugin({
-                $: 'jquery',
-                jQuery: 'jquery',
-                _: 'lodash'
-            }),
-            new webpack.DefinePlugin({
-                'NODE_ENV': JSON.stringify(NODE_ENV)
-            }),
-            new webpack.NoErrorsPlugin(),
-            new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/),
-            new webpack.optimize.DedupePlugin(),
-            new webpack.optimize.AggressiveMergingPlugin({
-                moveToParents: true
-            }),
-            new webpack.optimize.CommonsChunkPlugin({
-                name: 'common',
-                async: true,
-                children: true,
-                minChunks: Infinity
-            }),
-            new Manifest(path.join(_path + '/config', 'manifest.json'), {
-                rootAssetPath: rootAssetPath,
-                ignorePaths: ['.DS_Store']
-            }),
-            new ExtractTextPlugin('assets/styles/css/[name]' + (NODE_ENV === 'development' ? '' : '.[chunkhash]') + '.css', {allChunks: true})
-        ]
-    };
-
-    if (NODE_ENV !== 'development') {
-        webpackConfig.plugins = webpackConfig.plugins.concat([
-            new webpack.optimize.UglifyJsPlugin({
-                minimize: true,
-                warnings: false,
-                sourceMap: true
-            })
-        ]);
-    }
-
-    return webpackConfig;
-
-};

http://git-wip-us.apache.org/repos/asf/ignite/blob/5f425aab/modules/web-console/src/main/js/gulpfile.babel.js/paths.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/paths.js b/modules/web-console/src/main/js/gulpfile.babel.js/paths.js
index b865fcf..83372f9 100644
--- a/modules/web-console/src/main/js/gulpfile.babel.js/paths.js
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/paths.js
@@ -18,7 +18,7 @@
 import path from 'path';
 
 const srcDir = './app';
-const destDir = './build';
+const destDir = './dist';
 
 const igniteModulesDir = process.env.IGNITE_MODULES ? path.normalize(process.env.IGNITE_MODULES) : './ignite_modules';
 const igniteModulesTemp = './ignite_modules_temp';

http://git-wip-us.apache.org/repos/asf/ignite/blob/5f425aab/modules/web-console/src/main/js/gulpfile.babel.js/tasks/build.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/build.js b/modules/web-console/src/main/js/gulpfile.babel.js/tasks/build.js
index 69cd6cd..cc95e04 100644
--- a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/build.js
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/tasks/build.js
@@ -18,4 +18,4 @@
 import gulp from 'gulp';
 import sequence from 'gulp-sequence';
 
-gulp.task('build', (cb) => sequence(['clean', 'clean:ignite-modules-temp'], 'ignite:modules', ['copy', 'jade', 'sass'], 'bundle', cb));
+gulp.task('build', (cb) => sequence(['clean', 'clean:ignite-modules-temp'], 'ignite:modules', ['copy', 'jade'], 'bundle', cb));

http://git-wip-us.apache.org/repos/asf/ignite/blob/5f425aab/modules/web-console/src/main/js/gulpfile.babel.js/tasks/bundle.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/bundle.js b/modules/web-console/src/main/js/gulpfile.babel.js/tasks/bundle.js
index 38ed8d8..d7378d0 100644
--- a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/bundle.js
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/tasks/bundle.js
@@ -16,12 +16,15 @@
  */
 
 import gulp from 'gulp';
-import jspm from 'jspm';
+// import jspm from 'jspm';
 import util from 'gulp-util';
 import sequence from 'gulp-sequence';
 import htmlReplace from 'gulp-html-replace';
+import webpack from 'webpack';
+import webpackConfig from '../../webpack.config';
+import WebpackDevServer from 'webpack-dev-server';
 
-import { srcDir, destDir, igniteModulesTemp } from '../paths';
+import {srcDir, destDir, igniteModulesTemp} from '../paths';
 
 const options = {
     minify: true
@@ -37,40 +40,22 @@ gulp.task('bundle', ['eslint', 'bundle:ignite']);
 
 // Package all external dependencies and ignite-console.
 gulp.task('bundle:ignite', (cb) => {
-    if (util.env.debug)
-        return sequence('bundle:ignite:vendors', 'bundle:ignite:app', cb);
+    return sequence('bundle:ignite:app', cb);
 
-    return sequence('bundle:ignite:app-min', 'bundle:ignite:app-min:replace', cb);
+    // return sequence('bundle:ignite:app-min', 'bundle:ignite:app-min:replace', cb);
 });
 
-gulp.task('bundle:ignite:vendors', () => {
-    const exclude = [
-        `${srcDir}/**/*`,
-        `${srcDir}/**/*!jade`,
-        './controllers/**/*.js',
-        './generator/**/*.js',
-        './public/**/*!css',
-        `${igniteModulesTemp}/**/*`,
-        `${igniteModulesTemp}/**/*!jade`,
-        `${igniteModulesTemp}/**/*!css`
-    ].map((item) => `[${item}]`).join(' - ');
-
-    return jspm.bundle(`${srcDir}/index - ${exclude}`, `${destDir}/vendors.js`, options);
+gulp.task('bundle:ignite:app', (callback) => {
+    const bundler = webpack(webpackConfig);
+    new WebpackDevServer(bundler, webpackConfig.devServer).listen(9000, 'localhost', function() {
+        callback();
+    });
 });
 
-gulp.task('bundle:ignite:app', () =>
-    jspm.bundle(`${srcDir}/index - ${destDir}/vendors`, `${destDir}/app.js`, options)
-);
 
-gulp.task('bundle:ignite:app-min', () =>
-    jspm.bundleSFX(`${srcDir}/index`, `${destDir}/app.min.js`, options)
-);
+gulp.task('webpack-dev-server', () => {
+    new WebpackDevServer(webpackConfig).listen(9000);
+
+});
 
-gulp.task('bundle:ignite:app-min:replace', () =>
-    gulp.src('./build/index.html')
-        .pipe(htmlReplace({
-            css: 'app.min.css',
-            js: 'app.min.js'
-        }))
-        .pipe(gulp.dest('./build'))
-);
+gulp.task('bundle:ignite:app-min', () => jspm.bundleSFX(`${srcDir}/index`, `${destDir}/app.min.js`, options));

http://git-wip-us.apache.org/repos/asf/ignite/blob/5f425aab/modules/web-console/src/main/js/gulpfile.babel.js/tasks/copy.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/copy.js b/modules/web-console/src/main/js/gulpfile.babel.js/tasks/copy.js
index c97f11a..083089e 100644
--- a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/copy.js
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/tasks/copy.js
@@ -25,20 +25,20 @@ import { destDir, jsPaths, jsModulePaths, resourcePaths, resourceModulePaths, ig
 gulp.task('copy', (cb) => {
     const tasks = ['copy:resource', 'copy:ignite_modules:resource'];
 
-    if (util.env.debug || util.env.sourcemaps) {
-        tasks.push('copy:js');
+    // if (util.env.debug || util.env.sourcemaps) {
+    //     tasks.push('copy:js');
 
         tasks.push('copy:ignite_modules:js');
-    }
+    // }
 
     return sequence(tasks, cb);
 });
 
-gulp.task('copy:js', () =>
-    gulp.src(jsPaths, {base: './'})
-        .pipe(cache('copy:js'))
-        .pipe(gulp.dest(destDir))
-);
+// gulp.task('copy:js', () =>
+//     gulp.src(jsPaths, {base: './'})
+//         .pipe(cache('copy:js'))
+//         .pipe(gulp.dest(destDir))
+// );
 
 gulp.task('copy:ignite_modules:js', () =>
     gulp.src(jsModulePaths)

http://git-wip-us.apache.org/repos/asf/ignite/blob/5f425aab/modules/web-console/src/main/js/gulpfile.babel.js/tasks/watch.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/watch.js b/modules/web-console/src/main/js/gulpfile.babel.js/tasks/watch.js
index 8a78aca..19c8c38 100644
--- a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/watch.js
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/tasks/watch.js
@@ -20,20 +20,20 @@ import sequence from 'gulp-sequence';
 
 import { sassPaths, jadePaths, jadeModulePaths, resourcePaths, resourceModulePaths, appPaths, appModulePaths } from '../paths';
 
-gulp.task('watch:sass', (cb) => sequence('sass', 'bundle:ignite:app', cb));
+// gulp.task('watch:sass', (cb) => sequence('sass', 'bundle:ignite:app', cb));
 
-gulp.task('watch:ignite-modules', (cb) => sequence('clean:ignite-modules-temp', 'ignite:modules', ['eslint:browser', 'copy:ignite_modules:js', 'bundle:ignite:app'], cb));
+// gulp.task('watch:ignite-modules', (cb) => sequence('clean:ignite-modules-temp', 'ignite:modules', ['eslint:browser', 'copy:ignite_modules:js', 'bundle:ignite:app'], cb));
 
 // Build + connect + watch task.
-gulp.task('watch', ['build', 'connect'], () => {
-    //gulp.watch(sassPaths, ['watch:sass']);
+gulp.task('watch', ['build'], () => {
+    // gulp.watch(sassPaths, ['watch:sass']);
 
     gulp.watch(jadePaths.concat(jadeModulePaths), ['jade']);
 
     gulp.watch(resourcePaths, ['copy:resource']);
     gulp.watch(resourceModulePaths, ['copy:ignite_modules:resource']);
 
-    gulp.watch(appPaths, ['eslint:browser', 'copy:js', 'bundle:ignite:app']);
-    gulp.watch(appModulePaths, ['watch:ignite-modules']);
+    // gulp.watch(appPaths, ['eslint:browser', 'copy:js', 'bundle:ignite:app']);
+    // gulp.watch(appModulePaths, ['watch:ignite-modules']);
 });
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/5f425aab/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/development.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/development.js b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/development.js
new file mode 100644
index 0000000..ced7f69
--- /dev/null
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/development.js
@@ -0,0 +1,85 @@
+'use strict';
+var webpack = require('webpack');
+var ProgressPlugin = require('webpack/lib/ProgressPlugin');
+var HtmlWebpackPlugin = require("html-webpack-plugin");
+var path = require('path');
+var jade = require('jade');
+
+module.exports = function (_path) {
+    var chars = 0,
+        lastState, lastStateTime;
+
+    var plugins = [
+        new webpack.HotModuleReplacementPlugin(),
+        new HtmlWebpackPlugin({
+            filename: 'index.html',
+            templateContent: function () {
+                return jade.renderFile(path.join(_path, 'views', 'index.jade'));
+            },
+            title: 'DEBUG:Ignite Web Console'
+        }),
+        new ProgressPlugin(function(percentage, msg) {
+            var state = msg;
+            if(percentage < 1) {
+                percentage = Math.floor(percentage * 100);
+                msg = percentage + "% " + msg;
+                if(percentage < 100) {
+                    msg = " " + msg;
+                }
+                if(percentage < 10) {
+                    msg = " " + msg;
+                }
+            }
+                state = state.replace(/^\d+\/\d+\s+/, "");
+                if(percentage === 0) {
+                    lastState = null;
+                    lastStateTime = +new Date();
+                } else if(state !== lastState || percentage === 1) {
+                    var now = +new Date();
+                    if(lastState) {
+                        var stateMsg = (now - lastStateTime) + "ms " + lastState;
+                        goToLineStart(stateMsg);
+                        process.stderr.write(stateMsg + "\n");
+                        chars = 0;
+                    }
+                    lastState = state;
+                    lastStateTime = now;
+                }
+            goToLineStart(msg);
+            process.stderr.write(msg);
+        })
+    ];
+
+    function goToLineStart(nextMessage) {
+        var str = "";
+        for(; chars > nextMessage.length; chars--) {
+            str += "\b \b";
+        }
+        chars = nextMessage.length;
+        for(var i = 0; i < chars; i++) {
+            str += "\b";
+        }
+        if(str) process.stderr.write(str);
+    }
+
+    return {
+        context: _path,
+        debug: true,
+        devtool: 'cheap-source-map',
+        devServer: {
+            contentBase: './dist',
+            info: true,
+            hot: true,
+            inline: false,
+            proxy: {
+                '/api/*': {
+                    target: 'http://localhost:3000'
+                }
+            },
+            stats: {colors: true, progress: true},
+            port: 9000
+        },
+        stats: {colors: true, progress: true},
+        plugins: plugins
+    };
+};

http://git-wip-us.apache.org/repos/asf/ignite/blob/5f425aab/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/production.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/production.js b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/production.js
new file mode 100644
index 0000000..ce2a128
--- /dev/null
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/production.js
@@ -0,0 +1,29 @@
+'use strict';
+var CleanWebpackPlugin = require('clean-webpack-plugin');
+var HtmlWebpackPlugin = require("html-webpack-plugin");
+var path = require('path');
+
+module.exports = function(_path) {
+  return {
+    context: _path,
+    debug: false,
+    devtool: 'cheap-source-map',
+    output: {
+      publicPath: '/',
+      filename: '[name].[chunkhash].js'
+    },
+    plugins: [
+      new CleanWebpackPlugin(['dist'], {
+        root: _path,
+        verbose: true,
+        dry: false
+      }),
+      new HtmlWebpackPlugin({
+        filename: 'index.html',
+        template: path.join(_path, 'views', 'index.html'),
+        title: 'Ignite Web Console',
+        favicon: path.join(_path, 'src', 'favicon.ico')
+      })
+    ]
+  };
+};
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/5f425aab/modules/web-console/src/main/js/gulpfile.babel.js/webpack/global.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/global.js b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/global.js
new file mode 100644
index 0000000..c44fd46
--- /dev/null
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/global.js
@@ -0,0 +1,193 @@
+'use strict';
+
+// Depends
+var path = require('path');
+var webpack = require('webpack');
+var autoprefixer = require('autoprefixer-core');
+// var Manifest = require('manifest-revision-webpack-plugin');
+var ExtractTextPlugin = require("extract-text-webpack-plugin");
+
+var NODE_ENV = process.env.NODE_ENV || "production";
+var DEVELOPMENT = NODE_ENV === "production" ? false : true;
+var stylesLoader = 'css-loader?sourceMap!postcss-loader!sass-loader?outputStyle=expanded&sourceMap=true&sourceMapContents=true';
+
+
+module.exports = function (_path) {
+    var rootAssetPath = _path + 'src';
+
+    var webpackConfig = {
+        node: {
+            fs: 'empty'
+        },
+        // entry points
+        entry: {
+            vendor: _path + '/app/vendor.js',
+            app: _path + '/app/index.js',
+            polyfill: 'babel-polyfill'
+        },
+
+        // output system
+        output: {
+            path: 'dist',
+            filename: '[name].js',
+            publicPath: '/'
+        },
+
+        // resolves modules
+        resolve: {
+            extensions: ['', '.js'],
+            modulesDirectories: ['node_modules', './'],
+            alias: {
+                _appRoot: path.join(_path, 'app'),
+                _images: path.join(_path,  'app', 'assets', 'images'),
+                _stylesheets: path.join(_path, 'app', 'assets', 'styles'),
+                _scripts: path.join(_path,  'app', 'assets', 'js'),
+                ace: path.join(_path, 'node_modules','ace-builds','src')
+            }
+        },
+
+        // modules resolvers
+        module: {
+            noParse: [],
+            // preLoaders: [
+            //     {
+            //         test: /\.js$/,
+            //         exclude: [
+            //             path.resolve(_path, "node_modules")
+            //         ],
+            //         loader: 'eslint-loader'
+            //     }
+            // ],
+            loaders: [
+                {
+                    test: /\.json$/,
+                    loader: 'json-loader'
+                },
+                {
+                    test: /\.html$/,
+                    loaders: [
+                        'ngtemplate-loader?relativeTo=' + _path,
+                        'html-loader?attrs[]=img:src&attrs[]=img:data-src'
+                    ]
+                },
+                {
+                    test: /\.jade$/,
+                    loaders: [
+                        'ngtemplate-loader?relativeTo=' + _path,
+                        'html-loader?attrs[]=img:src&attrs[]=img:data-src',
+                        'jade-html-loader'
+                    ]
+                }, {
+                    test: /\.js$/,
+                    loaders: [
+                        'baggage-loader?[file].html&[file].css'
+                    ]
+                }, {
+                    test: /\.js$/,
+                    exclude: [
+                        path.resolve(_path, "node_modules")
+                    ],
+                    loaders: [
+                        'ng-annotate-loader'
+                    ]
+                }, {
+                    test: /\.js$/,
+                    exclude: [
+                        path.resolve(_path, "node_modules")
+                    ],
+                    loader: 'babel-loader',
+                    query: {
+                        cacheDirectory: true,
+                        plugins: ['transform-runtime', 'add-module-exports'],
+                        presets: ['angular', 'es2017']
+                    }
+                }
+                , {
+                    test: /\.css$/,
+                    loaders: [
+                        'style-loader',
+                        'css-loader?sourceMap',
+                        'postcss-loader'
+                    ]
+                }, {
+                    test: /\.(scss|sass)$/,
+                    loader: DEVELOPMENT ? ('style-loader!' + stylesLoader) : ExtractTextPlugin.extract('style-loader', stylesLoader)
+                }, {
+                    test: /\.(woff2|woff|ttf|eot|svg)?(\?v=[0-9]\.[0-9]\.[0-9])?$/,
+                    loaders: [
+                        "url-loader?name=assets/fonts/[name]_[hash].[ext]"
+                    ]
+                }, {
+                    test: /\.(jpe?g|png|gif)$/i,
+                    loaders: [
+                        'url-loader?name=assets/images/[name]_[hash].[ext]'
+                    ]
+                }, {
+                    test: require.resolve("angular"),
+                    loaders: [
+                        "expose?angular"
+                    ]
+                    
+                },
+
+                {
+                    test: require.resolve("jquery"),
+                    loaders: [
+                        "expose?$",
+                        "expose?jQuery"
+                    ]
+                }
+
+            ]
+        },
+        
+        
+        
+
+        // post css
+        postcss: [autoprefixer({browsers: ['last 2 versions']})],
+
+        // load plugins
+        plugins: [
+            //new webpack.ContextReplacementPlugin(/moment[\/\\]locale$/, /en|hu/),
+            new webpack.ProvidePlugin({
+                $: 'jquery',
+                jQuery: 'jquery',
+                _: 'lodash'
+            }),
+            new webpack.DefinePlugin({
+                'NODE_ENV': JSON.stringify(NODE_ENV)
+            }),
+            new webpack.NoErrorsPlugin(),
+            new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/),
+            new webpack.optimize.DedupePlugin(),
+            new webpack.optimize.AggressiveMergingPlugin({
+                moveToParents: true
+            }),
+            new webpack.optimize.CommonsChunkPlugin({
+                name: 'common',
+                async: true,
+                children: true,
+                minChunks: Infinity
+            }),
+            // new Manifest(path.join(_path + '/config', 'manifest.json'), {
+            //     rootAssetPath: rootAssetPath,
+            //     ignorePaths: ['.DS_Store']
+            // }),
+            new ExtractTextPlugin('assets/styles/css/[name]' + (NODE_ENV === 'development' ? '' : '.[chunkhash]') + '.css', {allChunks: true})
+        ]
+    };
+
+    if (NODE_ENV !== 'development') {
+        webpackConfig.plugins = webpackConfig.plugins.concat([
+            new webpack.optimize.UglifyJsPlugin({
+                minimize: true,
+                warnings: false,
+                sourceMap: true
+            })
+        ]);
+    }
+
+    return webpackConfig;
+
+};

http://git-wip-us.apache.org/repos/asf/ignite/blob/5f425aab/modules/web-console/src/main/js/gulpfile.babel.js/webpack/manifest.json
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/manifest.json b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/manifest.json
new file mode 100644
index 0000000..1b08f72
--- /dev/null
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/manifest.json
@@ -0,0 +1 @@
+{"assets":{"app.map":"app.js.map","polyfill.map":"polyfill.js.map","vendor.map":"vendor.js.map","common.map":"common.js.map"},"publicPath":"/"}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/5f425aab/modules/web-console/src/main/js/webpack.config.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/webpack.config.js b/modules/web-console/src/main/js/webpack.config.js
index 91b3c3b..b706876 100644
--- a/modules/web-console/src/main/js/webpack.config.js
+++ b/modules/web-console/src/main/js/webpack.config.js
@@ -4,11 +4,11 @@ var _ = require('lodash');
 var _configs = {
 
   // global section
-  global: require(__dirname + '/config/webpack/global'),
+  global: require(__dirname + '/gulpfile.babel.js/webpack/global'),
 
   // config by enviroments
-  production: require(__dirname + '/config/webpack/environments/production'),
-  development: require(__dirname + '/config/webpack/environments/development')
+  production: require(__dirname + '/gulpfile.babel.js/webpack/environments/production'),
+  development: require(__dirname + '/gulpfile.babel.js/webpack/environments/development')
 };
 
 var _load = function() {


[06/50] [abbrv] ignite git commit: IGNITE-3223 Fixed wrong value in table editor.

Posted by an...@apache.org.
IGNITE-3223 Fixed wrong value in table editor.


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

Branch: refs/heads/ignite-3262
Commit: 5a005e738343b89c12c6722e6e939e21f7b9342c
Parents: 555fbb9
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Thu Jun 2 17:29:55 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Thu Jun 2 17:29:55 2016 +0700

----------------------------------------------------------------------
 modules/web-console/src/main/js/app/helpers/jade/mixins.jade | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/5a005e73/modules/web-console/src/main/js/app/helpers/jade/mixins.jade
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/helpers/jade/mixins.jade b/modules/web-console/src/main/js/app/helpers/jade/mixins.jade
index 341d351..a96db33 100644
--- a/modules/web-console/src/main/js/app/helpers/jade/mixins.jade
+++ b/modules/web-console/src/main/js/app/helpers/jade/mixins.jade
@@ -353,7 +353,7 @@ mixin table-text-field(field, items, valid, save, placeholder, newItem)
     -var onBlur = valid + ' && ( ' + save + '); ' + resetOnBlur + ';'
 
     ignite-form-field-input-text(
-        data-name=field
+        data-name='#{field}{{ $index || "" }}'
         data-ng-model=field
         data-ng-required='true'
         data-placeholder=placeholder
@@ -376,7 +376,7 @@ mixin table-java-class-field(lbl, field, items, valid, save, newItem)
     -var onBlur = valid + ' && ( ' + save + '); ' + resetOnBlur + ';'
 
     ignite-form-field-input-text(
-        data-name=field
+        data-name='#{field}{{ $index || "" }}'
         data-ng-model=field
         data-ng-required='true'
         data-ignite-unique=items
@@ -411,7 +411,7 @@ mixin table-java-package-field(field, items, valid, save, newItem)
     -var onBlur = valid + ' && ( ' + save + '); ' + resetOnBlur + ';'
 
     ignite-form-field-input-text(
-        data-name=field
+        data-name='#{field}{{ $index || "" }}'
         data-ng-model=field
         data-ng-required='true'
         data-placeholder='Enter package name'
@@ -436,7 +436,7 @@ mixin table-address-field(field, items, valid, save, newItem, portRange)
     -var onBlur = valid + ' && ( ' + save + '); ' + resetOnBlur + ';'
 
     ignite-form-field-input-text(
-        data-name=field
+        data-name='#{field}{{ $index || "" }}'
         data-ng-model=field
         data-ng-required='true'
         data-placeholder='IP address:port'


[03/50] [abbrv] ignite git commit: GG-11183 Added info/error message on cache start.

Posted by an...@apache.org.
GG-11183 Added info/error message on cache start.


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

Branch: refs/heads/ignite-3262
Commit: 92f1b240d44311c33c19200bd483030b8c5dfb2d
Parents: 9cfc937
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Thu Jun 2 11:40:01 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Thu Jun 2 11:40:01 2016 +0700

----------------------------------------------------------------------
 modules/web-console/src/main/js/controllers/common-module.js  | 2 +-
 modules/web-console/src/main/js/public/stylesheets/style.scss | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/92f1b240/modules/web-console/src/main/js/controllers/common-module.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/controllers/common-module.js b/modules/web-console/src/main/js/controllers/common-module.js
index 1cce7f3..9ddcdbf 100644
--- a/modules/web-console/src/main/js/controllers/common-module.js
+++ b/modules/web-console/src/main/js/controllers/common-module.js
@@ -156,7 +156,7 @@ consoleModule.service('$common', ['$alert', '$popover', '$anchorScroll', '$locat
                 title: errorMessage(msg),
                 placement: placement ? placement : 'top-right',
                 container: container ? container : 'body',
-                duration: persistent ? false : 5
+                duration: persistent ? false : 10
             });
 
             msgModal.$scope.icon = icon ? icon : 'fa-exclamation-triangle';

http://git-wip-us.apache.org/repos/asf/ignite/blob/92f1b240/modules/web-console/src/main/js/public/stylesheets/style.scss
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/public/stylesheets/style.scss b/modules/web-console/src/main/js/public/stylesheets/style.scss
index 589028c..10e71f4 100644
--- a/modules/web-console/src/main/js/public/stylesheets/style.scss
+++ b/modules/web-console/src/main/js/public/stylesheets/style.scss
@@ -1346,6 +1346,7 @@ label.required:after {
     position: fixed;
     z-index: 1050;
     margin: 20px;
+    max-width: 700px;
 
     &.top-right {
         top: 60px;


[29/50] [abbrv] ignite git commit: WIP Fixed gulp build.

Posted by an...@apache.org.
WIP Fixed gulp build.


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

Branch: refs/heads/ignite-3262
Commit: 00d3d90d93fba0ca42e7e2ed1cde64501db0b756
Parents: f09d217
Author: Maxim Afanasiev <ma...@gmail.com>
Authored: Thu Jun 9 18:57:38 2016 +0700
Committer: Maxim Afanasiev <ma...@gmail.com>
Committed: Thu Jun 9 18:57:38 2016 +0700

----------------------------------------------------------------------
 modules/web-console/src/main/js/app/index.js    |  13 +-
 .../main/js/app/modules/form/field/field.css    |   2 +-
 modules/web-console/src/main/js/app/vendor.js   |   6 +-
 .../src/main/js/gulpfile.babel.js/paths.js      |   8 +-
 .../main/js/gulpfile.babel.js/tasks/bundle.js   |  10 +-
 .../webpack/environments/development.js         |  64 +++++-----
 .../webpack/environments/production.js          |  18 +--
 .../main/js/gulpfile.babel.js/webpack/global.js | 125 +++++++++----------
 modules/web-console/src/main/js/package.json    |  20 ++-
 .../web-console/src/main/js/views/index.jade    |   2 +-
 10 files changed, 137 insertions(+), 131 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/00d3d90d/modules/web-console/src/main/js/app/index.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/index.js b/modules/web-console/src/main/js/app/index.js
index 27b572c..91b7b84 100644
--- a/modules/web-console/src/main/js/app/index.js
+++ b/modules/web-console/src/main/js/app/index.js
@@ -14,19 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-import _ from 'lodash';
-import angular from 'angular';
-import pdfMake from 'pdfmake';
-
-window._ = _;
-window.pdfMake = pdfMake;
-
-
 import '../public/stylesheets/style.scss';
 
-
-
 import './decorator/select';
 import './decorator/tooltip';
 
@@ -149,7 +138,7 @@ angular
     'ignite-console.version',
     'ignite-console.loading',
     // Ignite legacy module.
-    'ignite-console.legacy',
+    'ignite-console.legacy'
     // Ignite modules.
     // 'ignite-console.modules'
 ])

http://git-wip-us.apache.org/repos/asf/ignite/blob/00d3d90d/modules/web-console/src/main/js/app/modules/form/field/field.css
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/form/field/field.css b/modules/web-console/src/main/js/app/modules/form/field/field.css
index 8dfe05e..3ea64f4 100644
--- a/modules/web-console/src/main/js/app/modules/form/field/field.css
+++ b/modules/web-console/src/main/js/app/modules/form/field/field.css
@@ -16,7 +16,7 @@
  */
 
 .indexField {
-	float: left;
+    float: left;
     line-height: 28px;
     margin-right: 5px;
     color: #ec1c24;

http://git-wip-us.apache.org/repos/asf/ignite/blob/00d3d90d/modules/web-console/src/main/js/app/vendor.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/vendor.js b/modules/web-console/src/main/js/app/vendor.js
index 1361792..e71111f 100644
--- a/modules/web-console/src/main/js/app/vendor.js
+++ b/modules/web-console/src/main/js/app/vendor.js
@@ -15,7 +15,6 @@ import 'angular-nvd3';
 import 'angular-tree-control';
 import 'angular-gridster';
 import 'bootstrap-sass/assets/javascripts/bootstrap/carousel';
-import 'nvd3';
 import 'brace';
 import 'brace/mode/xml';
 import 'brace/mode/sql';
@@ -26,9 +25,12 @@ import 'font-awesome-webpack';
 import 'file-saver';
 import 'jszip';
 import 'query-command-supported';
-
 import 'angular-gridster/dist/angular-gridster.min.css';
 import 'angular-tree-control/css/tree-control-attribute.css';
 import 'angular-tree-control/css/tree-control.css';
 import 'angular-ui-grid/ui-grid.css';
 import 'angular-motion/dist/angular-motion.css';
+
+// import pdfMake from 'pdfmake';
+
+// window.pdfMake = pdfMake;

http://git-wip-us.apache.org/repos/asf/ignite/blob/00d3d90d/modules/web-console/src/main/js/gulpfile.babel.js/paths.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/paths.js b/modules/web-console/src/main/js/gulpfile.babel.js/paths.js
index 83372f9..8de6bcb 100644
--- a/modules/web-console/src/main/js/gulpfile.babel.js/paths.js
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/paths.js
@@ -17,11 +17,12 @@
 
 import path from 'path';
 
-const srcDir = './app';
-const destDir = './dist';
+const rootDir = path.resolve('./');
+const srcDir = path.resolve('app');
+const destDir = path.resolve('dist');
 
 const igniteModulesDir = process.env.IGNITE_MODULES ? path.normalize(process.env.IGNITE_MODULES) : './ignite_modules';
-const igniteModulesTemp = './ignite_modules_temp';
+const igniteModulesTemp = path.resolve('ignite_modules_temp');
 
 const sassPaths = [
     './public/stylesheets/*.scss'
@@ -80,6 +81,7 @@ const appModulePaths = [
 ];
 
 export {
+    rootDir,
     srcDir,
     destDir,
     igniteModulesDir,

http://git-wip-us.apache.org/repos/asf/ignite/blob/00d3d90d/modules/web-console/src/main/js/gulpfile.babel.js/tasks/bundle.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/bundle.js b/modules/web-console/src/main/js/gulpfile.babel.js/tasks/bundle.js
index bdff139..c584665 100644
--- a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/bundle.js
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/tasks/bundle.js
@@ -39,11 +39,9 @@ gulp.task('bundle', ['bundle:ignite']);
 
 // Package all external dependencies and ignite-console.
 gulp.task('bundle:ignite', (cb) => {
-    const bundler = webpack(webpackConfig, (err) => {
-            // if(err) throw new gutil.PluginError("webpack", err);
-            cb();
-    });
+    const compiler = webpack(webpackConfig, cb);
 
-    if(process.env.NODE_ENV==='development')
-        new WebpackDevServer(bundler).listen(webpackConfig.devServer.port, 'localhost', cb);
+    if(process.env.NODE_ENV==='development' && webpackConfig.devServer)
+        new WebpackDevServer(compiler, webpackConfig.devServer)
+            .listen(webpackConfig.devServer.port || 9000, 'localhost');
 });

http://git-wip-us.apache.org/repos/asf/ignite/blob/00d3d90d/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/development.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/development.js b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/development.js
index eddff63..fc3c3af 100644
--- a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/development.js
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/development.js
@@ -1,24 +1,38 @@
 'use strict';
-var webpack = require('webpack');
-var ProgressPlugin = require('webpack/lib/ProgressPlugin');
-var HtmlWebpackPlugin = require("html-webpack-plugin");
-var path = require('path');
-var jade = require('jade');
 
-module.exports = function (_path) {
-    var chars = 0,
+import webpack from 'webpack';
+import ProgressPlugin from 'webpack/lib/ProgressPlugin';
+import HtmlWebpackPlugin from 'html-webpack-plugin';
+import {destDir, rootDir} from '../../paths';
+import jade from 'jade';
+import path from 'path';
+
+module.exports = function () {
+    let chars = 0,
         lastState, lastStateTime;
 
-    var plugins = [
+    const _goToLineStart = (nextMessage) => {
+        var str = "";
+        for (; chars > nextMessage.length; chars--) {
+            str += "\b \b";
+        }
+        chars = nextMessage.length;
+        for (var i = 0; i < chars; i++) {
+            str += "\b";
+        }
+        if (str) process.stderr.write(str);
+    };
+
+    let plugins = [
         new webpack.HotModuleReplacementPlugin(),
         new HtmlWebpackPlugin({
             filename: 'index.html',
             templateContent: function () {
-                return jade.renderFile(path.join(_path, 'views', 'index.jade'));
+                return jade.renderFile(path.join(rootDir, 'views', 'index.jade'));
             },
             title: 'DEBUG:Ignite Web Console'
         }),
-        new ProgressPlugin(function (percentage, msg) {
+        new ProgressPlugin((percentage, msg) => {
             var state = msg;
             if (percentage < 1) {
                 percentage = Math.floor(percentage * 100);
@@ -38,41 +52,31 @@ module.exports = function (_path) {
                 var now = +new Date();
                 if (lastState) {
                     var stateMsg = (now - lastStateTime) + "ms " + lastState;
-                    goToLineStart(stateMsg);
+                    _goToLineStart(stateMsg);
                     process.stderr.write(stateMsg + "\n");
                     chars = 0;
                 }
                 lastState = state;
                 lastStateTime = now;
             }
-            goToLineStart(msg);
+            _goToLineStart(msg);
             process.stderr.write(msg);
         })
     ];
 
-    function goToLineStart(nextMessage) {
-        var str = "";
-        for (; chars > nextMessage.length; chars--) {
-            str += "\b \b";
-        }
-        chars = nextMessage.length;
-        for (var i = 0; i < chars; i++) {
-            str += "\b";
-        }
-        if (str) process.stderr.write(str);
-    }
 
     return {
-        context: _path,
+        context: rootDir,
         debug: true,
-        devtool: 'cheap-source-map',
+        devtool: 'eval',
         devServer: {
             historyApiFallback: true,
-            publicPath: '/',
-            contentBase: './dist',
-            info: true,
-            hot: true,
-            inline: false,
+            // publicPath: '/',
+            contentBase: destDir,
+            // info: true,
+            // hot: true,
+            // inline: true,
+            // quiet: false,
             proxy: {
                 '/socket.io': {
                     target: 'http://localhost:3000',

http://git-wip-us.apache.org/repos/asf/ignite/blob/00d3d90d/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/production.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/production.js b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/production.js
index dc91d0c..d2f1345 100644
--- a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/production.js
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/production.js
@@ -1,26 +1,30 @@
 'use strict';
-var HtmlWebpackPlugin = require("html-webpack-plugin");
-var path = require('path');
-var jade = require('jade');
+import HtmlWebpackPlugin from 'html-webpack-plugin';
+import webpack from 'webpack';
+import path from 'path';
+import jade from 'jade';
+
+import {destDir, rootDir} from '../../paths';
 
 module.exports = function (_path) {
     return {
-        context: _path,
+        context: rootDir,
         debug: false,
         devtool: 'cheap-source-map',
         output: {
             publicPath: '/',
             filename: '[name].[chunkhash].js',
-            contentBase: './dist'
+            contentBase: destDir
         },
         plugins: [
             new HtmlWebpackPlugin({
                 filename: 'index.html',
-                templateContent: function () {
+                templateContent: () => {
                     return jade.renderFile(path.join(_path, 'views', 'index.jade'));
                 },
                 title: 'Ignite Web Console'
-            })
+            }),
+            new webpack.optimize.DedupePlugin()
         ]
     };
 };
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/00d3d90d/modules/web-console/src/main/js/gulpfile.babel.js/webpack/global.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/global.js b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/global.js
index ca5128d..c8ea2c7 100644
--- a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/global.js
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/global.js
@@ -1,62 +1,61 @@
 'use strict';
 
-// Depends
-var path = require('path');
-var webpack = require('webpack');
-var autoprefixer = require('autoprefixer-core');
-// var Manifest = require('manifest-revision-webpack-plugin');
-var ExtractTextPlugin = require("extract-text-webpack-plugin");
+import path from 'path';
+import webpack from 'webpack';
+import autoprefixer from 'autoprefixer-core';
+//import  Manifest from 'manifest-revision-webpack-plugin';
+import ExtractTextPlugin from 'extract-text-webpack-plugin';
+import {srcDir, destDir, rootDir} from '../paths';
 
-var NODE_ENV = process.env.NODE_ENV || "production";
-var DEVELOPMENT = NODE_ENV === "production" ? false : true;
-var stylesLoader = 'css-loader?sourceMap!postcss-loader!sass-loader?outputStyle=expanded&sourceMap=true&sourceMapContents=true';
+const NODE_ENV = process.env.NODE_ENV || 'production';
+const IS_DEVELOPMENT = NODE_ENV === 'development';
+const stylesLoader = 'css-loader?sourceMap!postcss-loader!sass-loader?outputStyle=expanded&sourceMap=true&sourceMapContents=true';
 
 
 module.exports = function (_path) {
-    var rootAssetPath = _path + 'src';
 
-    var webpackConfig = {
+    const NODE_MODULES_PATH = path.resolve('node_modules');
+    const webpackConfig = {
         node: {
             fs: 'empty'
         },
         // entry points
         entry: {
-            vendor: _path + '/app/vendor.js',
-            app: _path + '/app/index.js',
-            polyfill: 'babel-polyfill'
+            polyfill: 'babel-polyfill',
+            app: srcDir + '/index.js',
+            vendor: srcDir + '/vendor.js',
         },
 
-
-        // output system
+        // // output system
         output: {
-            path: path.resolve("dist"),
-            filename: '[name].js',
-            publicPath: '/'
+            path: destDir,
+            filename: '[name].js'
         },
 
         // resolves modules
         resolve: {
             extensions: ['', '.js'],
-            modulesDirectories: ['node_modules', './'],
+            root : rootDir,
+            modulesDirectories: [NODE_MODULES_PATH, './'],
             alias: {
-                _appRoot: path.join(_path, 'app'),
-                _images: path.join(_path, 'app', 'assets', 'images'),
-                _stylesheets: path.join(_path, 'app', 'assets', 'styles'),
-                _scripts: path.join(_path, 'app', 'assets', 'js'),
-                ace: path.join(_path, 'node_modules', 'ace-builds', 'src')
+                // _appRoot: path.join(_path, 'app'),
+                // _images: path.join(_path, 'app', 'assets', 'images'),
+                // _stylesheets: path.join(_path, 'app', 'assets', 'styles'),
+                // _scripts: path.join(_path, 'app', 'assets', 'js'),
+                // ace: path.join(_path, 'node_modules', 'ace-builds', 'src')
             }
         },
 
         // modules resolvers
         module: {
             noParse: [],
-            preLoaders: [
-                {
-                    test: /\.js$/,
-                    exclude: [path.resolve(_path, "node_modules")],
-                    loader: 'eslint-loader'
-                }
-            ],
+            // preLoaders: [
+            //     {
+            //         test: /\.js$/,
+            //         exclude: [NODE_MODULES_PATH],
+            //         loader: 'eslint-loader'
+            //     }
+            // ],
             loaders: [
                 {
                     test: /\.json$/,
@@ -70,18 +69,18 @@ module.exports = function (_path) {
                         'jade-html-loader'
                     ]
                 },
+                // {
+                //     test: /\.js$/,
+                //     loaders: ['baggage-loader?[file].html&[file].css']
+                // },
+                // {
+                //     test: /\.js$/,
+                //     exclude: [NODE_MODULES_PATH],
+                //     loaders: ['ng-annotate-loader']
+                // },
                 {
                     test: /\.js$/,
-                    loaders: ['baggage-loader?[file].html&[file].css']
-                },
-                {
-                    test: /\.js$/,
-                    exclude: [path.resolve(_path, "node_modules")],
-                    loaders: ['ng-annotate-loader']
-                },
-                {
-                    test: /\.js$/,
-                    exclude: [path.resolve(_path, "node_modules")],
+                    exclude: [NODE_MODULES_PATH],
                     loader: 'babel-loader',
                     query: {
                         cacheDirectory: true,
@@ -95,27 +94,31 @@ module.exports = function (_path) {
                 },
                 {
                     test: /\.(scss|sass)$/,
-                    loader: DEVELOPMENT ? ('style-loader!' + stylesLoader) : ExtractTextPlugin.extract('style-loader', stylesLoader)
+                    loader: IS_DEVELOPMENT ? ('style-loader!' + stylesLoader) : ExtractTextPlugin.extract('style-loader', stylesLoader)
                 },
                 {
                     test: /\.(woff2|woff|ttf|eot|svg)?(\?v=[0-9]\.[0-9]\.[0-9])?$/,
                     loaders: [
-                        "url-loader?name=fonts/[name]_[hash].[ext]"
+                        'url-loader?name=fonts/[name]_[hash].[ext]'
                     ]
                 },
                 {
                     test: /\.(jpe?g|png|gif)$/i,
                     loaders: ['url-loader?name=images/[name]_[hash].[ext]']
-                },
-                {
-                    test: require.resolve("angular"),
-                    loaders: ["expose?angular"]
-                },
-                {
-                    test: require.resolve("jquery"),
-                    loaders: ["expose?$", "expose?jQuery"]
                 }
-
+                // {
+                //     test: require.resolve("jquery"),
+                //     loaders: [
+                //         "expose?$",
+                //         "expose?jQuery"
+                //     ]
+                // },
+                // {
+                //     test: require.resolve("angular"),
+                //     loaders: [
+                //         "expose?angular"
+                //     ]
+                // }
             ]
         },
 
@@ -124,37 +127,31 @@ module.exports = function (_path) {
 
         // load plugins
         plugins: [
-            //new webpack.ContextReplacementPlugin(/moment[\/\\]locale$/, /en|hu/),
             new webpack.ProvidePlugin({
                 $: 'jquery',
                 jQuery: 'jquery',
                 _: 'lodash',
                 nv: 'nvd3'
             }),
-            new webpack.DefinePlugin({
-                'NODE_ENV': JSON.stringify(NODE_ENV)
-            }),
+            new webpack.DefinePlugin({'NODE_ENV': JSON.stringify(NODE_ENV)}),
             new webpack.NoErrorsPlugin(),
-            new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/),
-            new webpack.optimize.DedupePlugin(),
-            new webpack.optimize.AggressiveMergingPlugin({
-                moveToParents: true
-            }),
+            new webpack.optimize.AggressiveMergingPlugin({moveToParents: true}),
             new webpack.optimize.CommonsChunkPlugin({
                 name: 'common',
                 async: true,
                 children: true,
                 minChunks: Infinity
             }),
+
             // new Manifest(path.join(_path + '/config', 'manifest.json'), {
             //     rootAssetPath: rootAssetPath,
             //     ignorePaths: ['.DS_Store']
             // }),
-            new ExtractTextPlugin('assets/styles/css/[name]' + (NODE_ENV === 'development' ? '' : '.[chunkhash]') + '.css', {allChunks: true})
+            new ExtractTextPlugin('assets/css/[name]' + (IS_DEVELOPMENT ? '' : '.[chunkhash]') + '.css', {allChunks: true})
         ]
     };
 
-    if (NODE_ENV !== 'development') {
+    if (!IS_DEVELOPMENT) {
         webpackConfig.plugins = webpackConfig.plugins.concat([
             new webpack.optimize.UglifyJsPlugin({
                 minimize: true,

http://git-wip-us.apache.org/repos/asf/ignite/blob/00d3d90d/modules/web-console/src/main/js/package.json
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/package.json b/modules/web-console/src/main/js/package.json
index 9bdf2ec..c71f7c5 100644
--- a/modules/web-console/src/main/js/package.json
+++ b/modules/web-console/src/main/js/package.json
@@ -93,7 +93,6 @@
     "ngtemplate-loader": "^1.3.1",
     "node-sass": "^3.4.2",
     "nodemailer": "^2.3.0",
-    "oclazyload": "^1.0.9",
     "passport": "^0.3.2",
     "passport-local": "^1.0.0",
     "passport-local-mongoose": "^4.0.0",
@@ -107,21 +106,32 @@
     "socket.io": "^1.4.5",
     "socket.io-client": "^1.4.6",
     "style-loader": "^0.13.1",
-    "swagger-client-generator": "^0.2.13",
     "ui-router-metatags": "^1.0.3",
     "url": "^0.11.0",
     "url-loader": "^0.5.6",
     "webpack": "^1.12.12",
-    "webpack-dev-server": "1.14.0",
     "ws": "^0.8.0"
   },
   "devDependencies": {
+    "gulp": "^3.9.0",
+    "gulp-cached": "^1.1.0",
+    "gulp-connect": "^3.2.2",
+    "gulp-environments": "^0.1.1",
+    "gulp-eslint": "^2.0.0",
+    "gulp-html-replace": "^1.5.5",
+    "gulp-ignore": "^2.0.1",
+    "gulp-inject": "^4.0.0",
+    "gulp-jade": "^1.1.0",
+    "gulp-rimraf": "^0.2.0",
+    "gulp-sass": "^2.1.0",
+    "gulp-sequence": "^0.4.1",
+    "gulp-util": "^3.0.7",
     "http-proxy-middleware": "^0.13.0",
     "json-loader": "^0.5.4",
-    "jspm": "^0.16.32",
     "mocha": "~2.4.5",
     "morgan": "^1.7.0",
     "should": "^8.3.0",
-    "supertest": "^1.1.0"
+    "supertest": "^1.1.0",
+    "webpack-dev-server": "1.14.0"
   }
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/00d3d90d/modules/web-console/src/main/js/views/index.jade
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/views/index.jade b/modules/web-console/src/main/js/views/index.jade
index 8690753..757f281 100644
--- a/modules/web-console/src/main/js/views/index.jade
+++ b/modules/web-console/src/main/js/views/index.jade
@@ -42,7 +42,7 @@ html(ng-app='ignite-console' id='app' ng-strict-di)
 
 
         = '{% for (var chunk in o.htmlWebpackPlugin.files.chunks) { %}'
-        script(src="{%=o.htmlWebpackPlugin.files.chunks[chunk].entry %}")
+        script(src='{%=o.htmlWebpackPlugin.files.chunks[chunk].entry %}')
         = '{% } %}'
 
     body.theme-line.body-overlap.greedy


[36/50] [abbrv] ignite git commit: IGNITE-2047 Fixed placeholders

Posted by an...@apache.org.
IGNITE-2047 Fixed placeholders


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

Branch: refs/heads/ignite-3262
Commit: e05289915a8705a0ebe74e8f6942de80b8a9ff6c
Parents: ecce865
Author: vsisko <vs...@gridgain.com>
Authored: Wed Jun 15 10:36:02 2016 +0700
Committer: vsisko <vs...@gridgain.com>
Committed: Wed Jun 15 10:36:02 2016 +0700

----------------------------------------------------------------------
 .../js/app/modules/states/configuration/clusters/attributes.jade | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/e0528991/modules/web-console/src/main/js/app/modules/states/configuration/clusters/attributes.jade
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/attributes.jade b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/attributes.jade
index 15e931a..e6ffd50 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/attributes.jade
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/attributes.jade
@@ -49,10 +49,10 @@ form.panel.panel-default(name=form novalidate)
                                             a.labelFormField(ng-click='tableStartEdit(backupItem, attributesTbl, $index)') {{item.name}} = {{item.value}}
                                             +btn-remove('tableRemove(backupItem, attributesTbl, $index)', '"Remove attribute"')
                                         td.col-sm-12(ng-show='tableEditing(attributesTbl, $index)')
-                                            +table-pair-edit('attributesTbl', 'cur', 'Field name', 'Field Attribute', false, false, '{{::attributesTbl.focusId + $index}}', '$index', '=')
+                                            +table-pair-edit('attributesTbl', 'cur', 'Attribute name', 'Attribute value', false, false, '{{::attributesTbl.focusId + $index}}', '$index', '=')
                                 tfoot(ng-show='tableNewItemActive(attributesTbl)')
                                     tr
                                         td.col-sm-12
-                                            +table-pair-edit('attributesTbl', 'new', 'Field name', 'Field Attribute', false, false, '{{::attributesTbl.focusId + $index}}', '-1', '=')
+                                            +table-pair-edit('attributesTbl', 'new', 'Attribute name', 'Attribute value', false, false, '{{::attributesTbl.focusId + $index}}', '-1', '=')
             .col-sm-6
                 +preview-xml-java(model, 'clusterUserAttributes')


[17/50] [abbrv] ignite git commit: IGNITE-3236 Fixed eslint warnigs + fixed several typos.

Posted by an...@apache.org.
IGNITE-3236 Fixed eslint warnigs + fixed several typos.


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

Branch: refs/heads/ignite-3262
Commit: f97b7576f3e7ddc418d39f3bc37c76c07f0dbeff
Parents: 512180a
Author: vsisko <vs...@gridgain.com>
Authored: Mon Jun 6 21:50:41 2016 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Mon Jun 6 21:50:41 2016 +0700

----------------------------------------------------------------------
 .../main/js/controllers/caches-controller.js    | 102 +++++---------
 .../main/js/controllers/clusters-controller.js  | 137 +++++++++----------
 .../src/main/js/controllers/common-module.js    |  35 +++++
 .../main/js/controllers/domains-controller.js   |  70 +++-------
 4 files changed, 160 insertions(+), 184 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/f97b7576/modules/web-console/src/main/js/controllers/caches-controller.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/controllers/caches-controller.js b/modules/web-console/src/main/js/controllers/caches-controller.js
index e8714e7..2d27164 100644
--- a/modules/web-console/src/main/js/controllers/caches-controller.js
+++ b/modules/web-console/src/main/js/controllers/caches-controller.js
@@ -243,88 +243,60 @@ consoleModule.controller('cachesController', [
             return true;
         }
 
-        // Check cache logical consistency.
-        function validate(item) {
-            $common.hidePopover();
-
-            if ($common.isEmptyString(item.name))
-                return showPopoverMessage($scope.ui, 'general', 'cacheName', 'Cache name should not be empty!');
-
-            if (item.memoryMode === 'ONHEAP_TIERED' && item.offHeapMaxMemory > 0 && !$common.isDefined(item.evictionPolicy.kind))
-                return showPopoverMessage($scope.ui, 'memory', 'evictionPolicyKind', 'Eviction policy should not be configured!');
-
-            const form = $scope.ui.inputForm;
-            const errors = form.$error;
-            const errKeys = Object.keys(errors);
-
-            if (errKeys && errKeys.length > 0) {
-                const firstErrorKey = errKeys[0];
+        function checkStoreFactoryBean(storeFactory, beanFieldId) {
+            if (!$common.isValidJavaIdentifier('Data source bean', storeFactory.dataSourceBean, beanFieldId, $scope.ui, 'store'))
+                return false;
 
-                const firstError = errors[firstErrorKey][0];
-                const actualError = firstError.$error[firstErrorKey][0];
+            return checkDataSources();
+        }
 
-                const errNameFull = actualError.$name;
-                const errNameShort = errNameFull.endsWith('TextInput') ? errNameFull.substring(0, errNameFull.length - 9) : errNameFull;
+        function checkStoreFactory(item) {
+            const cacheStoreFactorySelected = item.cacheStoreFactory && item.cacheStoreFactory.kind;
 
-                const extractErrorMessage = function(errName) {
-                    try {
-                        return errors[firstErrorKey][0].$errorMessages[errName][firstErrorKey];
-                    }
-                    catch (ignored) {
-                        try {
-                            return form[firstError.$name].$errorMessages[errName][firstErrorKey];
-                        }
-                        catch (ignited) {
-                            return false;
-                        }
-                    }
-                };
+            if (cacheStoreFactorySelected) {
+                const storeFactory = item.cacheStoreFactory[item.cacheStoreFactory.kind];
 
-                const msg = extractErrorMessage(errNameFull) || extractErrorMessage(errNameShort) || 'Invalid value!';
+                if (item.cacheStoreFactory.kind === 'CacheJdbcPojoStoreFactory' && !checkStoreFactoryBean(storeFactory, 'pojoDataSourceBean'))
+                    return false;
 
-                return showPopoverMessage($scope.ui, firstError.$name, errNameFull, msg);
+                if (item.cacheStoreFactory.kind === 'CacheJdbcBlobStoreFactory' && storeFactory.connectVia !== 'URL'
+                    && !checkStoreFactoryBean(storeFactory, 'blobDataSourceBean'))
+                    return false;
             }
 
-            if (item.memoryMode === 'OFFHEAP_VALUES' && !_.isEmpty(item.domains))
-                return showPopoverMessage($scope.ui, 'memory', 'memoryMode', 'Query indexing could not be enabled while values are stored off-heap!');
+            if ((item.readThrough || item.writeThrough) && !cacheStoreFactorySelected)
+                return showPopoverMessage($scope.ui, 'store', 'cacheStoreFactory', (item.readThrough ? 'Read' : 'Write') + ' through are enabled but store is not configured!');
 
-            if (item.memoryMode === 'OFFHEAP_TIERED' && (!$common.isDefined(item.offHeapMaxMemory) || item.offHeapMaxMemory < 0))
-                return showPopoverMessage($scope.ui, 'memory', 'offHeapMaxMemory', 'Off-heap max memory should be specified!');
+            if (item.writeBehindEnabled && !cacheStoreFactorySelected)
+                return showPopoverMessage($scope.ui, 'store', 'cacheStoreFactory', 'Write behind enabled but store is not configured!');
 
-            const cacheStoreFactorySelected = item.cacheStoreFactory && item.cacheStoreFactory.kind;
+            if (cacheStoreFactorySelected && !item.readThrough && !item.writeThrough)
+                return showPopoverMessage($scope.ui, 'store', 'readThroughTooltip', 'Store is configured but read/write through are not enabled!');
 
-            if (cacheStoreFactorySelected) {
-                const storeFactory = item.cacheStoreFactory[item.cacheStoreFactory.kind];
+            return true;
+        }
 
-                if (item.cacheStoreFactory.kind === 'CacheJdbcPojoStoreFactory') {
-                    if (!$common.isValidJavaIdentifier('Data source bean', storeFactory.dataSourceBean, 'pojoDataSourceBean', $scope.ui, 'store'))
-                        return false;
+        // Check cache logical consistency.
+        function validate(item) {
+            $common.hidePopover();
 
-                    if (!checkDataSources())
-                        return false;
-                }
+            if ($common.isEmptyString(item.name))
+                return showPopoverMessage($scope.ui, 'general', 'cacheName', 'Cache name should not be empty!');
 
-                if (item.cacheStoreFactory.kind === 'CacheJdbcBlobStoreFactory') {
-                    if (storeFactory.connectVia !== 'URL') {
-                        if (!$common.isValidJavaIdentifier('Data source bean', storeFactory.dataSourceBean, 'blobDataSourceBean', $scope.ui, 'store'))
-                            return false;
+            if (item.memoryMode === 'ONHEAP_TIERED' && item.offHeapMaxMemory > 0 && !$common.isDefined(item.evictionPolicy.kind))
+                return showPopoverMessage($scope.ui, 'memory', 'evictionPolicyKind', 'Eviction policy should not be configured!');
 
-                        if (!checkDataSources())
-                            return false;
-                    }
-                }
-            }
+            if (!$common.checkFieldValidators($scope.ui))
+                return false;
 
-            if ((item.readThrough || item.writeThrough) && !cacheStoreFactorySelected)
-                return showPopoverMessage($scope.ui, 'store', 'cacheStoreFactory', (item.readThrough ? 'Read' : 'Write') + ' through are enabled but store is not configured!');
+            if (item.memoryMode === 'OFFHEAP_VALUES' && !_.isEmpty(item.domains))
+                return showPopoverMessage($scope.ui, 'memory', 'memoryMode', 'Query indexing could not be enabled while values are stored off-heap!');
 
-            if (item.writeBehindEnabled && !cacheStoreFactorySelected)
-                return showPopoverMessage($scope.ui, 'store', 'cacheStoreFactory', 'Write behind enabled but store is not configured!');
+            if (item.memoryMode === 'OFFHEAP_TIERED' && (!$common.isDefined(item.offHeapMaxMemory) || item.offHeapMaxMemory < 0))
+                return showPopoverMessage($scope.ui, 'memory', 'offHeapMaxMemory', 'Off-heap max memory should be specified!');
 
-            if (cacheStoreFactorySelected) {
-                if (!item.readThrough && !item.writeThrough)
-                    return showPopoverMessage($scope.ui, 'store', 'readThroughTooltip', 'Store is configured but read/write through are not enabled!');
-            }
+            if (!checkStoreFactory(item))
+                return false;
 
             if (item.writeBehindFlushSize === 0 && item.writeBehindFlushFrequency === 0)
                 return showPopoverMessage($scope.ui, 'store', 'writeBehindFlushSize', 'Both "Flush frequency" and "Flush size" are not allowed as 0!');

http://git-wip-us.apache.org/repos/asf/ignite/blob/f97b7576/modules/web-console/src/main/js/controllers/clusters-controller.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/controllers/clusters-controller.js b/modules/web-console/src/main/js/controllers/clusters-controller.js
index 5faadb5..7da00a5 100644
--- a/modules/web-console/src/main/js/controllers/clusters-controller.js
+++ b/modules/web-console/src/main/js/controllers/clusters-controller.js
@@ -334,47 +334,9 @@ consoleModule.controller('clustersController', [
             return _.findIndex($scope.caches, (cache) => cache.value === cacheId);
         };
 
-        // Check cluster logical consistency.
-        function validate(item) {
-            $common.hidePopover();
-
-            if ($common.isEmptyString(item.name))
-                return showPopoverMessage($scope.ui, 'general', 'clusterName', 'Cluster name should not be empty!');
-
-            const form = $scope.ui.inputForm;
-            const errors = form.$error;
-            const errKeys = Object.keys(errors);
-
-            if (errKeys && errKeys.length > 0) {
-                const firstErrorKey = errKeys[0];
-
-                const firstError = errors[firstErrorKey][0];
-                const actualError = firstError.$error[firstErrorKey][0];
-
-                const errNameFull = actualError.$name;
-                const errNameShort = errNameFull.endsWith('TextInput') ? errNameFull.substring(0, errNameFull.length - 9) : errNameFull;
-
-                const extractErrorMessage = function(errName) {
-                    try {
-                        return errors[firstErrorKey][0].$errorMessages[errName][firstErrorKey];
-                    }
-                    catch (ignored) {
-                        try {
-                            return form[firstError.$name].$errorMessages[errName][firstErrorKey];
-                        }
-                        catch (ignited) {
-                            return false;
-                        }
-                    }
-                };
-
-                const msg = extractErrorMessage(errNameFull) || extractErrorMessage(errNameShort) || 'Invalid value!';
-
-                return showPopoverMessage($scope.ui, firstError.$name, errNameFull, msg);
-            }
-
+        function checkCacheDatasources(item) {
             const caches = _.filter(_.map($scope.caches, (scopeCache) => scopeCache.cache),
-                (cache) => _.includes($scope.backupItem.caches, cache._id));
+                (cache) => _.includes(item.caches, cache._id));
 
             const checkRes = $common.checkCachesDataSources(caches);
 
@@ -386,6 +348,10 @@ consoleModule.controller('clustersController', [
                     $common.cacheStoreJdbcDialectsLabel(checkRes.secondDB) + '" in "' + checkRes.secondCache.name + '"', 10000);
             }
 
+            return true;
+        }
+
+        function checkBinaryConfiguration(item) {
             const b = item.binaryConfiguration;
 
             if ($common.isDefined(b)) {
@@ -402,6 +368,10 @@ consoleModule.controller('clustersController', [
                 }
             }
 
+            return true;
+        }
+
+        function checkCommunicationConfiguration(item) {
             const c = item.communication;
 
             if ($common.isDefined(c)) {
@@ -417,13 +387,10 @@ consoleModule.controller('clustersController', [
                     return showPopoverMessage($scope.ui, 'communication', 'sharedMemoryPort', 'Shared memory port should be more than "0" or equals to "-1"!');
             }
 
-            const r = item.connector;
-
-            if ($common.isDefined(r)) {
-                if (r.sslEnabled && $common.isEmptyString(r.sslFactory))
-                    return showPopoverMessage($scope.ui, 'connector', 'connectorSslFactory', 'SSL factory should not be empty!');
-            }
+            return true;
+        }
 
+        function checkDiscoveryConfiguration(item) {
             const d = item.discovery;
 
             if (d) {
@@ -432,33 +399,12 @@ consoleModule.controller('clustersController', [
 
                 if (d.kind === 'Vm' && d.Vm && d.Vm.addresses.length === 0)
                     return showPopoverMessage($scope.ui, 'general', 'addresses', 'Addresses are not specified!');
-
-                if (d.kind === 'S3' && d.S3 && $common.isEmptyString(d.S3.bucketName))
-                    return showPopoverMessage($scope.ui, 'general', 'bucketName', 'Bucket name should not be empty!');
-
-                if (d.kind === 'Cloud' && d.Cloud) {
-                    if ($common.isEmptyString(d.Cloud.identity))
-                        return showPopoverMessage($scope.ui, 'general', 'identity', 'Identity should not be empty!');
-
-                    if ($common.isEmptyString(d.Cloud.provider))
-                        return showPopoverMessage($scope.ui, 'general', 'provider', 'Provider should not be empty!');
-                }
-
-                if (d.kind === 'GoogleStorage' && d.GoogleStorage) {
-                    if ($common.isEmptyString(d.GoogleStorage.projectName))
-                        return showPopoverMessage($scope.ui, 'general', 'projectName', 'Project name should not be empty!');
-
-                    if ($common.isEmptyString(d.GoogleStorage.bucketName))
-                        return showPopoverMessage($scope.ui, 'general', 'bucketName', 'Bucket name should not be empty!');
-
-                    if ($common.isEmptyString(d.GoogleStorage.serviceAccountP12FilePath))
-                        return showPopoverMessage($scope.ui, 'general', 'serviceAccountP12FilePath', 'Private key path should not be empty!');
-
-                    if ($common.isEmptyString(d.GoogleStorage.serviceAccountId))
-                        return showPopoverMessage($scope.ui, 'general', 'serviceAccountId', 'Account ID should not be empty!');
-                }
             }
 
+            return true;
+        }
+
+        function checkSwapConfiguration(item) {
             const swapKind = item.swapSpaceSpi && item.swapSpaceSpi.kind;
 
             if (swapKind && item.swapSpaceSpi[swapKind]) {
@@ -475,6 +421,17 @@ consoleModule.controller('clustersController', [
                     return showPopoverMessage($scope.ui, 'swap', 'readStripesNumber', 'Read stripe size must be positive and power of two!');
             }
 
+            return true;
+        }
+
+        function checkSslConfiguration(item) {
+            const r = item.connector;
+
+            if ($common.isDefined(r)) {
+                if (r.sslEnabled && $common.isEmptyString(r.sslFactory))
+                    return showPopoverMessage($scope.ui, 'connector', 'connectorSslFactory', 'SSL factory should not be empty!');
+            }
+
             if (item.sslEnabled) {
                 if (!$common.isDefined(item.sslContextFactory) || $common.isEmptyString(item.sslContextFactory.keyStoreFilePath))
                     return showPopoverMessage($scope.ui, 'sslConfiguration', 'keyStoreFilePath', 'Key store file should not be empty!');
@@ -483,12 +440,50 @@ consoleModule.controller('clustersController', [
                     return showPopoverMessage($scope.ui, 'sslConfiguration', 'sslConfiguration-title', 'Trust storage file or managers should be configured!');
             }
 
+            return true;
+        }
+
+        function checkPoolSizes(item) {
             if (item.rebalanceThreadPoolSize && item.systemThreadPoolSize && item.systemThreadPoolSize <= item.rebalanceThreadPoolSize)
                 return showPopoverMessage($scope.ui, 'pools', 'rebalanceThreadPoolSize', 'Rebalance thread pool size exceed or equals System thread pool size!');
 
             return true;
         }
 
+        // Check cluster logical consistency.
+        function validate(item) {
+            $common.hidePopover();
+
+            if ($common.isEmptyString(item.name))
+                return showPopoverMessage($scope.ui, 'general', 'clusterName', 'Cluster name should not be empty!');
+
+            if (!$common.checkFieldValidators($scope.ui))
+                return false;
+
+            if (!checkCacheDatasources(item))
+                return false;
+
+            if (!checkBinaryConfiguration(item))
+                return false;
+
+            if (!checkCommunicationConfiguration(item))
+                return false;
+
+            if (!checkDiscoveryConfiguration(item))
+                return false;
+
+            if (!checkSwapConfiguration(item))
+                return false;
+
+            if (!checkSslConfiguration(item))
+                return false;
+
+            if (!checkPoolSizes(item))
+                return false;
+
+            return true;
+        }
+
         // Save cluster in database.
         function save(item) {
             $http.post('/api/v1/configuration/clusters/save', item)

http://git-wip-us.apache.org/repos/asf/ignite/blob/f97b7576/modules/web-console/src/main/js/controllers/common-module.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/controllers/common-module.js b/modules/web-console/src/main/js/controllers/common-module.js
index 9ddcdbf..e744f79 100644
--- a/modules/web-console/src/main/js/controllers/common-module.js
+++ b/modules/web-console/src/main/js/controllers/common-module.js
@@ -1016,6 +1016,41 @@ consoleModule.service('$common', ['$alert', '$popover', '$anchorScroll', '$locat
                     res += possible.charAt(Math.floor(Math.random() * possibleLen));
 
                 return res;
+            },
+            checkFieldValidators(ui) {
+                const form = ui.inputForm;
+                const errors = form.$error;
+                const errKeys = Object.keys(errors);
+
+                if (errKeys && errKeys.length > 0) {
+                    const firstErrorKey = errKeys[0];
+
+                    const firstError = errors[firstErrorKey][0];
+                    const actualError = firstError.$error[firstErrorKey][0];
+
+                    const errNameFull = actualError.$name;
+                    const errNameShort = errNameFull.endsWith('TextInput') ? errNameFull.substring(0, errNameFull.length - 9) : errNameFull;
+
+                    const extractErrorMessage = function(errName) {
+                        try {
+                            return errors[firstErrorKey][0].$errorMessages[errName][firstErrorKey];
+                        }
+                        catch (ignored) {
+                            try {
+                                return form[firstError.$name].$errorMessages[errName][firstErrorKey];
+                            }
+                            catch (ignited) {
+                                return false;
+                            }
+                        }
+                    };
+
+                    const msg = extractErrorMessage(errNameFull) || extractErrorMessage(errNameShort) || 'Invalid value!';
+
+                    return showPopoverMessage(ui, firstError.$name, errNameFull, msg);
+                }
+
+                return true;
             }
         };
     }]);

http://git-wip-us.apache.org/repos/asf/ignite/blob/f97b7576/modules/web-console/src/main/js/controllers/domains-controller.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/controllers/domains-controller.js b/modules/web-console/src/main/js/controllers/domains-controller.js
index c1523d5..df7d8a9 100644
--- a/modules/web-console/src/main/js/controllers/domains-controller.js
+++ b/modules/web-console/src/main/js/controllers/domains-controller.js
@@ -1203,53 +1203,8 @@ consoleModule.controller('domainsController', [
             }
         };
 
-        // Check domain model logical consistency.
-        function validate(item) {
-            const form = $scope.ui.inputForm;
-            const errors = form.$error;
-            const errKeys = Object.keys(errors);
-
-            if (errKeys && errKeys.length > 0) {
-                const firstErrorKey = errKeys[0];
-
-                const firstError = errors[firstErrorKey][0];
-                const actualError = firstError.$error[firstErrorKey][0];
-
-                const errNameFull = actualError.$name;
-                const errNameShort = errNameFull.endsWith('TextInput') ? errNameFull.substring(0, errNameFull.length - 9) : errNameFull;
-
-                const extractErrorMessage = function(errName) {
-                    try {
-                        return errors[firstErrorKey][0].$errorMessages[errName][firstErrorKey];
-                    }
-                    catch (ignored) {
-                        try {
-                            return form[firstError.$name].$errorMessages[errName][firstErrorKey];
-                        }
-                        catch (ignited) {
-                            return false;
-                        }
-                    }
-                };
-
-                const msg = extractErrorMessage(errNameFull) || extractErrorMessage(errNameShort) || 'Invalid value!';
-
-                return showPopoverMessage($scope.ui, firstError.$name, errNameFull, msg);
-            }
-
-            if ($common.isEmptyString(item.keyType))
-                return showPopoverMessage($scope.ui, 'general', 'keyType', 'Key type should not be empty');
-            else if (!$common.isValidJavaClass('Key type', item.keyType, true, 'keyType', false, $scope.ui, 'general'))
-                return false;
-
-            if ($common.isEmptyString(item.valueType))
-                return showPopoverMessage($scope.ui, 'general', 'valueType', 'Value type should not be empty');
-            else if (!$common.isValidJavaClass('Value type', item.valueType, false, 'valueType', false, $scope.ui, 'general'))
-                return false;
-
-            const qry = $common.domainForQueryConfigured(item);
-
-            if (item.queryMetadata === 'Configuration' && qry) {
+        function checkQueryConfiguration(item) {
+            if (item.queryMetadata === 'Configuration' && $common.domainForQueryConfigured(item)) {
                 if (_.isEmpty(item.fields))
                     return showPopoverMessage($scope.ui, 'query', 'queryFields', 'Query fields should not be empty');
 
@@ -1264,6 +1219,10 @@ consoleModule.controller('domainsController', [
                 }
             }
 
+            return true;
+        }
+
+        function checkStoreConfiguration(item) {
             if ($common.domainForStoreConfigured(item)) {
                 if ($common.isEmptyString(item.databaseSchema))
                     return showPopoverMessage($scope.ui, 'store', 'databaseSchema', 'Database schema should not be empty');
@@ -1280,7 +1239,22 @@ consoleModule.controller('domainsController', [
                 if (_.isEmpty(item.valueFields))
                     return showPopoverMessage($scope.ui, 'store', 'valueFields', 'Value fields are not specified');
             }
-            else if (!qry && item.queryMetadata === 'Configuration')
+
+            return true;
+        }
+
+        // Check domain model logical consistency.
+        function validate(item) {
+            if (!$common.checkFieldValidators($scope.ui))
+                return false;
+
+            if (!checkQueryConfiguration(item))
+                return false;
+
+            if (!checkStoreConfiguration(item))
+                return false;
+
+            if (!$common.domainForStoreConfigured(item) && !$common.domainForQueryConfigured(item) && item.queryMetadata === 'Configuration')
                 return showPopoverMessage($scope.ui, 'query', 'query-title', 'SQL query domain model should be configured');
 
             return true;


[27/50] [abbrv] ignite git commit: IGNITE-2047 Use of common method, fix in generation, fix in field path

Posted by an...@apache.org.
IGNITE-2047 Use of common method, fix in generation, fix in field path


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

Branch: refs/heads/ignite-3262
Commit: 00de17aa84b606994ec5c0e783aa0cde98895a33
Parents: 592e274
Author: vsisko <vs...@gridgain.com>
Authored: Wed Jun 8 18:03:39 2016 +0700
Committer: vsisko <vs...@gridgain.com>
Committed: Wed Jun 8 18:03:39 2016 +0700

----------------------------------------------------------------------
 .../src/main/js/controllers/igfs-controller.js  | 33 ++------------------
 1 file changed, 2 insertions(+), 31 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/00de17aa/modules/web-console/src/main/js/controllers/igfs-controller.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/controllers/igfs-controller.js b/modules/web-console/src/main/js/controllers/igfs-controller.js
index 265af84..c6b3273 100644
--- a/modules/web-console/src/main/js/controllers/igfs-controller.js
+++ b/modules/web-console/src/main/js/controllers/igfs-controller.js
@@ -270,37 +270,8 @@ consoleModule.controller('igfsController', [
             if ($common.isEmptyString(item.name))
                 return showPopoverMessage($scope.ui, 'general', 'igfsName', 'IGFS name should not be empty!');
 
-            const form = $scope.ui.inputForm;
-            const errors = form.$error;
-            const errKeys = Object.keys(errors);
-
-            if (errKeys && errKeys.length > 0) {
-                const firstErrorKey = errKeys[0];
-
-                const firstError = errors[firstErrorKey][0];
-                const actualError = firstError.$error[firstErrorKey][0];
-
-                const errNameFull = actualError.$name;
-                const errNameShort = errNameFull.endsWith('TextInput') ? errNameFull.substring(0, errNameFull.length - 9) : errNameFull;
-
-                const extractErrorMessage = function(errName) {
-                    try {
-                        return errors[firstErrorKey][0].$errorMessages[errName][firstErrorKey];
-                    }
-                    catch (ignored) {
-                        try {
-                            return form[firstError.$name].$errorMessages[errName][firstErrorKey];
-                        }
-                        catch (ignited) {
-                            return false;
-                        }
-                    }
-                };
-
-                const msg = extractErrorMessage(errNameFull) || extractErrorMessage(errNameShort) || 'Invalid value!';
-
-                return showPopoverMessage($scope.ui, firstError.$name, errNameFull, msg);
-            }
+            if (!$common.checkFieldValidators($scope.ui))
+                return false;
 
             if (!item.secondaryFileSystemEnabled && (item.defaultMode === 'PROXY'))
                 return showPopoverMessage($scope.ui, 'secondaryFileSystem', 'secondaryFileSystem-title', 'Secondary file system should be configured for "PROXY" IGFS mode!');


[40/50] [abbrv] ignite git commit: IGNITE-3319 Review.

Posted by an...@apache.org.
IGNITE-3319 Review.


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

Branch: refs/heads/ignite-3262
Commit: 2bc83e61e05301c82a124ba46ca1ccf61ac7f0e8
Parents: f70157e
Author: Andrey Novikov <an...@apache.org>
Authored: Wed Jun 15 18:42:27 2016 +0700
Committer: Andrey Novikov <an...@apache.org>
Committed: Wed Jun 15 18:42:27 2016 +0700

----------------------------------------------------------------------
 .../src/main/js/app/modules/states/signin.state.js       |  4 ++--
 .../src/main/js/gulpfile.babel.js/tasks/bundle.js        |  3 ++-
 .../src/main/js/gulpfile.babel.js/tasks/copy.js          |  1 +
 .../src/main/js/gulpfile.babel.js/tasks/watch.js         |  2 +-
 .../src/main/js/gulpfile.babel.js/webpack/common.js      | 11 ++++++-----
 .../webpack/environments/development.js                  |  2 --
 .../gulpfile.babel.js/webpack/environments/production.js |  2 --
 .../src/main/js/gulpfile.babel.js/webpack/index.js       |  9 +++------
 modules/web-console/src/main/js/serve/agent.js           |  2 +-
 9 files changed, 16 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/2bc83e61/modules/web-console/src/main/js/app/modules/states/signin.state.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/signin.state.js b/modules/web-console/src/main/js/app/modules/states/signin.state.js
index 916040e..a23a496 100644
--- a/modules/web-console/src/main/js/app/modules/states/signin.state.js
+++ b/modules/web-console/src/main/js/app/modules/states/signin.state.js
@@ -16,7 +16,7 @@
  */
 
 import angular from 'angular';
-import signinTemplateUrl from 'views/signin.jade';
+import templateUrl from 'views/signin.jade';
 
 angular
 .module('ignite-console.states.login', [
@@ -29,7 +29,7 @@ angular
     $stateProvider
     .state('signin', {
         url: '/',
-        templateUrl: signinTemplateUrl,
+        templateUrl,
         metaTags: {
         }
     });

http://git-wip-us.apache.org/repos/asf/ignite/blob/2bc83e61/modules/web-console/src/main/js/gulpfile.babel.js/tasks/bundle.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/bundle.js b/modules/web-console/src/main/js/gulpfile.babel.js/tasks/bundle.js
index f4e7fcc..d3e8dca 100644
--- a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/bundle.js
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/tasks/bundle.js
@@ -21,10 +21,11 @@ import webpackConfig from '../webpack';
 import WebpackDevServer from 'webpack-dev-server';
 
 gulp.task('bundle', (cb) => {
-    if (process.env.NODE_ENV === 'development')
+    if (process.env.NODE_ENV === 'development') {
         // Important! Call webpack and WebpackDevServer must be inline.
         new WebpackDevServer(webpack(webpackConfig), webpackConfig.devServer)
             .listen(webpackConfig.devServer.port, 'localhost', cb);
+    }
     else
         webpack(webpackConfig, cb);
 });

http://git-wip-us.apache.org/repos/asf/ignite/blob/2bc83e61/modules/web-console/src/main/js/gulpfile.babel.js/tasks/copy.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/copy.js b/modules/web-console/src/main/js/gulpfile.babel.js/tasks/copy.js
index c0ec9b5..ac31fdd 100644
--- a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/copy.js
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/tasks/copy.js
@@ -23,6 +23,7 @@ import { destDir, rootDir, jsModulePaths, resourcePaths, resourceModulePaths, ig
 
 gulp.task('copy', (cb) => {
     const tasks = ['copy:resource', 'copy:ignite_modules:resource', 'copy:ignite_modules:js'];
+    
     return sequence(tasks, cb);
 });
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/2bc83e61/modules/web-console/src/main/js/gulpfile.babel.js/tasks/watch.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/watch.js b/modules/web-console/src/main/js/gulpfile.babel.js/tasks/watch.js
index 33b0727..b958816 100644
--- a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/watch.js
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/tasks/watch.js
@@ -22,7 +22,7 @@ import { jadePaths, jadeModulePaths, resourcePaths, resourceModulePaths, appPath
 
 gulp.task('watch:ignite-modules', (cb) => sequence('clean:ignite-modules-temp', 'ignite:modules', 'copy:ignite_modules:js', cb));
 
-// Build + connect + watch task.
+// Build + watch task.
 gulp.task('watch', ['build'], () => {
     gulp.watch(jadePaths.concat(jadeModulePaths), ['jade']);
     gulp.watch(resourcePaths, ['copy:resource']);

http://git-wip-us.apache.org/repos/asf/ignite/blob/2bc83e61/modules/web-console/src/main/js/gulpfile.babel.js/webpack/common.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/common.js b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/common.js
index 6160af1..e686762 100644
--- a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/common.js
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/common.js
@@ -22,10 +22,12 @@ import progressPlugin from './plugins/progress';
 
 //import  Manifest from 'manifest-revision-webpack-plugin';
 import ExtractTextPlugin from 'extract-text-webpack-plugin';
+
 import {srcDir, destDir, rootDir} from '../paths';
 
 const NODE_ENV = process.env.NODE_ENV || 'production';
 const IS_DEVELOPMENT = NODE_ENV === 'development';
+
 const stylesLoader = 'css-loader?sourceMap!postcss-loader!sass-loader?outputStyle=expanded&sourceMap=true&sourceMapContents=true';
 
 export default () => {
@@ -35,29 +37,28 @@ export default () => {
         node: {
             fs: 'empty'
         },
+        
         // Entry points.
         entry: {
             polyfill: 'babel-polyfill',
             app: path.join(srcDir, 'index.js'),
             vendor: path.join(srcDir, 'vendor.js')
         },
-
+        
         // Output system.
         output: {
             path: destDir,
             publicPath: './',
             filename: '[name].js'
         },
-
+        
         // Resolves modules.
         resolve: {
             extensions: ['', '.js'],
             root: [rootDir],
             modulesDirectories: [NODE_MODULES_PATH, './'],
-            alias: {
-            }
         },
-
+        
         // Modules resolvers.
         module: {
             noParse: [],

http://git-wip-us.apache.org/repos/asf/ignite/blob/2bc83e61/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/development.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/development.js b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/development.js
index 716bc25..defbb77 100644
--- a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/development.js
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/development.js
@@ -22,7 +22,6 @@ import jade from 'jade';
 import path from 'path';
 
 export default () => {
-
     let plugins = [
         new webpack.HotModuleReplacementPlugin(),
         new HtmlWebpackPlugin({
@@ -34,7 +33,6 @@ export default () => {
         })
     ];
 
-
     return {
         context: rootDir,
         debug: true,

http://git-wip-us.apache.org/repos/asf/ignite/blob/2bc83e61/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/production.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/production.js b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/production.js
index 5630448..9bb5e1d 100644
--- a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/production.js
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/production.js
@@ -23,7 +23,6 @@ import jade from 'jade';
 import {destDir, rootDir} from '../../paths';
 
 export default () => {
-
     const plugins = [
         new HtmlWebpackPlugin({
             filename: 'index.html',
@@ -54,5 +53,4 @@ export default () => {
         },
         plugins
     };
-
 };

http://git-wip-us.apache.org/repos/asf/ignite/blob/2bc83e61/modules/web-console/src/main/js/gulpfile.babel.js/webpack/index.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/index.js b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/index.js
index 25eda4c..6682f9c 100644
--- a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/index.js
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/index.js
@@ -20,16 +20,13 @@ import commonConfig from './common';
 import devConfig from './environments/development';
 import prodConfig from './environments/production';
 
-const ENV = process.env.NODE_ENV ? process.env.NODE_ENV : 'production';
+const env = process.env.NODE_ENV || 'production';
 
+// Config by environments.
 const configs = {
-    // Common config section.
-    common: commonConfig,
-
-    // Config by environments.
     production: prodConfig,
     development: devConfig
 };
 
 // Load config file by environment
-export default _.merge(configs.common(), configs[ENV]());
+export default _.merge(commonConfig(), configs[env]());

http://git-wip-us.apache.org/repos/asf/ignite/blob/2bc83e61/modules/web-console/src/main/js/serve/agent.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/serve/agent.js b/modules/web-console/src/main/js/serve/agent.js
index 7a79cda..456aba9 100644
--- a/modules/web-console/src/main/js/serve/agent.js
+++ b/modules/web-console/src/main/js/serve/agent.js
@@ -549,7 +549,7 @@ module.exports.factory = function(_, ws, fs, path, JSZip, socketio, settings, mo
          */
         attach(srv) {
             if (this._server)
-                throw 'Agent server already started';
+                throw 'Agent server already started!';
 
             this._server = srv;
 


[35/50] [abbrv] ignite git commit: IGNITE-2047 Changed tooltip

Posted by an...@apache.org.
IGNITE-2047 Changed tooltip


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

Branch: refs/heads/ignite-3262
Commit: ecce86599f73a2ed4e5cd738beb1e547c779ea5d
Parents: 98046ab
Author: vsisko <vs...@gridgain.com>
Authored: Wed Jun 15 09:38:54 2016 +0700
Committer: vsisko <vs...@gridgain.com>
Committed: Wed Jun 15 09:38:54 2016 +0700

----------------------------------------------------------------------
 .../js/app/modules/states/configuration/clusters/discovery.jade  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/ecce8659/modules/web-console/src/main/js/app/modules/states/configuration/clusters/discovery.jade
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/discovery.jade b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/discovery.jade
index d1ee763..15b7065 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/discovery.jade
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/discovery.jade
@@ -47,7 +47,9 @@ form.panel.panel-default(name=form novalidate)
                 .settings-row
                     +number('Network timeout:', model + '.networkTimeout', 'discoNetworkTimeout', 'true', '5000', '1', 'Network timeout')
                 .settings-row
-                    +number('Join timeout:', model + '.joinTimeout', 'joinTimeout', 'true', '0', '0', 'Join timeout')
+                    +number('Join timeout:', model + '.joinTimeout', 'joinTimeout', 'true', '0', '0',
+                        'Join timeout<br/>' +
+                        '0 means wait forever')
                 .settings-row
                     +number('Thread priority:', model + '.threadPriority', 'threadPriority', 'true', '10', '1', 'Thread priority for all threads started by SPI')
                 .settings-row


[23/50] [abbrv] ignite git commit: Merge remote-tracking branch 'community/web-console-staging' into web-console-staging

Posted by an...@apache.org.
Merge remote-tracking branch 'community/web-console-staging' into web-console-staging


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

Branch: refs/heads/ignite-3262
Commit: ee17ea76738767fc33be39d03397c726a194efbf
Parents: d0ccd6a 4ed4cbc
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Tue Jun 7 15:03:33 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Tue Jun 7 15:03:33 2016 +0700

----------------------------------------------------------------------
 .../modules/states/configuration/caches/store.jade    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------



[39/50] [abbrv] ignite git commit: Merge remote-tracking branch 'origin/web-console-staging' into ignite-3319

Posted by an...@apache.org.
Merge remote-tracking branch 'origin/web-console-staging' into ignite-3319


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

Branch: refs/heads/ignite-3262
Commit: f70157ee21a49c654571aa44cf5e8f4c3a17a378
Parents: af05c35 9b7c747
Author: Maxim Afanasiev <ma...@gmail.com>
Authored: Wed Jun 15 17:16:44 2016 +0700
Committer: Maxim Afanasiev <ma...@gmail.com>
Committed: Wed Jun 15 17:16:44 2016 +0700

----------------------------------------------------------------------
 .../main/js/app/modules/agent/agent.module.js   |  3 +-
 .../form/field/input/datalist.directive.js      |  6 ++--
 .../modules/form/field/input/text.directive.js  |  6 ++--
 .../app/modules/form/group/group.directive.js   |  6 ++--
 .../states/configuration/caches/store.jade      | 21 +++++++-----
 .../configuration/clusters/attributes.jade      |  4 +--
 .../configuration/clusters/communication.jade   |  2 +-
 .../configuration/clusters/discovery.jade       |  4 ++-
 .../main/js/controllers/caches-controller.js    |  6 ++--
 .../main/js/controllers/clusters-controller.js  |  6 ++--
 .../main/js/controllers/domains-controller.js   |  6 ++--
 .../src/main/js/controllers/igfs-controller.js  |  6 ++--
 .../src/main/js/controllers/sql-controller.js   | 36 ++++++++------------
 13 files changed, 57 insertions(+), 55 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/f70157ee/modules/web-console/src/main/js/app/modules/form/field/input/datalist.directive.js
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/f70157ee/modules/web-console/src/main/js/app/modules/form/field/input/text.directive.js
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/f70157ee/modules/web-console/src/main/js/app/modules/form/group/group.directive.js
----------------------------------------------------------------------


[12/50] [abbrv] ignite git commit: IGNITE-3079 disable animation for ng-hide

Posted by an...@apache.org.
IGNITE-3079 disable animation for ng-hide


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

Branch: refs/heads/ignite-3262
Commit: 5bc6b45814e2bcde4a41de05e4b21a966c8ef6fe
Parents: cba61d7
Author: Dmitriyff <dm...@gmail.com>
Authored: Fri Jun 3 15:24:49 2016 +0700
Committer: Dmitriyff <dm...@gmail.com>
Committed: Fri Jun 3 15:24:49 2016 +0700

----------------------------------------------------------------------
 modules/web-console/src/main/js/app/helpers/jade/mixins.jade | 2 +-
 .../web-console/src/main/js/public/stylesheets/style.scss    | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/5bc6b458/modules/web-console/src/main/js/app/helpers/jade/mixins.jade
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/helpers/jade/mixins.jade b/modules/web-console/src/main/js/app/helpers/jade/mixins.jade
index a96db33..56adfc6 100644
--- a/modules/web-console/src/main/js/app/helpers/jade/mixins.jade
+++ b/modules/web-console/src/main/js/app/helpers/jade/mixins.jade
@@ -466,7 +466,7 @@ mixin table-save-button(valid, save, newItem)
 //- Mixin for table remove button.
 mixin table-remove-conditional-button(items, show, tip)
     i.tipField.fa.fa-remove(
-        ng-show='#{show} && !field.edit'
+        ng-hide='!(#{show} && !field.edit)'
         bs-tooltip='"#{tip}"'
         ng-click='#{items}.splice(#{items}.indexOf(model), 1)'
     )

http://git-wip-us.apache.org/repos/asf/ignite/blob/5bc6b458/modules/web-console/src/main/js/public/stylesheets/style.scss
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/public/stylesheets/style.scss b/modules/web-console/src/main/js/public/stylesheets/style.scss
index 10e71f4..1a776e9 100644
--- a/modules/web-console/src/main/js/public/stylesheets/style.scss
+++ b/modules/web-console/src/main/js/public/stylesheets/style.scss
@@ -2127,3 +2127,11 @@ html,body,.splash-screen {
 .nvd3 .nv-axis .nv-axisMaxMin text {
     font-weight: normal; /* Here the text can be modified*/
 }
+
+[ng-hide].ng-hide-add.ng-hide-animate {
+    display: none;
+}
+
+[ng-show].ng-hide-add.ng-hide-animate {
+    display: none;
+}


[34/50] [abbrv] ignite git commit: IGNITE-2047 Fixed default value.

Posted by an...@apache.org.
IGNITE-2047 Fixed default value.


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

Branch: refs/heads/ignite-3262
Commit: 98046abdc74ebf42e23992abd7d3eb697118340e
Parents: af57914
Author: vsisko <vs...@gridgain.com>
Authored: Tue Jun 14 17:00:10 2016 +0700
Committer: vsisko <vs...@gridgain.com>
Committed: Tue Jun 14 17:00:10 2016 +0700

----------------------------------------------------------------------
 .../app/modules/states/configuration/clusters/communication.jade   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/98046abd/modules/web-console/src/main/js/app/modules/states/configuration/clusters/communication.jade
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/communication.jade b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/communication.jade
index 5d8ed10..12e3519 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/communication.jade
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/communication.jade
@@ -41,7 +41,7 @@ form.panel.panel-default(name=form novalidate)
                 .settings-row
                     +java-class('Communication listener:', communication + '.listener', 'comListener', 'true', 'false', 'Communication listener')
                 .settings-row
-                    +text-ip-address('Local IP address:', communication + '.localAddress', 'comLocalAddress', 'true', '228.1.2.4', 'Local host address for socket binding')
+                    +text-ip-address('Local IP address:', communication + '.localAddress', 'comLocalAddress', 'true', '0.0.0.0', 'Local host address for socket binding')
                 .settings-row
                     +number-min-max('Local port:', communication + '.localPort', 'comLocalPort', 'true', '47100', '1024', '65535', 'Local port for socket binding')
                 .settings-row


[18/50] [abbrv] ignite git commit: WIP Fixed gulp build.

Posted by an...@apache.org.
WIP Fixed gulp build.


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

Branch: refs/heads/ignite-3262
Commit: f09d217d82f457b21089577f21f6441e680190e6
Parents: 5f425aa
Author: Maxim Afanasiev <ma...@gmail.com>
Authored: Tue Jun 7 11:03:17 2016 +0700
Committer: Maxim Afanasiev <ma...@gmail.com>
Committed: Tue Jun 7 11:03:17 2016 +0700

----------------------------------------------------------------------
 modules/web-console/src/main/js/app/index.js    |   8 +-
 .../src/main/js/app/modules/ace.module.js       |   4 +-
 .../branding/powered-by-apache.directive.js     |   4 +-
 .../js/app/modules/loading/loading.directive.js |   4 +-
 .../configuration/preview-panel.directive.js    |   2 +-
 modules/web-console/src/main/js/app/vendor.js   |  17 +-
 .../main/js/gulpfile.babel.js/tasks/bundle.js   |  44 ++--
 .../main/js/gulpfile.babel.js/tasks/clean.js    |   5 +-
 .../src/main/js/gulpfile.babel.js/tasks/copy.js |  17 +-
 .../src/main/js/gulpfile.babel.js/tasks/sass.js |  25 ---
 .../main/js/gulpfile.babel.js/tasks/server.js   |  22 ++
 .../main/js/gulpfile.babel.js/tasks/watch.js    |  15 +-
 .../webpack/environments/development.js         |  62 +++---
 .../webpack/environments/production.js          |  45 ++---
 .../main/js/gulpfile.babel.js/webpack/global.js | 102 ++++------
 modules/web-console/src/main/js/package.json    | 201 +------------------
 .../src/main/js/public/stylesheets/style.scss   |   7 +-
 .../web-console/src/main/js/views/index.html    |  45 -----
 18 files changed, 170 insertions(+), 459 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/f09d217d/modules/web-console/src/main/js/app/index.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/index.js b/modules/web-console/src/main/js/app/index.js
index 5dbf6f9..27b572c 100644
--- a/modules/web-console/src/main/js/app/index.js
+++ b/modules/web-console/src/main/js/app/index.js
@@ -16,15 +16,11 @@
  */
 
 import _ from 'lodash';
-import ace from 'brace';
 import angular from 'angular';
-// import pdfMake from 'pdfmake';
-
-ace.config.set('basePath', '/jspm_packages/github/ajaxorg/ace-builds@1.2.3');
+import pdfMake from 'pdfmake';
 
 window._ = _;
-window.require = ace.require; // TODO Should be removed after full refactoring to directives.
-// window.pdfMake = pdfMake;
+window.pdfMake = pdfMake;
 
 
 import '../public/stylesheets/style.scss';

http://git-wip-us.apache.org/repos/asf/ignite/blob/f09d217d/modules/web-console/src/main/js/app/modules/ace.module.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/ace.module.js b/modules/web-console/src/main/js/app/modules/ace.module.js
index 2477965..4920a6f 100644
--- a/modules/web-console/src/main/js/app/modules/ace.module.js
+++ b/modules/web-console/src/main/js/app/modules/ace.module.js
@@ -44,13 +44,13 @@ angular
         const setOptions = (acee, session, opts) => {
             // Sets the ace worker path, if running from concatenated or minified source.
             if (angular.isDefined(opts.workerPath)) {
-                const config = window.ace.require('ace/config');
+                const config = window.ace.acequire('ace/config');
 
                 config.set('workerPath', opts.workerPath);
             }
 
             // Ace requires loading.
-            _.forEach(opts.require, (n) => window.ace.require(n));
+            _.forEach(opts.require, (n) => window.ace.acequire(n));
 
             // Boolean options.
             if (angular.isDefined(opts.showGutter))

http://git-wip-us.apache.org/repos/asf/ignite/blob/f09d217d/modules/web-console/src/main/js/app/modules/branding/powered-by-apache.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/branding/powered-by-apache.directive.js b/modules/web-console/src/main/js/app/modules/branding/powered-by-apache.directive.js
index 4b04d28..2f02446 100644
--- a/modules/web-console/src/main/js/app/modules/branding/powered-by-apache.directive.js
+++ b/modules/web-console/src/main/js/app/modules/branding/powered-by-apache.directive.js
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import templateUrlPoweredByApache from './powered-by-apache.jade';
+import templateUrl from './powered-by-apache.jade';
 
 export default ['ignitePoweredByApache', ['IgniteBranding', (branding) => {
     function controller() {
@@ -26,7 +26,7 @@ export default ['ignitePoweredByApache', ['IgniteBranding', (branding) => {
 
     return {
         restrict: 'E',
-        templateUrl: templatePoweredByApache,
+        templateUrl,
         controller,
         controllerAs: 'poweredBy',
         replace: true

http://git-wip-us.apache.org/repos/asf/ignite/blob/f09d217d/modules/web-console/src/main/js/app/modules/loading/loading.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/loading/loading.directive.js b/modules/web-console/src/main/js/app/modules/loading/loading.directive.js
index aac3508..06e66b1 100644
--- a/modules/web-console/src/main/js/app/modules/loading/loading.directive.js
+++ b/modules/web-console/src/main/js/app/modules/loading/loading.directive.js
@@ -18,9 +18,9 @@
 import templateUrl from './loading.jade';
 import './loading.css';
 
-export default ['igniteLoading', ['$loading', '$compile', ($loading, $compile) => {
+export default ['igniteLoading', ['$loading', '$templateCache', '$compile', ($loading, $templateCache, $compile) => {
     const link = (scope, element) => {
-        const compiledTemplate = $compile(templateUrl());
+        const compiledTemplate = $compile($templateCache.get(templateUrl));
 
         const build = () => {
             scope.position = scope.position || 'middle';

http://git-wip-us.apache.org/repos/asf/ignite/blob/f09d217d/modules/web-console/src/main/js/app/modules/states/configuration/preview-panel.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/preview-panel.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/preview-panel.directive.js
index 1e4a29e..be7bf1e 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/preview-panel.directive.js
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/preview-panel.directive.js
@@ -21,7 +21,7 @@ export default ['previewPanel', ['$interval', '$timeout', ($interval, $timeout)
     let animation = {editor: null, stage: 0, start: 0, stop: 0};
     let prevContent = [];
 
-    const Range = ace.require('ace/range').Range;
+    const Range = ace.acequire('ace/range').Range;
 
     const _clearSelection = (editor) => {
         _.forEach(editor.session.getMarkers(false), (marker) => {

http://git-wip-us.apache.org/repos/asf/ignite/blob/f09d217d/modules/web-console/src/main/js/app/vendor.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/vendor.js b/modules/web-console/src/main/js/app/vendor.js
index 0e4c860..1361792 100644
--- a/modules/web-console/src/main/js/app/vendor.js
+++ b/modules/web-console/src/main/js/app/vendor.js
@@ -3,18 +3,27 @@ import 'angular';
 import 'angular-animate';
 import 'angular-sanitize';
 import 'angular-strap';
+import 'angular-strap/dist/angular-strap.tpl';
 import 'angular-socket-io';
 import 'angular-retina';
 import 'angular-ui-router';
-import 'ui-router-metatags/dist/ui-router-metatags.js';
+import 'ui-router-metatags/dist/ui-router-metatags';
 import 'angular-smart-table';
 import 'angular-ui-grid/ui-grid';
 import 'angular-drag-and-drop-lists';
 import 'angular-nvd3';
 import 'angular-tree-control';
 import 'angular-gridster';
-import 'bootstrap-sass/assets/javascripts/bootstrap/carousel.js';
-// import 'file-saver';
+import 'bootstrap-sass/assets/javascripts/bootstrap/carousel';
+import 'nvd3';
+import 'brace';
+import 'brace/mode/xml';
+import 'brace/mode/sql';
+import 'brace/mode/java';
+import 'brace/mode/dockerfile';
+import 'brace/theme/chrome';
+import 'font-awesome-webpack';
+import 'file-saver';
 import 'jszip';
 import 'query-command-supported';
 
@@ -22,4 +31,4 @@ import 'angular-gridster/dist/angular-gridster.min.css';
 import 'angular-tree-control/css/tree-control-attribute.css';
 import 'angular-tree-control/css/tree-control.css';
 import 'angular-ui-grid/ui-grid.css';
-import 'angular-motion/dist/angular-motion.css';
\ No newline at end of file
+import 'angular-motion/dist/angular-motion.css';

http://git-wip-us.apache.org/repos/asf/ignite/blob/f09d217d/modules/web-console/src/main/js/gulpfile.babel.js/tasks/bundle.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/bundle.js b/modules/web-console/src/main/js/gulpfile.babel.js/tasks/bundle.js
index d7378d0..bdff139 100644
--- a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/bundle.js
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/tasks/bundle.js
@@ -16,46 +16,34 @@
  */
 
 import gulp from 'gulp';
-// import jspm from 'jspm';
 import util from 'gulp-util';
-import sequence from 'gulp-sequence';
-import htmlReplace from 'gulp-html-replace';
 import webpack from 'webpack';
 import webpackConfig from '../../webpack.config';
 import WebpackDevServer from 'webpack-dev-server';
 
 import {srcDir, destDir, igniteModulesTemp} from '../paths';
 
-const options = {
-    minify: true
-};
 
-if (util.env.debug)
-    delete options.minify;
+// TODO source map
+// const options = {
+//     minify: true
+// };
+//
+// if (util.env.debug)
+//     delete options.minify;
+//
+// if (util.env.debug || util.env.sourcemaps)
+//     options.sourceMaps = true;
 
-if (util.env.debug || util.env.sourcemaps)
-    options.sourceMaps = true;
-
-gulp.task('bundle', ['eslint', 'bundle:ignite']);
+gulp.task('bundle', ['bundle:ignite']);
 
 // Package all external dependencies and ignite-console.
 gulp.task('bundle:ignite', (cb) => {
-    return sequence('bundle:ignite:app', cb);
-
-    // return sequence('bundle:ignite:app-min', 'bundle:ignite:app-min:replace', cb);
-});
-
-gulp.task('bundle:ignite:app', (callback) => {
-    const bundler = webpack(webpackConfig);
-    new WebpackDevServer(bundler, webpackConfig.devServer).listen(9000, 'localhost', function() {
-        callback();
+    const bundler = webpack(webpackConfig, (err) => {
+            // if(err) throw new gutil.PluginError("webpack", err);
+            cb();
     });
-});
-
-
-gulp.task('webpack-dev-server', () => {
-    new WebpackDevServer(webpackConfig).listen(9000);
 
+    if(process.env.NODE_ENV==='development')
+        new WebpackDevServer(bundler).listen(webpackConfig.devServer.port, 'localhost', cb);
 });
-
-gulp.task('bundle:ignite:app-min', () => jspm.bundleSFX(`${srcDir}/index`, `${destDir}/app.min.js`, options));

http://git-wip-us.apache.org/repos/asf/ignite/blob/f09d217d/modules/web-console/src/main/js/gulpfile.babel.js/tasks/clean.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/clean.js b/modules/web-console/src/main/js/gulpfile.babel.js/tasks/clean.js
index 4c821e8..c9104b2 100644
--- a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/clean.js
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/tasks/clean.js
@@ -16,16 +16,13 @@
  */
 
 import gulp from 'gulp';
-import ignore from 'gulp-ignore';
 import clean from 'gulp-rimraf';
 
 import { destDir, igniteModulesTemp } from '../paths';
 
 // Clean build folder, remove files.
 gulp.task('clean', () =>
-    gulp.src(`${ destDir }/*`, {read: false})
-        .pipe(ignore('jspm_packages'))
-        .pipe(ignore('system.config.js'))
+    gulp.src(`${destDir}/*`, {read: false})
         .pipe(clean({ force: true }))
 );
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f09d217d/modules/web-console/src/main/js/gulpfile.babel.js/tasks/copy.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/copy.js b/modules/web-console/src/main/js/gulpfile.babel.js/tasks/copy.js
index 083089e..5683a48 100644
--- a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/copy.js
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/tasks/copy.js
@@ -16,29 +16,16 @@
  */
 
 import gulp from 'gulp';
-import util from 'gulp-util';
 import cache from 'gulp-cached';
 import sequence from 'gulp-sequence';
 
-import { destDir, jsPaths, jsModulePaths, resourcePaths, resourceModulePaths, igniteModulesTemp } from '../paths';
+import { destDir, jsModulePaths, resourcePaths, resourceModulePaths, igniteModulesTemp } from '../paths';
 
 gulp.task('copy', (cb) => {
-    const tasks = ['copy:resource', 'copy:ignite_modules:resource'];
-
-    // if (util.env.debug || util.env.sourcemaps) {
-    //     tasks.push('copy:js');
-
-        tasks.push('copy:ignite_modules:js');
-    // }
-
+    const tasks = ['copy:resource', 'copy:ignite_modules:resource', 'copy:ignite_modules:js'];
     return sequence(tasks, cb);
 });
 
-// gulp.task('copy:js', () =>
-//     gulp.src(jsPaths, {base: './'})
-//         .pipe(cache('copy:js'))
-//         .pipe(gulp.dest(destDir))
-// );
 
 gulp.task('copy:ignite_modules:js', () =>
     gulp.src(jsModulePaths)

http://git-wip-us.apache.org/repos/asf/ignite/blob/f09d217d/modules/web-console/src/main/js/gulpfile.babel.js/tasks/sass.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/sass.js b/modules/web-console/src/main/js/gulpfile.babel.js/tasks/sass.js
deleted file mode 100644
index 13dc502..0000000
--- a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/sass.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import gulp from 'gulp';
-import sass from 'gulp-sass';
-
-gulp.task('sass', () =>
-    gulp.src('./public/stylesheets/style.scss')
-        .pipe(sass({ outputStyle: 'nested' }).on('error', sass.logError))
-        .pipe(gulp.dest('./public/stylesheets'))
-);

http://git-wip-us.apache.org/repos/asf/ignite/blob/f09d217d/modules/web-console/src/main/js/gulpfile.babel.js/tasks/server.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/server.js b/modules/web-console/src/main/js/gulpfile.babel.js/tasks/server.js
new file mode 100644
index 0000000..9999f89
--- /dev/null
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/tasks/server.js
@@ -0,0 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import gulp from 'gulp';
+
+gulp.task('server', () => {
+    require('../../serve');
+});

http://git-wip-us.apache.org/repos/asf/ignite/blob/f09d217d/modules/web-console/src/main/js/gulpfile.babel.js/tasks/watch.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/watch.js b/modules/web-console/src/main/js/gulpfile.babel.js/tasks/watch.js
index 19c8c38..27b13bd 100644
--- a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/watch.js
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/tasks/watch.js
@@ -18,22 +18,17 @@
 import gulp from 'gulp';
 import sequence from 'gulp-sequence';
 
-import { sassPaths, jadePaths, jadeModulePaths, resourcePaths, resourceModulePaths, appPaths, appModulePaths } from '../paths';
+import { jadePaths, jadeModulePaths, resourcePaths, resourceModulePaths, appPaths, appModulePaths } from '../paths';
 
-// gulp.task('watch:sass', (cb) => sequence('sass', 'bundle:ignite:app', cb));
-
-// gulp.task('watch:ignite-modules', (cb) => sequence('clean:ignite-modules-temp', 'ignite:modules', ['eslint:browser', 'copy:ignite_modules:js', 'bundle:ignite:app'], cb));
+//TODO Webpack stream || webpack autoload
+gulp.task('watch:ignite-modules', (cb) => sequence('clean:ignite-modules-temp', 'ignite:modules', ['copy:ignite_modules:js', 'bundle:ignite:app'], cb));
 
 // Build + connect + watch task.
 gulp.task('watch', ['build'], () => {
-    // gulp.watch(sassPaths, ['watch:sass']);
-
     gulp.watch(jadePaths.concat(jadeModulePaths), ['jade']);
-
     gulp.watch(resourcePaths, ['copy:resource']);
     gulp.watch(resourceModulePaths, ['copy:ignite_modules:resource']);
-
-    // gulp.watch(appPaths, ['eslint:browser', 'copy:js', 'bundle:ignite:app']);
-    // gulp.watch(appModulePaths, ['watch:ignite-modules']);
+    gulp.watch(appModulePaths, ['watch:ignite-modules']);
+    gulp.watch(appPaths, ['copy']);
 });
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/f09d217d/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/development.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/development.js b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/development.js
index ced7f69..eddff63 100644
--- a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/development.js
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/development.js
@@ -18,33 +18,33 @@ module.exports = function (_path) {
             },
             title: 'DEBUG:Ignite Web Console'
         }),
-        new ProgressPlugin(function(percentage, msg) {
+        new ProgressPlugin(function (percentage, msg) {
             var state = msg;
-            if(percentage < 1) {
+            if (percentage < 1) {
                 percentage = Math.floor(percentage * 100);
                 msg = percentage + "% " + msg;
-                if(percentage < 100) {
+                if (percentage < 100) {
                     msg = " " + msg;
                 }
-                if(percentage < 10) {
+                if (percentage < 10) {
                     msg = " " + msg;
                 }
             }
-                state = state.replace(/^\d+\/\d+\s+/, "");
-                if(percentage === 0) {
-                    lastState = null;
-                    lastStateTime = +new Date();
-                } else if(state !== lastState || percentage === 1) {
-                    var now = +new Date();
-                    if(lastState) {
-                        var stateMsg = (now - lastStateTime) + "ms " + lastState;
-                        goToLineStart(stateMsg);
-                        process.stderr.write(stateMsg + "\n");
-                        chars = 0;
-                    }
-                    lastState = state;
-                    lastStateTime = now;
+            state = state.replace(/^\d+\/\d+\s+/, "");
+            if (percentage === 0) {
+                lastState = null;
+                lastStateTime = +new Date();
+            } else if (state !== lastState || percentage === 1) {
+                var now = +new Date();
+                if (lastState) {
+                    var stateMsg = (now - lastStateTime) + "ms " + lastState;
+                    goToLineStart(stateMsg);
+                    process.stderr.write(stateMsg + "\n");
+                    chars = 0;
                 }
+                lastState = state;
+                lastStateTime = now;
+            }
             goToLineStart(msg);
             process.stderr.write(msg);
         })
@@ -52,14 +52,14 @@ module.exports = function (_path) {
 
     function goToLineStart(nextMessage) {
         var str = "";
-        for(; chars > nextMessage.length; chars--) {
+        for (; chars > nextMessage.length; chars--) {
             str += "\b \b";
         }
         chars = nextMessage.length;
-        for(var i = 0; i < chars; i++) {
+        for (var i = 0; i < chars; i++) {
             str += "\b";
         }
-        if(str) process.stderr.write(str);
+        if (str) process.stderr.write(str);
     }
 
     return {
@@ -67,19 +67,31 @@ module.exports = function (_path) {
         debug: true,
         devtool: 'cheap-source-map',
         devServer: {
+            historyApiFallback: true,
+            publicPath: '/',
             contentBase: './dist',
             info: true,
             hot: true,
             inline: false,
             proxy: {
-                '/api/*': {
-                    target: 'http://localhost:3000'
+                '/socket.io': {
+                    target: 'http://localhost:3000',
+                    changeOrigin: true,
+                    ws: true
+                },
+                '/api/v1/*': {
+                    target: 'http://localhost:3000',
+                    changeOrigin: true,
+                    rewrite: function(req) {
+                        req.url = req.url.replace(/^\/api\/v1/, '');
+                        return req;
+                    }
                 }
             },
-            stats: {colors: true, progress: true},
+            stats: {colors: true},
             port: 9000
         },
-        stats: {colors: true, progress: true},
+        stats: {colors: true},
         plugins: plugins
     };
 };

http://git-wip-us.apache.org/repos/asf/ignite/blob/f09d217d/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/production.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/production.js b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/production.js
index ce2a128..dc91d0c 100644
--- a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/production.js
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/production.js
@@ -1,29 +1,26 @@
 'use strict';
-var CleanWebpackPlugin = require('clean-webpack-plugin');
 var HtmlWebpackPlugin = require("html-webpack-plugin");
 var path = require('path');
+var jade = require('jade');
 
-module.exports = function(_path) {
-  return {
-    context: _path,
-    debug: false,
-    devtool: 'cheap-source-map',
-    output: {
-      publicPath: '/',
-      filename: '[name].[chunkhash].js'
-    },
-    plugins: [
-      new CleanWebpackPlugin(['dist'], {
-        root: _path,
-        verbose: true,
-        dry: false
-      }),
-      new HtmlWebpackPlugin({
-        filename: 'index.html',
-        template: path.join(_path, 'views', 'index.html'),
-        title: 'Ignite Web Console',
-        favicon: path.join(_path, 'src', 'favicon.ico')
-      })
-    ]
-  };
+module.exports = function (_path) {
+    return {
+        context: _path,
+        debug: false,
+        devtool: 'cheap-source-map',
+        output: {
+            publicPath: '/',
+            filename: '[name].[chunkhash].js',
+            contentBase: './dist'
+        },
+        plugins: [
+            new HtmlWebpackPlugin({
+                filename: 'index.html',
+                templateContent: function () {
+                    return jade.renderFile(path.join(_path, 'views', 'index.jade'));
+                },
+                title: 'Ignite Web Console'
+            })
+        ]
+    };
 };
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/f09d217d/modules/web-console/src/main/js/gulpfile.babel.js/webpack/global.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/global.js b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/global.js
index c44fd46..ca5128d 100644
--- a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/global.js
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/global.js
@@ -26,9 +26,10 @@ module.exports = function (_path) {
             polyfill: 'babel-polyfill'
         },
 
+
         // output system
         output: {
-            path: 'dist',
+            path: path.resolve("dist"),
             filename: '[name].js',
             publicPath: '/'
         },
@@ -39,110 +40,84 @@ module.exports = function (_path) {
             modulesDirectories: ['node_modules', './'],
             alias: {
                 _appRoot: path.join(_path, 'app'),
-                _images: path.join(_path,  'app', 'assets', 'images'),
+                _images: path.join(_path, 'app', 'assets', 'images'),
                 _stylesheets: path.join(_path, 'app', 'assets', 'styles'),
-                _scripts: path.join(_path,  'app', 'assets', 'js'),
-                ace: path.join(_path, 'node_modules','ace-builds','src')
+                _scripts: path.join(_path, 'app', 'assets', 'js'),
+                ace: path.join(_path, 'node_modules', 'ace-builds', 'src')
             }
         },
 
         // modules resolvers
         module: {
             noParse: [],
-            // preLoaders: [
-            //     {
-            //         test: /\.js$/,
-            //         exclude: [
-            //             path.resolve(_path, "node_modules")
-            //         ],
-            //         loader: 'eslint-loader'
-            //     }
-            // ],
+            preLoaders: [
+                {
+                    test: /\.js$/,
+                    exclude: [path.resolve(_path, "node_modules")],
+                    loader: 'eslint-loader'
+                }
+            ],
             loaders: [
                 {
                     test: /\.json$/,
                     loader: 'json-loader'
                 },
                 {
-                    test: /\.html$/,
-                    loaders: [
-                        'ngtemplate-loader?relativeTo=' + _path,
-                        'html-loader?attrs[]=img:src&attrs[]=img:data-src'
-                    ]
-                },
-                {
                     test: /\.jade$/,
                     loaders: [
                         'ngtemplate-loader?relativeTo=' + _path,
                         'html-loader?attrs[]=img:src&attrs[]=img:data-src',
                         'jade-html-loader'
                     ]
-                }, {
+                },
+                {
                     test: /\.js$/,
-                    loaders: [
-                        'baggage-loader?[file].html&[file].css'
-                    ]
-                }, {
+                    loaders: ['baggage-loader?[file].html&[file].css']
+                },
+                {
                     test: /\.js$/,
-                    exclude: [
-                        path.resolve(_path, "node_modules")
-                    ],
-                    loaders: [
-                        'ng-annotate-loader'
-                    ]
-                }, {
+                    exclude: [path.resolve(_path, "node_modules")],
+                    loaders: ['ng-annotate-loader']
+                },
+                {
                     test: /\.js$/,
-                    exclude: [
-                        path.resolve(_path, "node_modules")
-                    ],
+                    exclude: [path.resolve(_path, "node_modules")],
                     loader: 'babel-loader',
                     query: {
                         cacheDirectory: true,
                         plugins: ['transform-runtime', 'add-module-exports'],
                         presets: ['angular', 'es2017']
                     }
-                }
-                , {
+                },
+                {
                     test: /\.css$/,
-                    loaders: [
-                        'style-loader',
-                        'css-loader?sourceMap',
-                        'postcss-loader'
-                    ]
-                }, {
+                    loaders: ['style-loader', 'css-loader?sourceMap', 'postcss-loader']
+                },
+                {
                     test: /\.(scss|sass)$/,
                     loader: DEVELOPMENT ? ('style-loader!' + stylesLoader) : ExtractTextPlugin.extract('style-loader', stylesLoader)
-                }, {
+                },
+                {
                     test: /\.(woff2|woff|ttf|eot|svg)?(\?v=[0-9]\.[0-9]\.[0-9])?$/,
                     loaders: [
-                        "url-loader?name=assets/fonts/[name]_[hash].[ext]"
+                        "url-loader?name=fonts/[name]_[hash].[ext]"
                     ]
-                }, {
+                },
+                {
                     test: /\.(jpe?g|png|gif)$/i,
-                    loaders: [
-                        'url-loader?name=assets/images/[name]_[hash].[ext]'
-                    ]
-                }, {
+                    loaders: ['url-loader?name=images/[name]_[hash].[ext]']
+                },
+                {
                     test: require.resolve("angular"),
-                    loaders: [
-                        "expose?angular"
-                    ]
-                    
+                    loaders: ["expose?angular"]
                 },
-
                 {
                     test: require.resolve("jquery"),
-                    loaders: [
-                        "expose?$",
-                        "expose?jQuery"
-                    ]
+                    loaders: ["expose?$", "expose?jQuery"]
                 }
 
             ]
         },
-        
-        
-        
 
         // post css
         postcss: [autoprefixer({browsers: ['last 2 versions']})],
@@ -153,7 +128,8 @@ module.exports = function (_path) {
             new webpack.ProvidePlugin({
                 $: 'jquery',
                 jQuery: 'jquery',
-                _: 'lodash'
+                _: 'lodash',
+                nv: 'nvd3'
             }),
             new webpack.DefinePlugin({
                 'NODE_ENV': JSON.stringify(NODE_ENV)

http://git-wip-us.apache.org/repos/asf/ignite/blob/f09d217d/modules/web-console/src/main/js/package.json
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/package.json b/modules/web-console/src/main/js/package.json
index f81b872..9bdf2ec 100644
--- a/modules/web-console/src/main/js/package.json
+++ b/modules/web-console/src/main/js/package.json
@@ -4,9 +4,8 @@
   "description": "Interactive Web console for configuration, executing SQL queries and monitoring of Apache Ignite Cluster",
   "private": true,
   "scripts": {
-    "dev": "cross-env NODE_ENV=development webpack-dev-server --progress",
-    "build": "cross-env NODE_ENV=production webpack -p --colors",
-    "eslint": "node_modules/.bin/gulp eslint"
+    "dev": "cross-env NODE_ENV=development gulp watch",
+    "dist": "cross-env NODE_ENV=production gulp build"
   },
   "author": "",
   "contributors": [
@@ -58,7 +57,6 @@
     "bootstrap-loader": "^1.0.10",
     "bootstrap-sass": "^3.3.6",
     "brace": "^0.8.0",
-    "clean-webpack-plugin": "^0.1.8",
     "connect-mongo": "^1.1.0",
     "cookie-parser": "~1.4.0",
     "cross-env": "^1.0.7",
@@ -125,200 +123,5 @@
     "morgan": "^1.7.0",
     "should": "^8.3.0",
     "supertest": "^1.1.0"
-  },
-  "jspm": {
-    "directories": {
-      "packages": "build/jspm_packages"
-    },
-    "configFile": "build/system.config.js",
-    "dependencies": {
-      "#ace": "github:ajaxorg/ace-builds@1.2.3",
-      "#angular": "github:angular/bower-angular@^1.5.0",
-      "#angular-animate": "github:angular/bower-angular-animate@^1.5.0",
-      "#angular-drag-and-drop-lists": "github:marceljuenemann/angular-drag-and-drop-lists@^1.3.0",
-      "#angular-gridster": "github:ManifestWebDesign/angular-gridster@^0.13.5",
-      "#angular-motion": "github:mgcrea/angular-motion@^0.4.3",
-      "#angular-nvd3": "github:krispo/angular-nvd3@^1.0.4",
-      "#angular-retina": "github:jrief/angular-retina@0.3.8",
-      "#angular-sanitize": "github:angular/bower-angular-sanitize@^1.5.0",
-      "#angular-smart-table": "github:lorenzofox3/Smart-Table@^2.1.4",
-      "#angular-socket-io": "github:btford/angular-socket-io@^0.7.0",
-      "#angular-strap": "github:mgcrea/angular-strap@2.3.8",
-      "#angular-tree-control": "github:wix/angular-tree-control@^0.2.23",
-      "#angular-ui-grid": "github:angular-ui/bower-ui-grid@^3.0.7",
-      "#angular-ui-router": "github:angular-ui/ui-router@^0.2.15",
-      "angular-ui-router-metatags": "github:tinusn/ui-router-metatags@^1.0.3",
-      "blob": "github:eligrey/Blob.js@master",
-      "bootstrap-carousel": "github:twbs/bootstrap@^3.3.6",
-      "css": "github:systemjs/plugin-css@^0.1.20",
-      "file-saver": "github:eligrey/FileSaver.js@master",
-      "font-awesome": "npm:font-awesome@4.5.0",
-      "jade": "github:johnsoftek/plugin-jade@^0.6.0",
-      "jquery": "github:components/jquery@^2.1.4",
-      "json": "github:systemjs/plugin-json@^0.1.0",
-      "jszip": "github:Stuk/jszip@^2.5.0",
-      "lodash": "github:lodash/lodash@^4.2.6",
-      "pdfmake": "github:bpampuch/pdfmake@^0.1.20",
-      "query-command-supported": "github:zenorocha/document.queryCommandSupported@^1.0.0",
-      "socket.io-client": "github:socketio/socket.io-client@1.4.5",
-      "text": "github:systemjs/plugin-text@^0.0.7"
-    },
-    "devDependencies": {
-      "babel": "npm:babel-core@^5.8.24",
-      "babel-runtime": "npm:babel-runtime@^5.8.24",
-      "clean-css": "npm:clean-css@^3.4.8",
-      "core-js": "npm:core-js@^1.1.4"
-    },
-    "overrides": {
-      "github:angular/bower-angular@1.5.0": {
-        "format": "global",
-        "dependencies": {
-          "jquery": "github:components/jquery@^2.1.4"
-        },
-        "shim": {
-          "angular": {
-            "deps": [
-              "jquery"
-            ]
-          }
-        }
-      },
-      "github:btford/angular-socket-io@0.7.0": {
-        "dependencies": {
-          "socket.io-client": "github:socketio/socket.io-client@1.4.5"
-        }
-      },
-      "github:socketio/socket.io-client@1.4.5": {
-        "format": "global",
-        "main": "socket.io",
-        "shim": {
-          "socket.io": {
-            "exports": "io"
-          }
-        }
-      },
-      "github:Stuk/jszip@2.5.0": {
-        "format": "global",
-        "main": "./dist/jszip"
-      },
-      "github:bpampuch/pdfmake@0.1.20": {
-        "format": "global",
-        "main": "vfs_fonts",
-        "shim": {
-          "vfs_fonts": {
-            "deps": [
-              "./pdfmake"
-            ],
-            "exports": "pdfMake"
-          }
-        }
-      },
-      "github:zenorocha/document.queryCommandSupported@1.0.0": {
-        "format": "global"
-      },
-      "github:krispo/angular-nvd3@1.0.4": {
-        "main": "dist/angular-nvd3",
-        "dependencies": {
-          "nvd3": "npm:nvd3@1.8.1",
-          "d3": "npm:d3@3.5.14"
-        },
-        "shim": {
-          "dist/angular-nvd3": {
-            "deps": [
-              "d3",
-              "nvd3",
-              "nvd3/build/nv.d3.css!"
-            ]
-          }
-        }
-      },
-      "github:ajaxorg/ace-builds@1.2.3": {
-        "format": "global",
-        "main": "theme-chrome",
-        "shim": {
-          "theme-chrome": {
-            "exports": "ace",
-            "deps": [
-              "./ace",
-              "./mode-xml",
-              "./mode-java",
-              "./mode-sql",
-              "./ext-language_tools",
-              "./mode-dockerfile"
-            ]
-          },
-          "ace": {
-            "exports": "ace"
-          },
-          "mode-xml": {
-            "deps": [
-              "./ace"
-            ]
-          },
-          "mode-java": {
-            "deps": [
-              "./ace"
-            ]
-          },
-          "mode-sql": {
-            "deps": [
-              "./ace"
-            ]
-          },
-          "ext-language_tools": {
-            "deps": [
-              "./ace"
-            ]
-          },
-          "worker-xml": {
-            "deps": [
-              "./ace"
-            ]
-          },
-          "mode-dockerfile": {
-            "deps": [
-              "./ace"
-            ]
-          }
-        }
-      },
-      "github:angular-ui/bower-ui-grid@3.0.7": {
-        "dependencies": {
-          "pdfmake": "github:bpampuch/pdfmake@^0.1.20"
-        }
-      },
-      "github:mgcrea/angular-strap@2.3.8": {
-        "directories": {
-          "lib": "dist"
-        },
-        "main": "angular-strap.tpl",
-        "dependencies": {
-          "angular": "^1",
-          "angular-animate": "github:angular/bower-angular-animate@^1.5.0",
-          "angular-motion": "github:mgcrea/angular-motion@^0.4.3",
-          "angular-sanitize": "github:angular/bower-angular-sanitize@^1.5.0"
-        },
-        "shim": {
-          "angular-strap.tpl": {
-            "deps": [
-              "./angular-strap",
-              "angular"
-            ]
-          }
-        }
-      },
-      "github:eligrey/FileSaver.js@master": {
-        "format": "global",
-        "dependencies": {
-          "blob": "github:eligrey/Blob.js@master"
-        }
-      },
-      "github:eligrey/Blob.js@master": {
-        "format": "global"
-      },
-      "github:jrief/angular-retina@0.3.8": {
-        "main": "build/angular-retina.min"
-      }
-    }
   }
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/f09d217d/modules/web-console/src/main/js/public/stylesheets/style.scss
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/public/stylesheets/style.scss b/modules/web-console/src/main/js/public/stylesheets/style.scss
index 589028c..027389b 100644
--- a/modules/web-console/src/main/js/public/stylesheets/style.scss
+++ b/modules/web-console/src/main/js/public/stylesheets/style.scss
@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-@import "font-awesome-custom";
-@import "bootstrap-custom";
+@import "./bootstrap-custom";
 
 @import "./variables";
 
@@ -26,14 +25,14 @@
     font-family: 'Roboto Slab';
     font-style: normal;
     font-weight: 400;
-    src: local('Roboto Slab Regular'), local('RobotoSlab-Regular'), url(//fonts.gstatic.com/s/robotoslab/v6/y7lebkjgREBJK96VQi37ZiwlidHJgAgmTjOEEzwu1L8.ttf) format('truetype');
+    src: local('Roboto Slab Regular'), local('RobotoSlab-Regular'), url(http://fonts.gstatic.com/s/robotoslab/v6/y7lebkjgREBJK96VQi37ZiwlidHJgAgmTjOEEzwu1L8.ttf) format('truetype');
 }
 
 @font-face {
     font-family: 'Roboto Slab';
     font-style: normal;
     font-weight: 700;
-    src: local('Roboto Slab Bold'), local('RobotoSlab-Bold'), url(//fonts.gstatic.com/s/robotoslab/v6/dazS1PrQQuCxC3iOAJFEJTdGNerWpg2Hn6A-BxWgZ_I.ttf) format('truetype');
+    src: local('Roboto Slab Bold'), local('RobotoSlab-Bold'), url(http://fonts.gstatic.com/s/robotoslab/v6/dazS1PrQQuCxC3iOAJFEJTdGNerWpg2Hn6A-BxWgZ_I.ttf) format('truetype');
 }
 
 hr {

http://git-wip-us.apache.org/repos/asf/ignite/blob/f09d217d/modules/web-console/src/main/js/views/index.html
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/views/index.html b/modules/web-console/src/main/js/views/index.html
deleted file mode 100644
index 62490ea..0000000
--- a/modules/web-console/src/main/js/views/index.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!doctype html>
-<html ng-app='ignite-console' id='app' ng-strict-di>
-<head>
-    <meta charset="utf-8">
-    <base href="/">
-    <title>{%=o.htmlWebpackPlugin.options.title%}</title>
-    <meta name="description" content="">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
-    <link rel="shortcut icon" href="/favicon.ico?v1" type="image/x-icon">
-
-    {% if (o.htmlWebpackPlugin.files.favicon) { %}
-    <link rel="shortcut icon" href="{%=o.htmlWebpackPlugin.files.favicon%}">
-    {% } %}
-
-    {% for (var css in o.htmlWebpackPlugin.files.css) { %}
-    <link href="{%=o.htmlWebpackPlugin.files.css[css] %}" rel="stylesheet">
-    {% } %}
-
-
-    {% for (var chunk in o.htmlWebpackPlugin.files.chunks) { %}
-    <script src="{%=o.htmlWebpackPlugin.files.chunks[chunk].entry %}"></script>
-    {% } %}
-
-</head>
-<body class="theme-line body-overlap greedy">
-<div hide-on-state-change="hide-on-state-change" class="splash splash-max-foreground">
-    <div class="splash-wrapper">
-        <div class="spinner">
-            <div class="bounce1"></div>
-            <div class="bounce2"></div>
-            <div class="bounce3"></div>
-        </div>
-        <div class="splash-wellcome">Loading...</div>
-    </div>
-</div>
-<div ng-cloak="ng-cloak" class="ribbon-wrapper right">
-    <div ng-style="IgniteDemoMode &amp;&amp; {&quot;background&quot;: &quot;#1b6d88&quot;}" class="ribbon">
-        <label>{{IgniteDemoMode ? "Demo" : "Beta" }}</label>
-    </div>
-</div>
-<div ui-view="" class="wrapper"></div>
-
-
-</body>
-</html>
\ No newline at end of file


[30/50] [abbrv] ignite git commit: WIP webpack dev / prod

Posted by an...@apache.org.
WIP webpack dev / prod


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

Branch: refs/heads/ignite-3262
Commit: fb8f08ba7179270ea503dba07d7305e7051e0d3f
Parents: 00d3d90
Author: Maxim Afanasiev <ma...@gmail.com>
Authored: Thu Jun 9 22:28:37 2016 +0700
Committer: Maxim Afanasiev <ma...@gmail.com>
Committed: Thu Jun 9 22:28:37 2016 +0700

----------------------------------------------------------------------
 modules/web-console/src/main/js/app/index.js    |   2 +-
 .../src/main/js/build/system.config.js          | 424 -------------------
 .../main/js/gulpfile.babel.js/tasks/bundle.js   |  32 +-
 .../main/js/gulpfile.babel.js/tasks/watch.js    |   2 +-
 .../webpack/environments/development.js         |  53 +--
 .../webpack/environments/production.js          |  11 +-
 .../main/js/gulpfile.babel.js/webpack/global.js |  59 ++-
 .../webpack/plugins/progress.js                 |  47 ++
 modules/web-console/src/main/js/package.json    |  14 +-
 9 files changed, 98 insertions(+), 546 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/fb8f08ba/modules/web-console/src/main/js/app/index.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/index.js b/modules/web-console/src/main/js/app/index.js
index 91b7b84..3f12eda 100644
--- a/modules/web-console/src/main/js/app/index.js
+++ b/modules/web-console/src/main/js/app/index.js
@@ -100,7 +100,7 @@ import 'controllers/profile-controller';
 import 'controllers/sql-controller';
 
 // Inject external modules.
-// import 'ignite_modules_temp/index'; // TODO: Modules integration.
+import 'ignite_modules_temp/index'; 
 
 import baseTemplate from '../views/base.jade';
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/fb8f08ba/modules/web-console/src/main/js/build/system.config.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/build/system.config.js b/modules/web-console/src/main/js/build/system.config.js
deleted file mode 100644
index 20af865..0000000
--- a/modules/web-console/src/main/js/build/system.config.js
+++ /dev/null
@@ -1,424 +0,0 @@
-System.config({
-  defaultJSExtensions: true,
-  transpiler: "babel",
-  babelOptions: {
-    "optional": [
-      "runtime",
-      "optimisation.modules.system"
-    ]
-  },
-  paths: {
-    "github:*": "build/jspm_packages/github/*",
-    "npm:*": "build/jspm_packages/npm/*"
-  },
-  separateCSS: true,
-
-  map: {
-    "ace": "github:ajaxorg/ace-builds@1.2.3",
-    "angular": "github:angular/bower-angular@1.5.5",
-    "angular-animate": "github:angular/bower-angular-animate@1.5.5",
-    "angular-drag-and-drop-lists": "github:marceljuenemann/angular-drag-and-drop-lists@1.4.0",
-    "angular-gridster": "github:ManifestWebDesign/angular-gridster@0.13.9",
-    "angular-motion": "github:mgcrea/angular-motion@0.4.4",
-    "angular-nvd3": "github:krispo/angular-nvd3@1.0.7",
-    "angular-retina": "github:jrief/angular-retina@0.3.8",
-    "angular-sanitize": "github:angular/bower-angular-sanitize@1.5.5",
-    "angular-smart-table": "github:lorenzofox3/Smart-Table@2.1.8",
-    "angular-socket-io": "github:btford/angular-socket-io@0.7.0",
-    "angular-strap": "github:mgcrea/angular-strap@2.3.8",
-    "angular-tree-control": "github:wix/angular-tree-control@0.2.26",
-    "angular-ui-grid": "github:angular-ui/bower-ui-grid@3.1.1",
-    "angular-ui-router": "github:angular-ui/ui-router@0.2.18",
-    "angular-ui-router-metatags": "github:tinusn/ui-router-metatags@1.0.3",
-    "babel": "npm:babel-core@5.8.38",
-    "babel-runtime": "npm:babel-runtime@5.8.38",
-    "blob": "github:eligrey/Blob.js@master",
-    "bootstrap-carousel": "github:twbs/bootstrap@3.3.6",
-    "clean-css": "npm:clean-css@3.4.12",
-    "core-js": "npm:core-js@1.2.6",
-    "css": "github:systemjs/plugin-css@0.1.21",
-    "file-saver": "github:eligrey/FileSaver.js@master",
-    "font-awesome": "npm:font-awesome@4.5.0",
-    "jade": "github:johnsoftek/plugin-jade@0.6.3",
-    "jquery": "github:components/jquery@2.2.1",
-    "json": "github:systemjs/plugin-json@0.1.2",
-    "jszip": "github:Stuk/jszip@2.6.0",
-    "lodash": "github:lodash/lodash@4.13.0",
-    "pdfmake": "github:bpampuch/pdfmake@0.1.20",
-    "query-command-supported": "github:zenorocha/document.queryCommandSupported@1.0.0",
-    "socket.io-client": "github:socketio/socket.io-client@1.4.5",
-    "text": "github:systemjs/plugin-text@0.0.7",
-    "github:angular-ui/bower-ui-grid@3.1.1": {
-      "pdfmake": "github:bpampuch/pdfmake@0.1.20"
-    },
-    "github:angular-ui/ui-router@0.2.18": {
-      "angular": "github:angular/bower-angular@1.5.5"
-    },
-    "github:angular/bower-angular-animate@1.5.5": {
-      "angular": "github:angular/bower-angular@1.5.5"
-    },
-    "github:angular/bower-angular-sanitize@1.5.5": {
-      "angular": "github:angular/bower-angular@1.5.5"
-    },
-    "github:angular/bower-angular@1.5.5": {
-      "jquery": "github:components/jquery@2.2.1"
-    },
-    "github:btford/angular-socket-io@0.7.0": {
-      "socket.io-client": "github:socketio/socket.io-client@1.4.5"
-    },
-    "github:eligrey/FileSaver.js@master": {
-      "blob": "github:eligrey/Blob.js@master"
-    },
-    "github:johnsoftek/plugin-jade@0.6.3": {
-      "jade-compiler": "npm:jade@1.11.0"
-    },
-    "github:jspm/nodelibs-assert@0.1.0": {
-      "assert": "npm:assert@1.4.0"
-    },
-    "github:jspm/nodelibs-buffer@0.1.0": {
-      "buffer": "npm:buffer@3.6.0"
-    },
-    "github:jspm/nodelibs-events@0.1.1": {
-      "events": "npm:events@1.0.2"
-    },
-    "github:jspm/nodelibs-http@1.7.1": {
-      "Base64": "npm:Base64@0.2.1",
-      "events": "github:jspm/nodelibs-events@0.1.1",
-      "inherits": "npm:inherits@2.0.1",
-      "stream": "github:jspm/nodelibs-stream@0.1.0",
-      "url": "github:jspm/nodelibs-url@0.1.0",
-      "util": "github:jspm/nodelibs-util@0.1.0"
-    },
-    "github:jspm/nodelibs-https@0.1.0": {
-      "https-browserify": "npm:https-browserify@0.0.0"
-    },
-    "github:jspm/nodelibs-os@0.1.0": {
-      "os-browserify": "npm:os-browserify@0.1.2"
-    },
-    "github:jspm/nodelibs-path@0.1.0": {
-      "path-browserify": "npm:path-browserify@0.0.0"
-    },
-    "github:jspm/nodelibs-process@0.1.2": {
-      "process": "npm:process@0.11.3"
-    },
-    "github:jspm/nodelibs-stream@0.1.0": {
-      "stream-browserify": "npm:stream-browserify@1.0.0"
-    },
-    "github:jspm/nodelibs-tty@0.1.0": {
-      "tty-browserify": "npm:tty-browserify@0.0.0"
-    },
-    "github:jspm/nodelibs-url@0.1.0": {
-      "url": "npm:url@0.10.3"
-    },
-    "github:jspm/nodelibs-util@0.1.0": {
-      "util": "npm:util@0.10.3"
-    },
-    "github:jspm/nodelibs-vm@0.1.0": {
-      "vm-browserify": "npm:vm-browserify@0.0.4"
-    },
-    "github:krispo/angular-nvd3@1.0.7": {
-      "d3": "npm:d3@3.5.14",
-      "nvd3": "npm:nvd3@1.8.1"
-    },
-    "github:mgcrea/angular-motion@0.4.4": {
-      "angular": "github:angular/bower-angular@1.5.5",
-      "css": "github:systemjs/plugin-css@0.1.21"
-    },
-    "github:mgcrea/angular-strap@2.3.8": {
-      "angular": "github:angular/bower-angular@1.5.5",
-      "angular-animate": "github:angular/bower-angular-animate@1.5.5",
-      "angular-motion": "github:mgcrea/angular-motion@0.4.4",
-      "angular-sanitize": "github:angular/bower-angular-sanitize@1.5.5"
-    },
-    "github:twbs/bootstrap@3.3.6": {
-      "jquery": "npm:jquery@2.2.4"
-    },
-    "npm:acorn-globals@1.0.9": {
-      "acorn": "npm:acorn@2.7.0"
-    },
-    "npm:acorn@1.2.2": {
-      "fs": "github:jspm/nodelibs-fs@0.1.2",
-      "path": "github:jspm/nodelibs-path@0.1.0",
-      "process": "github:jspm/nodelibs-process@0.1.2",
-      "stream": "github:jspm/nodelibs-stream@0.1.0"
-    },
-    "npm:acorn@2.7.0": {
-      "fs": "github:jspm/nodelibs-fs@0.1.2",
-      "path": "github:jspm/nodelibs-path@0.1.0",
-      "process": "github:jspm/nodelibs-process@0.1.2",
-      "stream": "github:jspm/nodelibs-stream@0.1.0"
-    },
-    "npm:align-text@0.1.4": {
-      "kind-of": "npm:kind-of@3.0.3",
-      "longest": "npm:longest@1.0.1",
-      "repeat-string": "npm:repeat-string@1.5.4"
-    },
-    "npm:amdefine@1.0.0": {
-      "fs": "github:jspm/nodelibs-fs@0.1.2",
-      "module": "github:jspm/nodelibs-module@0.1.0",
-      "path": "github:jspm/nodelibs-path@0.1.0",
-      "process": "github:jspm/nodelibs-process@0.1.2"
-    },
-    "npm:asap@1.0.0": {
-      "process": "github:jspm/nodelibs-process@0.1.2"
-    },
-    "npm:assert@1.4.0": {
-      "assert": "github:jspm/nodelibs-assert@0.1.0",
-      "buffer": "github:jspm/nodelibs-buffer@0.1.0",
-      "buffer-shims": "npm:buffer-shims@1.0.0",
-      "process": "github:jspm/nodelibs-process@0.1.2",
-      "util": "npm:util@0.10.3"
-    },
-    "npm:async@0.2.10": {
-      "process": "github:jspm/nodelibs-process@0.1.2"
-    },
-    "npm:babel-runtime@5.8.38": {
-      "process": "github:jspm/nodelibs-process@0.1.2"
-    },
-    "npm:buffer-shims@1.0.0": {
-      "buffer": "github:jspm/nodelibs-buffer@0.1.0"
-    },
-    "npm:buffer@3.6.0": {
-      "base64-js": "npm:base64-js@0.0.8",
-      "child_process": "github:jspm/nodelibs-child_process@0.1.0",
-      "fs": "github:jspm/nodelibs-fs@0.1.2",
-      "ieee754": "npm:ieee754@1.1.6",
-      "isarray": "npm:isarray@1.0.0",
-      "process": "github:jspm/nodelibs-process@0.1.2"
-    },
-    "npm:center-align@0.1.3": {
-      "align-text": "npm:align-text@0.1.4",
-      "lazy-cache": "npm:lazy-cache@1.0.4"
-    },
-    "npm:clean-css@3.4.12": {
-      "buffer": "github:jspm/nodelibs-buffer@0.1.0",
-      "commander": "npm:commander@2.8.1",
-      "fs": "github:jspm/nodelibs-fs@0.1.2",
-      "http": "github:jspm/nodelibs-http@1.7.1",
-      "https": "github:jspm/nodelibs-https@0.1.0",
-      "os": "github:jspm/nodelibs-os@0.1.0",
-      "path": "github:jspm/nodelibs-path@0.1.0",
-      "process": "github:jspm/nodelibs-process@0.1.2",
-      "source-map": "npm:source-map@0.4.4",
-      "url": "github:jspm/nodelibs-url@0.1.0",
-      "util": "github:jspm/nodelibs-util@0.1.0"
-    },
-    "npm:cliui@2.1.0": {
-      "center-align": "npm:center-align@0.1.3",
-      "right-align": "npm:right-align@0.1.3",
-      "wordwrap": "npm:wordwrap@0.0.2"
-    },
-    "npm:commander@2.6.0": {
-      "child_process": "github:jspm/nodelibs-child_process@0.1.0",
-      "events": "github:jspm/nodelibs-events@0.1.1",
-      "path": "github:jspm/nodelibs-path@0.1.0",
-      "process": "github:jspm/nodelibs-process@0.1.2"
-    },
-    "npm:commander@2.8.1": {
-      "child_process": "github:jspm/nodelibs-child_process@0.1.0",
-      "events": "github:jspm/nodelibs-events@0.1.1",
-      "fs": "github:jspm/nodelibs-fs@0.1.2",
-      "graceful-readlink": "npm:graceful-readlink@1.0.1",
-      "path": "github:jspm/nodelibs-path@0.1.0",
-      "process": "github:jspm/nodelibs-process@0.1.2"
-    },
-    "npm:constantinople@3.0.2": {
-      "acorn": "npm:acorn@2.7.0"
-    },
-    "npm:core-js@1.2.6": {
-      "fs": "github:jspm/nodelibs-fs@0.1.2",
-      "path": "github:jspm/nodelibs-path@0.1.0",
-      "process": "github:jspm/nodelibs-process@0.1.2",
-      "systemjs-json": "github:systemjs/plugin-json@0.1.2"
-    },
-    "npm:core-util-is@1.0.2": {
-      "buffer": "github:jspm/nodelibs-buffer@0.1.0"
-    },
-    "npm:css@1.0.8": {
-      "assert": "github:jspm/nodelibs-assert@0.1.0",
-      "css-parse": "npm:css-parse@1.0.4",
-      "css-stringify": "npm:css-stringify@1.0.5",
-      "fs": "github:jspm/nodelibs-fs@0.1.2",
-      "process": "github:jspm/nodelibs-process@0.1.2"
-    },
-    "npm:font-awesome@4.5.0": {
-      "css": "github:systemjs/plugin-css@0.1.21"
-    },
-    "npm:graceful-readlink@1.0.1": {
-      "fs": "github:jspm/nodelibs-fs@0.1.2"
-    },
-    "npm:https-browserify@0.0.0": {
-      "http": "github:jspm/nodelibs-http@1.7.1"
-    },
-    "npm:inherits@2.0.1": {
-      "util": "github:jspm/nodelibs-util@0.1.0"
-    },
-    "npm:is-buffer@1.1.3": {
-      "buffer": "github:jspm/nodelibs-buffer@0.1.0"
-    },
-    "npm:isarray@1.0.0": {
-      "systemjs-json": "github:systemjs/plugin-json@0.1.2"
-    },
-    "npm:jade@1.11.0": {
-      "buffer": "github:jspm/nodelibs-buffer@0.1.0",
-      "character-parser": "npm:character-parser@1.2.1",
-      "clean-css": "npm:clean-css@3.4.12",
-      "commander": "npm:commander@2.6.0",
-      "constantinople": "npm:constantinople@3.0.2",
-      "jstransformer": "npm:jstransformer@0.0.2",
-      "mkdirp": "npm:mkdirp@0.5.1",
-      "path": "github:jspm/nodelibs-path@0.1.0",
-      "process": "github:jspm/nodelibs-process@0.1.2",
-      "systemjs-json": "github:systemjs/plugin-json@0.1.2",
-      "transformers": "npm:transformers@2.1.0",
-      "uglify-js": "npm:uglify-js@2.6.2",
-      "void-elements": "npm:void-elements@2.0.1",
-      "with": "npm:with@4.0.3"
-    },
-    "npm:jstransformer@0.0.2": {
-      "assert": "github:jspm/nodelibs-assert@0.1.0",
-      "fs": "github:jspm/nodelibs-fs@0.1.2",
-      "is-promise": "npm:is-promise@2.1.0",
-      "promise": "npm:promise@6.1.0"
-    },
-    "npm:kind-of@3.0.3": {
-      "buffer": "github:jspm/nodelibs-buffer@0.1.0",
-      "is-buffer": "npm:is-buffer@1.1.3"
-    },
-    "npm:lazy-cache@1.0.4": {
-      "process": "github:jspm/nodelibs-process@0.1.2"
-    },
-    "npm:mkdirp@0.5.1": {
-      "fs": "github:jspm/nodelibs-fs@0.1.2",
-      "minimist": "npm:minimist@0.0.8",
-      "path": "github:jspm/nodelibs-path@0.1.0",
-      "process": "github:jspm/nodelibs-process@0.1.2"
-    },
-    "npm:nvd3@1.8.1": {
-      "d3": "npm:d3@3.5.14"
-    },
-    "npm:optimist@0.3.7": {
-      "path": "github:jspm/nodelibs-path@0.1.0",
-      "process": "github:jspm/nodelibs-process@0.1.2",
-      "wordwrap": "npm:wordwrap@0.0.2"
-    },
-    "npm:os-browserify@0.1.2": {
-      "os": "github:jspm/nodelibs-os@0.1.0"
-    },
-    "npm:path-browserify@0.0.0": {
-      "process": "github:jspm/nodelibs-process@0.1.2"
-    },
-    "npm:process@0.11.3": {
-      "assert": "github:jspm/nodelibs-assert@0.1.0"
-    },
-    "npm:promise@2.0.0": {
-      "is-promise": "npm:is-promise@1.0.1",
-      "process": "github:jspm/nodelibs-process@0.1.2"
-    },
-    "npm:promise@6.1.0": {
-      "asap": "npm:asap@1.0.0"
-    },
-    "npm:punycode@1.3.2": {
-      "process": "github:jspm/nodelibs-process@0.1.2"
-    },
-    "npm:readable-stream@1.1.14": {
-      "buffer": "github:jspm/nodelibs-buffer@0.1.0",
-      "core-util-is": "npm:core-util-is@1.0.2",
-      "events": "github:jspm/nodelibs-events@0.1.1",
-      "inherits": "npm:inherits@2.0.1",
-      "isarray": "npm:isarray@0.0.1",
-      "process": "github:jspm/nodelibs-process@0.1.2",
-      "stream-browserify": "npm:stream-browserify@1.0.0",
-      "string_decoder": "npm:string_decoder@0.10.31"
-    },
-    "npm:right-align@0.1.3": {
-      "align-text": "npm:align-text@0.1.4"
-    },
-    "npm:source-map@0.1.43": {
-      "amdefine": "npm:amdefine@1.0.0",
-      "fs": "github:jspm/nodelibs-fs@0.1.2",
-      "path": "github:jspm/nodelibs-path@0.1.0",
-      "process": "github:jspm/nodelibs-process@0.1.2"
-    },
-    "npm:source-map@0.4.4": {
-      "amdefine": "npm:amdefine@1.0.0",
-      "process": "github:jspm/nodelibs-process@0.1.2"
-    },
-    "npm:source-map@0.5.6": {
-      "process": "github:jspm/nodelibs-process@0.1.2"
-    },
-    "npm:stream-browserify@1.0.0": {
-      "events": "github:jspm/nodelibs-events@0.1.1",
-      "inherits": "npm:inherits@2.0.1",
-      "readable-stream": "npm:readable-stream@1.1.14"
-    },
-    "npm:string_decoder@0.10.31": {
-      "buffer": "github:jspm/nodelibs-buffer@0.1.0"
-    },
-    "npm:transformers@2.1.0": {
-      "css": "npm:css@1.0.8",
-      "fs": "github:jspm/nodelibs-fs@0.1.2",
-      "path": "github:jspm/nodelibs-path@0.1.0",
-      "process": "github:jspm/nodelibs-process@0.1.2",
-      "promise": "npm:promise@2.0.0",
-      "uglify-js": "npm:uglify-js@2.2.5",
-      "vm": "github:jspm/nodelibs-vm@0.1.0"
-    },
-    "npm:uglify-js@2.2.5": {
-      "fs": "github:jspm/nodelibs-fs@0.1.2",
-      "optimist": "npm:optimist@0.3.7",
-      "path": "github:jspm/nodelibs-path@0.1.0",
-      "process": "github:jspm/nodelibs-process@0.1.2",
-      "source-map": "npm:source-map@0.1.43",
-      "util": "github:jspm/nodelibs-util@0.1.0",
-      "vm": "github:jspm/nodelibs-vm@0.1.0"
-    },
-    "npm:uglify-js@2.6.2": {
-      "async": "npm:async@0.2.10",
-      "fs": "github:jspm/nodelibs-fs@0.1.2",
-      "path": "github:jspm/nodelibs-path@0.1.0",
-      "process": "github:jspm/nodelibs-process@0.1.2",
-      "source-map": "npm:source-map@0.5.6",
-      "uglify-to-browserify": "npm:uglify-to-browserify@1.0.2",
-      "yargs": "npm:yargs@3.10.0"
-    },
-    "npm:uglify-to-browserify@1.0.2": {
-      "fs": "github:jspm/nodelibs-fs@0.1.2",
-      "stream": "github:jspm/nodelibs-stream@0.1.0"
-    },
-    "npm:url@0.10.3": {
-      "assert": "github:jspm/nodelibs-assert@0.1.0",
-      "punycode": "npm:punycode@1.3.2",
-      "querystring": "npm:querystring@0.2.0",
-      "util": "github:jspm/nodelibs-util@0.1.0"
-    },
-    "npm:util@0.10.3": {
-      "inherits": "npm:inherits@2.0.1",
-      "process": "github:jspm/nodelibs-process@0.1.2"
-    },
-    "npm:vm-browserify@0.0.4": {
-      "indexof": "npm:indexof@0.0.1"
-    },
-    "npm:void-elements@2.0.1": {
-      "http": "github:jspm/nodelibs-http@1.7.1"
-    },
-    "npm:window-size@0.1.0": {
-      "process": "github:jspm/nodelibs-process@0.1.2",
-      "tty": "github:jspm/nodelibs-tty@0.1.0"
-    },
-    "npm:with@4.0.3": {
-      "acorn": "npm:acorn@1.2.2",
-      "acorn-globals": "npm:acorn-globals@1.0.9"
-    },
-    "npm:yargs@3.10.0": {
-      "assert": "github:jspm/nodelibs-assert@0.1.0",
-      "camelcase": "npm:camelcase@1.2.1",
-      "cliui": "npm:cliui@2.1.0",
-      "decamelize": "npm:decamelize@1.2.0",
-      "fs": "github:jspm/nodelibs-fs@0.1.2",
-      "path": "github:jspm/nodelibs-path@0.1.0",
-      "process": "github:jspm/nodelibs-process@0.1.2",
-      "window-size": "npm:window-size@0.1.0"
-    }
-  }
-});

http://git-wip-us.apache.org/repos/asf/ignite/blob/fb8f08ba/modules/web-console/src/main/js/gulpfile.babel.js/tasks/bundle.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/bundle.js b/modules/web-console/src/main/js/gulpfile.babel.js/tasks/bundle.js
index c584665..1f817fb 100644
--- a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/bundle.js
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/tasks/bundle.js
@@ -16,32 +16,16 @@
  */
 
 import gulp from 'gulp';
-import util from 'gulp-util';
 import webpack from 'webpack';
 import webpackConfig from '../../webpack.config';
 import WebpackDevServer from 'webpack-dev-server';
 
-import {srcDir, destDir, igniteModulesTemp} from '../paths';
-
-
-// TODO source map
-// const options = {
-//     minify: true
-// };
-//
-// if (util.env.debug)
-//     delete options.minify;
-//
-// if (util.env.debug || util.env.sourcemaps)
-//     options.sourceMaps = true;
-
-gulp.task('bundle', ['bundle:ignite']);
-
-// Package all external dependencies and ignite-console.
-gulp.task('bundle:ignite', (cb) => {
-    const compiler = webpack(webpackConfig, cb);
-
-    if(process.env.NODE_ENV==='development' && webpackConfig.devServer)
-        new WebpackDevServer(compiler, webpackConfig.devServer)
-            .listen(webpackConfig.devServer.port || 9000, 'localhost');
+gulp.task('bundle', (cb) => {
+    if (process.env.NODE_ENV === 'development')
+        // Important! Call webpack and WebpackDevServer must be inline.
+        new WebpackDevServer(webpack(webpackConfig), webpackConfig.devServer)
+            .listen(webpackConfig.devServer.port, 'localhost');
+    else
+        webpack(webpackConfig, cb);
 });
+

http://git-wip-us.apache.org/repos/asf/ignite/blob/fb8f08ba/modules/web-console/src/main/js/gulpfile.babel.js/tasks/watch.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/watch.js b/modules/web-console/src/main/js/gulpfile.babel.js/tasks/watch.js
index 27b13bd..b2f8348 100644
--- a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/watch.js
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/tasks/watch.js
@@ -21,7 +21,7 @@ import sequence from 'gulp-sequence';
 import { jadePaths, jadeModulePaths, resourcePaths, resourceModulePaths, appPaths, appModulePaths } from '../paths';
 
 //TODO Webpack stream || webpack autoload
-gulp.task('watch:ignite-modules', (cb) => sequence('clean:ignite-modules-temp', 'ignite:modules', ['copy:ignite_modules:js', 'bundle:ignite:app'], cb));
+gulp.task('watch:ignite-modules', (cb) => sequence('clean:ignite-modules-temp', 'ignite:modules', ['copy:ignite_modules:js'], cb));
 
 // Build + connect + watch task.
 gulp.task('watch', ['build'], () => {

http://git-wip-us.apache.org/repos/asf/ignite/blob/fb8f08ba/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/development.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/development.js b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/development.js
index fc3c3af..37f3eca 100644
--- a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/development.js
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/development.js
@@ -1,27 +1,13 @@
 'use strict';
 
 import webpack from 'webpack';
-import ProgressPlugin from 'webpack/lib/ProgressPlugin';
 import HtmlWebpackPlugin from 'html-webpack-plugin';
 import {destDir, rootDir} from '../../paths';
 import jade from 'jade';
 import path from 'path';
 
 module.exports = function () {
-    let chars = 0,
-        lastState, lastStateTime;
 
-    const _goToLineStart = (nextMessage) => {
-        var str = "";
-        for (; chars > nextMessage.length; chars--) {
-            str += "\b \b";
-        }
-        chars = nextMessage.length;
-        for (var i = 0; i < chars; i++) {
-            str += "\b";
-        }
-        if (str) process.stderr.write(str);
-    };
 
     let plugins = [
         new webpack.HotModuleReplacementPlugin(),
@@ -31,36 +17,6 @@ module.exports = function () {
                 return jade.renderFile(path.join(rootDir, 'views', 'index.jade'));
             },
             title: 'DEBUG:Ignite Web Console'
-        }),
-        new ProgressPlugin((percentage, msg) => {
-            var state = msg;
-            if (percentage < 1) {
-                percentage = Math.floor(percentage * 100);
-                msg = percentage + "% " + msg;
-                if (percentage < 100) {
-                    msg = " " + msg;
-                }
-                if (percentage < 10) {
-                    msg = " " + msg;
-                }
-            }
-            state = state.replace(/^\d+\/\d+\s+/, "");
-            if (percentage === 0) {
-                lastState = null;
-                lastStateTime = +new Date();
-            } else if (state !== lastState || percentage === 1) {
-                var now = +new Date();
-                if (lastState) {
-                    var stateMsg = (now - lastStateTime) + "ms " + lastState;
-                    _goToLineStart(stateMsg);
-                    process.stderr.write(stateMsg + "\n");
-                    chars = 0;
-                }
-                lastState = state;
-                lastStateTime = now;
-            }
-            _goToLineStart(msg);
-            process.stderr.write(msg);
         })
     ];
 
@@ -71,12 +27,11 @@ module.exports = function () {
         devtool: 'eval',
         devServer: {
             historyApiFallback: true,
-            // publicPath: '/',
+            publicPath: '/',
             contentBase: destDir,
-            // info: true,
-            // hot: true,
-            // inline: true,
-            // quiet: false,
+            info: true,
+            hot: true,
+            inline: true,
             proxy: {
                 '/socket.io': {
                     target: 'http://localhost:3000',

http://git-wip-us.apache.org/repos/asf/ignite/blob/fb8f08ba/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/production.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/production.js b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/production.js
index d2f1345..4c63d8c 100644
--- a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/production.js
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/production.js
@@ -14,7 +14,7 @@ module.exports = function (_path) {
         output: {
             publicPath: '/',
             filename: '[name].[chunkhash].js',
-            contentBase: destDir
+            path: destDir
         },
         plugins: [
             new HtmlWebpackPlugin({
@@ -24,7 +24,14 @@ module.exports = function (_path) {
                 },
                 title: 'Ignite Web Console'
             }),
-            new webpack.optimize.DedupePlugin()
+            new webpack.optimize.DedupePlugin(),
+            new webpack.optimize.UglifyJsPlugin({
+                path: destDir,
+                minimize: true,
+                warnings: false,
+                sourceMap: true,
+                mangle: true
+            })
         ]
     };
 };
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/fb8f08ba/modules/web-console/src/main/js/gulpfile.babel.js/webpack/global.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/global.js b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/global.js
index c8ea2c7..9000038 100644
--- a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/global.js
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/global.js
@@ -3,6 +3,8 @@
 import path from 'path';
 import webpack from 'webpack';
 import autoprefixer from 'autoprefixer-core';
+import progressPlugin from './plugins/progress';
+
 //import  Manifest from 'manifest-revision-webpack-plugin';
 import ExtractTextPlugin from 'extract-text-webpack-plugin';
 import {srcDir, destDir, rootDir} from '../paths';
@@ -22,13 +24,14 @@ module.exports = function (_path) {
         // entry points
         entry: {
             polyfill: 'babel-polyfill',
-            app: srcDir + '/index.js',
-            vendor: srcDir + '/vendor.js',
+            app: path.join(srcDir, 'index.js'),
+            vendor: path.join(srcDir, 'vendor.js')
         },
 
-        // // output system
+        // Output system.
         output: {
             path: destDir,
+            publicPath: './',
             filename: '[name].js'
         },
 
@@ -69,15 +72,15 @@ module.exports = function (_path) {
                         'jade-html-loader'
                     ]
                 },
-                // {
-                //     test: /\.js$/,
-                //     loaders: ['baggage-loader?[file].html&[file].css']
-                // },
-                // {
-                //     test: /\.js$/,
-                //     exclude: [NODE_MODULES_PATH],
-                //     loaders: ['ng-annotate-loader']
-                // },
+                {
+                    test: /\.js$/,
+                    loaders: ['baggage-loader?[file].html&[file].css']
+                },
+                {
+                    test: /\.js$/,
+                    exclude: [NODE_MODULES_PATH],
+                    loaders: ['ng-annotate-loader']
+                },
                 {
                     test: /\.js$/,
                     exclude: [NODE_MODULES_PATH],
@@ -105,14 +108,14 @@ module.exports = function (_path) {
                 {
                     test: /\.(jpe?g|png|gif)$/i,
                     loaders: ['url-loader?name=images/[name]_[hash].[ext]']
-                }
-                // {
-                //     test: require.resolve("jquery"),
-                //     loaders: [
-                //         "expose?$",
-                //         "expose?jQuery"
-                //     ]
-                // },
+                },
+                {
+                    test: require.resolve("jquery"),
+                    loaders: [
+                        "expose?$",
+                        "expose?jQuery"
+                    ]
+                },
                 // {
                 //     test: require.resolve("angular"),
                 //     loaders: [
@@ -147,20 +150,10 @@ module.exports = function (_path) {
             //     rootAssetPath: rootAssetPath,
             //     ignorePaths: ['.DS_Store']
             // }),
-            new ExtractTextPlugin('assets/css/[name]' + (IS_DEVELOPMENT ? '' : '.[chunkhash]') + '.css', {allChunks: true})
+            new ExtractTextPlugin('assets/css/[name]' + (IS_DEVELOPMENT ? '' : '.[chunkhash]') + '.css', {allChunks: true}),
+            progressPlugin
         ]
     };
-
-    if (!IS_DEVELOPMENT) {
-        webpackConfig.plugins = webpackConfig.plugins.concat([
-            new webpack.optimize.UglifyJsPlugin({
-                minimize: true,
-                warnings: false,
-                sourceMap: true
-            })
-        ]);
-    }
-
+    
     return webpackConfig;
-
 };

http://git-wip-us.apache.org/repos/asf/ignite/blob/fb8f08ba/modules/web-console/src/main/js/gulpfile.babel.js/webpack/plugins/progress.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/plugins/progress.js b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/plugins/progress.js
new file mode 100644
index 0000000..b6f21b9
--- /dev/null
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/plugins/progress.js
@@ -0,0 +1,47 @@
+import ProgressPlugin from 'webpack/lib/ProgressPlugin';
+
+let chars = 0,
+    lastState, lastStateTime;
+
+const _goToLineStart = (nextMessage) => {
+    var str = "";
+    for (; chars > nextMessage.length; chars--) {
+        str += "\b \b";
+    }
+    chars = nextMessage.length;
+    for (var i = 0; i < chars; i++) {
+        str += "\b";
+    }
+    if (str) process.stderr.write(str);
+};
+
+export default new ProgressPlugin((percentage, msg) => {
+    var state = msg;
+    if (percentage < 1) {
+        percentage = Math.floor(percentage * 100);
+        msg = percentage + "% " + msg;
+        if (percentage < 100) {
+            msg = " " + msg;
+        }
+        if (percentage < 10) {
+            msg = " " + msg;
+        }
+    }
+    state = state.replace(/^\d+\/\d+\s+/, "");
+    if (percentage === 0) {
+        lastState = null;
+        lastStateTime = +new Date();
+    } else if (state !== lastState || percentage === 1) {
+        var now = +new Date();
+        if (lastState) {
+            var stateMsg = (now - lastStateTime) + "ms " + lastState;
+            _goToLineStart(stateMsg);
+            process.stderr.write(stateMsg + "\n");
+            chars = 0;
+        }
+        lastState = state;
+        lastStateTime = now;
+    }
+    _goToLineStart(msg);
+    process.stderr.write(msg);
+});
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/fb8f08ba/modules/web-console/src/main/js/package.json
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/package.json b/modules/web-console/src/main/js/package.json
index c71f7c5..0b46586 100644
--- a/modules/web-console/src/main/js/package.json
+++ b/modules/web-console/src/main/js/package.json
@@ -4,7 +4,7 @@
   "description": "Interactive Web console for configuration, executing SQL queries and monitoring of Apache Ignite Cluster",
   "private": true,
   "scripts": {
-    "dev": "cross-env NODE_ENV=development gulp watch",
+    "dev": " NODE_ENV=development node $NODE_DEBUG_OPTION ./node_modules/gulp/bin/gulp.js watch",
     "dist": "cross-env NODE_ENV=production gulp build"
   },
   "author": "",
@@ -113,19 +113,9 @@
     "ws": "^0.8.0"
   },
   "devDependencies": {
-    "gulp": "^3.9.0",
     "gulp-cached": "^1.1.0",
-    "gulp-connect": "^3.2.2",
-    "gulp-environments": "^0.1.1",
-    "gulp-eslint": "^2.0.0",
-    "gulp-html-replace": "^1.5.5",
-    "gulp-ignore": "^2.0.1",
-    "gulp-inject": "^4.0.0",
-    "gulp-jade": "^1.1.0",
     "gulp-rimraf": "^0.2.0",
-    "gulp-sass": "^2.1.0",
-    "gulp-sequence": "^0.4.1",
-    "gulp-util": "^3.0.7",
+    "gulp-sequence": "^0.4.5",
     "http-proxy-middleware": "^0.13.0",
     "json-loader": "^0.5.4",
     "mocha": "~2.4.5",


[19/50] [abbrv] ignite git commit: Merge branch 'web-console-staging' of https://github.com/gridgain/apache-ignite into web-console-staging

Posted by an...@apache.org.
Merge branch 'web-console-staging' of https://github.com/gridgain/apache-ignite into web-console-staging


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

Branch: refs/heads/ignite-3262
Commit: 1e78374a1ca6ac73bcafe014e627e6c37b39c344
Parents: c9ad356 f97b757
Author: Dmitriyff <dm...@gmail.com>
Authored: Tue Jun 7 11:05:38 2016 +0700
Committer: Dmitriyff <dm...@gmail.com>
Committed: Tue Jun 7 11:05:38 2016 +0700

----------------------------------------------------------------------
 .../main/js/controllers/caches-controller.js    | 102 +++++---------
 .../main/js/controllers/clusters-controller.js  | 137 +++++++++----------
 .../src/main/js/controllers/common-module.js    |  35 +++++
 .../main/js/controllers/domains-controller.js   |  70 +++-------
 4 files changed, 160 insertions(+), 184 deletions(-)
----------------------------------------------------------------------



[47/50] [abbrv] ignite git commit: IGNITE-3262 Fixed tests.

Posted by an...@apache.org.
IGNITE-3262 Fixed tests.


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

Branch: refs/heads/ignite-3262
Commit: 4537158260fc817800b099fc94e073789d07bdae
Parents: 5d274a6
Author: Andrey Novikov <an...@apache.org>
Authored: Fri Jun 17 13:22:28 2016 +0700
Committer: Andrey Novikov <an...@apache.org>
Committed: Fri Jun 17 13:22:28 2016 +0700

----------------------------------------------------------------------
 modules/web-console/src/main/js/karma.conf.js   |  9 +++----
 .../src/main/js/test/unit/JavaTypes.test.js     | 25 ++++++++++++++++----
 .../web-console/src/main/js/test/unit/test.js   | 17 +++++++++++++
 3 files changed, 43 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/45371582/modules/web-console/src/main/js/karma.conf.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/karma.conf.js b/modules/web-console/src/main/js/karma.conf.js
index b6533ca..72af49d 100644
--- a/modules/web-console/src/main/js/karma.conf.js
+++ b/modules/web-console/src/main/js/karma.conf.js
@@ -29,10 +29,11 @@ module.exports = function(config) {
     ],
 
     plugins: [
+      require('karma-teamcity-reporter'),
+      require('karma-jasmine'),
       require('karma-babel-preprocessor'),
       require('karma-phantomjs-launcher'),
-      require('karma-webpack'),
-      require('karma-jasmine')
+      require('karma-webpack')
     ],
 
     // Preprocess matching files before serving them to the browser
@@ -56,7 +57,7 @@ module.exports = function(config) {
     // Test results reporter to use
     // possible values: 'dots', 'progress'
     // available reporters: https://npmjs.org/browse/keyword/karma-reporter.
-    reporters: ['progress'],
+    reporters: ['teamcity'],
 
     // web server port
     port: 9876,
@@ -83,4 +84,4 @@ module.exports = function(config) {
     // how many browser should be started simultaneous
     concurrency: Infinity
   })
-}
+};

http://git-wip-us.apache.org/repos/asf/ignite/blob/45371582/modules/web-console/src/main/js/test/unit/JavaTypes.test.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/test/unit/JavaTypes.test.js b/modules/web-console/src/main/js/test/unit/JavaTypes.test.js
index 6a02dc9..77cf4e5 100644
--- a/modules/web-console/src/main/js/test/unit/JavaTypes.test.js
+++ b/modules/web-console/src/main/js/test/unit/JavaTypes.test.js
@@ -1,13 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 describe('nonBuiltInClass', () => {
   it('one', (done) => {
     done()
-  })
+  });
 
   it('two', (done) => {
     done()
-  })
+  });
 
   it('three', (done) => {
     done()
-  })
-})
\ No newline at end of file
+  });
+});

http://git-wip-us.apache.org/repos/asf/ignite/blob/45371582/modules/web-console/src/main/js/test/unit/test.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/test/unit/test.js b/modules/web-console/src/main/js/test/unit/test.js
index 09e7683..d607ca2 100644
--- a/modules/web-console/src/main/js/test/unit/test.js
+++ b/modules/web-console/src/main/js/test/unit/test.js
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 export default [function test() {
     return true;
 }];


[04/50] [abbrv] ignite git commit: GG-11183 Fixed serialization of Throwable.

Posted by an...@apache.org.
GG-11183 Fixed serialization of Throwable.


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

Branch: refs/heads/ignite-3262
Commit: a5a5be7d468b080ceec982e214eb76ab1cbe10a3
Parents: 92f1b24
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Thu Jun 2 16:56:18 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Thu Jun 2 16:56:18 2016 +0700

----------------------------------------------------------------------
 .../http/jetty/GridJettyJsonConfig.java         | 27 ++++++++++++++++++++
 .../http/jetty/GridJettyRestHandler.java        |  6 +++--
 2 files changed, 31 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/a5a5be7d/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyJsonConfig.java
----------------------------------------------------------------------
diff --git a/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyJsonConfig.java b/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyJsonConfig.java
index 955eb47..b85d01e 100644
--- a/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyJsonConfig.java
+++ b/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyJsonConfig.java
@@ -205,6 +205,32 @@ class GridJettyJsonConfig extends JsonConfig {
     };
 
     /**
+     * Helper class for simple to-string conversion for {@link UUID}.
+     */
+    private static JsonValueProcessor THROWABLE_PROCESSOR = new AbstractJsonValueProcessor() {
+        /** {@inheritDoc} */
+        protected Object processBean(Object bean, JsonConfig jsonCfg) {
+            if (bean == null)
+                return new JSONObject(true);
+
+            if (bean instanceof Throwable) {
+                Throwable e = (Throwable)bean;
+
+                final JSONObject ret = new JSONObject();
+
+                ret.element("message", e.getMessage(), jsonCfg);
+
+                if (e.getCause() != null)
+                    ret.element("cause", e.getCause(), jsonCfg);
+
+                return ret;
+            }
+
+            throw new UnsupportedOperationException("Serialize value to json is not supported: " + bean);
+        }
+    };
+
+    /**
      * Constructs default jetty json config.
      */
     GridJettyJsonConfig(IgniteLogger log) {
@@ -218,6 +244,7 @@ class GridJettyJsonConfig extends JsonConfig {
         registerJsonValueProcessor(Date.class, DATE_PROCESSOR);
         registerJsonValueProcessor(java.sql.Date.class, DATE_PROCESSOR);
         registerJsonValueProcessor(HashMap.class, NULL_MAP_PREPROCESSOR);
+        registerJsonValueProcessor(Throwable.class, THROWABLE_PROCESSOR);
 
         final LessNamingProcessor lessNamingProcessor = new LessNamingProcessor();
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/a5a5be7d/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java
----------------------------------------------------------------------
diff --git a/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java b/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java
index b6a386b..bcee2b4 100644
--- a/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java
+++ b/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java
@@ -74,11 +74,13 @@ import static org.apache.ignite.internal.processors.rest.GridRestResponse.STATUS
 public class GridJettyRestHandler extends AbstractHandler {
     /** JSON value processor that does not transform input object. */
     private static final JsonValueProcessor SKIP_STR_VAL_PROC = new JsonValueProcessor() {
-        @Override public Object processArrayValue(Object o, JsonConfig jsonConfig) {
+        /** {@inheritDoc} */
+        @Override public Object processArrayValue(Object o, JsonConfig jsonCfg) {
             return o;
         }
 
-        @Override public Object processObjectValue(String s, Object o, JsonConfig jsonConfig) {
+        /** {@inheritDoc} */
+        @Override public Object processObjectValue(String s, Object o, JsonConfig jsonCfg) {
             return o;
         }
     };


[46/50] [abbrv] ignite git commit: IGNITE-3262 added text runner

Posted by an...@apache.org.
IGNITE-3262 added text runner


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

Branch: refs/heads/ignite-3262
Commit: 5d274a61be183b10168afc9cfd2dccb96ad35346
Parents: 2b6834b
Author: Dmitriyff Smile <dm...@gmail.com>
Authored: Fri Jun 17 11:45:12 2016 +0700
Committer: Dmitriyff Smile <dm...@gmail.com>
Committed: Fri Jun 17 11:45:12 2016 +0700

----------------------------------------------------------------------
 modules/web-console/src/main/js/karma.conf.js   | 86 ++++++++++++++++++++
 modules/web-console/src/main/js/package.json    | 27 ++++--
 .../src/main/js/test/unit/JavaTypes.test.js     | 13 +++
 .../web-console/src/main/js/test/unit/test.js   |  3 +
 4 files changed, 120 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/5d274a61/modules/web-console/src/main/js/karma.conf.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/karma.conf.js b/modules/web-console/src/main/js/karma.conf.js
new file mode 100644
index 0000000..b6533ca
--- /dev/null
+++ b/modules/web-console/src/main/js/karma.conf.js
@@ -0,0 +1,86 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+module.exports = function(config) {
+  config.set({
+    // Base path that will be used to resolve all patterns (eg. files, exclude).
+    basePath: '',
+
+    // Frameworks to use available frameworks: https://npmjs.org/browse/keyword/karma-adapter
+    frameworks: ['jasmine'],
+
+    // List of files / patterns to load in the browser.
+    files: [
+      'test/**/*.test.js'
+    ],
+
+    plugins: [
+      require('karma-babel-preprocessor'),
+      require('karma-phantomjs-launcher'),
+      require('karma-webpack'),
+      require('karma-jasmine')
+    ],
+
+    // Preprocess matching files before serving them to the browser
+    // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor.
+    preprocessors: {
+        'test/**/*.js': ['webpack']
+    },
+
+    webpack: {
+      devtool: 'inline-source-map',
+      module: {
+        loaders: [
+          {test: /\.js/, loaders: ['babel'], exclude: /node_modules/}
+        ]
+      },
+      resolve: {
+        extensions: ["", ".js"]
+      }
+    },
+
+    // Test results reporter to use
+    // possible values: 'dots', 'progress'
+    // available reporters: https://npmjs.org/browse/keyword/karma-reporter.
+    reporters: ['progress'],
+
+    // web server port
+    port: 9876,
+
+    // enable / disable colors in the output (reporters and logs)
+    colors: true,
+
+    // level of logging
+    // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
+    logLevel: config.LOG_INFO,
+
+    // enable / disable watching file and executing tests whenever any file changes
+    autoWatch: true,
+
+    // start these browsers
+    // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
+    browsers: ['PhantomJS'],
+
+    // Continuous Integration mode
+    // if true, Karma captures browsers, runs the tests and exits
+    singleRun: true,
+
+    // Concurrency level
+    // how many browser should be started simultaneous
+    concurrency: Infinity
+  })
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/5d274a61/modules/web-console/src/main/js/package.json
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/package.json b/modules/web-console/src/main/js/package.json
index e7cc110..38f5da0 100644
--- a/modules/web-console/src/main/js/package.json
+++ b/modules/web-console/src/main/js/package.json
@@ -5,7 +5,8 @@
   "private": true,
   "scripts": {
     "dev": "cross-env NODE_ENV=development gulp watch",
-    "dist": "cross-env NODE_ENV=production gulp build"
+    "dist": "cross-env NODE_ENV=production gulp build",
+    "test": "karma start karma.conf.js"
   },
   "author": "",
   "contributors": [
@@ -104,6 +105,14 @@
     "ws": "^0.8.0"
   },
   "devDependencies": {
+    "babel-core": "^6.7.6",
+    "babel-eslint": "^6.0.4",
+    "babel-loader": "^6.2.4",
+    "babel-plugin-add-module-exports": "^0.1.2",
+    "babel-plugin-transform-runtime": "^6.7.5",
+    "babel-polyfill": "^6.7.4",
+    "babel-preset-angular": "^6.0.15",
+    "babel-runtime": "^6.6.1",
     "gulp": "^3.9.1",
     "gulp-cached": "^1.1.0",
     "gulp-connect": "^3.2.2",
@@ -117,19 +126,19 @@
     "gulp-sequence": "^0.4.1",
     "gulp-util": "^3.0.7",
     "http-proxy-middleware": "^0.13.0",
+    "jasmine-core": "^2.4.1",
+    "karma": "^0.13.22",
+    "karma-babel-preprocessor": "^6.0.1",
+    "karma-jasmine": "^1.0.2",
+    "karma-phantomjs-launcher": "^1.0.0",
+    "karma-teamcity-reporter": "^1.0.0",
+    "karma-webpack": "^1.7.0",
     "less": "^2.7.1",
     "mocha": "~2.4.5",
     "morgan": "^1.7.0",
+    "phantomjs-prebuilt": "^2.1.7",
     "should": "^8.3.0",
     "supertest": "^1.1.0",
-    "babel-core": "^6.7.6",
-    "babel-eslint": "^6.0.4",
-    "babel-loader": "^6.2.4",
-    "babel-plugin-add-module-exports": "^0.1.2",
-    "babel-plugin-transform-runtime": "^6.7.5",
-    "babel-polyfill": "^6.7.4",
-    "babel-preset-angular": "^6.0.15",
-    "babel-runtime": "^6.6.1",
     "webpack-dev-server": "^1.14.1"
   }
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/5d274a61/modules/web-console/src/main/js/test/unit/JavaTypes.test.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/test/unit/JavaTypes.test.js b/modules/web-console/src/main/js/test/unit/JavaTypes.test.js
new file mode 100644
index 0000000..6a02dc9
--- /dev/null
+++ b/modules/web-console/src/main/js/test/unit/JavaTypes.test.js
@@ -0,0 +1,13 @@
+describe('nonBuiltInClass', () => {
+  it('one', (done) => {
+    done()
+  })
+
+  it('two', (done) => {
+    done()
+  })
+
+  it('three', (done) => {
+    done()
+  })
+})
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/5d274a61/modules/web-console/src/main/js/test/unit/test.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/test/unit/test.js b/modules/web-console/src/main/js/test/unit/test.js
new file mode 100644
index 0000000..09e7683
--- /dev/null
+++ b/modules/web-console/src/main/js/test/unit/test.js
@@ -0,0 +1,3 @@
+export default [function test() {
+    return true;
+}];


[11/50] [abbrv] ignite git commit: JSON: workaround for false cycle detection in case of spring exceptions.

Posted by an...@apache.org.
JSON: workaround for false cycle detection in case of spring exceptions.


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

Branch: refs/heads/ignite-3262
Commit: cba61d785e3cea110b19a0f34eee4907a1ab5a79
Parents: 2cf3241
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Fri Jun 3 14:06:21 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Fri Jun 3 14:06:21 2016 +0700

----------------------------------------------------------------------
 .../protocols/http/jetty/GridJettyJsonConfig.java   | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/cba61d78/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyJsonConfig.java
----------------------------------------------------------------------
diff --git a/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyJsonConfig.java b/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyJsonConfig.java
index b85d01e..9e1532a 100644
--- a/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyJsonConfig.java
+++ b/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyJsonConfig.java
@@ -205,16 +205,20 @@ class GridJettyJsonConfig extends JsonConfig {
     };
 
     /**
-     * Helper class for simple to-string conversion for {@link UUID}.
+     * Workaround for false cycle detection in Spring exceptions.
+     *
+     * Cycle detection of json-lib is quite primitive.
+     * If some bean has more than one reference to same object false cycle will be detected.
      */
-    private static JsonValueProcessor THROWABLE_PROCESSOR = new AbstractJsonValueProcessor() {
+    private static JsonValueProcessor RUNTIME_EXCEPTION_PROCESSOR = new AbstractJsonValueProcessor() {
         /** {@inheritDoc} */
         protected Object processBean(Object bean, JsonConfig jsonCfg) {
             if (bean == null)
                 return new JSONObject(true);
 
-            if (bean instanceof Throwable) {
-                Throwable e = (Throwable)bean;
+            if (bean instanceof RuntimeException &&
+                bean.getClass().getCanonicalName().startsWith("org.springframework.")) {
+                RuntimeException e = (RuntimeException)bean;
 
                 final JSONObject ret = new JSONObject();
 
@@ -226,7 +230,7 @@ class GridJettyJsonConfig extends JsonConfig {
                 return ret;
             }
 
-            throw new UnsupportedOperationException("Serialize value to json is not supported: " + bean);
+            return JSONObject.fromObject(bean, jsonCfg);
         }
     };
 
@@ -244,7 +248,7 @@ class GridJettyJsonConfig extends JsonConfig {
         registerJsonValueProcessor(Date.class, DATE_PROCESSOR);
         registerJsonValueProcessor(java.sql.Date.class, DATE_PROCESSOR);
         registerJsonValueProcessor(HashMap.class, NULL_MAP_PREPROCESSOR);
-        registerJsonValueProcessor(Throwable.class, THROWABLE_PROCESSOR);
+        registerJsonValueProcessor(RuntimeException.class, RUNTIME_EXCEPTION_PROCESSOR);
 
         final LessNamingProcessor lessNamingProcessor = new LessNamingProcessor();
 


[48/50] [abbrv] ignite git commit: IGNITE-3262 added base tesxt to javatypes service

Posted by an...@apache.org.
IGNITE-3262 added base tesxt to javatypes service


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

Branch: refs/heads/ignite-3262
Commit: b18f0f8d1b3e3fc1de0cc9f8759b21746b0e4bc0
Parents: 5d274a6
Author: Dmitriyff Smile <dm...@gmail.com>
Authored: Fri Jun 17 21:01:09 2016 +0700
Committer: Dmitriyff Smile <dm...@gmail.com>
Committed: Fri Jun 17 21:01:09 2016 +0700

----------------------------------------------------------------------
 .../main/js/app/services/JavaTypes.service.js   |  6 +-
 .../src/main/js/gulpfile.babel.js/tasks/test.js | 87 ++++++++++++++++++++
 modules/web-console/src/main/js/karma.conf.js   | 47 ++++++++---
 modules/web-console/src/main/js/package.json    |  4 +-
 .../src/main/js/test/unit/JavaTypes.test.js     | 79 +++++++++++++++---
 .../web-console/src/main/js/test/unit/test.js   |  3 -
 6 files changed, 192 insertions(+), 34 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/b18f0f8d/modules/web-console/src/main/js/app/services/JavaTypes.service.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/services/JavaTypes.service.js b/modules/web-console/src/main/js/app/services/JavaTypes.service.js
index d34d669..9e9c753 100644
--- a/modules/web-console/src/main/js/app/services/JavaTypes.service.js
+++ b/modules/web-console/src/main/js/app/services/JavaTypes.service.js
@@ -16,12 +16,12 @@
  */
 
 // Java built-in class names.
-import JAVA_CLASSES from 'app/data/java-classes.json';
+import JAVA_CLASSES from '../data/java-classes.json';
 
 // Java build-in primitive.
-import JAVA_PRIMITIVES from 'app/data/java-primitives.json';
+import JAVA_PRIMITIVES from '../data/java-primitives.json';
 
-import JAVA_KEYWORDS from 'app/data/java-keywords.json';
+import JAVA_KEYWORDS from '../data/java-keywords.json';
 
 export default ['JavaTypes', function() {
     return {

http://git-wip-us.apache.org/repos/asf/ignite/blob/b18f0f8d/modules/web-console/src/main/js/gulpfile.babel.js/tasks/test.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/test.js b/modules/web-console/src/main/js/gulpfile.babel.js/tasks/test.js
new file mode 100644
index 0000000..c14528a
--- /dev/null
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/tasks/test.js
@@ -0,0 +1,87 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import gulp from 'gulp';
+import {Server} from 'karma';
+
+import {srcDir, destDir, rootDir} from '../paths';
+
+gulp.task('test', (cb) => {
+    new Server({
+        // Base path that will be used to resolve all patterns (eg. files, exclude).
+        basePath: rootDir,
+
+        // Frameworks to use available frameworks: https://npmjs.org/browse/keyword/karma-adapter
+        frameworks: ['jasmine'],
+
+        // List of files / patterns to load in the browser.
+        files: [
+          'test/**/*.test.js'
+        ],
+
+        plugins: [
+          require('karma-babel-preprocessor'),
+          require('karma-phantomjs-launcher'),
+          require('karma-webpack'),
+          require('karma-jasmine')
+        ],
+
+        // Preprocess matching files before serving them to the browser
+        // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor.
+        preprocessors: {
+            'test/**/*.js': ['webpack']
+        },
+
+        webpack: {
+          devtool: 'inline-source-map',
+          module: {
+            loaders: [
+              {test: /\.js/, loaders: ['babel'], exclude: /node_modules/}
+            ]
+          },
+          resolve: {
+            extensions: ["", ".js"]
+          }
+        },
+
+        // Test results reporter to use
+        // possible values: 'dots', 'progress'
+        // available reporters: https://npmjs.org/browse/keyword/karma-reporter.
+        reporters: ['progress'],
+
+        // web server port
+        port: 9876,
+
+        // enable / disable colors in the output (reporters and logs)
+        colors: true,
+
+        // enable / disable watching file and executing tests whenever any file changes
+        autoWatch: true,
+
+        // start these browsers
+        // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
+        browsers: ['PhantomJS'],
+
+        // Continuous Integration mode
+        // if true, Karma captures browsers, runs the tests and exits
+        singleRun: true,
+
+        // Concurrency level
+        // how many browser should be started simultaneous
+        concurrency: Infinity
+    }, cb).start();
+});

http://git-wip-us.apache.org/repos/asf/ignite/blob/b18f0f8d/modules/web-console/src/main/js/karma.conf.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/karma.conf.js b/modules/web-console/src/main/js/karma.conf.js
index b6533ca..dc6c88a 100644
--- a/modules/web-console/src/main/js/karma.conf.js
+++ b/modules/web-console/src/main/js/karma.conf.js
@@ -15,13 +15,18 @@
  * limitations under the License.
  */
 
+var path = require('path');
+var webpack = require('webpack');
+
+var basePath = path.resolve('./');
+
 module.exports = function(config) {
   config.set({
     // Base path that will be used to resolve all patterns (eg. files, exclude).
-    basePath: '',
+    basePath: basePath,
 
     // Frameworks to use available frameworks: https://npmjs.org/browse/keyword/karma-adapter
-    frameworks: ['jasmine'],
+    frameworks: ['mocha'],
 
     // List of files / patterns to load in the browser.
     files: [
@@ -29,10 +34,10 @@ module.exports = function(config) {
     ],
 
     plugins: [
-      require('karma-babel-preprocessor'),
       require('karma-phantomjs-launcher'),
+      require('karma-teamcity-reporter'),
       require('karma-webpack'),
-      require('karma-jasmine')
+      require('karma-mocha')
     ],
 
     // Preprocess matching files before serving them to the browser
@@ -42,15 +47,31 @@ module.exports = function(config) {
     },
 
     webpack: {
-      devtool: 'inline-source-map',
-      module: {
-        loaders: [
-          {test: /\.js/, loaders: ['babel'], exclude: /node_modules/}
+        module: {
+            loaders: [
+                {
+                    test: /\.json$/,
+                    loader: 'json'
+                },
+                {
+                    test: /\.js$/, 
+                    loader: 'babel', 
+                    exclude: /node_modules/
+                }
+            ]
+        },
+        resolve: {
+            extensions: ["", ".js"]
+        },
+        plugins: [
+            new webpack.ProvidePlugin({
+                _: 'lodash'
+            })
         ]
-      },
-      resolve: {
-        extensions: ["", ".js"]
-      }
+    },
+
+    webpackMiddleware: {
+      noInfo: true
     },
 
     // Test results reporter to use
@@ -82,5 +103,5 @@ module.exports = function(config) {
     // Concurrency level
     // how many browser should be started simultaneous
     concurrency: Infinity
-  })
+  });
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/b18f0f8d/modules/web-console/src/main/js/package.json
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/package.json b/modules/web-console/src/main/js/package.json
index 38f5da0..ab9a7f6 100644
--- a/modules/web-console/src/main/js/package.json
+++ b/modules/web-console/src/main/js/package.json
@@ -113,6 +113,7 @@
     "babel-polyfill": "^6.7.4",
     "babel-preset-angular": "^6.0.15",
     "babel-runtime": "^6.6.1",
+    "chai": "^3.5.0",
     "gulp": "^3.9.1",
     "gulp-cached": "^1.1.0",
     "gulp-connect": "^3.2.2",
@@ -128,8 +129,7 @@
     "http-proxy-middleware": "^0.13.0",
     "jasmine-core": "^2.4.1",
     "karma": "^0.13.22",
-    "karma-babel-preprocessor": "^6.0.1",
-    "karma-jasmine": "^1.0.2",
+    "karma-mocha": "^1.0.1",
     "karma-phantomjs-launcher": "^1.0.0",
     "karma-teamcity-reporter": "^1.0.0",
     "karma-webpack": "^1.7.0",

http://git-wip-us.apache.org/repos/asf/ignite/blob/b18f0f8d/modules/web-console/src/main/js/test/unit/JavaTypes.test.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/test/unit/JavaTypes.test.js b/modules/web-console/src/main/js/test/unit/JavaTypes.test.js
index 6a02dc9..c6f459d 100644
--- a/modules/web-console/src/main/js/test/unit/JavaTypes.test.js
+++ b/modules/web-console/src/main/js/test/unit/JavaTypes.test.js
@@ -1,13 +1,66 @@
-describe('nonBuiltInClass', () => {
-  it('one', (done) => {
-    done()
-  })
-
-  it('two', (done) => {
-    done()
-  })
-
-  it('three', (done) => {
-    done()
-  })
-})
\ No newline at end of file
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import JavaTypes from '../../app/services/JavaTypes.service.js';
+
+import { assert } from 'chai';
+
+const { nonBuiltInClass, fullClassName, validIdentifier, validPackage, packageSpecified, isKeywords, isJavaPrimitive} = JavaTypes[1]();
+
+describe('JavaTypes Service Test', () => {
+    describe('nonBuiltInClass', () => {
+        it('BigDecimal', () => {
+            assert.equal(nonBuiltInClass('BigDecimal'), false);
+        });
+    });
+
+    describe('fullClassName', () => {
+        it('java.math.BigDecimal', () => {
+            assert.equal(fullClassName('BigDecimal'), 'java.math.BigDecimal');
+        });
+    });
+
+    describe('validIdentifier', () => {
+        it('java.math.BigDecimal', () => {
+            assert.equal(validIdentifier('java.math.BigDecimal'), true);
+        });
+    });
+
+    describe('validPackage', () => {
+        it('java.math.BigDecimal.', () => {
+            assert.equal(validPackage('java.math.BigDecimal'), true);
+        });
+    });
+
+    describe('packageSpecified', () => {
+        it('java.math.BigDecimal.', () => {
+            assert.equal(packageSpecified('java.math.BigDecimal'), true);
+        });
+    });
+
+    describe('isKeywords', () => {
+        it('java.math.BigDecimal.', () => {
+            assert.equal(isKeywords('abstract'), true);
+        });
+    });
+
+    describe('isJavaPrimitive', () => {
+        it('boolean', () => {
+            assert.equal(isJavaPrimitive('boolean'), true);
+        });
+    });
+});

http://git-wip-us.apache.org/repos/asf/ignite/blob/b18f0f8d/modules/web-console/src/main/js/test/unit/test.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/test/unit/test.js b/modules/web-console/src/main/js/test/unit/test.js
deleted file mode 100644
index 09e7683..0000000
--- a/modules/web-console/src/main/js/test/unit/test.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export default [function test() {
-    return true;
-}];


[38/50] [abbrv] ignite git commit: IGNITE-3319 Finished migration to webpack

Posted by an...@apache.org.
IGNITE-3319 Finished migration to webpack


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

Branch: refs/heads/ignite-3262
Commit: af05c35c09b250a3ec675bee1db0a994a041188a
Parents: 40f6abc
Author: Maxim Afanasiev <ma...@gmail.com>
Authored: Wed Jun 15 16:13:56 2016 +0700
Committer: Maxim Afanasiev <ma...@gmail.com>
Committed: Wed Jun 15 16:13:56 2016 +0700

----------------------------------------------------------------------
 modules/web-console/src/main/js/app/index.js    |   7 +-
 .../clusters/general/discovery/vm.jade          |   2 +-
 modules/web-console/src/main/js/app/vendor.js   |   5 +-
 .../src/main/js/gulpfile.babel.js/paths.js      |   2 +-
 .../main/js/gulpfile.babel.js/tasks/bundle.js   |   4 +-
 .../main/js/gulpfile.babel.js/tasks/connect.js  |  47 -----
 .../src/main/js/gulpfile.babel.js/tasks/copy.js |   4 +-
 .../main/js/gulpfile.babel.js/tasks/eslint.js   |  46 -----
 .../gulpfile.babel.js/tasks/ignite-modules.js   |   9 +-
 .../main/js/gulpfile.babel.js/tasks/server.js   |  22 ---
 .../main/js/gulpfile.babel.js/tasks/watch.js    |   3 +-
 .../main/js/gulpfile.babel.js/webpack/common.js | 174 +++++++++++++++++++
 .../webpack/environments/development.js         |  31 +++-
 .../webpack/environments/production.js          |  61 ++++---
 .../main/js/gulpfile.babel.js/webpack/global.js | 159 -----------------
 .../main/js/gulpfile.babel.js/webpack/index.js  |  35 ++++
 .../webpack/plugins/progress.js                 |  43 ++++-
 modules/web-console/src/main/js/package.json    |  24 ++-
 .../web-console/src/main/js/views/index.jade    |  12 +-
 .../web-console/src/main/js/webpack.config.js   |  28 ---
 20 files changed, 348 insertions(+), 370 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/af05c35c/modules/web-console/src/main/js/app/index.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/index.js b/modules/web-console/src/main/js/app/index.js
index 3f12eda..6fe84c2 100644
--- a/modules/web-console/src/main/js/app/index.js
+++ b/modules/web-console/src/main/js/app/index.js
@@ -100,7 +100,8 @@ import 'controllers/profile-controller';
 import 'controllers/sql-controller';
 
 // Inject external modules.
-import 'ignite_modules_temp/index'; 
+import 'ignite_modules_temp/index';
+
 
 import baseTemplate from '../views/base.jade';
 
@@ -138,9 +139,9 @@ angular
     'ignite-console.version',
     'ignite-console.loading',
     // Ignite legacy module.
-    'ignite-console.legacy'
+    'ignite-console.legacy',
     // Ignite modules.
-    // 'ignite-console.modules'
+    'ignite-console.modules'
 ])
 // Directives.
 .directive(...igniteHideOnStateChange)

http://git-wip-us.apache.org/repos/asf/ignite/blob/af05c35c/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/vm.jade
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/vm.jade b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/vm.jade
index cc39790..1f20613 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/vm.jade
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/vm.jade
@@ -37,7 +37,7 @@ include ../../../../../../../app/helpers/jade/mixins.jade
                 li Hostname and port range (e.g. host1.com:47500..47510, host2:47502..47508, etc)
             | If port is 0 or not provided then default port will be used (depends on discovery SPI configuration)#[br]
             | If port range is provided (e.g. host:port1..port2) the following should be considered:
-            ul: li port1 < port2 should be true
+            ul: li port1 &lt; port2 should be true
                 li Both port1 and port2 should be greater than 0
         ignite-form-group-add(ng-click='group.add = [{}]')
             | Add new address

http://git-wip-us.apache.org/repos/asf/ignite/blob/af05c35c/modules/web-console/src/main/js/app/vendor.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/vendor.js b/modules/web-console/src/main/js/app/vendor.js
index e71111f..cf90f4c 100644
--- a/modules/web-console/src/main/js/app/vendor.js
+++ b/modules/web-console/src/main/js/app/vendor.js
@@ -24,13 +24,10 @@ import 'brace/theme/chrome';
 import 'font-awesome-webpack';
 import 'file-saver';
 import 'jszip';
+import 'nvd3';
 import 'query-command-supported';
 import 'angular-gridster/dist/angular-gridster.min.css';
 import 'angular-tree-control/css/tree-control-attribute.css';
 import 'angular-tree-control/css/tree-control.css';
 import 'angular-ui-grid/ui-grid.css';
 import 'angular-motion/dist/angular-motion.css';
-
-// import pdfMake from 'pdfmake';
-
-// window.pdfMake = pdfMake;

http://git-wip-us.apache.org/repos/asf/ignite/blob/af05c35c/modules/web-console/src/main/js/gulpfile.babel.js/paths.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/paths.js b/modules/web-console/src/main/js/gulpfile.babel.js/paths.js
index 8de6bcb..9a1e61a 100644
--- a/modules/web-console/src/main/js/gulpfile.babel.js/paths.js
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/paths.js
@@ -19,7 +19,7 @@ import path from 'path';
 
 const rootDir = path.resolve('./');
 const srcDir = path.resolve('app');
-const destDir = path.resolve('dist');
+const destDir = path.resolve('build');
 
 const igniteModulesDir = process.env.IGNITE_MODULES ? path.normalize(process.env.IGNITE_MODULES) : './ignite_modules';
 const igniteModulesTemp = path.resolve('ignite_modules_temp');

http://git-wip-us.apache.org/repos/asf/ignite/blob/af05c35c/modules/web-console/src/main/js/gulpfile.babel.js/tasks/bundle.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/bundle.js b/modules/web-console/src/main/js/gulpfile.babel.js/tasks/bundle.js
index 1f817fb..f4e7fcc 100644
--- a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/bundle.js
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/tasks/bundle.js
@@ -17,14 +17,14 @@
 
 import gulp from 'gulp';
 import webpack from 'webpack';
-import webpackConfig from '../../webpack.config';
+import webpackConfig from '../webpack';
 import WebpackDevServer from 'webpack-dev-server';
 
 gulp.task('bundle', (cb) => {
     if (process.env.NODE_ENV === 'development')
         // Important! Call webpack and WebpackDevServer must be inline.
         new WebpackDevServer(webpack(webpackConfig), webpackConfig.devServer)
-            .listen(webpackConfig.devServer.port, 'localhost');
+            .listen(webpackConfig.devServer.port, 'localhost', cb);
     else
         webpack(webpackConfig, cb);
 });

http://git-wip-us.apache.org/repos/asf/ignite/blob/af05c35c/modules/web-console/src/main/js/gulpfile.babel.js/tasks/connect.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/connect.js b/modules/web-console/src/main/js/gulpfile.babel.js/tasks/connect.js
deleted file mode 100644
index 4bffe50..0000000
--- a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/connect.js
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import gulp from 'gulp';
-import connect from 'gulp-connect';
-import proxy from 'http-proxy-middleware';
-
-import { destDir } from '../paths';
-
-// Task run static server to local development.
-gulp.task('connect', () => {
-    connect.server({
-        port: 8090,
-        root: [destDir],
-        middleware() {
-            return [
-                proxy('/socket.io', {
-                    target: 'http://localhost:3000',
-                    changeOrigin: true,
-                    ws: true
-                }),
-                proxy('/api/v1/', {
-                    target: 'http://localhost:3000',
-                    changeOrigin: true,
-                    pathRewrite: {
-                        '^/api/v1/': '/' // remove path
-                    }
-                })
-            ];
-        },
-        fallback: `${destDir}/index.html`
-    });
-});

http://git-wip-us.apache.org/repos/asf/ignite/blob/af05c35c/modules/web-console/src/main/js/gulpfile.babel.js/tasks/copy.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/copy.js b/modules/web-console/src/main/js/gulpfile.babel.js/tasks/copy.js
index 5683a48..c0ec9b5 100644
--- a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/copy.js
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/tasks/copy.js
@@ -19,7 +19,7 @@ import gulp from 'gulp';
 import cache from 'gulp-cached';
 import sequence from 'gulp-sequence';
 
-import { destDir, jsModulePaths, resourcePaths, resourceModulePaths, igniteModulesTemp } from '../paths';
+import { destDir, rootDir, jsModulePaths, resourcePaths, resourceModulePaths, igniteModulesTemp } from '../paths';
 
 gulp.task('copy', (cb) => {
     const tasks = ['copy:resource', 'copy:ignite_modules:resource', 'copy:ignite_modules:js'];
@@ -30,7 +30,7 @@ gulp.task('copy', (cb) => {
 gulp.task('copy:ignite_modules:js', () =>
     gulp.src(jsModulePaths)
         .pipe(cache('copy:ignite_modules:js'))
-        .pipe(gulp.dest(`${destDir}/${igniteModulesTemp}`))
+        .pipe(gulp.dest(`${rootDir}/${igniteModulesTemp}`))
 );
 
 gulp.task('copy:resource', () =>

http://git-wip-us.apache.org/repos/asf/ignite/blob/af05c35c/modules/web-console/src/main/js/gulpfile.babel.js/tasks/eslint.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/eslint.js b/modules/web-console/src/main/js/gulpfile.babel.js/tasks/eslint.js
deleted file mode 100644
index 2d60037..0000000
--- a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/eslint.js
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import gulp from 'gulp';
-import cache from 'gulp-cached';
-import eslint from 'gulp-eslint';
-import sequence from 'gulp-sequence';
-
-const paths = [
-    './app/**/*.js',
-    './controllers/**/*.js',
-    './generator/**/*.js',
-    './ignite_modules_temp/**/*.js',
-    './gulpfile.babel.js/**/*.js',
-    './gulpfile.babel.js/*.js'
-];
-
-gulp.task('eslint:node', () =>
-	gulp.src('./serve/**/*.js')
-        .pipe(cache('eslint:node'))
-		.pipe(eslint({envs: ['node']}))
-		.pipe(eslint.format())
-);
-
-gulp.task('eslint:browser', () =>
-	gulp.src(paths)
-        .pipe(cache('eslint:browser'))
-		.pipe(eslint({envs: ['browser']}))
-		.pipe(eslint.format())
-);
-
-gulp.task('eslint', (cb) => sequence('eslint:browser', 'eslint:node', cb));

http://git-wip-us.apache.org/repos/asf/ignite/blob/af05c35c/modules/web-console/src/main/js/gulpfile.babel.js/tasks/ignite-modules.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/ignite-modules.js b/modules/web-console/src/main/js/gulpfile.babel.js/tasks/ignite-modules.js
index b1b1190..b97de7c 100644
--- a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/ignite-modules.js
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/tasks/ignite-modules.js
@@ -19,8 +19,7 @@ import gulp from 'gulp';
 import inject from 'gulp-inject';
 import clean from 'gulp-rimraf';
 import sequence from 'gulp-sequence';
-
-import { appModulePaths, igniteModulesTemp } from '../paths';
+import {appModulePaths, igniteModulesTemp} from '../paths';
 
 gulp.task('ignite:modules', (cb) => sequence('ignite:modules:copy', 'ignite:modules:inject', cb));
 
@@ -37,7 +36,7 @@ gulp.task('ignite:modules:inject', () =>
             transform: (filePath) => {
                 const igniteModuleName = filePath.replace(/.*ignite_modules_temp\/([^\/]+).*/mgi, '$1');
 
-                // return file contents as string
+                // Return file contents as string.
                 return `import './${igniteModuleName}/main';`;
             }
         }))
@@ -47,10 +46,10 @@ gulp.task('ignite:modules:inject', () =>
             transform: (filePath, file, i) => {
                 const igniteModuleName = filePath.replace(/.*ignite_modules_temp\/([^\/]+).*/mgi, '$1');
 
-                // return file contents as string
+                // Return file contents as string.
                 return (i ? ',' : '') + `'ignite-console.${igniteModuleName}'`;
             }
         }))
-        .pipe(clean({ force: true }))
+        .pipe(clean({force: true}))
         .pipe(gulp.dest(igniteModulesTemp))
 );

http://git-wip-us.apache.org/repos/asf/ignite/blob/af05c35c/modules/web-console/src/main/js/gulpfile.babel.js/tasks/server.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/server.js b/modules/web-console/src/main/js/gulpfile.babel.js/tasks/server.js
deleted file mode 100644
index 9999f89..0000000
--- a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/server.js
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import gulp from 'gulp';
-
-gulp.task('server', () => {
-    require('../../serve');
-});

http://git-wip-us.apache.org/repos/asf/ignite/blob/af05c35c/modules/web-console/src/main/js/gulpfile.babel.js/tasks/watch.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/watch.js b/modules/web-console/src/main/js/gulpfile.babel.js/tasks/watch.js
index b2f8348..33b0727 100644
--- a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/watch.js
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/tasks/watch.js
@@ -20,8 +20,7 @@ import sequence from 'gulp-sequence';
 
 import { jadePaths, jadeModulePaths, resourcePaths, resourceModulePaths, appPaths, appModulePaths } from '../paths';
 
-//TODO Webpack stream || webpack autoload
-gulp.task('watch:ignite-modules', (cb) => sequence('clean:ignite-modules-temp', 'ignite:modules', ['copy:ignite_modules:js'], cb));
+gulp.task('watch:ignite-modules', (cb) => sequence('clean:ignite-modules-temp', 'ignite:modules', 'copy:ignite_modules:js', cb));
 
 // Build + connect + watch task.
 gulp.task('watch', ['build'], () => {

http://git-wip-us.apache.org/repos/asf/ignite/blob/af05c35c/modules/web-console/src/main/js/gulpfile.babel.js/webpack/common.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/common.js b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/common.js
new file mode 100644
index 0000000..6160af1
--- /dev/null
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/common.js
@@ -0,0 +1,174 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import path from 'path';
+import webpack from 'webpack';
+import autoprefixer from 'autoprefixer-core';
+import progressPlugin from './plugins/progress';
+
+//import  Manifest from 'manifest-revision-webpack-plugin';
+import ExtractTextPlugin from 'extract-text-webpack-plugin';
+import {srcDir, destDir, rootDir} from '../paths';
+
+const NODE_ENV = process.env.NODE_ENV || 'production';
+const IS_DEVELOPMENT = NODE_ENV === 'development';
+const stylesLoader = 'css-loader?sourceMap!postcss-loader!sass-loader?outputStyle=expanded&sourceMap=true&sourceMapContents=true';
+
+export default () => {
+    const NODE_MODULES_PATH = path.resolve('node_modules');
+
+    const webpackConfig = {
+        node: {
+            fs: 'empty'
+        },
+        // Entry points.
+        entry: {
+            polyfill: 'babel-polyfill',
+            app: path.join(srcDir, 'index.js'),
+            vendor: path.join(srcDir, 'vendor.js')
+        },
+
+        // Output system.
+        output: {
+            path: destDir,
+            publicPath: './',
+            filename: '[name].js'
+        },
+
+        // Resolves modules.
+        resolve: {
+            extensions: ['', '.js'],
+            root: [rootDir],
+            modulesDirectories: [NODE_MODULES_PATH, './'],
+            alias: {
+            }
+        },
+
+        // Modules resolvers.
+        module: {
+            noParse: [],
+            preLoaders: [
+                {
+                    test: /\.js$/,
+                    exclude: [NODE_MODULES_PATH],
+                    loader: 'eslint-loader'
+                }
+            ],
+            loaders: [
+                {
+                    test: /\.json$/,
+                    loader: 'json-loader'
+                },
+                {
+                    test: /\.jade$/,
+                    loaders: [
+                        `ngtemplate-loader?relativeTo=${rootDir}`,
+                        'html-loader?attrs[]=img:src&attrs[]=img:data-src',
+                        `jade-html-loader`
+                    ]
+                },
+                {
+                    test: /\.js$/,
+                    loaders: ['baggage-loader?[file].html&[file].css']
+                },
+                {
+                    test: /\.js$/,
+                    exclude: [NODE_MODULES_PATH],
+                    loaders: ['ng-annotate-loader']
+                },
+                {
+                    test: /\.js$/,
+                    exclude: [NODE_MODULES_PATH],
+                    loader: 'babel-loader',
+                    query: {
+                        cacheDirectory: true,
+                        plugins: ['transform-runtime', 'add-module-exports'],
+                        presets: ['angular']
+
+                    }
+                },
+                {
+                    test: /\.css$/,
+                    loaders: ['style-loader', 'css-loader?sourceMap', 'postcss-loader']
+                },
+                {
+                    test: /\.(scss|sass)$/,
+                    loader: IS_DEVELOPMENT ? `style-loader!${stylesLoader}` : ExtractTextPlugin.extract('style-loader', stylesLoader)
+                },
+                {
+                    test: /\.(woff2|woff|ttf|eot|svg)?(\?v=[0-9]\.[0-9]\.[0-9])?$/,
+                    loaders: [
+                        'url-loader?name=fonts/[name]_[hash].[ext]'
+                    ]
+                },
+                {
+                    test: /\.(jpe?g|png|gif)$/i,
+                    loaders: ['url-loader?name=images/[name]_[hash].[ext]']
+                },
+                {
+                    test: require.resolve("jquery"),
+                    loaders: [
+                        "expose-loader?$",
+                        "expose-loader?jQuery"
+                    ]
+                },
+                {
+                    test: require.resolve("nvd3"),
+                    loaders: [
+                        "expose-loader?nv"
+                    ]
+                }
+            ]
+        },
+
+        // Postcss configuration.
+        postcss: [autoprefixer({browsers: ['last 2 versions']})],
+
+        // ESLint loader configuration.
+        eslint: {
+            failOnWarning: false,
+            failOnError: false
+        },
+
+        // Load plugins.
+        plugins: [
+            new webpack.ProvidePlugin({
+                $: 'jquery',
+                jQuery: 'jquery',
+                _: 'lodash',
+                nv: 'nvd3'
+            }),
+            new webpack.DefinePlugin({'NODE_ENV': JSON.stringify(NODE_ENV)}),
+            // new webpack.NoErrorsPlugin(),
+            new webpack.optimize.AggressiveMergingPlugin({moveToParents: true}),
+            new webpack.optimize.CommonsChunkPlugin({
+                name: 'common',
+                async: true,
+                children: true,
+                minChunks: Infinity
+            }),
+            // new Manifest(path.join(_path + '/config', 'manifest.json'), {
+            //     rootAssetPath: rootAssetPath,
+            //     ignorePaths: ['.DS_Store']
+            // }),
+            new ExtractTextPlugin('assets/css/[name]' + (IS_DEVELOPMENT ? '' : '.[chunkhash]') + '.css', {allChunks: true}),
+            progressPlugin
+        ]
+    };
+
+    return webpackConfig;
+};

http://git-wip-us.apache.org/repos/asf/ignite/blob/af05c35c/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/development.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/development.js b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/development.js
index 37f3eca..716bc25 100644
--- a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/development.js
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/development.js
@@ -1,4 +1,19 @@
-'use strict';
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
 import webpack from 'webpack';
 import HtmlWebpackPlugin from 'html-webpack-plugin';
@@ -6,8 +21,7 @@ import {destDir, rootDir} from '../../paths';
 import jade from 'jade';
 import path from 'path';
 
-module.exports = function () {
-
+export default () => {
 
     let plugins = [
         new webpack.HotModuleReplacementPlugin(),
@@ -24,7 +38,8 @@ module.exports = function () {
     return {
         context: rootDir,
         debug: true,
-        devtool: 'eval',
+        devtool: 'cheap-module-eval-source-map',
+        watch: true,
         devServer: {
             historyApiFallback: true,
             publicPath: '/',
@@ -47,10 +62,14 @@ module.exports = function () {
                     }
                 }
             },
-            stats: {colors: true},
+            watchOptions: {
+                aggregateTimeout: 1000,
+                poll: 1000
+            },
+            stats: 'verbose',
             port: 9000
         },
         stats: {colors: true},
-        plugins: plugins
+        plugins
     };
 };

http://git-wip-us.apache.org/repos/asf/ignite/blob/af05c35c/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/production.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/production.js b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/production.js
index 4c63d8c..5630448 100644
--- a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/production.js
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/production.js
@@ -1,4 +1,20 @@
-'use strict';
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 import HtmlWebpackPlugin from 'html-webpack-plugin';
 import webpack from 'webpack';
 import path from 'path';
@@ -6,9 +22,29 @@ import jade from 'jade';
 
 import {destDir, rootDir} from '../../paths';
 
-module.exports = function (_path) {
+export default () => {
+
+    const plugins = [
+        new HtmlWebpackPlugin({
+            filename: 'index.html',
+            templateContent: () => {
+                return jade.renderFile(path.join(rootDir, 'views', 'index.jade'));
+            },
+            title: 'Ignite Web Console'
+        }),
+        new webpack.optimize.DedupePlugin(),
+        new webpack.optimize.UglifyJsPlugin({
+            path: destDir,
+            minimize: true,
+            warnings: false,
+            sourceMap: true,
+            mangle: true
+        })
+    ];
+
     return {
         context: rootDir,
+        bail: true, // Cancel build on error.
         debug: false,
         devtool: 'cheap-source-map',
         output: {
@@ -16,22 +52,7 @@ module.exports = function (_path) {
             filename: '[name].[chunkhash].js',
             path: destDir
         },
-        plugins: [
-            new HtmlWebpackPlugin({
-                filename: 'index.html',
-                templateContent: () => {
-                    return jade.renderFile(path.join(_path, 'views', 'index.jade'));
-                },
-                title: 'Ignite Web Console'
-            }),
-            new webpack.optimize.DedupePlugin(),
-            new webpack.optimize.UglifyJsPlugin({
-                path: destDir,
-                minimize: true,
-                warnings: false,
-                sourceMap: true,
-                mangle: true
-            })
-        ]
+        plugins
     };
-};
\ No newline at end of file
+
+};

http://git-wip-us.apache.org/repos/asf/ignite/blob/af05c35c/modules/web-console/src/main/js/gulpfile.babel.js/webpack/global.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/global.js b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/global.js
deleted file mode 100644
index 9000038..0000000
--- a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/global.js
+++ /dev/null
@@ -1,159 +0,0 @@
-'use strict';
-
-import path from 'path';
-import webpack from 'webpack';
-import autoprefixer from 'autoprefixer-core';
-import progressPlugin from './plugins/progress';
-
-//import  Manifest from 'manifest-revision-webpack-plugin';
-import ExtractTextPlugin from 'extract-text-webpack-plugin';
-import {srcDir, destDir, rootDir} from '../paths';
-
-const NODE_ENV = process.env.NODE_ENV || 'production';
-const IS_DEVELOPMENT = NODE_ENV === 'development';
-const stylesLoader = 'css-loader?sourceMap!postcss-loader!sass-loader?outputStyle=expanded&sourceMap=true&sourceMapContents=true';
-
-
-module.exports = function (_path) {
-
-    const NODE_MODULES_PATH = path.resolve('node_modules');
-    const webpackConfig = {
-        node: {
-            fs: 'empty'
-        },
-        // entry points
-        entry: {
-            polyfill: 'babel-polyfill',
-            app: path.join(srcDir, 'index.js'),
-            vendor: path.join(srcDir, 'vendor.js')
-        },
-
-        // Output system.
-        output: {
-            path: destDir,
-            publicPath: './',
-            filename: '[name].js'
-        },
-
-        // resolves modules
-        resolve: {
-            extensions: ['', '.js'],
-            root : rootDir,
-            modulesDirectories: [NODE_MODULES_PATH, './'],
-            alias: {
-                // _appRoot: path.join(_path, 'app'),
-                // _images: path.join(_path, 'app', 'assets', 'images'),
-                // _stylesheets: path.join(_path, 'app', 'assets', 'styles'),
-                // _scripts: path.join(_path, 'app', 'assets', 'js'),
-                // ace: path.join(_path, 'node_modules', 'ace-builds', 'src')
-            }
-        },
-
-        // modules resolvers
-        module: {
-            noParse: [],
-            // preLoaders: [
-            //     {
-            //         test: /\.js$/,
-            //         exclude: [NODE_MODULES_PATH],
-            //         loader: 'eslint-loader'
-            //     }
-            // ],
-            loaders: [
-                {
-                    test: /\.json$/,
-                    loader: 'json-loader'
-                },
-                {
-                    test: /\.jade$/,
-                    loaders: [
-                        'ngtemplate-loader?relativeTo=' + _path,
-                        'html-loader?attrs[]=img:src&attrs[]=img:data-src',
-                        'jade-html-loader'
-                    ]
-                },
-                {
-                    test: /\.js$/,
-                    loaders: ['baggage-loader?[file].html&[file].css']
-                },
-                {
-                    test: /\.js$/,
-                    exclude: [NODE_MODULES_PATH],
-                    loaders: ['ng-annotate-loader']
-                },
-                {
-                    test: /\.js$/,
-                    exclude: [NODE_MODULES_PATH],
-                    loader: 'babel-loader',
-                    query: {
-                        cacheDirectory: true,
-                        plugins: ['transform-runtime', 'add-module-exports'],
-                        presets: ['angular', 'es2017']
-                    }
-                },
-                {
-                    test: /\.css$/,
-                    loaders: ['style-loader', 'css-loader?sourceMap', 'postcss-loader']
-                },
-                {
-                    test: /\.(scss|sass)$/,
-                    loader: IS_DEVELOPMENT ? ('style-loader!' + stylesLoader) : ExtractTextPlugin.extract('style-loader', stylesLoader)
-                },
-                {
-                    test: /\.(woff2|woff|ttf|eot|svg)?(\?v=[0-9]\.[0-9]\.[0-9])?$/,
-                    loaders: [
-                        'url-loader?name=fonts/[name]_[hash].[ext]'
-                    ]
-                },
-                {
-                    test: /\.(jpe?g|png|gif)$/i,
-                    loaders: ['url-loader?name=images/[name]_[hash].[ext]']
-                },
-                {
-                    test: require.resolve("jquery"),
-                    loaders: [
-                        "expose?$",
-                        "expose?jQuery"
-                    ]
-                },
-                // {
-                //     test: require.resolve("angular"),
-                //     loaders: [
-                //         "expose?angular"
-                //     ]
-                // }
-            ]
-        },
-
-        // post css
-        postcss: [autoprefixer({browsers: ['last 2 versions']})],
-
-        // load plugins
-        plugins: [
-            new webpack.ProvidePlugin({
-                $: 'jquery',
-                jQuery: 'jquery',
-                _: 'lodash',
-                nv: 'nvd3'
-            }),
-            new webpack.DefinePlugin({'NODE_ENV': JSON.stringify(NODE_ENV)}),
-            new webpack.NoErrorsPlugin(),
-            new webpack.optimize.AggressiveMergingPlugin({moveToParents: true}),
-            new webpack.optimize.CommonsChunkPlugin({
-                name: 'common',
-                async: true,
-                children: true,
-                minChunks: Infinity
-            }),
-
-            // new Manifest(path.join(_path + '/config', 'manifest.json'), {
-            //     rootAssetPath: rootAssetPath,
-            //     ignorePaths: ['.DS_Store']
-            // }),
-            new ExtractTextPlugin('assets/css/[name]' + (IS_DEVELOPMENT ? '' : '.[chunkhash]') + '.css', {allChunks: true}),
-            progressPlugin
-        ]
-    };
-    
-    return webpackConfig;
-};

http://git-wip-us.apache.org/repos/asf/ignite/blob/af05c35c/modules/web-console/src/main/js/gulpfile.babel.js/webpack/index.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/index.js b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/index.js
new file mode 100644
index 0000000..25eda4c
--- /dev/null
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/index.js
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import _ from 'lodash';
+import commonConfig from './common';
+import devConfig from './environments/development';
+import prodConfig from './environments/production';
+
+const ENV = process.env.NODE_ENV ? process.env.NODE_ENV : 'production';
+
+const configs = {
+    // Common config section.
+    common: commonConfig,
+
+    // Config by environments.
+    production: prodConfig,
+    development: devConfig
+};
+
+// Load config file by environment
+export default _.merge(configs.common(), configs[ENV]());

http://git-wip-us.apache.org/repos/asf/ignite/blob/af05c35c/modules/web-console/src/main/js/gulpfile.babel.js/webpack/plugins/progress.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/plugins/progress.js b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/plugins/progress.js
index b6f21b9..5258059 100644
--- a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/plugins/progress.js
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/plugins/progress.js
@@ -1,22 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 import ProgressPlugin from 'webpack/lib/ProgressPlugin';
 
 let chars = 0,
     lastState, lastStateTime;
 
+const outputStream = process.stdout;
+
 const _goToLineStart = (nextMessage) => {
-    var str = "";
+    let str = "";
     for (; chars > nextMessage.length; chars--) {
         str += "\b \b";
     }
+
     chars = nextMessage.length;
+
     for (var i = 0; i < chars; i++) {
         str += "\b";
     }
-    if (str) process.stderr.write(str);
+    if (str)
+        outputStream.write(str);
 };
 
 export default new ProgressPlugin((percentage, msg) => {
-    var state = msg;
+    let state = msg;
+
     if (percentage < 1) {
         percentage = Math.floor(percentage * 100);
         msg = percentage + "% " + msg;
@@ -27,21 +50,27 @@ export default new ProgressPlugin((percentage, msg) => {
             msg = " " + msg;
         }
     }
+
     state = state.replace(/^\d+\/\d+\s+/, "");
+
     if (percentage === 0) {
         lastState = null;
         lastStateTime = +new Date();
-    } else if (state !== lastState || percentage === 1) {
-        var now = +new Date();
+    }
+    else if (state !== lastState || percentage === 1) {
+        let now = +new Date();
+
         if (lastState) {
             var stateMsg = (now - lastStateTime) + "ms " + lastState;
             _goToLineStart(stateMsg);
-            process.stderr.write(stateMsg + "\n");
+            outputStream.write(stateMsg + "\n");
             chars = 0;
         }
+
         lastState = state;
         lastStateTime = now;
     }
+
     _goToLineStart(msg);
-    process.stderr.write(msg);
+    outputStream.write(msg);
 });
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/af05c35c/modules/web-console/src/main/js/package.json
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/package.json b/modules/web-console/src/main/js/package.json
index 0b46586..1148cc6 100644
--- a/modules/web-console/src/main/js/package.json
+++ b/modules/web-console/src/main/js/package.json
@@ -4,7 +4,7 @@
   "description": "Interactive Web console for configuration, executing SQL queries and monitoring of Apache Ignite Cluster",
   "private": true,
   "scripts": {
-    "dev": " NODE_ENV=development node $NODE_DEBUG_OPTION ./node_modules/gulp/bin/gulp.js watch",
+    "dev": "cross-env NODE_ENV=development gulp watch",
     "dist": "cross-env NODE_ENV=production gulp build"
   },
   "author": "",
@@ -50,7 +50,6 @@
     "babel-plugin-transform-runtime": "^6.7.5",
     "babel-polyfill": "^6.7.4",
     "babel-preset-angular": "^6.0.15",
-    "babel-preset-es2017": "^1.3.1",
     "babel-runtime": "^6.6.1",
     "baggage-loader": "^0.2.4",
     "body-parser": "^1.15.0",
@@ -83,7 +82,6 @@
     "jquery": "^2.1.4",
     "json-loader": "^0.5.4",
     "jszip": "^2.6.0",
-    "less": "^2.7.0",
     "lodash": "^4.8.2",
     "manifest-revision-webpack-plugin": "~0.1.0",
     "mongoose": "^4.4.11",
@@ -109,19 +107,29 @@
     "ui-router-metatags": "^1.0.3",
     "url": "^0.11.0",
     "url-loader": "^0.5.6",
-    "webpack": "^1.12.12",
+    "webpack": "^1.13.1",
+    "webpack-dev-server": "^1.14.1",
     "ws": "^0.8.0"
   },
   "devDependencies": {
+    "gulp": "^3.9.1",
     "gulp-cached": "^1.1.0",
+    "gulp-connect": "^3.2.2",
+    "gulp-environments": "^0.1.1",
+    "gulp-eslint": "^2.0.0",
+    "gulp-html-replace": "^1.5.5",
+    "gulp-ignore": "^2.0.1",
+    "gulp-inject": "^4.0.0",
+    "gulp-jade": "^1.1.0",
     "gulp-rimraf": "^0.2.0",
-    "gulp-sequence": "^0.4.5",
+    "gulp-sass": "^2.1.0",
+    "gulp-sequence": "^0.4.1",
+    "gulp-util": "^3.0.7",
     "http-proxy-middleware": "^0.13.0",
-    "json-loader": "^0.5.4",
+    "less": "^2.7.1",
     "mocha": "~2.4.5",
     "morgan": "^1.7.0",
     "should": "^8.3.0",
-    "supertest": "^1.1.0",
-    "webpack-dev-server": "1.14.0"
+    "supertest": "^1.1.0"
   }
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/af05c35c/modules/web-console/src/main/js/views/index.jade
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/views/index.jade b/modules/web-console/src/main/js/views/index.jade
index 757f281..db4bf99 100644
--- a/modules/web-console/src/main/js/views/index.jade
+++ b/modules/web-console/src/main/js/views/index.jade
@@ -30,8 +30,6 @@ html(ng-app='ignite-console' id='app' ng-strict-di)
         meta(name='keywords' content='{{$meta.keywords}}')
         meta(ng-repeat='(key, value) in $meta.properties' name='{{::key}}' content='{{::value}}')
 
-
-
         = '{% if (o.htmlWebpackPlugin.files.favicon) { %}'
         link(rel='shortcut icon' href='{%=o.htmlWebpackPlugin.files.favicon%}')
         = '{% } %}'
@@ -40,11 +38,6 @@ html(ng-app='ignite-console' id='app' ng-strict-di)
         link(href='{%=o.htmlWebpackPlugin.files.css[css] %}' rel='stylesheet')
         = '{% } %}'
 
-
-        = '{% for (var chunk in o.htmlWebpackPlugin.files.chunks) { %}'
-        script(src='{%=o.htmlWebpackPlugin.files.chunks[chunk].entry %}')
-        = '{% } %}'
-
     body.theme-line.body-overlap.greedy
 
         .splash.splash-max-foreground(hide-on-state-change)
@@ -62,3 +55,8 @@ html(ng-app='ignite-console' id='app' ng-strict-di)
                 label {{IgniteDemoMode ? "Demo" : "Beta" }}
 
         .wrapper(ui-view='')
+
+
+        = '{% for (var chunk in o.htmlWebpackPlugin.files.chunks) { %}'
+        script(src='{%=o.htmlWebpackPlugin.files.chunks[chunk].entry %}')
+        = '{% } %}'
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/af05c35c/modules/web-console/src/main/js/webpack.config.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/webpack.config.js b/modules/web-console/src/main/js/webpack.config.js
deleted file mode 100644
index b706876..0000000
--- a/modules/web-console/src/main/js/webpack.config.js
+++ /dev/null
@@ -1,28 +0,0 @@
-'use strict';
-
-var _ = require('lodash');
-var _configs = {
-
-  // global section
-  global: require(__dirname + '/gulpfile.babel.js/webpack/global'),
-
-  // config by enviroments
-  production: require(__dirname + '/gulpfile.babel.js/webpack/environments/production'),
-  development: require(__dirname + '/gulpfile.babel.js/webpack/environments/development')
-};
-
-var _load = function() {
-  var ENV = process.env.NODE_ENV
-    ? process.env.NODE_ENV
-    : 'production';
-
-  console.log('Current Environment: ', ENV);
-
-  // load config file by environment
-  return _configs && _.merge(
-    _configs.global(__dirname),
-    _configs[ENV](__dirname)
-  );
-};
-
-module.exports = _load();


[43/50] [abbrv] ignite git commit: IGNITE-3319 Fixed bootstrap carousel.

Posted by an...@apache.org.
IGNITE-3319 Fixed bootstrap carousel.


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

Branch: refs/heads/ignite-3262
Commit: 567dbbe2bf86fd2a8cb08415ed7d1c44004482de
Parents: 595a42f
Author: Maxim Afanasiev <ma...@gmail.com>
Authored: Thu Jun 16 14:03:18 2016 +0700
Committer: Maxim Afanasiev <ma...@gmail.com>
Committed: Thu Jun 16 14:03:18 2016 +0700

----------------------------------------------------------------------
 modules/web-console/src/main/js/app/vendor.js | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/567dbbe2/modules/web-console/src/main/js/app/vendor.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/vendor.js b/modules/web-console/src/main/js/app/vendor.js
index e899d23..9885f30 100644
--- a/modules/web-console/src/main/js/app/vendor.js
+++ b/modules/web-console/src/main/js/app/vendor.js
@@ -31,6 +31,7 @@ import 'angular-drag-and-drop-lists';
 import 'angular-nvd3';
 import 'angular-tree-control';
 import 'angular-gridster';
+import 'bootstrap-sass/assets/javascripts/bootstrap/transition';
 import 'bootstrap-sass/assets/javascripts/bootstrap/carousel';
 import 'brace';
 import 'brace/mode/xml';


[22/50] [abbrv] ignite git commit: Simplified varargs code generation.

Posted by an...@apache.org.
Simplified varargs code generation.


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

Branch: refs/heads/ignite-3262
Commit: d0ccd6aa03e440687befc9d41006104c17e1ba66
Parents: 7ce3b4b
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Tue Jun 7 15:02:59 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Tue Jun 7 15:02:59 2016 +0700

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


http://git-wip-us.apache.org/repos/asf/ignite/blob/d0ccd6aa/modules/web-console/src/main/js/generator/generator-java.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/generator/generator-java.js b/modules/web-console/src/main/js/generator/generator-java.js
index 2df9a54..155962c 100644
--- a/modules/web-console/src/main/js/generator/generator-java.js
+++ b/modules/web-console/src/main/js/generator/generator-java.js
@@ -282,6 +282,30 @@ $generatorJava.listProperty = function(res, varName, obj, propName, dataType, se
 };
 
 /**
+ * Add function with varargs arguments.
+ *
+ * @param res Resulting output with generated code.
+ * @param fx Function name.
+ * @param quote Whether to quote arguments.
+ * @param args Array with arguments.
+ */
+$generatorJava.fxVarArgs = function(res, fx, quote, args) {
+    const quoteArg = (arg) => quote ? '"' + arg + '"' : arg;
+
+    if (args.length === 1)
+        res.append(fx + '(' + quoteArg(args[0]) + ');');
+    else {
+        res.startBlock(fx + '(');
+
+        const len = args.length - 1;
+
+        _.forEach(args, (arg, ix) => res.line(quoteArg(arg) + (ix < len ? ', ' : '')));
+
+        res.endBlock(');');
+    }
+};
+
+/**
  * Add array property.
  *
  * @param res Resulting output with generated code.


[09/50] [abbrv] ignite git commit: WIP webpack migration

Posted by an...@apache.org.
WIP webpack migration


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

Branch: refs/heads/ignite-3262
Commit: 002452b0339ce7927b1f185e97ad88872a3b4b7c
Parents: eff979c
Author: Maxim Afanasiev <ma...@gmail.com>
Authored: Fri Jun 3 09:21:40 2016 +0700
Committer: Maxim Afanasiev <ma...@gmail.com>
Committed: Fri Jun 3 09:21:40 2016 +0700

----------------------------------------------------------------------
 modules/web-console/src/main/js/app/index.js    |  2 -
 modules/web-console/src/main/js/app/vendor.js   | 25 ++++++++
 .../config/webpack/environments/development.js  | 64 ++++++++++++++------
 .../src/main/js/config/webpack/global.js        |  4 --
 .../main/js/gulpfile.babel.js/tasks/watch.js    |  2 +-
 modules/web-console/src/main/js/package.json    |  1 +
 .../web-console/src/main/js/views/index.jade    | 30 +++++----
 7 files changed, 85 insertions(+), 43 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/002452b0/modules/web-console/src/main/js/app/index.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/index.js b/modules/web-console/src/main/js/app/index.js
index 8b7ba73..5dbf6f9 100644
--- a/modules/web-console/src/main/js/app/index.js
+++ b/modules/web-console/src/main/js/app/index.js
@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-import 'vendor.js';
 import _ from 'lodash';
 import ace from 'brace';
 import angular from 'angular';
@@ -28,7 +27,6 @@ window.require = ace.require; // TODO Should be removed after full refactoring t
 // window.pdfMake = pdfMake;
 
 
-
 import '../public/stylesheets/style.scss';
 
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/002452b0/modules/web-console/src/main/js/app/vendor.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/vendor.js b/modules/web-console/src/main/js/app/vendor.js
new file mode 100644
index 0000000..0e4c860
--- /dev/null
+++ b/modules/web-console/src/main/js/app/vendor.js
@@ -0,0 +1,25 @@
+import 'jquery';
+import 'angular';
+import 'angular-animate';
+import 'angular-sanitize';
+import 'angular-strap';
+import 'angular-socket-io';
+import 'angular-retina';
+import 'angular-ui-router';
+import 'ui-router-metatags/dist/ui-router-metatags.js';
+import 'angular-smart-table';
+import 'angular-ui-grid/ui-grid';
+import 'angular-drag-and-drop-lists';
+import 'angular-nvd3';
+import 'angular-tree-control';
+import 'angular-gridster';
+import 'bootstrap-sass/assets/javascripts/bootstrap/carousel.js';
+// import 'file-saver';
+import 'jszip';
+import 'query-command-supported';
+
+import 'angular-gridster/dist/angular-gridster.min.css';
+import 'angular-tree-control/css/tree-control-attribute.css';
+import 'angular-tree-control/css/tree-control.css';
+import 'angular-ui-grid/ui-grid.css';
+import 'angular-motion/dist/angular-motion.css';
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/002452b0/modules/web-console/src/main/js/config/webpack/environments/development.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/config/webpack/environments/development.js b/modules/web-console/src/main/js/config/webpack/environments/development.js
index e0593e5..2968095 100644
--- a/modules/web-console/src/main/js/config/webpack/environments/development.js
+++ b/modules/web-console/src/main/js/config/webpack/environments/development.js
@@ -2,25 +2,49 @@
 var webpack = require('webpack');
 var HtmlWebpackPlugin = require("html-webpack-plugin");
 var path = require('path');
+var glob = require('glob');
+var jade = require('jade');
 
-module.exports = function(_path) {
-  return {
-    context: _path,
-    debug: true,
-    devtool: 'cheap-source-map',
-    devServer: {
-      contentBase: './dist',
-      info: true,
-      hot: true,
-      inline: true
-    },
-    plugins: [
-      new webpack.HotModuleReplacementPlugin(),
-      new HtmlWebpackPlugin({
-        filename: 'index.html',
-        template: path.join(_path, 'views', 'index.html'),
-        title: 'DEBUG:Ignite Web Console'
-      })
-    ]
-  };
+module.exports = function (_path) {
+    var plugins = [
+        new webpack.HotModuleReplacementPlugin(),
+        new HtmlWebpackPlugin({
+            filename: 'index.html',
+            templateContent: function () {
+                return jade.renderFile(path.join(_path, 'views', 'index.jade'));
+            },
+            title: 'DEBUG:Ignite Web Console'
+        })
+    ];
+
+    glob.sync(path.join(_path, 'views') + '/**/*.jade').map(function (file) {
+        plugins.push(
+            new HtmlWebpackPlugin({
+                filename: 'templates/'+path.basename(file).replace('.jade', '.html'),
+                templateContent: function () {
+                    return jade.renderFile(file);
+                }
+            }))
+    });
+
+    return {
+        context: _path,
+        debug: true,
+        devtool: 'cheap-source-map',
+        devServer: {
+            contentBase: './dist',
+            info: true,
+            hot: true,
+            inline: false,
+            proxy: {
+                '/api/*': {
+                    target: 'http://localhost:3000'
+                }
+            },
+            stats: {colors: true},
+            port: 9000
+        },
+
+        plugins: plugins
+    };
 };

http://git-wip-us.apache.org/repos/asf/ignite/blob/002452b0/modules/web-console/src/main/js/config/webpack/global.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/config/webpack/global.js b/modules/web-console/src/main/js/config/webpack/global.js
index 2a9a162..9cdf686 100644
--- a/modules/web-console/src/main/js/config/webpack/global.js
+++ b/modules/web-console/src/main/js/config/webpack/global.js
@@ -71,10 +71,6 @@ module.exports = function (_path) {
                     ]
                 },
                 {
-                    test: /index\.jade$/,
-                    loader: 'jade'
-                },
-                {
                     test: /\.jade$/,
                     loaders: [
                         'ngtemplate-loader?relativeTo=' + _path,

http://git-wip-us.apache.org/repos/asf/ignite/blob/002452b0/modules/web-console/src/main/js/gulpfile.babel.js/tasks/watch.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/watch.js b/modules/web-console/src/main/js/gulpfile.babel.js/tasks/watch.js
index 8666999..8a78aca 100644
--- a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/watch.js
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/tasks/watch.js
@@ -26,7 +26,7 @@ gulp.task('watch:ignite-modules', (cb) => sequence('clean:ignite-modules-temp',
 
 // Build + connect + watch task.
 gulp.task('watch', ['build', 'connect'], () => {
-    gulp.watch(sassPaths, ['watch:sass']);
+    //gulp.watch(sassPaths, ['watch:sass']);
 
     gulp.watch(jadePaths.concat(jadeModulePaths), ['jade']);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/002452b0/modules/web-console/src/main/js/package.json
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/package.json b/modules/web-console/src/main/js/package.json
index 480f4b2..f81b872 100644
--- a/modules/web-console/src/main/js/package.json
+++ b/modules/web-console/src/main/js/package.json
@@ -76,6 +76,7 @@
     "fire-up": "^1.0.0",
     "font-awesome": "^4.6.1",
     "font-awesome-webpack": "0.0.4",
+    "glob": "^7.0.3",
     "html-loader": "^0.3.0",
     "html-webpack-plugin": "^1.7.0",
     "imagemin-pngquant": "^4.2.0",

http://git-wip-us.apache.org/repos/asf/ignite/blob/002452b0/modules/web-console/src/main/js/views/index.jade
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/views/index.jade b/modules/web-console/src/main/js/views/index.jade
index 8514533..8690753 100644
--- a/modules/web-console/src/main/js/views/index.jade
+++ b/modules/web-console/src/main/js/views/index.jade
@@ -30,10 +30,20 @@ html(ng-app='ignite-console' id='app' ng-strict-di)
         meta(name='keywords' content='{{$meta.keywords}}')
         meta(ng-repeat='(key, value) in $meta.properties' name='{{::key}}' content='{{::value}}')
 
-        // build:css
-        link(rel='stylesheet', href='/vendors.css')
-        link(rel='stylesheet', href='/app.css')
-        // endbuild
+
+
+        = '{% if (o.htmlWebpackPlugin.files.favicon) { %}'
+        link(rel='shortcut icon' href='{%=o.htmlWebpackPlugin.files.favicon%}')
+        = '{% } %}'
+
+        = '{% for (var css in o.htmlWebpackPlugin.files.css) { %}'
+        link(href='{%=o.htmlWebpackPlugin.files.css[css] %}' rel='stylesheet')
+        = '{% } %}'
+
+
+        = '{% for (var chunk in o.htmlWebpackPlugin.files.chunks) { %}'
+        script(src="{%=o.htmlWebpackPlugin.files.chunks[chunk].entry %}")
+        = '{% } %}'
 
     body.theme-line.body-overlap.greedy
 
@@ -52,15 +62,3 @@ html(ng-app='ignite-console' id='app' ng-strict-di)
                 label {{IgniteDemoMode ? "Demo" : "Beta" }}
 
         .wrapper(ui-view='')
-
-
-        // build:js
-        script(src='jspm_packages/system.js')
-        script(src='system.config.js')
-        script(src='vendors.js')
-        script(src='app.js')
-        script System.import('app/index');
-        // endbuild
-
-        // ignite:plugins
-        // endignite
\ No newline at end of file


[42/50] [abbrv] ignite git commit: IGNITE-3319 Review.

Posted by an...@apache.org.
IGNITE-3319 Review.


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

Branch: refs/heads/ignite-3262
Commit: d075cca2246fdeedd2b43e2d579ff8ab7306f724
Parents: 595a42f
Author: Andrey Novikov <an...@apache.org>
Authored: Thu Jun 16 13:51:12 2016 +0700
Committer: Andrey Novikov <an...@apache.org>
Committed: Thu Jun 16 13:51:12 2016 +0700

----------------------------------------------------------------------
 modules/web-console/src/main/js/.gitignore      |  1 -
 modules/web-console/src/main/js/app/app.js      |  6 +--
 .../src/main/js/gulpfile.babel.js/paths.js      | 57 ++++++++------------
 .../src/main/js/gulpfile.babel.js/tasks/copy.js | 12 ++---
 .../main/js/gulpfile.babel.js/tasks/watch.js    |  2 -
 .../main/js/gulpfile.babel.js/webpack/common.js | 31 ++++++-----
 .../webpack/environments/development.js         |  5 +-
 7 files changed, 52 insertions(+), 62 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/d075cca2/modules/web-console/src/main/js/.gitignore
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/.gitignore b/modules/web-console/src/main/js/.gitignore
index 43f716c..a6af5e1 100644
--- a/modules/web-console/src/main/js/.gitignore
+++ b/modules/web-console/src/main/js/.gitignore
@@ -7,4 +7,3 @@ ignite_modules_temp/*
 public/stylesheets/*.css
 serve/config/*.json
 serve/agent_dists/*.zip
-

http://git-wip-us.apache.org/repos/asf/ignite/blob/d075cca2/modules/web-console/src/main/js/app/app.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/app.js b/modules/web-console/src/main/js/app/app.js
index 6fe84c2..a33e385 100644
--- a/modules/web-console/src/main/js/app/app.js
+++ b/modules/web-console/src/main/js/app/app.js
@@ -14,6 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 import '../public/stylesheets/style.scss';
 
 import './decorator/select';
@@ -56,7 +57,7 @@ import igniteUiAcePom from './directives/ui-ace-pom/ui-ace-pom.directive';
 import igniteUiAceDocker from './directives/ui-ace-docker/ui-ace-docker.directive';
 import igniteUiAcePojos from './directives/ui-ace-pojos/ui-ace-pojos.directive';
 import igniteBsAffixUpdate from './directives/bs-affix-update.directive';
-import ignite\u0421entered from './directives/centered/centered.directive.js';
+import igniteCentered from './directives/centered/centered.directive.js';
 
 // Services.
 import cleanup from './services/cleanup.service';
@@ -102,7 +103,6 @@ import 'controllers/sql-controller';
 // Inject external modules.
 import 'ignite_modules_temp/index';
 
-
 import baseTemplate from '../views/base.jade';
 
 angular
@@ -153,7 +153,7 @@ angular
 .directive(...igniteUiAceDocker)
 .directive(...igniteUiAcePojos)
 .directive(...igniteBsAffixUpdate)
-.directive(...ignite\u0421entered)
+.directive(...igniteCentered)
 // Services.
 .service(...cleanup)
 .service(...confirm)

http://git-wip-us.apache.org/repos/asf/ignite/blob/d075cca2/modules/web-console/src/main/js/gulpfile.babel.js/paths.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/paths.js b/modules/web-console/src/main/js/gulpfile.babel.js/paths.js
index 9a1e61a..2ce6bcb 100644
--- a/modules/web-console/src/main/js/gulpfile.babel.js/paths.js
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/paths.js
@@ -29,57 +29,48 @@ const sassPaths = [
 ];
 
 const jadePaths = [
-    '!./views/error.jade',
     './views/*.jade',
     './views/**/*.jade'
 ];
 
-const jadeModulePaths = [
-    igniteModulesDir + '/**/view/**/*.jade'
-];
-
-const resourcePaths = [
-    './controllers/**/*.json',
-    './public/**/*.png',
-    './public/*.ico'
-];
-
-const resourceModulePaths = [
-    igniteModulesDir + '/**/controllers/models/*.json',
-    igniteModulesDir + '/**/images/*.png'
-];
-
 const jsPaths = [
     './{app,controllers,generator}/*.js',
     './{app,controllers,generator}/**/*.js'
 ];
 
-const jsModulePaths = [
-    igniteModulesTemp + '/index.js',
-    igniteModulesTemp + '/**/main.js',
-    igniteModulesTemp + '/**/module.js',
-    igniteModulesTemp + '/**/app/modules/*.js',
-    igniteModulesTemp + '/**/app/modules/**/*.js',
-    igniteModulesTemp + '/**/app/modules/**/*.jade'
-];
-
 const appPaths = [
     './app/**/*.\u0441ss',
     './app/**/*.jade',
     './app/data/*.json'
 ].concat(jsPaths);
 
-const appModulePaths = [
+const resourcePaths = [
+    './public/**/*.png',
+    './public/*.ico'
+];
+
+const jadeModulePaths = [
+    igniteModulesDir + '/**/view/**/*.jade'
+];
+
+const jsModulePaths = [
     igniteModulesDir + '/index.js',
     igniteModulesDir + '/**/main.js',
     igniteModulesDir + '/**/module.js',
-    igniteModulesDir + '/**/app/**/*.css',
-    igniteModulesDir + '/**/app/data/*.json',
     igniteModulesDir + '/**/app/modules/*.js',
     igniteModulesDir + '/**/app/modules/**/*.js',
     igniteModulesDir + '/**/app/modules/**/*.jade'
 ];
 
+const appModulePaths = [
+    igniteModulesDir + '/**/app/**/*.css',
+    igniteModulesDir + '/**/app/data/*.json'
+].concat(jsModulePaths);
+
+const resourceModulePaths = [
+    igniteModulesDir + '/**/images/*.png'
+];
+
 export {
     rootDir,
     srcDir,
@@ -90,14 +81,12 @@ export {
     sassPaths,
 
     jadePaths,
-    jadeModulePaths,
-
     resourcePaths,
-    resourceModulePaths,
-
     jsPaths,
-    jsModulePaths,
-
     appPaths,
+
+    jadeModulePaths,
+    resourceModulePaths,
+    jsModulePaths,
     appModulePaths
 };

http://git-wip-us.apache.org/repos/asf/ignite/blob/d075cca2/modules/web-console/src/main/js/gulpfile.babel.js/tasks/copy.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/copy.js b/modules/web-console/src/main/js/gulpfile.babel.js/tasks/copy.js
index ac31fdd..d2abfe6 100644
--- a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/copy.js
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/tasks/copy.js
@@ -22,23 +22,21 @@ import sequence from 'gulp-sequence';
 import { destDir, rootDir, jsModulePaths, resourcePaths, resourceModulePaths, igniteModulesTemp } from '../paths';
 
 gulp.task('copy', (cb) => {
-    const tasks = ['copy:resource', 'copy:ignite_modules:resource', 'copy:ignite_modules:js'];
+    const tasks = ['copy:resource', 'copy:ignite_modules:js', 'copy:ignite_modules:resource'];
     
     return sequence(tasks, cb);
 });
 
+gulp.task('copy:resource', () =>
+    gulp.src(resourcePaths)
+        .pipe(gulp.dest(destDir))
+);
 
 gulp.task('copy:ignite_modules:js', () =>
     gulp.src(jsModulePaths)
-        .pipe(cache('copy:ignite_modules:js'))
         .pipe(gulp.dest(`${rootDir}/${igniteModulesTemp}`))
 );
 
-gulp.task('copy:resource', () =>
-    gulp.src(resourcePaths)
-        .pipe(gulp.dest(destDir))
-);
-
 gulp.task('copy:ignite_modules:resource', () =>
     gulp.src(resourceModulePaths)
         .pipe(gulp.dest(`${destDir}/ignite_modules`))

http://git-wip-us.apache.org/repos/asf/ignite/blob/d075cca2/modules/web-console/src/main/js/gulpfile.babel.js/tasks/watch.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/watch.js b/modules/web-console/src/main/js/gulpfile.babel.js/tasks/watch.js
index b958816..f708e67 100644
--- a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/watch.js
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/tasks/watch.js
@@ -28,6 +28,4 @@ gulp.task('watch', ['build'], () => {
     gulp.watch(resourcePaths, ['copy:resource']);
     gulp.watch(resourceModulePaths, ['copy:ignite_modules:resource']);
     gulp.watch(appModulePaths, ['watch:ignite-modules']);
-    gulp.watch(appPaths, ['copy']);
 });
-

http://git-wip-us.apache.org/repos/asf/ignite/blob/d075cca2/modules/web-console/src/main/js/gulpfile.babel.js/webpack/common.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/common.js b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/common.js
index 1369328..941f79a 100644
--- a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/common.js
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/common.js
@@ -32,35 +32,39 @@ const development = NODE_ENV === 'development';
 const node_modules_path = path.resolve('node_modules');
 const stylesLoader = 'css-loader?sourceMap!postcss-loader!sass-loader?outputStyle=expanded&sourceMap=true&sourceMapContents=true';
 
-
 export default () => {
-
-    const webpackConfig = {
+    return {
         node: {
             fs: 'empty'
         },
-        
+
         // Entry points.
         entry: {
             polyfill: 'babel-polyfill',
             app: path.join(srcDir, 'app.js'),
             vendor: path.join(srcDir, 'vendor.js')
         },
-        
+
         // Output system.
         output: {
             path: destDir,
             publicPath: './',
             filename: '[name].js'
         },
-        
+
         // Resolves modules.
         resolve: {
-            extensions: ['', '.js'],
+            extensions: [
+                '',
+                '.js'
+            ],
             root: [rootDir],
-            modulesDirectories: [node_modules_path, './'],
+            modulesDirectories: [
+                node_modules_path,
+                './'
+            ]
         },
-        
+
         // Modules resolvers.
         module: {
             noParse: [],
@@ -99,14 +103,17 @@ export default () => {
                     loader: 'babel-loader',
                     query: {
                         cacheDirectory: true,
-                        plugins: ['transform-runtime', 'add-module-exports'],
+                        plugins: ['transform-runtime',
+                            'add-module-exports'],
                         presets: ['angular']
 
                     }
                 },
                 {
                     test: /\.css$/,
-                    loaders: ['style-loader', 'css-loader?sourceMap', 'postcss-loader']
+                    loaders: ['style-loader',
+                        'css-loader?sourceMap',
+                        'postcss-loader']
                 },
                 {
                     test: /\.(scss|sass)$/,
@@ -179,6 +186,4 @@ export default () => {
             progressPlugin
         ]
     };
-
-    return webpackConfig;
 };

http://git-wip-us.apache.org/repos/asf/ignite/blob/d075cca2/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/development.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/development.js b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/development.js
index 766bda8..6b23450 100644
--- a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/development.js
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/development.js
@@ -19,7 +19,7 @@ import webpack from 'webpack';
 import {destDir, rootDir} from '../../paths';
 
 export default () => {
-    let plugins = [
+    const plugins = [
         new webpack.HotModuleReplacementPlugin()
     ];
 
@@ -44,8 +44,9 @@ export default () => {
                 '/api/v1/*': {
                     target: 'http://localhost:3000',
                     changeOrigin: true,
-                    rewrite: function(req) {
+                    rewrite: (req) => {
                         req.url = req.url.replace(/^\/api\/v1/, '');
+
                         return req;
                     }
                 }


[20/50] [abbrv] ignite git commit: GG-11225 Fixed Undo of cache store.

Posted by an...@apache.org.
GG-11225 Fixed Undo of cache store.


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

Branch: refs/heads/ignite-3262
Commit: 4ed4cbcdb93b443f71194722a7b697bf8de3ab5c
Parents: 1e78374
Author: vsisko <vs...@gridgain.com>
Authored: Tue Jun 7 14:35:23 2016 +0700
Committer: vsisko <vs...@gridgain.com>
Committed: Tue Jun 7 14:35:23 2016 +0700

----------------------------------------------------------------------
 .../modules/states/configuration/caches/store.jade    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/4ed4cbcd/modules/web-console/src/main/js/app/modules/states/configuration/caches/store.jade
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/caches/store.jade b/modules/web-console/src/main/js/app/modules/states/configuration/caches/store.jade
index 86f6870..b52e022 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/caches/store.jade
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/caches/store.jade
@@ -96,11 +96,11 @@ form.panel.panel-default(name=form novalidate)
                         ]',
                         'Factory for persistent storage for cache data'
                     )
-                    span(ng-if=storeFactoryKind ng-init='__.expanded = true')
+                    span(ng-show=storeFactoryKind ng-init='__.expanded = true')
                         a.customize(ng-show='__.expanded' ng-click='__.expanded = false') Hide settings
                         a.customize(ng-hide='__.expanded' ng-click='__.expanded = true') Show settings
-                        .panel-details(ng-if='__.expanded')
-                            div(ng-if='#{storeFactoryKind} === "CacheJdbcPojoStoreFactory"')
+                        .panel-details(ng-show='__.expanded')
+                            div(ng-show='#{storeFactoryKind} === "CacheJdbcPojoStoreFactory"')
                                 -var pojoStoreFactory = storeFactory + '.CacheJdbcPojoStoreFactory'
 
                                 .details-row
@@ -111,7 +111,7 @@ form.panel.panel-default(name=form novalidate)
                                     +dialect('Dialect:', pojoStoreFactory + '.dialect', 'pojoDialect',
                                         'Dialect of SQL implemented by a particular RDBMS:', 'Generic JDBC dialect',
                                         'Choose JDBC dialect')
-                            div(ng-if='#{storeFactoryKind} === "CacheJdbcBlobStoreFactory"')
+                            div(ng-show='#{storeFactoryKind} === "CacheJdbcBlobStoreFactory"')
                                 -var blobStoreFactory = storeFactory + '.CacheJdbcBlobStoreFactory'
                                 -var blobStoreFactoryVia = blobStoreFactory + '.connectVia'
 
@@ -126,7 +126,7 @@ form.panel.panel-default(name=form novalidate)
                                             <li>JDBC URL, for example: jdbc:h2:mem:myDatabase</li>\
                                             <li>Configured data source</li>\
                                         </ul>')
-                                div(ng-if='#{blobStoreFactoryVia} === "URL"')
+                                div(ng-show='#{blobStoreFactoryVia} === "URL"')
                                     .details-row
                                         +text('Connection URL:', blobStoreFactory + '.connectionUrl', 'connectionUrl', 'true', 'Input URL',
                                             'URL for database access, for example: jdbc:h2:mem:myDatabase')
@@ -134,7 +134,7 @@ form.panel.panel-default(name=form novalidate)
                                         +text('User:', blobStoreFactory + '.user', 'user', 'true', 'Input user name', 'User name for database access')
                                     .details-row
                                         label Note, password will be generated as stub
-                                div(ng-if='#{blobStoreFactoryVia} !== "URL"')
+                                div(ng-show='#{blobStoreFactoryVia} !== "URL"')
                                     .details-row
                                         +text('Data source bean name:', blobStoreFactory + '.dataSourceBean', 'blobDataSourceBean', 'true', 'Input bean name',
                                             'Name of the data source bean in Spring context')
@@ -164,7 +164,7 @@ form.panel.panel-default(name=form novalidate)
                                         'Query for delete entry from underlying database<br/>\
                                         Default value: delete from ENTRIES where key=?')
 
-                            div(ng-if='#{storeFactoryKind} === "CacheHibernateBlobStoreFactory"')
+                            div(ng-show='#{storeFactoryKind} === "CacheHibernateBlobStoreFactory"')
                                 -var hibernateStoreFactory = storeFactory + '.CacheHibernateBlobStoreFactory'
                                 -var hibernateProperties = hibernateStoreFactory + '.hibernateProperties'
 


[44/50] [abbrv] ignite git commit: IGNITE-3319 Fixed plugin definition.

Posted by an...@apache.org.
IGNITE-3319 Fixed plugin definition.


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

Branch: refs/heads/ignite-3262
Commit: 0254f6a29763ae77228ebcd51167ff3d0509f3e7
Parents: 567dbbe
Author: Maxim Afanasiev <ma...@gmail.com>
Authored: Thu Jun 16 16:27:12 2016 +0700
Committer: Maxim Afanasiev <ma...@gmail.com>
Committed: Thu Jun 16 16:27:12 2016 +0700

----------------------------------------------------------------------
 .../src/main/js/gulpfile.babel.js/webpack/common.js      | 11 +++--------
 .../gulpfile.babel.js/webpack/environments/production.js |  1 -
 .../src/main/js/gulpfile.babel.js/webpack/manifest.json  |  1 -
 modules/web-console/src/main/js/package.json             |  1 +
 4 files changed, 4 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/0254f6a2/modules/web-console/src/main/js/gulpfile.babel.js/webpack/common.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/common.js b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/common.js
index 1369328..6cd238b 100644
--- a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/common.js
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/common.js
@@ -157,17 +157,12 @@ export default () => {
             }),
             new webpack.DefinePlugin({'NODE_ENV': JSON.stringify(NODE_ENV)}),
             // new webpack.NoErrorsPlugin(),
-            new webpack.optimize.AggressiveMergingPlugin({moveToParents: true}),
+            new webpack.optimize.DedupePlugin(),
             new webpack.optimize.CommonsChunkPlugin({
                 name: 'common',
-                async: true,
-                children: true,
-                minChunks: Infinity
+                chunks: ['vendor', 'app']
             }),
-            // new Manifest(path.join(_path + '/config', 'manifest.json'), {
-            //     rootAssetPath: rootAssetPath,
-            //     ignorePaths: ['.DS_Store']
-            // }),
+            new webpack.optimize.AggressiveMergingPlugin({moveToParents: true}),
             new ExtractTextPlugin('assets/css/[name]' + (development ? '' : '.[chunkhash]') + '.css', {allChunks: true}),
             new HtmlWebpackPlugin({
                 filename: 'index.html',

http://git-wip-us.apache.org/repos/asf/ignite/blob/0254f6a2/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/production.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/production.js b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/production.js
index b2bfe78..1fede99 100644
--- a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/production.js
+++ b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/environments/production.js
@@ -21,7 +21,6 @@ import {destDir, rootDir} from '../../paths';
 
 export default () => {
     const plugins = [
-        new webpack.optimize.DedupePlugin(),
         new webpack.optimize.UglifyJsPlugin({
             path: destDir,
             minimize: true,

http://git-wip-us.apache.org/repos/asf/ignite/blob/0254f6a2/modules/web-console/src/main/js/gulpfile.babel.js/webpack/manifest.json
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/manifest.json b/modules/web-console/src/main/js/gulpfile.babel.js/webpack/manifest.json
deleted file mode 100644
index 1b08f72..0000000
--- a/modules/web-console/src/main/js/gulpfile.babel.js/webpack/manifest.json
+++ /dev/null
@@ -1 +0,0 @@
-{"assets":{"app.map":"app.js.map","polyfill.map":"polyfill.js.map","vendor.map":"vendor.js.map","common.map":"common.js.map"},"publicPath":"/"}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/0254f6a2/modules/web-console/src/main/js/package.json
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/package.json b/modules/web-console/src/main/js/package.json
index 0c8669c..e7cc110 100644
--- a/modules/web-console/src/main/js/package.json
+++ b/modules/web-console/src/main/js/package.json
@@ -83,6 +83,7 @@
     "ngtemplate-loader": "^1.3.1",
     "node-sass": "^3.4.2",
     "nodemailer": "^2.3.0",
+    "nvd3": "^1.8.3",
     "passport": "^0.3.2",
     "passport-local": "^1.0.0",
     "passport-local-mongoose": "^4.0.0",


[32/50] [abbrv] ignite git commit: IGNITE-3250 Reworked object comparing from JSON stringify() to _.isEqual()

Posted by an...@apache.org.
IGNITE-3250 Reworked object comparing from JSON stringify() to _.isEqual()


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

Branch: refs/heads/ignite-3262
Commit: 4dd0f4c8cd950ba67102bf41d27b52d3624ff6fb
Parents: 79270b1
Author: Dmitriyff <dm...@gmail.com>
Authored: Fri Jun 10 14:40:34 2016 +0700
Committer: vsisko <vs...@gridgain.com>
Committed: Fri Jun 10 14:40:34 2016 +0700

----------------------------------------------------------------------
 .../main/js/app/modules/form/field/input/datalist.directive.js | 6 +++---
 .../src/main/js/app/modules/form/field/input/text.directive.js | 6 +++---
 .../src/main/js/app/modules/form/group/group.directive.js      | 6 +++---
 .../web-console/src/main/js/controllers/caches-controller.js   | 6 +++---
 .../web-console/src/main/js/controllers/clusters-controller.js | 6 +++---
 .../web-console/src/main/js/controllers/domains-controller.js  | 6 +++---
 modules/web-console/src/main/js/controllers/igfs-controller.js | 6 +++---
 7 files changed, 21 insertions(+), 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/4dd0f4c8/modules/web-console/src/main/js/app/modules/form/field/input/datalist.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/form/field/input/datalist.directive.js b/modules/web-console/src/main/js/app/modules/form/field/input/datalist.directive.js
index 0cd9d69..ce67897 100644
--- a/modules/web-console/src/main/js/app/modules/form/field/input/datalist.directive.js
+++ b/modules/web-console/src/main/js/app/modules/form/field/input/datalist.directive.js
@@ -74,10 +74,10 @@ export default ['igniteFormFieldInputDatalist', ['IgniteFormGUID', '$table', (gu
         scope.ngChange = () => {
             ngModel.$setViewValue(scope.value);
 
-            if (JSON.stringify(scope.value) !== JSON.stringify(form.$defaults[name]))
-                ngModel.$setDirty();
-            else
+            if (_.isEqual(scope.value, form.$defaults[name]))
                 ngModel.$setPristine();
+            else
+                ngModel.$setDirty();
 
             setTimeout(checkValid, 100); // Use setTimeout() workaround of problem of two controllers.
         };

http://git-wip-us.apache.org/repos/asf/ignite/blob/4dd0f4c8/modules/web-console/src/main/js/app/modules/form/field/input/text.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/form/field/input/text.directive.js b/modules/web-console/src/main/js/app/modules/form/field/input/text.directive.js
index ba4407f..619a541 100644
--- a/modules/web-console/src/main/js/app/modules/form/field/input/text.directive.js
+++ b/modules/web-console/src/main/js/app/modules/form/field/input/text.directive.js
@@ -75,10 +75,10 @@ export default ['igniteFormFieldInputText', ['IgniteFormGUID', '$table', (guid,
         scope.ngChange = () => {
             ngModel.$setViewValue(scope.value);
 
-            if (JSON.stringify(scope.value) !== JSON.stringify(form.$defaults[name]))
-                ngModel.$setDirty();
-            else
+            if (_.isEqual(scope.value, form.$defaults[name]))
                 ngModel.$setPristine();
+            else
+                ngModel.$setDirty();
 
             setTimeout(checkValid, 100); // Use setTimeout() workaround of problem of two controllers.
         };

http://git-wip-us.apache.org/repos/asf/ignite/blob/4dd0f4c8/modules/web-console/src/main/js/app/modules/form/group/group.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/form/group/group.directive.js b/modules/web-console/src/main/js/app/modules/form/group/group.directive.js
index 5039d6f..0971d44 100644
--- a/modules/web-console/src/main/js/app/modules/form/group/group.directive.js
+++ b/modules/web-console/src/main/js/app/modules/form/group/group.directive.js
@@ -50,10 +50,10 @@ export default ['igniteFormGroup', [() => {
         };
 
         const setAsDirty = () => {
-            if (JSON.stringify(scope.ngModel) !== JSON.stringify(parentFormCtrl.$defaults[name]))
-                ngModelCtrl.$setDirty();
-            else
+            if (_.isEqual(scope.ngModel, parentFormCtrl.$defaults[name]))
                 ngModelCtrl.$setPristine();
+            else
+                ngModelCtrl.$setDirty();
         };
 
         scope.$watch(() => parentFormCtrl.$pristine, setAsDefault);

http://git-wip-us.apache.org/repos/asf/ignite/blob/4dd0f4c8/modules/web-console/src/main/js/controllers/caches-controller.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/controllers/caches-controller.js b/modules/web-console/src/main/js/controllers/caches-controller.js
index 2d27164..e90461a 100644
--- a/modules/web-console/src/main/js/controllers/caches-controller.js
+++ b/modules/web-console/src/main/js/controllers/caches-controller.js
@@ -134,14 +134,14 @@ consoleModule.controller('cachesController', [
                 }
 
                 $scope.$watch('ui.inputForm.$valid', function(valid) {
-                    if (valid && __original_value === JSON.stringify($cleanup($scope.backupItem)))
+                    if (valid && _.isEqual(__original_value, $cleanup($scope.backupItem)))
                         $scope.ui.inputForm.$dirty = false;
                 });
 
                 $scope.$watch('backupItem', function(val) {
                     const form = $scope.ui.inputForm;
 
-                    if (form.$pristine || (form.$valid && __original_value === JSON.stringify($cleanup(val))))
+                    if (form.$pristine || (form.$valid && _.isEqual(__original_value, $cleanup(val))))
                         form.$setPristine();
                     else
                         form.$setDirty();
@@ -179,7 +179,7 @@ consoleModule.controller('cachesController', [
 
                 $scope.backupItem = angular.merge({}, blank, $scope.backupItem);
 
-                __original_value = JSON.stringify($cleanup($scope.backupItem));
+                __original_value = $cleanup($scope.backupItem);
 
                 if ($common.getQueryVariable('new'))
                     $state.go('base.configuration.caches');

http://git-wip-us.apache.org/repos/asf/ignite/blob/4dd0f4c8/modules/web-console/src/main/js/controllers/clusters-controller.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/controllers/clusters-controller.js b/modules/web-console/src/main/js/controllers/clusters-controller.js
index 7da00a5..65c5be1 100644
--- a/modules/web-console/src/main/js/controllers/clusters-controller.js
+++ b/modules/web-console/src/main/js/controllers/clusters-controller.js
@@ -246,14 +246,14 @@ consoleModule.controller('clustersController', [
                 }
 
                 $scope.$watch('ui.inputForm.$valid', function(valid) {
-                    if (valid && __original_value === JSON.stringify($cleanup($scope.backupItem)))
+                    if (valid && _.isEqual(__original_value, $cleanup($scope.backupItem)))
                         $scope.ui.inputForm.$dirty = false;
                 });
 
                 $scope.$watch('backupItem', function(val) {
                     const form = $scope.ui.inputForm;
 
-                    if (form.$pristine || (form.$valid && __original_value === JSON.stringify($cleanup(val))))
+                    if (form.$pristine || (form.$valid && _.isEqual(__original_value, $cleanup(val))))
                         form.$setPristine();
                     else
                         form.$setDirty();
@@ -297,7 +297,7 @@ consoleModule.controller('clustersController', [
 
                 $scope.backupItem = angular.merge({}, blank, $scope.backupItem);
 
-                __original_value = JSON.stringify($cleanup($scope.backupItem));
+                __original_value = $cleanup($scope.backupItem);
 
                 if ($common.getQueryVariable('new'))
                     $state.go('base.configuration.clusters');

http://git-wip-us.apache.org/repos/asf/ignite/blob/4dd0f4c8/modules/web-console/src/main/js/controllers/domains-controller.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/controllers/domains-controller.js b/modules/web-console/src/main/js/controllers/domains-controller.js
index df7d8a9..ab7e7d8 100644
--- a/modules/web-console/src/main/js/controllers/domains-controller.js
+++ b/modules/web-console/src/main/js/controllers/domains-controller.js
@@ -1118,14 +1118,14 @@ consoleModule.controller('domainsController', [
                 }
 
                 $scope.$watch('ui.inputForm.$valid', function(valid) {
-                    if (valid && __original_value === JSON.stringify($cleanup($scope.backupItem)))
+                    if (valid && _.isEqual(__original_value, $cleanup($scope.backupItem)))
                         $scope.ui.inputForm.$dirty = false;
                 });
 
                 $scope.$watch('backupItem', function(val) {
                     const form = $scope.ui.inputForm;
 
-                    if (form.$pristine || (form.$valid && __original_value === JSON.stringify($cleanup(val))))
+                    if (form.$pristine || (form.$valid && _.isEqual(__original_value, $cleanup(val))))
                         form.$setPristine();
                     else
                         form.$setDirty();
@@ -1176,7 +1176,7 @@ consoleModule.controller('domainsController', [
 
                 $scope.backupItem = angular.merge({}, blank, $scope.backupItem);
 
-                __original_value = JSON.stringify($cleanup($scope.backupItem));
+                __original_value = $cleanup($scope.backupItem);
 
                 if ($common.isDefined($scope.backupItem) && !$common.isDefined($scope.backupItem.queryMetadata))
                     $scope.backupItem.queryMetadata = 'Configuration';

http://git-wip-us.apache.org/repos/asf/ignite/blob/4dd0f4c8/modules/web-console/src/main/js/controllers/igfs-controller.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/controllers/igfs-controller.js b/modules/web-console/src/main/js/controllers/igfs-controller.js
index c6b3273..bb15e8b 100644
--- a/modules/web-console/src/main/js/controllers/igfs-controller.js
+++ b/modules/web-console/src/main/js/controllers/igfs-controller.js
@@ -184,14 +184,14 @@ consoleModule.controller('igfsController', [
                 }
 
                 $scope.$watch('ui.inputForm.$valid', function(valid) {
-                    if (valid && __original_value === JSON.stringify($cleanup($scope.backupItem)))
+                    if (valid && _.isEqual(__original_value, $cleanup($scope.backupItem)))
                         $scope.ui.inputForm.$dirty = false;
                 });
 
                 $scope.$watch('backupItem', function(val) {
                     const form = $scope.ui.inputForm;
 
-                    if (form.$pristine || (form.$valid && __original_value === JSON.stringify($cleanup(val))))
+                    if (form.$pristine || (form.$valid && _.isEqual(__original_value, $cleanup(val))))
                         form.$setPristine();
                     else
                         form.$setDirty();
@@ -231,7 +231,7 @@ consoleModule.controller('igfsController', [
 
                 $scope.backupItem = angular.merge({}, blank, $scope.backupItem);
 
-                __original_value = JSON.stringify($cleanup($scope.backupItem));
+                __original_value = $cleanup($scope.backupItem);
 
                 if ($common.getQueryVariable('new'))
                     $state.go('base.configuration.igfs');


[02/50] [abbrv] ignite git commit: WIP webpack migration

Posted by an...@apache.org.
WIP webpack migration


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

Branch: refs/heads/ignite-3262
Commit: eff979c51d7629f881d3bbaa025b96c016408c93
Parents: 4a04247
Author: Maxim Afanasiev <ma...@gmail.com>
Authored: Thu Jun 2 10:44:42 2016 +0700
Committer: Maxim Afanasiev <ma...@gmail.com>
Committed: Thu Jun 2 10:44:43 2016 +0700

----------------------------------------------------------------------
 .../directives/centered/centered.directive.js   |   2 +-
 .../information/information.directive.js        |   4 +-
 .../ui-ace-docker/ui-ace-docker.directive.js    |   4 +-
 .../ui-ace-java/ui-ace-java.directive.js        |   4 +-
 .../ui-ace-pojos/ui-ace-pojos.directive.js      |   4 +-
 .../ui-ace-pom/ui-ace-pom.directive.js          |   4 +-
 .../ui-ace-xml/ui-ace-xml.directive.js          |   4 +-
 modules/web-console/src/main/js/app/index.js    |  50 ++---
 .../src/main/js/app/modules/Demo/Demo.module.js |   2 +-
 .../modules/branding/header-logo.directive.js   |   4 +-
 .../branding/powered-by-apache.directive.js     |   4 +-
 .../configuration/EventGroups.provider.js       |   2 +-
 .../configuration/generator/Pom.service.js      |   2 +-
 .../js/app/modules/dialog/dialog.factory.js     |   4 +-
 .../modules/form/field/dropdown.directive.js    |   4 +-
 .../app/modules/form/field/field.directive.js   |   6 +-
 .../form/field/input/checkbox.directive.js      |   4 +-
 .../form/field/input/datalist.directive.js      |   4 +-
 .../form/field/input/number.directive.js        |   4 +-
 .../modules/form/field/input/text.directive.js  |   6 +-
 .../app/modules/form/group/group.directive.js   |   4 +-
 .../app/modules/form/group/table.directive.js   |   4 +-
 .../getting-started/GettingStarted.provider.js  |   2 +-
 .../js/app/modules/loading/loading.directive.js |   6 +-
 .../caches/concurrency.directive.js             |   4 +-
 .../configuration/caches/general.directive.js   |   4 +-
 .../configuration/caches/memory.directive.js    |   4 +-
 .../configuration/caches/query.directive.js     |   4 +-
 .../configuration/caches/rebalance.directive.js |   4 +-
 .../caches/server-near-cache.directive.js       |   4 +-
 .../caches/statistics.directive.js              |   4 +-
 .../configuration/caches/store.directive.js     |   4 +-
 .../configuration/clusters/atomic.directive.js  |   4 +-
 .../clusters/attributes.directive.js            |   4 +-
 .../configuration/clusters/binary.directive.js  |   4 +-
 .../clusters/collision.directive.js             |   4 +-
 .../clusters/collision/custom.directive.js      |   4 +-
 .../clusters/collision/fifo-queue.directive.js  |   4 +-
 .../collision/job-stealing.directive.js         |   4 +-
 .../collision/priority-queue.directive.js       |   4 +-
 .../clusters/communication.directive.js         |   4 +-
 .../clusters/connector.directive.js             |   4 +-
 .../clusters/deployment.directive.js            |   4 +-
 .../clusters/discovery.directive.js             |   4 +-
 .../configuration/clusters/events.directive.js  |   4 +-
 .../clusters/failover.directive.js              |   4 +-
 .../configuration/clusters/general.directive.js |   4 +-
 .../general/discovery/cloud.directive.js        |   4 +-
 .../general/discovery/google.directive.js       |   4 +-
 .../general/discovery/jdbc.directive.js         |   4 +-
 .../general/discovery/multicast.directive.js    |   4 +-
 .../clusters/general/discovery/s3.directive.js  |   4 +-
 .../general/discovery/shared.directive.js       |   4 +-
 .../clusters/general/discovery/vm.directive.js  |   4 +-
 .../general/discovery/zookeeper.directive.js    |   4 +-
 .../bounded-exponential-backoff.directive.js    |   4 +-
 .../zookeeper/retrypolicy/custom.directive.js   |   4 +-
 .../exponential-backoff.directive.js            |   4 +-
 .../zookeeper/retrypolicy/forever.directive.js  |   4 +-
 .../zookeeper/retrypolicy/n-times.directive.js  |   4 +-
 .../zookeeper/retrypolicy/one-time.directive.js |   4 +-
 .../retrypolicy/until-elapsed.directive.js      |   4 +-
 .../configuration/clusters/igfs.directive.js    |   4 +-
 .../configuration/clusters/logger.directive.js  |   4 +-
 .../clusters/logger/custom.directive.js         |   4 +-
 .../clusters/logger/log4j.directive.js          |   4 +-
 .../clusters/logger/log4j2.directive.js         |   4 +-
 .../clusters/marshaller.directive.js            |   4 +-
 .../configuration/clusters/metrics.directive.js |   4 +-
 .../configuration/clusters/ssl.directive.js     |   4 +-
 .../configuration/clusters/swap.directive.js    |   4 +-
 .../configuration/clusters/thread.directive.js  |   4 +-
 .../configuration/clusters/time.directive.js    |   4 +-
 .../clusters/transactions.directive.js          |   4 +-
 .../configuration/domains/general.directive.js  |   4 +-
 .../configuration/domains/query.directive.js    |   4 +-
 .../configuration/domains/store.directive.js    |   4 +-
 .../states/configuration/igfs/dual.directive.js |   4 +-
 .../igfs/fragmentizer.directive.js              |   4 +-
 .../configuration/igfs/general.directive.js     |   4 +-
 .../states/configuration/igfs/ipc.directive.js  |   4 +-
 .../states/configuration/igfs/misc.directive.js |   4 +-
 .../configuration/igfs/secondary.directive.js   |   4 +-
 .../configuration/preview-panel.directive.js    |   2 +-
 .../main/js/app/modules/states/signin.state.js  |   3 +-
 .../main/js/app/services/ChartColors.service.js |   2 +-
 .../main/js/app/services/Countries.service.js   |   2 +-
 .../main/js/app/services/JavaTypes.service.js   |   6 +-
 .../src/main/js/config/manifest.json            |   1 +
 .../config/webpack/environments/development.js  |  26 +++
 .../config/webpack/environments/production.js   |  29 +++
 .../src/main/js/config/webpack/global.js        | 197 +++++++++++++++++++
 .../main/js/controllers/caches-controller.js    |   2 +-
 .../main/js/controllers/clusters-controller.js  |   4 +-
 .../src/main/js/controllers/common-module.js    |   4 +-
 .../main/js/controllers/domains-controller.js   |   2 +-
 .../src/main/js/controllers/igfs-controller.js  |   2 +-
 modules/web-console/src/main/js/package.json    | 124 ++++++++----
 modules/web-console/src/main/js/serve/agent.js  |   2 +-
 .../web-console/src/main/js/views/index.html    |  45 +++++
 .../web-console/src/main/js/webpack.config.js   |  28 +++
 101 files changed, 608 insertions(+), 247 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/directives/centered/centered.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/directives/centered/centered.directive.js b/modules/web-console/src/main/js/app/directives/centered/centered.directive.js
index 719194c..4abd086 100644
--- a/modules/web-console/src/main/js/app/directives/centered/centered.directive.js
+++ b/modules/web-console/src/main/js/app/directives/centered/centered.directive.js
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import './centered.css!';
+import './centered.css';
 
 export default ['centered', [() => {
     return {

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/directives/information/information.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/directives/information/information.directive.js b/modules/web-console/src/main/js/app/directives/information/information.directive.js
index 9250639..a9a2f8c 100644
--- a/modules/web-console/src/main/js/app/directives/information/information.directive.js
+++ b/modules/web-console/src/main/js/app/directives/information/information.directive.js
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import template from './information.jade!';
+import templateUrl from './information.jade';
 
 export default ['igniteInformation', [() => {
     return {
@@ -23,7 +23,7 @@ export default ['igniteInformation', [() => {
             title: '@'
         },
         restrict: 'E',
-        template,
+        templateUrl,
         replace: true,
         transclude: true
     };

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/directives/ui-ace-docker/ui-ace-docker.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/directives/ui-ace-docker/ui-ace-docker.directive.js b/modules/web-console/src/main/js/app/directives/ui-ace-docker/ui-ace-docker.directive.js
index 47a52df..08e4f76 100644
--- a/modules/web-console/src/main/js/app/directives/ui-ace-docker/ui-ace-docker.directive.js
+++ b/modules/web-console/src/main/js/app/directives/ui-ace-docker/ui-ace-docker.directive.js
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import template from './ui-ace-docker.jade!';
+import templateUrl from './ui-ace-docker.jade';
 import controller from './ui-ace-docker.controller';
 
 export default ['igniteUiAceDocker', [() => {
@@ -38,7 +38,7 @@ export default ['igniteUiAceDocker', [() => {
             data: '=ngModel'
         },
         link,
-        template,
+        templateUrl,
         controller,
         controllerAs: 'ctrl',
         require: ['?^igniteUiAceTabs']

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/directives/ui-ace-java/ui-ace-java.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/directives/ui-ace-java/ui-ace-java.directive.js b/modules/web-console/src/main/js/app/directives/ui-ace-java/ui-ace-java.directive.js
index 948f82c..eb606d1 100644
--- a/modules/web-console/src/main/js/app/directives/ui-ace-java/ui-ace-java.directive.js
+++ b/modules/web-console/src/main/js/app/directives/ui-ace-java/ui-ace-java.directive.js
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import template from './ui-ace-java.jade!';
+import templateUrl from './ui-ace-java.jade';
 import controller from './ui-ace-java.controller';
 
 export default ['igniteUiAceJava', ['GeneratorJava', (generator) => {
@@ -125,7 +125,7 @@ export default ['igniteUiAceJava', ['GeneratorJava', (generator) => {
             data: '=?ngModel'
         },
         link,
-        template,
+        templateUrl,
         controller,
         controllerAs: 'ctrl',
         require: ['igniteUiAceJava', '?^igniteUiAceTabs', '?^form', '?ngModel']

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/directives/ui-ace-pojos/ui-ace-pojos.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/directives/ui-ace-pojos/ui-ace-pojos.directive.js b/modules/web-console/src/main/js/app/directives/ui-ace-pojos/ui-ace-pojos.directive.js
index 6222dc0..7c224b7 100644
--- a/modules/web-console/src/main/js/app/directives/ui-ace-pojos/ui-ace-pojos.directive.js
+++ b/modules/web-console/src/main/js/app/directives/ui-ace-pojos/ui-ace-pojos.directive.js
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import template from './ui-ace-pojos.jade!';
+import templateUrl from './ui-ace-pojos.jade';
 import controller from './ui-ace-pojos.controller';
 
 export default ['igniteUiAcePojos', [() => {
@@ -38,7 +38,7 @@ export default ['igniteUiAcePojos', [() => {
             pojos: '=ngModel'
         },
         link,
-        template,
+        templateUrl,
         controller,
         controllerAs: 'ctrl',
         require: ['?^igniteUiAceTabs']

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/directives/ui-ace-pom/ui-ace-pom.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/directives/ui-ace-pom/ui-ace-pom.directive.js b/modules/web-console/src/main/js/app/directives/ui-ace-pom/ui-ace-pom.directive.js
index 3d68ba9..2a7a878 100644
--- a/modules/web-console/src/main/js/app/directives/ui-ace-pom/ui-ace-pom.directive.js
+++ b/modules/web-console/src/main/js/app/directives/ui-ace-pom/ui-ace-pom.directive.js
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import template from './ui-ace-pom.jade!';
+import templateUrl from './ui-ace-pom.jade';
 import controller from './ui-ace-pom.controller';
 
 export default ['igniteUiAcePom', [() => {
@@ -33,7 +33,7 @@ export default ['igniteUiAcePom', [() => {
             cluster: '='
         },
         link,
-        template,
+        templateUrl,
         controller,
         controllerAs: 'ctrl',
         require: ['?^igniteUiAceTabs']

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/directives/ui-ace-xml/ui-ace-xml.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/directives/ui-ace-xml/ui-ace-xml.directive.js b/modules/web-console/src/main/js/app/directives/ui-ace-xml/ui-ace-xml.directive.js
index 79787a2..aef9b43 100644
--- a/modules/web-console/src/main/js/app/directives/ui-ace-xml/ui-ace-xml.directive.js
+++ b/modules/web-console/src/main/js/app/directives/ui-ace-xml/ui-ace-xml.directive.js
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import template from './ui-ace-xml.jade!';
+import templateUrl from './ui-ace-xml.jade';
 import controller from './ui-ace-xml.controller';
 
 export default ['igniteUiAceXml', ['GeneratorXml', (generator) => {
@@ -125,7 +125,7 @@ export default ['igniteUiAceXml', ['GeneratorXml', (generator) => {
             data: '=?ngModel'
         },
         link,
-        template,
+        templateUrl,
         controller,
         controllerAs: 'ctrl',
         require: ['igniteUiAceXml', '?^igniteUiAceTabs', '?^form', '?ngModel']

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/index.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/index.js b/modules/web-console/src/main/js/app/index.js
index 397d25f..8b7ba73 100644
--- a/modules/web-console/src/main/js/app/index.js
+++ b/modules/web-console/src/main/js/app/index.js
@@ -15,43 +15,23 @@
  * limitations under the License.
  */
 
+import 'vendor.js';
 import _ from 'lodash';
-import ace from 'ace';
+import ace from 'brace';
 import angular from 'angular';
-import pdfMake from 'pdfmake';
+// import pdfMake from 'pdfmake';
 
 ace.config.set('basePath', '/jspm_packages/github/ajaxorg/ace-builds@1.2.3');
 
 window._ = _;
 window.require = ace.require; // TODO Should be removed after full refactoring to directives.
-window.pdfMake = pdfMake;
-
-import 'angular-animate';
-import 'angular-sanitize';
-import 'angular-strap';
-import 'angular-socket-io';
-import 'angular-retina';
-import 'angular-ui-router';
-import 'angular-ui-router-metatags';
-import 'angular-smart-table';
-import 'angular-ui-grid';
-import 'angular-drag-and-drop-lists';
-import 'angular-nvd3';
-import 'angular-tree-control';
-import 'angular-gridster';
-
-import 'bootstrap-carousel';
-import 'file-saver';
-import 'jszip';
-import 'query-command-supported';
-
-import 'public/stylesheets/style.css!';
-
-import 'angular-gridster/dist/angular-gridster.min.css!';
-import 'angular-tree-control/css/tree-control-attribute.css!';
-import 'angular-tree-control/css/tree-control.css!';
-import 'angular-ui-grid/ui-grid.css!';
-import 'angular-motion/dist/angular-motion.css!';
+// window.pdfMake = pdfMake;
+
+
+
+import '../public/stylesheets/style.scss';
+
+
 
 import './decorator/select';
 import './decorator/tooltip';
@@ -137,7 +117,9 @@ import 'controllers/profile-controller';
 import 'controllers/sql-controller';
 
 // Inject external modules.
-import 'ignite_modules_temp/index';
+// import 'ignite_modules_temp/index'; // TODO: Modules integration.
+
+import baseTemplate from '../views/base.jade';
 
 angular
 .module('ignite-console', [
@@ -175,7 +157,7 @@ angular
     // Ignite legacy module.
     'ignite-console.legacy',
     // Ignite modules.
-    'ignite-console.modules'
+    // 'ignite-console.modules'
 ])
 // Directives.
 .directive(...igniteHideOnStateChange)
@@ -205,12 +187,12 @@ angular
         .state('base', {
             url: '',
             abstract: true,
-            templateUrl: '/base.html'
+            templateUrl: baseTemplate
         })
         .state('settings', {
             url: '/settings',
             abstract: true,
-            templateUrl: '/base.html'
+            templateUrl: baseTemplate
         });
 
     $urlRouterProvider.otherwise('/');

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/Demo/Demo.module.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/Demo/Demo.module.js b/modules/web-console/src/main/js/app/modules/Demo/Demo.module.js
index f08d84c..7680408 100644
--- a/modules/web-console/src/main/js/app/modules/Demo/Demo.module.js
+++ b/modules/web-console/src/main/js/app/modules/Demo/Demo.module.js
@@ -17,7 +17,7 @@
 
 import angular from 'angular';
 
-import DEMO_INFO from 'app/data/demo-info.json!';
+import DEMO_INFO from 'app/data/demo-info.json';
 
 angular
 .module('ignite-console.demo', [

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/branding/header-logo.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/branding/header-logo.directive.js b/modules/web-console/src/main/js/app/modules/branding/header-logo.directive.js
index 1bfbc45..423de9c 100644
--- a/modules/web-console/src/main/js/app/modules/branding/header-logo.directive.js
+++ b/modules/web-console/src/main/js/app/modules/branding/header-logo.directive.js
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import template from './header-logo.jade!';
+import templateUrl from './header-logo.jade';
 
 export default ['igniteHeaderLogo', ['IgniteBranding', (branding) => {
     function controller() {
@@ -26,7 +26,7 @@ export default ['igniteHeaderLogo', ['IgniteBranding', (branding) => {
 
     return {
         restrict: 'E',
-        template,
+        templateUrl,
         controller,
         controllerAs: 'logo',
         replace: true

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/branding/powered-by-apache.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/branding/powered-by-apache.directive.js b/modules/web-console/src/main/js/app/modules/branding/powered-by-apache.directive.js
index 37f1dec..4b04d28 100644
--- a/modules/web-console/src/main/js/app/modules/branding/powered-by-apache.directive.js
+++ b/modules/web-console/src/main/js/app/modules/branding/powered-by-apache.directive.js
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import templatePoweredByApache from './powered-by-apache.jade!';
+import templateUrlPoweredByApache from './powered-by-apache.jade';
 
 export default ['ignitePoweredByApache', ['IgniteBranding', (branding) => {
     function controller() {
@@ -26,7 +26,7 @@ export default ['ignitePoweredByApache', ['IgniteBranding', (branding) => {
 
     return {
         restrict: 'E',
-        template: templatePoweredByApache,
+        templateUrl: templatePoweredByApache,
         controller,
         controllerAs: 'poweredBy',
         replace: true

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/configuration/EventGroups.provider.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/configuration/EventGroups.provider.js b/modules/web-console/src/main/js/app/modules/configuration/EventGroups.provider.js
index 2bbf11f..61f3188 100644
--- a/modules/web-console/src/main/js/app/modules/configuration/EventGroups.provider.js
+++ b/modules/web-console/src/main/js/app/modules/configuration/EventGroups.provider.js
@@ -16,7 +16,7 @@
  */
 
 // Events groups.
-import GROUPS from 'app/data/event-types.json!';
+import GROUPS from 'app/data/event-types.json';
 
 export default ['igniteEventGroups', function() {
     const groups = GROUPS;

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/configuration/generator/Pom.service.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/configuration/generator/Pom.service.js b/modules/web-console/src/main/js/app/modules/configuration/generator/Pom.service.js
index 3508e59..674c16e 100644
--- a/modules/web-console/src/main/js/app/modules/configuration/generator/Pom.service.js
+++ b/modules/web-console/src/main/js/app/modules/configuration/generator/Pom.service.js
@@ -16,7 +16,7 @@
  */
 
 // Java built-in class names.
-import POM_DEPENDENCIES from 'app/data/pom-dependencies.json!';
+import POM_DEPENDENCIES from 'app/data/pom-dependencies.json';
 
 /**
  * Pom file generation entry point.

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/dialog/dialog.factory.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/dialog/dialog.factory.js b/modules/web-console/src/main/js/app/modules/dialog/dialog.factory.js
index 18a2174..e15891f 100644
--- a/modules/web-console/src/main/js/app/modules/dialog/dialog.factory.js
+++ b/modules/web-console/src/main/js/app/modules/dialog/dialog.factory.js
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-import template from './dialog.jade!';
+import templateUrl from './dialog.jade';
 
 export default ['IgniteDialog', ['$modal', ($modal) => {
     const defaults = {
-        template: template(),
+        templateUrl,
         placement: 'center',
         show: false
     };

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/form/field/dropdown.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/form/field/dropdown.directive.js b/modules/web-console/src/main/js/app/modules/form/field/dropdown.directive.js
index fe4d948..a4c6abb 100644
--- a/modules/web-console/src/main/js/app/modules/form/field/dropdown.directive.js
+++ b/modules/web-console/src/main/js/app/modules/form/field/dropdown.directive.js
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import template from './dropdown.jade!';
+import templateUrl from './dropdown.jade';
 
 export default ['igniteFormFieldDropdown', ['IgniteFormGUID', '$table', (guid, $table) => {
     const controller = () => {};
@@ -74,7 +74,7 @@ export default ['igniteFormFieldDropdown', ['IgniteFormGUID', '$table', (guid, $
             multiple: '='
         },
         link,
-        template,
+        templateUrl,
         controller,
         controllerAs: 'dropdown',
         replace: true,

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/form/field/field.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/form/field/field.directive.js b/modules/web-console/src/main/js/app/modules/form/field/field.directive.js
index 0e3fe8d..630f74f 100644
--- a/modules/web-console/src/main/js/app/modules/form/field/field.directive.js
+++ b/modules/web-console/src/main/js/app/modules/form/field/field.directive.js
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-import template from './field.jade!';
-import './field.css!';
+import templateUrl from './field.jade';
+import './field.css';
 
 export default ['igniteFormField', [() => {
     const controller = [function() {
@@ -34,7 +34,7 @@ export default ['igniteFormField', [() => {
             type: '@',
             name: '@'
         },
-        template,
+        templateUrl,
         controller,
         controllerAs: 'field',
         replace: true,

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/form/field/input/checkbox.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/form/field/input/checkbox.directive.js b/modules/web-console/src/main/js/app/modules/form/field/input/checkbox.directive.js
index 5d77eab..d03b9ae 100644
--- a/modules/web-console/src/main/js/app/modules/form/field/input/checkbox.directive.js
+++ b/modules/web-console/src/main/js/app/modules/form/field/input/checkbox.directive.js
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import template from './checkbox.jade!';
+import templateUrl from './checkbox.jade';
 
 export default ['igniteFormFieldInputCheckbox', ['IgniteFormGUID', '$table', (guid, $table) => {
     const link = (scope, el, attrs, [form, label]) => {
@@ -59,7 +59,7 @@ export default ['igniteFormFieldInputCheckbox', ['IgniteFormGUID', '$table', (gu
             value: '=ngModel'
         },
         link,
-        template,
+        templateUrl,
         replace: true,
         transclude: true,
         require: ['^form', '?^igniteFormField']

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/form/field/input/datalist.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/form/field/input/datalist.directive.js b/modules/web-console/src/main/js/app/modules/form/field/input/datalist.directive.js
index 0cd9d69..9734759 100644
--- a/modules/web-console/src/main/js/app/modules/form/field/input/datalist.directive.js
+++ b/modules/web-console/src/main/js/app/modules/form/field/input/datalist.directive.js
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import template from './datalist.jade!';
+import templateUrl from './datalist.jade';
 
 export default ['igniteFormFieldInputDatalist', ['IgniteFormGUID', '$table', (guid, $table) => {
     const link = (scope, element, attrs, [ngModel, form, label], transclude) => {
@@ -115,7 +115,7 @@ export default ['igniteFormFieldInputDatalist', ['IgniteFormGUID', '$table', (gu
             autofocus: '=igniteFormFieldInputAutofocus'
         },
         link,
-        template,
+        templateUrl,
         replace: true,
         transclude: true,
         require: ['ngModel', '^form', '?^igniteFormField']

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/form/field/input/number.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/form/field/input/number.directive.js b/modules/web-console/src/main/js/app/modules/form/field/input/number.directive.js
index 0c7a101..71f95b8 100644
--- a/modules/web-console/src/main/js/app/modules/form/field/input/number.directive.js
+++ b/modules/web-console/src/main/js/app/modules/form/field/input/number.directive.js
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import template from './number.jade!';
+import templateUrl from './number.jade';
 
 export default ['igniteFormFieldInputNumber', ['IgniteFormGUID', '$table', (guid, $table) => {
     const link = (scope, el, attrs, [form, label]) => {
@@ -69,7 +69,7 @@ export default ['igniteFormFieldInputNumber', ['IgniteFormGUID', '$table', (guid
             value: '=ngModel'
         },
         link,
-        template,
+        templateUrl,
         replace: true,
         transclude: true,
         require: ['^form', '?^igniteFormField']

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/form/field/input/text.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/form/field/input/text.directive.js b/modules/web-console/src/main/js/app/modules/form/field/input/text.directive.js
index ba4407f..70542f3 100644
--- a/modules/web-console/src/main/js/app/modules/form/field/input/text.directive.js
+++ b/modules/web-console/src/main/js/app/modules/form/field/input/text.directive.js
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-import template from './text.jade!';
-import './text.css!';
+import templateUrl from './text.jade';
+import './text.css';
 
 export default ['igniteFormFieldInputText', ['IgniteFormGUID', '$table', (guid, $table) => {
     const link = (scope, element, attrs, [ngModel, form, label], transclude) => {
@@ -116,7 +116,7 @@ export default ['igniteFormFieldInputText', ['IgniteFormGUID', '$table', (guid,
             autofocus: '=igniteFormFieldInputAutofocus'
         },
         link,
-        template,
+        templateUrl,
         replace: true,
         transclude: true,
         require: ['ngModel', '^form', '?^igniteFormField']

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/form/group/group.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/form/group/group.directive.js b/modules/web-console/src/main/js/app/modules/form/group/group.directive.js
index 5039d6f..de64bf8 100644
--- a/modules/web-console/src/main/js/app/modules/form/group/group.directive.js
+++ b/modules/web-console/src/main/js/app/modules/form/group/group.directive.js
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import template from './group.jade!';
+import templateUrl from './group.jade';
 
 export default ['igniteFormGroup', [() => {
     const controller = [function() { }];
@@ -71,7 +71,7 @@ export default ['igniteFormGroup', [() => {
             label: '@'
         },
         link,
-        template,
+        templateUrl,
         controller,
         controllerAs: 'group',
         replace: true,

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/form/group/table.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/form/group/table.directive.js b/modules/web-console/src/main/js/app/modules/form/group/table.directive.js
index 520f8c2..8c4d0ed 100644
--- a/modules/web-console/src/main/js/app/modules/form/group/table.directive.js
+++ b/modules/web-console/src/main/js/app/modules/form/group/table.directive.js
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import template from './table.jade!';
+import templateUrl from './table.jade';
 
 export default ['igniteFormGroupTable', [() => {
     return {
         restrict: 'E',
         scope: {},
-        template,
+        templateUrl,
         replace: true,
         transclude: true,
         require: ['^form', '^igniteFormGroup']

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/getting-started/GettingStarted.provider.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/getting-started/GettingStarted.provider.js b/modules/web-console/src/main/js/app/modules/getting-started/GettingStarted.provider.js
index 74c24c2..cf9f561 100644
--- a/modules/web-console/src/main/js/app/modules/getting-started/GettingStarted.provider.js
+++ b/modules/web-console/src/main/js/app/modules/getting-started/GettingStarted.provider.js
@@ -18,7 +18,7 @@
 import angular from 'angular';
 
 // Getting started pages.
-import PAGES from 'app/data/getting-started.json!';
+import PAGES from 'app/data/getting-started.json';
 
 angular
     .module('ignite-console.getting-started', [])

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/loading/loading.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/loading/loading.directive.js b/modules/web-console/src/main/js/app/modules/loading/loading.directive.js
index fc3e1e6..aac3508 100644
--- a/modules/web-console/src/main/js/app/modules/loading/loading.directive.js
+++ b/modules/web-console/src/main/js/app/modules/loading/loading.directive.js
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-import template from './loading.jade!';
-import './loading.css!';
+import templateUrl from './loading.jade';
+import './loading.css';
 
 export default ['igniteLoading', ['$loading', '$compile', ($loading, $compile) => {
     const link = (scope, element) => {
-        const compiledTemplate = $compile(template());
+        const compiledTemplate = $compile(templateUrl());
 
         const build = () => {
             scope.position = scope.position || 'middle';

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/states/configuration/caches/concurrency.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/caches/concurrency.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/caches/concurrency.directive.js
index 0e00a4b..9438679 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/caches/concurrency.directive.js
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/caches/concurrency.directive.js
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import template from './concurrency.jade!';
+import templateUrl from './concurrency.jade';
 
 export default ['igniteConfigurationCachesConcurrency', [() => {
     return {
         scope: true,
         restrict: 'E',
-        template,
+        templateUrl,
         replace: true
     };
 }]];

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/states/configuration/caches/general.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/caches/general.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/caches/general.directive.js
index d3f5f45..3edc1a3 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/caches/general.directive.js
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/caches/general.directive.js
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import template from './general.jade!';
+import templateUrl from './general.jade';
 
 export default ['igniteConfigurationCachesGeneral', [() => {
     return {
         scope: true,
         restrict: 'E',
-        template,
+        templateUrl,
         replace: true
     };
 }]];

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/states/configuration/caches/memory.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/caches/memory.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/caches/memory.directive.js
index 0f8662d..c160b18 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/caches/memory.directive.js
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/caches/memory.directive.js
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import template from './memory.jade!';
+import templateUrl from './memory.jade';
 
 export default ['igniteConfigurationCachesMemory', [() => {
     return {
         scope: true,
         restrict: 'E',
-        template,
+        templateUrl,
         replace: true
     };
 }]];

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/states/configuration/caches/query.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/caches/query.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/caches/query.directive.js
index b3b6edb..9d8264e 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/caches/query.directive.js
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/caches/query.directive.js
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import template from './query.jade!';
+import templateUrl from './query.jade';
 
 export default ['igniteConfigurationCachesQuery', [() => {
     return {
         scope: true,
         restrict: 'E',
-        template,
+        templateUrl,
         replace: true
     };
 }]];

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/states/configuration/caches/rebalance.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/caches/rebalance.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/caches/rebalance.directive.js
index b3f24a1..5081578 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/caches/rebalance.directive.js
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/caches/rebalance.directive.js
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import template from './rebalance.jade!';
+import templateUrl from './rebalance.jade';
 
 export default ['igniteConfigurationCachesRebalance', [() => {
     return {
         scope: true,
         restrict: 'E',
-        template,
+        templateUrl,
         replace: true
     };
 }]];

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/states/configuration/caches/server-near-cache.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/caches/server-near-cache.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/caches/server-near-cache.directive.js
index 5a4e474..c2e83aa 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/caches/server-near-cache.directive.js
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/caches/server-near-cache.directive.js
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import template from './server-near-cache.jade!';
+import templateUrl from './server-near-cache.jade';
 
 export default ['igniteConfigurationCachesServerNearCache', [() => {
     return {
         scope: true,
         restrict: 'E',
-        template,
+        templateUrl,
         replace: true
     };
 }]];

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/states/configuration/caches/statistics.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/caches/statistics.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/caches/statistics.directive.js
index d40ac1a..ee0da3d 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/caches/statistics.directive.js
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/caches/statistics.directive.js
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import template from './statistics.jade!';
+import templateUrl from './statistics.jade';
 
 export default ['igniteConfigurationCachesStatistics', [() => {
     return {
         scope: true,
         restrict: 'E',
-        template,
+        templateUrl,
         replace: true
     };
 }]];

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/states/configuration/caches/store.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/caches/store.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/caches/store.directive.js
index 168eb85..80528e5 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/caches/store.directive.js
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/caches/store.directive.js
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import template from './store.jade!';
+import templateUrl from './store.jade';
 
 export default ['igniteConfigurationCachesStore', [() => {
     return {
         scope: true,
         restrict: 'E',
-        template,
+        templateUrl,
         replace: true
     };
 }]];

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/states/configuration/clusters/atomic.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/atomic.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/atomic.directive.js
index 062a527..64b80a0 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/atomic.directive.js
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/atomic.directive.js
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import template from './atomic.jade!';
+import templateUrl from './atomic.jade';
 
 export default ['igniteConfigurationClustersAtomic', [() => {
     return {
         scope: true,
         restrict: 'E',
-        template,
+        templateUrl,
         replace: true
     };
 }]];

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/states/configuration/clusters/attributes.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/attributes.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/attributes.directive.js
index cc9d474..f5f431c 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/attributes.directive.js
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/attributes.directive.js
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import template from './attributes.jade!';
+import templateUrl from './attributes.jade';
 
 export default ['igniteConfigurationUserAttributes', [() => {
     return {
         scope: true,
         restrict: 'E',
-        template,
+        templateUrl,
         replace: true
     };
 }]];

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/states/configuration/clusters/binary.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/binary.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/binary.directive.js
index 68c8dcb..7d701bc 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/binary.directive.js
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/binary.directive.js
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import template from './binary.jade!';
+import templateUrl from './binary.jade';
 
 export default ['igniteConfigurationClustersBinary', [() => {
     return {
         scope: true,
         restrict: 'E',
-        template,
+        templateUrl,
         replace: true
     };
 }]];

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/states/configuration/clusters/collision.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/collision.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/collision.directive.js
index 624056e..b8e0b43 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/collision.directive.js
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/collision.directive.js
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import template from './collision.jade!';
+import templateUrl from './collision.jade';
 
 export default ['igniteConfigurationClustersCollision', [() => {
     return {
         scope: true,
         restrict: 'E',
-        template,
+        templateUrl,
         replace: true
     };
 }]];

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/states/configuration/clusters/collision/custom.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/collision/custom.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/collision/custom.directive.js
index 9a8d414..2299133 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/collision/custom.directive.js
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/collision/custom.directive.js
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import template from './custom.jade!';
+import templateUrl from './custom.jade';
 
 export default ['igniteConfigurationClustersCollisionCustom', [() => {
     return {
         scope: true,
         restrict: 'E',
-        template,
+        templateUrl,
         replace: true
     };
 }]];

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/states/configuration/clusters/collision/fifo-queue.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/collision/fifo-queue.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/collision/fifo-queue.directive.js
index 240c98a..f14c1bb 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/collision/fifo-queue.directive.js
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/collision/fifo-queue.directive.js
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import template from './fifo-queue.jade!';
+import templateUrl from './fifo-queue.jade';
 
 export default ['igniteConfigurationClustersCollisionFifoQueue', [() => {
     return {
         scope: true,
         restrict: 'E',
-        template,
+        templateUrl,
         replace: true
     };
 }]];

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/states/configuration/clusters/collision/job-stealing.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/collision/job-stealing.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/collision/job-stealing.directive.js
index 3c187d1..0cc9cfa 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/collision/job-stealing.directive.js
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/collision/job-stealing.directive.js
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import template from './job-stealing.jade!';
+import templateUrl from './job-stealing.jade';
 
 export default ['igniteConfigurationClustersCollisionJobStealing', [() => {
     return {
         scope: true,
         restrict: 'E',
-        template,
+        templateUrl,
         replace: true
     };
 }]];

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/states/configuration/clusters/collision/priority-queue.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/collision/priority-queue.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/collision/priority-queue.directive.js
index e7e8798..95ebd5e 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/collision/priority-queue.directive.js
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/collision/priority-queue.directive.js
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import template from './priority-queue.jade!';
+import templateUrl from './priority-queue.jade';
 
 export default ['igniteConfigurationClustersCollisionPriorityQueue', [() => {
     return {
         scope: true,
         restrict: 'E',
-        template,
+        templateUrl,
         replace: true
     };
 }]];

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/states/configuration/clusters/communication.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/communication.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/communication.directive.js
index 5203a9e..e578dc6 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/communication.directive.js
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/communication.directive.js
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import template from './communication.jade!';
+import templateUrl from './communication.jade';
 
 export default ['igniteConfigurationClustersCommunication', [() => {
     return {
         scope: true,
         restrict: 'E',
-        template,
+        templateUrl,
         replace: true
     };
 }]];

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/states/configuration/clusters/connector.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/connector.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/connector.directive.js
index 6c085b6..ea0b04d 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/connector.directive.js
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/connector.directive.js
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import template from './connector.jade!';
+import templateUrl from './connector.jade';
 
 export default ['igniteConfigurationClustersConnector', [() => {
     return {
         scope: true,
         restrict: 'E',
-        template,
+        templateUrl,
         replace: true
     };
 }]];

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/states/configuration/clusters/deployment.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/deployment.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/deployment.directive.js
index bc71379..392ed7e 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/deployment.directive.js
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/deployment.directive.js
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import template from './deployment.jade!';
+import templateUrl from './deployment.jade';
 
 export default ['igniteConfigurationClustersDeployment', [() => {
     return {
         scope: true,
         restrict: 'E',
-        template,
+        templateUrl,
         replace: true
     };
 }]];

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/states/configuration/clusters/discovery.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/discovery.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/discovery.directive.js
index f61d625..80286ac 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/discovery.directive.js
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/discovery.directive.js
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import template from './discovery.jade!';
+import templateUrl from './discovery.jade';
 
 export default ['igniteConfigurationClustersDiscovery', [() => {
     return {
         scope: true,
         restrict: 'E',
-        template,
+        templateUrl,
         replace: true
     };
 }]];

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/states/configuration/clusters/events.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/events.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/events.directive.js
index c04829d..ee25ae2 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/events.directive.js
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/events.directive.js
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import template from './events.jade!';
+import templateUrl from './events.jade';
 
 export default ['igniteConfigurationClustersEvents', [() => {
     return {
         scope: true,
         restrict: 'E',
-        template,
+        templateUrl,
         replace: true
     };
 }]];

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/states/configuration/clusters/failover.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/failover.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/failover.directive.js
index 98335a7..b9f59ba 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/failover.directive.js
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/failover.directive.js
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import template from './failover.jade!';
+import templateUrl from './failover.jade';
 
 export default ['igniteConfigurationClustersFailover', [() => {
     return {
         scope: true,
         restrict: 'E',
-        template,
+        templateUrl,
         replace: true
     };
 }]];

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general.directive.js
index 29644fc..ccfadbe 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general.directive.js
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general.directive.js
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import template from './general.jade!';
+import templateUrl from './general.jade';
 
 export default ['igniteConfigurationClustersGeneral', [() => {
     return {
         scope: true,
         restrict: 'E',
-        template,
+        templateUrl,
         replace: true
     };
 }]];

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/cloud.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/cloud.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/cloud.directive.js
index a785395..8fa7edc 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/cloud.directive.js
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/cloud.directive.js
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import template from './cloud.jade!';
+import templateUrl from './cloud.jade';
 
 export default ['igniteConfigurationClustersGeneralDiscoveryCloud', [() => {
     return {
         scope: true,
         restrict: 'E',
-        template,
+        templateUrl,
         replace: true
     };
 }]];

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/google.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/google.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/google.directive.js
index d7df6d2..a409946 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/google.directive.js
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/google.directive.js
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import template from './google.jade!';
+import templateUrl from './google.jade';
 
 export default ['igniteConfigurationClustersGeneralDiscoveryGoogle', [() => {
     return {
         scope: true,
         restrict: 'E',
-        template,
+        templateUrl,
         replace: true
     };
 }]];

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/jdbc.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/jdbc.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/jdbc.directive.js
index 44d4624..6edd6ed 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/jdbc.directive.js
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/jdbc.directive.js
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import template from './jdbc.jade!';
+import templateUrl from './jdbc.jade';
 
 export default ['igniteConfigurationClustersGeneralDiscoveryJdbc', [() => {
     return {
         scope: true,
         restrict: 'E',
-        template,
+        templateUrl,
         replace: true
     };
 }]];

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/multicast.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/multicast.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/multicast.directive.js
index 606bb9d..67775d2 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/multicast.directive.js
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/multicast.directive.js
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import template from './multicast.jade!';
+import templateUrl from './multicast.jade';
 
 export default ['igniteConfigurationClustersGeneralDiscoveryMulticast', [() => {
     return {
         scope: true,
         restrict: 'E',
-        template,
+        templateUrl,
         replace: true
     };
 }]];

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/s3.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/s3.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/s3.directive.js
index c0624f0..25fd90a 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/s3.directive.js
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/s3.directive.js
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import template from './s3.jade!';
+import templateUrl from './s3.jade';
 
 export default ['igniteConfigurationClustersGeneralDiscoveryS3', [() => {
     return {
         scope: true,
         restrict: 'E',
-        template,
+        templateUrl,
         replace: true
     };
 }]];

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/shared.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/shared.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/shared.directive.js
index 6a5dce7..da1ee0c 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/shared.directive.js
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/shared.directive.js
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import template from './shared.jade!';
+import templateUrl from './shared.jade';
 
 export default ['igniteConfigurationClustersGeneralDiscoveryShared', [() => {
     return {
         scope: true,
         restrict: 'E',
-        template,
+        templateUrl,
         replace: true
     };
 }]];

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/vm.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/vm.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/vm.directive.js
index 2bb3efd..d07adc8 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/vm.directive.js
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/vm.directive.js
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import template from './vm.jade!';
+import templateUrl from './vm.jade';
 
 export default ['igniteConfigurationClustersGeneralDiscoveryVm', [() => {
     return {
         scope: true,
         restrict: 'E',
-        template,
+        templateUrl,
         replace: true
     };
 }]];

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper.directive.js
index 42925a9..3081443 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper.directive.js
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper.directive.js
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import template from './zookeeper.jade!';
+import templateUrl from './zookeeper.jade';
 
 export default ['igniteConfigurationClustersGeneralDiscoveryZookeeper', [() => {
     return {
         scope: true,
         restrict: 'E',
-        template,
+        templateUrl,
         replace: true
     };
 }]];

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/bounded-exponential-backoff.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/bounded-exponential-backoff.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/bounded-exponential-backoff.directive.js
index 68e338b..42fb229 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/bounded-exponential-backoff.directive.js
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/bounded-exponential-backoff.directive.js
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import template from './bounded-exponential-backoff.jade!';
+import templateUrl from './bounded-exponential-backoff.jade';
 
 export default ['igniteConfigurationClustersGeneralDiscoveryZookeeperBoundedExponential', [() => {
     return {
         scope: true,
         restrict: 'E',
-        template,
+        templateUrl,
         replace: true
     };
 }]];

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/custom.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/custom.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/custom.directive.js
index dfd9b08..969356b 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/custom.directive.js
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/custom.directive.js
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import template from './custom.jade!';
+import templateUrl from './custom.jade';
 
 export default ['igniteConfigurationClustersGeneralDiscoveryZookeeperCustom', [() => {
     return {
         scope: true,
         restrict: 'E',
-        template,
+        templateUrl,
         replace: true
     };
 }]];

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/exponential-backoff.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/exponential-backoff.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/exponential-backoff.directive.js
index 29c968c..e68dff6 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/exponential-backoff.directive.js
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/exponential-backoff.directive.js
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import template from './exponential-backoff.jade!';
+import templateUrl from './exponential-backoff.jade';
 
 export default ['igniteConfigurationClustersGeneralDiscoveryZookeeperExponential', [() => {
     return {
         scope: true,
         restrict: 'E',
-        template,
+        templateUrl,
         replace: true
     };
 }]];

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/forever.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/forever.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/forever.directive.js
index ec39f66..38bc2d8 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/forever.directive.js
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/forever.directive.js
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import template from './forever.jade!';
+import templateUrl from './forever.jade';
 
 export default ['igniteConfigurationClustersGeneralDiscoveryZookeeperForever', [() => {
     return {
         scope: true,
         restrict: 'E',
-        template,
+        templateUrl,
         replace: true
     };
 }]];

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/n-times.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/n-times.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/n-times.directive.js
index ce83da4..f369af8 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/n-times.directive.js
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/n-times.directive.js
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import template from './n-times.jade!';
+import templateUrl from './n-times.jade';
 
 export default ['igniteConfigurationClustersGeneralDiscoveryZookeeperNTimes', [() => {
     return {
         scope: true,
         restrict: 'E',
-        template,
+        templateUrl,
         replace: true
     };
 }]];

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/one-time.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/one-time.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/one-time.directive.js
index 7329cc2..e9e114d 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/one-time.directive.js
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/one-time.directive.js
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import template from './one-time.jade!';
+import templateUrl from './one-time.jade';
 
 export default ['igniteConfigurationClustersGeneralDiscoveryZookeeperOneTime', [() => {
     return {
         scope: true,
         restrict: 'E',
-        template,
+        templateUrl,
         replace: true
     };
 }]];

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/until-elapsed.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/until-elapsed.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/until-elapsed.directive.js
index 8997159..4ab76b2 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/until-elapsed.directive.js
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/general/discovery/zookeeper/retrypolicy/until-elapsed.directive.js
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import template from './until-elapsed.jade!';
+import templateUrl from './until-elapsed.jade';
 
 export default ['igniteConfigurationClustersGeneralDiscoveryZookeeperUntilElapsed', [() => {
     return {
         scope: true,
         restrict: 'E',
-        template,
+        templateUrl,
         replace: true
     };
 }]];

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/states/configuration/clusters/igfs.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/igfs.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/igfs.directive.js
index 1d0e3d8..74d4826 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/igfs.directive.js
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/igfs.directive.js
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import template from './igfs.jade!';
+import templateUrl from './igfs.jade';
 
 export default ['igniteConfigurationClustersIgfs', [() => {
     return {
         scope: true,
         restrict: 'E',
-        template,
+        templateUrl,
         replace: true
     };
 }]];

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/states/configuration/clusters/logger.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/logger.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/logger.directive.js
index 3df231f..8aec165 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/logger.directive.js
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/logger.directive.js
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import template from './logger.jade!';
+import templateUrl from './logger.jade';
 
 export default ['igniteConfigurationClustersLogger', [() => {
     return {
         scope: true,
         restrict: 'E',
-        template,
+        templateUrl,
         replace: true
     };
 }]];

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/states/configuration/clusters/logger/custom.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/logger/custom.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/logger/custom.directive.js
index 5bd586b..999a3ca 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/logger/custom.directive.js
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/logger/custom.directive.js
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import template from './custom.jade!';
+import templateUrl from './custom.jade';
 
 export default ['igniteConfigurationClustersLoggerCustom', [() => {
     return {
         scope: true,
         restrict: 'E',
-        template,
+        templateUrl,
         replace: true
     };
 }]];

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/states/configuration/clusters/logger/log4j.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/logger/log4j.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/logger/log4j.directive.js
index 64e4337..32f55e9 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/logger/log4j.directive.js
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/logger/log4j.directive.js
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import template from './log4j.jade!';
+import templateUrl from './log4j.jade';
 
 export default ['igniteConfigurationClustersLoggerLog4j', [() => {
     return {
         scope: true,
         restrict: 'E',
-        template,
+        templateUrl,
         replace: true
     };
 }]];

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/states/configuration/clusters/logger/log4j2.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/logger/log4j2.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/logger/log4j2.directive.js
index ad891f7..81ae296 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/logger/log4j2.directive.js
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/logger/log4j2.directive.js
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import template from './log4j2.jade!';
+import templateUrl from './log4j2.jade';
 
 export default ['igniteConfigurationClustersLoggerLog4j2', [() => {
     return {
         scope: true,
         restrict: 'E',
-        template,
+        templateUrl,
         replace: true
     };
 }]];

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/states/configuration/clusters/marshaller.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/marshaller.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/marshaller.directive.js
index 6c266a8..b4175b0 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/marshaller.directive.js
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/marshaller.directive.js
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import template from './marshaller.jade!';
+import templateUrl from './marshaller.jade';
 
 export default ['igniteConfigurationClustersMarshaller', [() => {
     return {
         scope: true,
         restrict: 'E',
-        template,
+        templateUrl,
         replace: true
     };
 }]];

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/states/configuration/clusters/metrics.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/metrics.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/metrics.directive.js
index fc572a6..9b8ddc3 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/metrics.directive.js
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/metrics.directive.js
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import template from './metrics.jade!';
+import templateUrl from './metrics.jade';
 
 export default ['igniteConfigurationClustersMetrics', [() => {
     return {
         scope: true,
         restrict: 'E',
-        template,
+        templateUrl,
         replace: true
     };
 }]];

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/states/configuration/clusters/ssl.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/ssl.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/ssl.directive.js
index d875c59..ded5bf0 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/ssl.directive.js
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/ssl.directive.js
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import template from './ssl.jade!';
+import templateUrl from './ssl.jade';
 
 export default ['igniteConfigurationClustersSsl', [() => {
     return {
         scope: true,
         restrict: 'E',
-        template,
+        templateUrl,
         replace: true
     };
 }]];

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/states/configuration/clusters/swap.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/swap.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/swap.directive.js
index db83d50..c340c4b 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/swap.directive.js
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/swap.directive.js
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import template from './swap.jade!';
+import templateUrl from './swap.jade';
 
 export default ['igniteConfigurationClustersSwap', [() => {
     return {
         scope: true,
         restrict: 'E',
-        template,
+        templateUrl,
         replace: true
     };
 }]];

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/states/configuration/clusters/thread.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/thread.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/thread.directive.js
index dabc574..f504e67 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/thread.directive.js
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/thread.directive.js
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import template from './thread.jade!';
+import templateUrl from './thread.jade';
 
 export default ['igniteConfigurationClustersThread', [() => {
     return {
         scope: true,
         restrict: 'E',
-        template,
+        templateUrl,
         replace: true
     };
 }]];

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/states/configuration/clusters/time.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/time.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/time.directive.js
index b55b8a1..8ab3e89 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/time.directive.js
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/time.directive.js
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import template from './time.jade!';
+import templateUrl from './time.jade';
 
 export default ['igniteConfigurationClustersTime', [() => {
     return {
         scope: true,
         restrict: 'E',
-        template,
+        templateUrl,
         replace: true
     };
 }]];

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/states/configuration/clusters/transactions.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/transactions.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/transactions.directive.js
index 985de49..faca0fa 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/clusters/transactions.directive.js
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/clusters/transactions.directive.js
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import template from './transactions.jade!';
+import templateUrl from './transactions.jade';
 
 export default ['igniteConfigurationClustersTransactions', [() => {
     return {
         scope: true,
         restrict: 'E',
-        template,
+        templateUrl,
         replace: true
     };
 }]];

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/states/configuration/domains/general.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/domains/general.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/domains/general.directive.js
index ab03eb0..9ca02f9 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/domains/general.directive.js
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/domains/general.directive.js
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import template from './general.jade!';
+import templateUrl from './general.jade';
 
 export default ['igniteConfigurationDomainsGeneral', [() => {
     return {
         scope: true,
         restrict: 'E',
-        template,
+        templateUrl,
         replace: true
     };
 }]];

http://git-wip-us.apache.org/repos/asf/ignite/blob/eff979c5/modules/web-console/src/main/js/app/modules/states/configuration/domains/query.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/app/modules/states/configuration/domains/query.directive.js b/modules/web-console/src/main/js/app/modules/states/configuration/domains/query.directive.js
index c5aa79e..2033394 100644
--- a/modules/web-console/src/main/js/app/modules/states/configuration/domains/query.directive.js
+++ b/modules/web-console/src/main/js/app/modules/states/configuration/domains/query.directive.js
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import template from './query.jade!';
+import templateUrl from './query.jade';
 
 export default ['igniteConfigurationDomainsQuery', [() => {
     return {
         scope: true,
         restrict: 'E',
-        template,
+        templateUrl,
         replace: true
     };
 }]];


[50/50] [abbrv] ignite git commit: IGNITE-3262 Fixed tests.

Posted by an...@apache.org.
IGNITE-3262 Fixed tests.


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

Branch: refs/heads/ignite-3262
Commit: 4abab89541d46b98ac4a8a0c0b2f8a2fda4ac1fd
Parents: adb53ba
Author: Andrey Novikov <an...@apache.org>
Authored: Mon Jun 20 09:56:55 2016 +0700
Committer: Andrey Novikov <an...@apache.org>
Committed: Mon Jun 20 09:56:55 2016 +0700

----------------------------------------------------------------------
 modules/web-console/src/main/js/karma.conf.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/4abab895/modules/web-console/src/main/js/karma.conf.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/karma.conf.js b/modules/web-console/src/main/js/karma.conf.js
index dc6c88a..4a48e98 100644
--- a/modules/web-console/src/main/js/karma.conf.js
+++ b/modules/web-console/src/main/js/karma.conf.js
@@ -77,7 +77,7 @@ module.exports = function(config) {
     // Test results reporter to use
     // possible values: 'dots', 'progress'
     // available reporters: https://npmjs.org/browse/keyword/karma-reporter.
-    reporters: ['progress'],
+    reporters: ['teamcity'],
 
     // web server port
     port: 9876,
@@ -104,4 +104,4 @@ module.exports = function(config) {
     // how many browser should be started simultaneous
     concurrency: Infinity
   });
-}
+};


[31/50] [abbrv] ignite git commit: Merge remote-tracking branch 'origin/web-console-staging' into ignite-gg-webpack-migration

Posted by an...@apache.org.
Merge remote-tracking branch 'origin/web-console-staging' into ignite-gg-webpack-migration

Conflicts:
	modules/web-console/src/main/js/controllers/caches-controller.js
	modules/web-console/src/main/js/controllers/clusters-controller.js
	modules/web-console/src/main/js/controllers/domains-controller.js
	modules/web-console/src/main/js/controllers/igfs-controller.js


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

Branch: refs/heads/ignite-3262
Commit: 40f6abc40b7eb583383b5ae436d4591c790b4daf
Parents: fb8f08b 79270b1
Author: Maxim Afanasiev <ma...@gmail.com>
Authored: Thu Jun 9 22:31:34 2016 +0700
Committer: Maxim Afanasiev <ma...@gmail.com>
Committed: Thu Jun 9 22:31:34 2016 +0700

----------------------------------------------------------------------
 .../http/jetty/GridJettyJsonConfig.java         |  31 +++++
 .../http/jetty/GridJettyRestHandler.java        |   6 +-
 modules/schema-import/README.txt                |  12 +-
 modules/web-agent/README.txt                    |   4 +-
 .../ignite/console/demo/AgentClusterDemo.java   |  86 ++++--------
 modules/web-console/README.txt                  |   4 +-
 .../src/main/js/app/helpers/jade/mixins.jade    |  13 +-
 .../states/configuration/caches/store.jade      |  16 +--
 .../states/configuration/clusters/binary.jade   |  12 +-
 .../clusters/general/discovery/zookeeper.jade   |  17 ++-
 .../bounded-exponential-backoff.jade            |   6 +-
 .../discovery/zookeeper/retrypolicy/custom.jade |   6 +-
 .../retrypolicy/exponential-backoff.jade        |   6 +-
 .../zookeeper/retrypolicy/forever.jade          |   2 +-
 .../zookeeper/retrypolicy/n-times.jade          |   2 +-
 .../zookeeper/retrypolicy/one-time.jade         |   2 +-
 .../zookeeper/retrypolicy/until-elapsed.jade    |   4 +-
 .../states/configuration/clusters/igfs.jade     |   2 +-
 .../states/configuration/domains/store.jade     |   2 +-
 .../src/main/js/app/services/cleanup.service.js |   4 +-
 .../main/js/controllers/caches-controller.js    | 122 +++++------------
 .../main/js/controllers/clusters-controller.js  | 137 +++++++++----------
 .../src/main/js/controllers/common-module.js    |  37 ++++-
 .../main/js/controllers/domains-controller.js   |  70 +++-------
 .../src/main/js/controllers/igfs-controller.js  |  33 +----
 .../src/main/js/generator/generator-common.js   |   9 +-
 .../src/main/js/generator/generator-java.js     |  61 +++++----
 .../src/main/js/public/stylesheets/style.scss   |   9 ++
 .../js/views/configuration/domains-import.jade  |   4 +-
 29 files changed, 329 insertions(+), 390 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/40f6abc4/modules/web-console/src/main/js/controllers/common-module.js
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/40f6abc4/modules/web-console/src/main/js/public/stylesheets/style.scss
----------------------------------------------------------------------


[28/50] [abbrv] ignite git commit: IGNITE-2047 Fixed script to fill test database

Posted by an...@apache.org.
IGNITE-2047 Fixed script to fill test database


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

Branch: refs/heads/ignite-3262
Commit: 79270b1a76e8ca92a183dfcd45318b9d329d1555
Parents: 00de17a
Author: vsisko <vs...@gridgain.com>
Authored: Thu Jun 9 17:39:28 2016 +0700
Committer: vsisko <vs...@gridgain.com>
Committed: Thu Jun 9 17:39:28 2016 +0700

----------------------------------------------------------------------
 modules/schema-import/README.txt | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/79270b1a/modules/schema-import/README.txt
----------------------------------------------------------------------
diff --git a/modules/schema-import/README.txt b/modules/schema-import/README.txt
index d4f2dbf..31a8ff0 100644
--- a/modules/schema-import/README.txt
+++ b/modules/schema-import/README.txt
@@ -19,12 +19,12 @@ For example you may use the following script for create sample type 'Person' in
 
 create table PERSON(id integer not null PRIMARY KEY, first_name varchar(50), last_name varchar(50), salary double);
 
-insert into PERSON(id, first_name, first_name, salary) values(1, 'Johannes', 'Kepler', 1000);
-insert into PERSON(id, first_name, first_name, salary) values(2, 'Galileo', 'Galilei', 1200);
-insert into PERSON(id, first_name, first_name, salary) values(3, 'Henry', 'More', 1150);
-insert into PERSON(id, first_name, first_name, salary) values(4, 'Polish', 'Brethren', 2000);
-insert into PERSON(id, first_name, first_name, salary) values(5, 'Robert', 'Boyle', 2500);
-insert into PERSON(id, first_name, first_name, salary) values(6, 'Isaac', 'Newton', 1300);
+insert into PERSON(id, first_name, last_name, salary) values(1, 'Johannes', 'Kepler', 1000);
+insert into PERSON(id, first_name, last_name, salary) values(2, 'Galileo', 'Galilei', 1200);
+insert into PERSON(id, first_name, last_name, salary) values(3, 'Henry', 'More', 1150);
+insert into PERSON(id, first_name, last_name, salary) values(4, 'Polish', 'Brethren', 2000);
+insert into PERSON(id, first_name, last_name, salary) values(5, 'Robert', 'Boyle', 2500);
+insert into PERSON(id, first_name, last_name, salary) values(6, 'Isaac', 'Newton', 1300);
 
 The Ignite Schema Import utility generates the following artifacts:
  # Java POJO key and value classes (enter "org.apache.ignite.schema" package name before generation).


[24/50] [abbrv] ignite git commit: IGNITE-3236 Array list generation by single way

Posted by an...@apache.org.
IGNITE-3236 Array list generation by single way


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

Branch: refs/heads/ignite-3262
Commit: af63e89f90279591558362644f8bfa5c7bdfcc1a
Parents: ee17ea7
Author: vsisko <vs...@gridgain.com>
Authored: Tue Jun 7 17:02:31 2016 +0700
Committer: vsisko <vs...@gridgain.com>
Committed: Tue Jun 7 17:02:31 2016 +0700

----------------------------------------------------------------------
 .../src/main/js/generator/generator-java.js     | 42 ++++++--------------
 1 file changed, 13 insertions(+), 29 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/af63e89f/modules/web-console/src/main/js/generator/generator-java.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/generator/generator-java.js b/modules/web-console/src/main/js/generator/generator-java.js
index 155962c..a22a3bf 100644
--- a/modules/web-console/src/main/js/generator/generator-java.js
+++ b/modules/web-console/src/main/js/generator/generator-java.js
@@ -270,12 +270,8 @@ $generatorJava.listProperty = function(res, varName, obj, propName, dataType, se
 
         res.importClass('java.util.Arrays');
 
-        res.line(varName + '.' + $generatorJava.setterName(propName, setterName) +
-            '(Arrays.asList(' +
-                _.map(val, function(v) {
-                    return $generatorJava.toJavaCode(v, dataType);
-                }).join(', ') +
-            '));');
+        $generatorJava.fxVarArgs(res, varName + '.' + $generatorJava.setterName(propName, setterName), false,
+            _.map(val, (v) => $generatorJava.toJavaCode(v, dataType)), '(Arrays.asList(', '))');
 
         res.needEmptyLine = true;
     }
@@ -288,20 +284,22 @@ $generatorJava.listProperty = function(res, varName, obj, propName, dataType, se
  * @param fx Function name.
  * @param quote Whether to quote arguments.
  * @param args Array with arguments.
+ * @param startBlock Optional start block string.
+ * @param endBlock Optional end block string.
  */
-$generatorJava.fxVarArgs = function(res, fx, quote, args) {
+$generatorJava.fxVarArgs = function(res, fx, quote, args, startBlock = '(', endBlock = ')') {
     const quoteArg = (arg) => quote ? '"' + arg + '"' : arg;
 
     if (args.length === 1)
-        res.append(fx + '(' + quoteArg(args[0]) + ');');
+        res.append(fx + startBlock + quoteArg(args[0]) + endBlock + ';');
     else {
-        res.startBlock(fx + '(');
+        res.startBlock(fx + startBlock);
 
         const len = args.length - 1;
 
         _.forEach(args, (arg, ix) => res.line(quoteArg(arg) + (ix < len ? ', ' : '')));
 
-        res.endBlock(');');
+        res.endBlock(endBlock + ';');
     }
 };
 
@@ -320,11 +318,8 @@ $generatorJava.arrayProperty = function(res, varName, obj, propName, setterName)
     if (val && val.length > 0) {
         res.emptyLineIfNeeded();
 
-        res.line(varName + '.' + $generatorJava.setterName(propName, setterName) + '({ ' +
-            _.map(val, function(v) {
-                return 'new ' + res.importClass(v) + '()';
-            }).join(', ') +
-        ' });');
+        $generatorJava.fxVarArgs(res, varName + '.' + $generatorJava.setterName(propName, setterName), false,
+            _.map(val, (v) => 'new ' + res.importClass(v) + '()'), '({ ', ' });');
 
         res.needEmptyLine = true;
     }
@@ -344,15 +339,8 @@ $generatorJava.multiparamProperty = function(res, varName, obj, propName, dataTy
     const val = obj[propName];
 
     if (val && val.length > 0) {
-        res.emptyLineIfNeeded();
-
-        res.startBlock(varName + '.' + $generatorJava.setterName(propName, setterName) + '(');
-
-        _.forEach(val, function(v, ix) {
-            res.append($generatorJava.toJavaCode(dataType === 'class' ? res.importClass(v) : v, dataType) + (ix < val.length - 1 ? ', ' : ''));
-        });
-
-        res.endBlock(');');
+        $generatorJava.fxVarArgs(res, varName + '.' + $generatorJava.setterName(propName, setterName), false,
+            _.map(val, (v, ix) => $generatorJava.toJavaCode(dataType === 'class' ? res.importClass(v) : v, dataType)));
     }
 };
 
@@ -1892,11 +1880,7 @@ $generatorJava.domainModelGeneral = function(domain, res) {
                     types.push('???');
 
                 if ($generatorCommon.isDefinedAndNotEmpty(types)) {
-                    res.startBlock('cache.setIndexedTypes(');
-
-                    res.line(types.join(', '));
-
-                    res.endBlock(');');
+                    $generatorJava.fxVarArgs(res, 'cache.setIndexedTypes', false, types);
                 }
             }