ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anovi...@apache.org
Subject [07/14] ignite git commit: IGNITE-2755 Optimize gulp build tasks.
Date Thu, 31 Mar 2016 07:27:45 GMT
IGNITE-2755 Optimize gulp build tasks.


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

Branch: refs/heads/ignite-2875
Commit: 2b0ddb5128d2fbdc2dc06ef87568edac75da4df7
Parents: 3b40bd7
Author: Andrey <anovikov@gridgain.com>
Authored: Wed Mar 30 11:15:54 2016 +0700
Committer: Andrey <anovikov@gridgain.com>
Committed: Wed Mar 30 11:15:54 2016 +0700

----------------------------------------------------------------------
 modules/control-center-web/src/main/js/.babelrc |    3 +
 .../control-center-web/src/main/js/.gitignore   |    8 +-
 .../src/main/js/app/decorator/select.js         |    4 +-
 .../control-center-web/src/main/js/app/index.js |   51 +-
 .../getting-started/GettingStarted.provider.js  |    2 +-
 .../main/js/app/modules/user/Auth.service.js    |    2 +-
 .../src/main/js/build/system.config.js          |  418 ++
 .../control-center-web/src/main/js/config.js    |  438 --
 .../src/main/js/controllers/admin-controller.js |    2 +
 .../main/js/controllers/caches-controller.js    |    2 +
 .../main/js/controllers/clusters-controller.js  |    2 +
 .../src/main/js/controllers/common-module.js    |  134 +-
 .../main/js/controllers/domains-controller.js   |    2 +
 .../src/main/js/controllers/ext-searchbox.js    |  420 --
 .../src/main/js/controllers/igfs-controller.js  |    2 +
 .../main/js/controllers/profile-controller.js   |    2 +
 .../src/main/js/controllers/sql-controller.js   |    2 +
 .../src/main/js/controllers/worker-xml.js       | 3892 ------------------
 .../src/main/js/gulpfile.babel.js/index.js      |   29 +
 .../src/main/js/gulpfile.babel.js/paths.js      |   34 +
 .../main/js/gulpfile.babel.js/tasks/build.js    |   21 +
 .../main/js/gulpfile.babel.js/tasks/bundle.js   |   75 +
 .../main/js/gulpfile.babel.js/tasks/clean.js    |   35 +
 .../main/js/gulpfile.babel.js/tasks/connect.js  |   36 +
 .../src/main/js/gulpfile.babel.js/tasks/copy.js |   90 +
 .../main/js/gulpfile.babel.js/tasks/eslint.js   |   43 +
 .../gulpfile.babel.js/tasks/ignite-modules.js   |   61 +
 .../src/main/js/gulpfile.babel.js/tasks/jade.js |   54 +
 .../src/main/js/gulpfile.babel.js/tasks/sass.js |   34 +
 .../src/main/js/gulpfile.js/index.js            |   31 -
 .../src/main/js/gulpfile.js/tasks/build.js      |   23 -
 .../src/main/js/gulpfile.js/tasks/bundle.js     |   68 -
 .../src/main/js/gulpfile.js/tasks/clean.js      |   24 -
 .../src/main/js/gulpfile.js/tasks/connect.js    |   39 -
 .../src/main/js/gulpfile.js/tasks/copy.js       |  100 -
 .../src/main/js/gulpfile.js/tasks/eslint.js     |   44 -
 .../main/js/gulpfile.js/tasks/inject-plugins.js |   70 -
 .../src/main/js/gulpfile.js/tasks/jade.js       |   56 -
 .../src/main/js/gulpfile.js/tasks/production.js |   28 -
 .../src/main/js/gulpfile.js/tasks/sass.js       |   36 -
 .../src/main/js/helpers/common-utils.js         |    7 +-
 .../src/main/js/helpers/data-structures.js      |    4 +-
 .../js/helpers/generator/generator-common.js    |    4 +-
 .../js/helpers/generator/generator-docker.js    |    4 +-
 .../main/js/helpers/generator/generator-java.js |    4 +-
 .../js/helpers/generator/generator-optional.js  |    4 +-
 .../main/js/helpers/generator/generator-pom.js  |    4 +-
 .../helpers/generator/generator-properties.js   |    4 +-
 .../js/helpers/generator/generator-readme.js    |    4 +-
 .../main/js/helpers/generator/generator-xml.js  |    4 +-
 .../src/main/js/ignite_modules/index.js         |   10 +
 .../control-center-web/src/main/js/package.json |   52 +-
 .../stylesheets/_font-awesome-custom.scss       |   26 +-
 .../src/main/js/views/index.jade                |   22 +-
 54 files changed, 1163 insertions(+), 5407 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/2b0ddb51/modules/control-center-web/src/main/js/.babelrc
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/.babelrc b/modules/control-center-web/src/main/js/.babelrc
new file mode 100644
index 0000000..af0f0c3
--- /dev/null
+++ b/modules/control-center-web/src/main/js/.babelrc
@@ -0,0 +1,3 @@
+{
+  "presets": ["es2015"]
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/2b0ddb51/modules/control-center-web/src/main/js/.gitignore
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/.gitignore b/modules/control-center-web/src/main/js/.gitignore
index bb977f8..c966a99 100644
--- a/modules/control-center-web/src/main/js/.gitignore
+++ b/modules/control-center-web/src/main/js/.gitignore
@@ -1,10 +1,10 @@
-node_modules
-jspm_packages
 *.idea
 *.log
 .npmrc
-build
-app/plugins
+build/*
+!build/system.config.js
+node_modules
+ignite_modules_temp/*
 public/stylesheets/*.css
 serve/config/*.json
 serve/agent_dists/*.zip

http://git-wip-us.apache.org/repos/asf/ignite/blob/2b0ddb51/modules/control-center-web/src/main/js/app/decorator/select.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/decorator/select.js b/modules/control-center-web/src/main/js/app/decorator/select.js
index 9a6d07b..2d22707 100644
--- a/modules/control-center-web/src/main/js/app/decorator/select.js
+++ b/modules/control-center-web/src/main/js/app/decorator/select.js
@@ -22,7 +22,7 @@ import angular from 'angular';
  * If this problem will be fixed in AngularStrap we can remove this delegate.
  */
 angular.module('mgcrea.ngStrap.select')
-    .decorator('$select', ($delegate) => {
+    .decorator('$select', ['$delegate', ($delegate) => {
         function SelectFactoryDecorated(element, controller, config) {
             const delegate = $delegate(element, controller, config);
 
@@ -74,4 +74,4 @@ angular.module('mgcrea.ngStrap.select')
         SelectFactoryDecorated.defaults = $delegate.defaults;
 
         return SelectFactoryDecorated;
-    });
+    }]);

http://git-wip-us.apache.org/repos/asf/ignite/blob/2b0ddb51/modules/control-center-web/src/main/js/app/index.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/index.js b/modules/control-center-web/src/main/js/app/index.js
index d5d480e..878cd67 100644
--- a/modules/control-center-web/src/main/js/app/index.js
+++ b/modules/control-center-web/src/main/js/app/index.js
@@ -20,8 +20,9 @@ import ace from 'ace';
 import angular from 'angular';
 import pdfMake from 'pdfmake';
 
+ace.config.set("basePath", "/jspm_packages/github/ajaxorg/ace-builds@1.2.3");
+
 window._ = _;
-window.ace = ace;
 window.require = ace.require; // TODO Should be removed after full refactoring to directives.
 window.pdfMake = pdfMake;
 
@@ -46,7 +47,6 @@ import 'query-command-supported';
 
 import 'public/stylesheets/style.css!';
 
-import 'nvd3/build/nv.d3.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!';
@@ -99,12 +99,51 @@ import IgniteCountries from './services/Countries.service';
 import IgniteChartColors from './services/ChartColors.service';
 import IgniteAgentMonitor from './services/AgentMonitor.service';
 
-// Providers
+// Providers.
 
 // Filters.
 import hasPojo from './filters/hasPojo.filter';
 import byName from './filters/byName.filter';
 
+// Helpers
+import $generatorCommon from 'helpers/generator/generator-common';
+import $generatorDocker from 'helpers/generator/generator-docker';
+import $generatorJava from 'helpers/generator/generator-java';
+import $generatorOptional from 'helpers/generator/generator-optional';
+import $generatorPom from 'helpers/generator/generator-pom';
+import $generatorProperties from 'helpers/generator/generator-properties';
+import $generatorReadme from 'helpers/generator/generator-readme';
+import $generatorXml from 'helpers/generator/generator-xml';
+
+import $commonUtils from 'helpers/common-utils';
+import $dataStructures from 'helpers/data-structures';
+
+window.$generatorCommon = $generatorCommon;
+window.$generatorDocker = $generatorDocker;
+window.$generatorJava = $generatorJava;
+window.$generatorOptional = $generatorOptional;
+window.$generatorPom = $generatorPom;
+window.$generatorProperties = $generatorProperties;
+window.$generatorReadme = $generatorReadme;
+window.$generatorXml = $generatorXml;
+window.$commonUtils = $commonUtils;
+window.$dataStructures = $dataStructures;
+
+// 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';
+
 angular
 .module('ignite-console', [
     'ngRetina',
@@ -134,7 +173,11 @@ angular
     'ignite-console.navbar',
     'ignite-console.configuration',
     'ignite-console.getting-started',
-    'ignite-console.version'
+    'ignite-console.version',
+    // Ignite legacy module.
+    'ignite-console.legacy',
+    // Ignite modules.
+    'ignite-console.modules'
 ])
 // Directives.
 .directive(...igniteAdvancedOptionsToggle)

http://git-wip-us.apache.org/repos/asf/ignite/blob/2b0ddb51/modules/control-center-web/src/main/js/app/modules/getting-started/GettingStarted.provider.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/getting-started/GettingStarted.provider.js b/modules/control-center-web/src/main/js/app/modules/getting-started/GettingStarted.provider.js
index d3379a0..b3b4cba 100644
--- a/modules/control-center-web/src/main/js/app/modules/getting-started/GettingStarted.provider.js
+++ b/modules/control-center-web/src/main/js/app/modules/getting-started/GettingStarted.provider.js
@@ -45,7 +45,7 @@ angular
             return items;
         }];
     })
-    .service('IgniteGettingStarted', ['$rootScope', '$modal', 'igniteGettingStarted', function($root, $modal, igniteGettingStarted) {
+    .service('gettingStarted', ['$rootScope', '$modal', 'igniteGettingStarted', function($root, $modal, igniteGettingStarted) {
         const _model = igniteGettingStarted;
 
         let _page = 0;

http://git-wip-us.apache.org/repos/asf/ignite/blob/2b0ddb51/modules/control-center-web/src/main/js/app/modules/user/Auth.service.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/user/Auth.service.js b/modules/control-center-web/src/main/js/app/modules/user/Auth.service.js
index 8894148..df4e68a 100644
--- a/modules/control-center-web/src/main/js/app/modules/user/Auth.service.js
+++ b/modules/control-center-web/src/main/js/app/modules/user/Auth.service.js
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-export default ['Auth', ['$http', '$rootScope', '$state', '$common', 'IgniteGettingStarted', 'User',
+export default ['Auth', ['$http', '$rootScope', '$state', '$common', 'gettingStarted', 'User',
     ($http, $root, $state, $common, gettingStarted, User) => {
         let _auth = false;
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/2b0ddb51/modules/control-center-web/src/main/js/build/system.config.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/build/system.config.js b/modules/control-center-web/src/main/js/build/system.config.js
new file mode 100644
index 0000000..c60d1e7
--- /dev/null
+++ b/modules/control-center-web/src/main/js/build/system.config.js
@@ -0,0 +1,418 @@
+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.3",
+    "angular-animate": "github:angular/bower-angular-animate@1.5.3",
+    "angular-drag-and-drop-lists": "github:marceljuenemann/angular-drag-and-drop-lists@1.4.0",
+    "angular-loading": "github:darthwade/angular-loading@0.1.4",
+    "angular-motion": "github:mgcrea/angular-motion@0.4.3",
+    "angular-nvd3": "github:krispo/angular-nvd3@1.0.5",
+    "angular-retina": "github:jrief/angular-retina@0.3.8",
+    "angular-sanitize": "github:angular/bower-angular-sanitize@1.5.3",
+    "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.7",
+    "angular-tree-control": "github:wix/angular-tree-control@0.2.23",
+    "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.10",
+    "core-js": "npm:core-js@1.2.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.2.1",
+    "json": "github:systemjs/plugin-json@0.1.0",
+    "jszip": "github:Stuk/jszip@2.6.0",
+    "lodash": "github:lodash/lodash@4.6.1",
+    "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.3"
+    },
+    "github:angular/bower-angular-animate@1.5.3": {
+      "angular": "github:angular/bower-angular@1.5.3"
+    },
+    "github:angular/bower-angular-sanitize@1.5.3": {
+      "angular": "github:angular/bower-angular@1.5.3"
+    },
+    "github:angular/bower-angular@1.5.3": {
+      "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:darthwade/angular-loading@0.1.4": {
+      "spinjs": "github:fgnass/spin.js@2.3.2"
+    },
+    "github:eligrey/FileSaver.js@master": {
+      "blob": "github:eligrey/Blob.js@master"
+    },
+    "github:johnsoftek/plugin-jade@0.6.0": {
+      "jade-compiler": "npm:jade@1.11.0",
+      "text": "github:systemjs/plugin-text@0.0.4"
+    },
+    "github:jspm/nodelibs-assert@0.1.0": {
+      "assert": "npm:assert@1.3.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.2"
+    },
+    "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.5": {
+      "d3": "npm:d3@3.5.14",
+      "nvd3": "npm:nvd3@1.8.1"
+    },
+    "github:mgcrea/angular-motion@0.4.3": {
+      "angular": "github:angular/bower-angular@1.5.3",
+      "css": "github:systemjs/plugin-css@0.1.20"
+    },
+    "github:mgcrea/angular-strap@2.3.7": {
+      "angular": "github:angular/bower-angular@1.5.3",
+      "angular-animate": "github:angular/bower-angular-animate@1.5.3",
+      "angular-motion": "github:mgcrea/angular-motion@0.4.3",
+      "angular-sanitize": "github:angular/bower-angular-sanitize@1.5.3"
+    },
+    "github:twbs/bootstrap@3.3.6": {
+      "jquery": "github:components/jquery@2.2.1"
+    },
+    "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.2",
+      "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.3.0": {
+      "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@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.3"
+    },
+    "npm:clean-css@3.4.10": {
+      "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.0"
+    },
+    "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.20"
+    },
+    "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: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.10",
+      "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.0",
+      "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.2": {
+      "buffer": "github:jspm/nodelibs-buffer@0.1.0",
+      "is-buffer": "npm:is-buffer@1.1.3"
+    },
+    "npm:lazy-cache@1.0.3": {
+      "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.2": {
+      "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.13": {
+      "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.3": {
+      "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.13"
+    },
+    "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.3",
+      "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/2b0ddb51/modules/control-center-web/src/main/js/config.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/config.js b/modules/control-center-web/src/main/js/config.js
deleted file mode 100644
index 5837fa9..0000000
--- a/modules/control-center-web/src/main/js/config.js
+++ /dev/null
@@ -1,438 +0,0 @@
-System.config({
-  defaultJSExtensions: true,
-  transpiler: "babel",
-  babelOptions: {
-    "optional": [
-      "runtime",
-      "optimisation.modules.system"
-    ]
-  },
-  paths: {
-    "github:*": "jspm_packages/github/*",
-    "npm:*": "jspm_packages/npm/*"
-  },
-  separateCSS: true,
-
-  map: {
-    "Blob": "github:eligrey/Blob.js@master",
-    "FileSaver": "github:eligrey/FileSaver.js@master",
-    "ace": "github:ajaxorg/ace-builds@1.2.3",
-    "angular": "github:angular/bower-angular@1.5.2",
-    "angular-ag-grid": "github:ceolter/ag-grid@2.3.5",
-    "angular-animate": "github:angular/bower-angular-animate@1.5.2",
-    "angular-drag-and-drop-lists": "github:marceljuenemann/angular-drag-and-drop-lists@1.4.0",
-    "angular-grid": "github:ceolter/ag-grid@2.3.5",
-    "angular-loading": "github:darthwade/angular-loading@0.1.4",
-    "angular-motion": "github:mgcrea/angular-motion@0.4.3",
-    "angular-nvd3": "github:krispo/angular-nvd3@1.0.5",
-    "angular-retina": "github:jrief/angular-retina@0.3.8",
-    "angular-sanitize": "github:angular/bower-angular-sanitize@1.5.2",
-    "angular-smart-table": "github:lorenzofox3/Smart-Table@2.1.7",
-    "angular-socket-io": "github:btford/angular-socket-io@0.7.0",
-    "angular-strap": "github:mgcrea/angular-strap@2.3.7",
-    "angular-tree-control": "github:wix/angular-tree-control@0.2.23",
-    "angular-ui-ace": "github:angular-ui/ui-ace@0.2.3",
-    "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",
-    "angular-ui-router-title": "github:nonplus/angular-ui-router-title@0.0.4",
-    "babel": "npm:babel-core@5.8.38",
-    "babel-runtime": "npm:babel-runtime@5.8.38",
-    "blob": "github:eligrey/Blob.js@master",
-    "bootstrap": "github:twbs/bootstrap@3.3.6",
-    "bootstrap-carousel": "github:twbs/bootstrap@3.3.6",
-    "clean-css": "npm:clean-css@3.4.10",
-    "core-js": "npm:core-js@1.2.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",
-    "johnsoftek/plugin-jade": "github:johnsoftek/plugin-jade@include",
-    "jquery": "github:components/jquery@2.2.1",
-    "json": "github:systemjs/plugin-json@0.1.0",
-    "jszip": "github:Stuk/jszip@2.5.0",
-    "lodash": "github:lodash/lodash@4.6.1",
-    "nvd3": "npm:nvd3@1.8.1",
-    "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",
-    "spinjs": "github:fgnass/spin.js@2.3.2",
-    "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-ace@0.2.3": {
-      "ace": "github:ajaxorg/ace-builds@1.2.3"
-    },
-    "github:angular-ui/ui-router@0.2.18": {
-      "angular": "github:angular/bower-angular@1.5.2"
-    },
-    "github:angular/bower-angular-animate@1.5.2": {
-      "angular": "github:angular/bower-angular@1.5.2"
-    },
-    "github:angular/bower-angular-sanitize@1.5.2": {
-      "angular": "github:angular/bower-angular@1.5.2"
-    },
-    "github:angular/bower-angular@1.5.2": {
-      "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:darthwade/angular-loading@0.1.4": {
-      "spinjs": "github:fgnass/spin.js@2.3.2"
-    },
-    "github:eligrey/FileSaver.js@master": {
-      "blob": "github:eligrey/Blob.js@master"
-    },
-    "github:johnsoftek/plugin-jade@0.6.0": {
-      "jade-compiler": "npm:jade@1.11.0",
-      "text": "github:systemjs/plugin-text@0.0.4"
-    },
-    "github:johnsoftek/plugin-jade@include": {
-      "jade-compiler": "npm:jade@1.11.0",
-      "text": "github:systemjs/plugin-text@0.0.4"
-    },
-    "github:jspm/nodelibs-assert@0.1.0": {
-      "assert": "npm:assert@1.3.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.2"
-    },
-    "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.5": {
-      "d3": "npm:d3@3.5.14",
-      "nvd3": "npm:nvd3@1.8.1"
-    },
-    "github:mgcrea/angular-motion@0.4.3": {
-      "angular": "github:angular/bower-angular@1.5.2",
-      "css": "github:systemjs/plugin-css@0.1.20"
-    },
-    "github:mgcrea/angular-strap@2.3.7": {
-      "angular": "github:angular/bower-angular@1.5.2",
-      "angular-animate": "github:angular/bower-angular-animate@1.5.2",
-      "angular-motion": "github:mgcrea/angular-motion@0.4.3",
-      "angular-sanitize": "github:angular/bower-angular-sanitize@1.5.2"
-    },
-    "github:twbs/bootstrap@3.3.6": {
-      "jquery": "github:components/jquery@2.2.1"
-    },
-    "github:wix/angular-tree-control@0.2.23": {
-      "angular": "github:angular/bower-angular@1.5.2"
-    },
-    "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.2",
-      "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.3.0": {
-      "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@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.3"
-    },
-    "npm:clean-css@3.4.10": {
-      "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.0"
-    },
-    "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.20"
-    },
-    "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: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.10",
-      "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.0",
-      "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.2": {
-      "buffer": "github:jspm/nodelibs-buffer@0.1.0",
-      "is-buffer": "npm:is-buffer@1.1.3"
-    },
-    "npm:lazy-cache@1.0.3": {
-      "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.2": {
-      "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.13": {
-      "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.3": {
-      "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.13"
-    },
-    "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.3",
-      "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/2b0ddb51/modules/control-center-web/src/main/js/controllers/admin-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/admin-controller.js b/modules/control-center-web/src/main/js/controllers/admin-controller.js
index 5d204d5..bc5c3e9 100644
--- a/modules/control-center-web/src/main/js/controllers/admin-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/admin-controller.js
@@ -16,6 +16,8 @@
  */
 
 // Controller for Admin screen.
+import consoleModule from 'controllers/common-module';
+
 consoleModule.controller('adminController', [
     '$rootScope', '$scope', '$http', '$q', '$common', '$confirm', '$state', 'User',
     function ($rootScope, $scope, $http, $q, $common, $confirm, $state, User) {

http://git-wip-us.apache.org/repos/asf/ignite/blob/2b0ddb51/modules/control-center-web/src/main/js/controllers/caches-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/caches-controller.js b/modules/control-center-web/src/main/js/controllers/caches-controller.js
index 97d5266..6ea2f18 100644
--- a/modules/control-center-web/src/main/js/controllers/caches-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/caches-controller.js
@@ -16,6 +16,8 @@
  */
 
 // Controller for Caches screen.
+import consoleModule from 'controllers/common-module';
+
 consoleModule.controller('cachesController', [
     '$scope', '$http', '$state', '$filter', '$timeout', '$common', '$confirm', '$clone', '$loading', '$cleanup', '$unsavedChangesGuard',
     function ($scope, $http, $state, $filter, $timeout, $common, $confirm, $clone, $loading, $cleanup, $unsavedChangesGuard) {

http://git-wip-us.apache.org/repos/asf/ignite/blob/2b0ddb51/modules/control-center-web/src/main/js/controllers/clusters-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/clusters-controller.js b/modules/control-center-web/src/main/js/controllers/clusters-controller.js
index 6932af4..a4b88e7 100644
--- a/modules/control-center-web/src/main/js/controllers/clusters-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/clusters-controller.js
@@ -16,6 +16,8 @@
  */
 
 // Controller for Clusters screen.
+import consoleModule from 'controllers/common-module';
+
 consoleModule.controller('clustersController', [
     '$scope', '$http', '$state', '$timeout', '$common', '$confirm', '$clone', '$loading', '$cleanup', '$unsavedChangesGuard', 'igniteEventGroups',
     function ($scope, $http, $state, $timeout, $common, $confirm, $clone, $loading, $cleanup, $unsavedChangesGuard, igniteEventGroups) {

http://git-wip-us.apache.org/repos/asf/ignite/blob/2b0ddb51/modules/control-center-web/src/main/js/controllers/common-module.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/common-module.js b/modules/control-center-web/src/main/js/controllers/common-module.js
index 0fff237..5793bef 100644
--- a/modules/control-center-web/src/main/js/controllers/common-module.js
+++ b/modules/control-center-web/src/main/js/controllers/common-module.js
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-var consoleModule = angular.module('ignite-web-console',
+const consoleModule = angular.module('ignite-console.legacy',
     [
         'darthwade.dwLoading',
         'smart-table',
@@ -28,50 +28,48 @@ var consoleModule = angular.module('ignite-web-console',
         'ui.grid.exporter',
         'nvd3',
         'dndLists'
-        /* ignite:modules */
-        , 'ignite-console'
-        /* endignite */
-
         /* ignite:plugins */
         /* endignite */
-    ])
-    .run(function ($rootScope, $http, $state, $common, Auth, User, IgniteGettingStarted) {
-        $rootScope.gettingStarted = IgniteGettingStarted;
-
-        $rootScope.revertIdentity = function () {
-            $http
-                .get('/api/v1/admin/revert/identity')
-                .then(User.read)
-                .then(function (user) {
-                    $rootScope.$broadcast('user', user);
-
-                    $state.go('settings.admin');
-                })
-                .catch(function (errMsg) {
-                    $common.showError($common.errorMessage(errMsg));
-                });
-        };
-    });
+    ]);
+
+consoleModule.run(['$rootScope', '$http', '$state', '$common', 'Auth', 'User', 'gettingStarted',
+    ($root, $http, $state, $common, Auth, User, gettingStarted) => {
+    $root.gettingStarted = gettingStarted;
+
+    $root.revertIdentity = function () {
+        $http
+            .get('/api/v1/admin/revert/identity')
+            .then(User.read)
+            .then(function (user) {
+                $root.$broadcast('user', user);
+
+                $state.go('settings.admin');
+            })
+            .catch(function (errMsg) {
+                $common.showError($common.errorMessage(errMsg));
+            });
+    };
+}]);
 
 // Modal popup configuration.
-consoleModule.config(function ($modalProvider) {
+consoleModule.config(['$modalProvider', ($modalProvider) => {
     angular.extend($modalProvider.defaults, {
         html: true
     });
-});
+}]);
 
 // Comboboxes configuration.
-consoleModule.config(function ($popoverProvider) {
+consoleModule.config(['$popoverProvider', ($popoverProvider) => {
     angular.extend($popoverProvider.defaults, {
         trigger: 'manual',
         placement: 'right',
         container: 'body',
         templateUrl: '/templates/validation-error.html'
     });
-});
+}]);
 
 // Tooltips configuration.
-consoleModule.config(function ($tooltipProvider) {
+consoleModule.config(['$tooltipProvider', ($tooltipProvider) => {
     angular.extend($tooltipProvider.defaults, {
         container: 'body',
         delay: 150,
@@ -79,10 +77,10 @@ consoleModule.config(function ($tooltipProvider) {
         html: 'true',
         trigger: 'click hover'
     });
-});
+}]);
 
 // Comboboxes configuration.
-consoleModule.config(function ($selectProvider) {
+consoleModule.config(['$selectProvider', ($selectProvider) => {
     angular.extend($selectProvider.defaults, {
         container: 'body',
         maxLength: '5',
@@ -92,35 +90,35 @@ consoleModule.config(function ($selectProvider) {
         iconCheckmark: 'fa fa-check',
         caretHtml: ''
     });
-});
+}]);
 
 // Alerts configuration.
-consoleModule.config(function ($alertProvider) {
+consoleModule.config(['$alertProvider', ($alertProvider) => {
     angular.extend($alertProvider.defaults, {
         container: 'body',
         placement: 'top-right',
         duration: '5',
         type: 'danger'
     });
-});
+}]);
 
 // Modals configuration.
-consoleModule.config(function($modalProvider) {
+consoleModule.config(['$modalProvider', ($modalProvider) => {
     angular.extend($modalProvider.defaults, {
         animation: 'am-fade-and-scale'
     });
-});
+}]);
 
 // Dropdowns configuration.
-consoleModule.config(function($dropdownProvider) {
+consoleModule.config(['$dropdownProvider', ($dropdownProvider) => {
     angular.extend($dropdownProvider.defaults, {
         templateUrl: 'templates/dropdown.html'
     });
-});
+}]);
 
 // Common functions to be used in controllers.
-consoleModule.service('$common', [
-    '$alert', '$popover', '$anchorScroll', '$location', '$timeout', '$focus', '$window', function ($alert, $popover, $anchorScroll, $location, $timeout, $focus, $window) {
+consoleModule.service('$common', ['$alert', '$popover', '$anchorScroll', '$location', '$timeout', '$focus', '$window',
+    ($alert, $popover, $anchorScroll, $location, $timeout, $focus, $window) => {
         $anchorScroll.yOffset = 55;
 
         function isDefined(v) {
@@ -1146,8 +1144,8 @@ consoleModule.service('$common', [
     }]);
 
 // Confirm popup service.
-consoleModule.service('$confirm', function ($modal, $rootScope, $q) {
-    var scope = $rootScope.$new();
+consoleModule.service('$confirm', ['$modal', '$rootScope', '$q', ($modal, $root, $q) => {
+    var scope = $root.$new();
 
     var deferred;
 
@@ -1176,17 +1174,17 @@ consoleModule.service('$confirm', function ($modal, $rootScope, $q) {
     };
 
     return confirmModal;
-});
+}]);
 
 // Confirm change location.
-consoleModule.service('$unsavedChangesGuard', function ($rootScope) {
+consoleModule.service('$unsavedChangesGuard', ['$rootScope', ($root) => {
     return {
         install: function ($scope) {
             $scope.$on("$destroy", function() {
                 window.onbeforeunload = null;
             });
 
-            var unbind = $rootScope.$on('$stateChangeStart', function(event) {
+            var unbind = $root.$on('$stateChangeStart', function(event) {
                 if ($scope.ui && ($scope.ui.isDirty() || ($scope.ui.angularWay && $scope.ui.inputForm && $scope.ui.inputForm.$dirty))) {
                     if (!confirm('You have unsaved changes.\n\nAre you sure you want to discard them?')) {
                         event.preventDefault();
@@ -1203,11 +1201,11 @@ consoleModule.service('$unsavedChangesGuard', function ($rootScope) {
             };
         }
     };
-});
+}]);
 
 // Service for confirm or skip several steps.
-consoleModule.service('$confirmBatch', function ($rootScope, $modal,  $q) {
-    var scope = $rootScope.$new();
+consoleModule.service('$confirmBatch', ['$modal', '$rootScope', '$q', ($modal, $root, $q) => {
+    var scope = $root.$new();
 
     scope.confirmModal = $modal({templateUrl: '/templates/batch-confirm.html', scope: scope, placement: 'center', show: false});
 
@@ -1272,11 +1270,11 @@ consoleModule.service('$confirmBatch', function ($rootScope, $modal,  $q) {
             return scope.deferred.promise;
         }
     };
-});
+}]);
 
 // 'Clone' popup service.
-consoleModule.service('$clone', function ($modal, $rootScope, $q) {
-    var scope = $rootScope.$new();
+consoleModule.service('$clone', ['$modal', '$rootScope', '$q', ($modal, $root, $q) => {
+    var scope = $root.$new();
 
     var deferred;
     var _names = [];
@@ -1321,7 +1319,7 @@ consoleModule.service('$clone', function ($modal, $rootScope, $q) {
     };
 
     return cloneModal;
-});
+}]);
 
 // Tables support service.
 consoleModule.service('$table', ['$common', '$focus', function ($common, $focus) {
@@ -1878,7 +1876,7 @@ consoleModule.directive('match', function ($parse) {
 });
 
 // Directive to bind ENTER key press with some user action.
-consoleModule.directive('onEnter', function ($timeout) {
+consoleModule.directive('onEnter', ['$timeout', ($timeout) => {
     return function (scope, elem, attrs) {
         elem.on('keydown keypress', function (event) {
             if (event.which === 13) {
@@ -1897,10 +1895,10 @@ consoleModule.directive('onEnter', function ($timeout) {
             elem.off('keydown keypress');
         });
     };
-});
+}]);
 
 // Directive to bind ESC key press with some user action.
-consoleModule.directive('onEscape', function () {
+consoleModule.directive('onEscape', () => {
     return function (scope, elem, attrs) {
         elem.on('keydown keypress', function (event) {
             if (event.which === 27) {
@@ -1920,7 +1918,7 @@ consoleModule.directive('onEscape', function () {
 });
 
 // Directive to retain selection. To fix angular-strap typeahead bug with setting cursor to the end of text.
-consoleModule.directive('retainSelection', function ($timeout) {
+consoleModule.directive('retainSelection', ['$timeout', ($timeout) => {
     var promise;
 
     return function (scope, elem) {
@@ -1968,10 +1966,10 @@ consoleModule.directive('retainSelection', function ($timeout) {
             elem.off('keydown');
         });
     };
-});
+}]);
 
 // Factory function to focus element.
-consoleModule.factory('$focus', function ($timeout) {
+consoleModule.factory('$focus', ['$timeout', ($timeout) => {
     return function (id) {
         // Timeout makes sure that is invoked after any other event has been triggered.
         // E.g. click events that need to run before the focus or inputs elements that are
@@ -1983,10 +1981,10 @@ consoleModule.factory('$focus', function ($timeout) {
                 elem[0].focus();
         }, 100);
     };
-});
+}]);
 
 // Directive to auto-focus element.
-consoleModule.directive('autoFocus', function($timeout) {
+consoleModule.directive('autoFocus', ['$timeout', ($timeout) => {
     return {
         restrict: 'AC',
         link: function(scope, element) {
@@ -1995,10 +1993,10 @@ consoleModule.directive('autoFocus', function($timeout) {
             });
         }
     };
-});
+}]);
 
 // Directive to focus next element on ENTER key.
-consoleModule.directive('enterFocusNext', function ($focus) {
+consoleModule.directive('enterFocusNext', ['$focus', ($focus) => {
     return function (scope, elem, attrs) {
         elem.on('keydown keypress', function (event) {
             if (event.which === 13) {
@@ -2008,10 +2006,10 @@ consoleModule.directive('enterFocusNext', function ($focus) {
             }
         });
     };
-});
+}]);
 
 // Directive to mark elements to focus.
-consoleModule.directive('onClickFocus', function ($focus) {
+consoleModule.directive('onClickFocus', ['$focus', ($focus) => {
     return function (scope, elem, attr) {
         elem.on('click', function () {
             $focus(attr.onClickFocus);
@@ -2022,11 +2020,11 @@ consoleModule.directive('onClickFocus', function ($focus) {
             elem.off('click');
         });
     };
-});
+}]);
 
 consoleModule.controller('resetPassword', [
     '$scope', '$modal', '$http', '$common', '$focus', 'Auth', '$state',
-    function ($scope, $modal, $http, $common, $focus, Auth, $state) {
+    ($scope, $modal, $http, $common, $focus, Auth, $state) => {
         if ($state.params.token)
             $http.post('/api/v1/password/validate/token', {token: $state.params.token})
                 .success(function (res) {
@@ -2058,7 +2056,7 @@ consoleModule.controller('resetPassword', [
 
 // Sign in controller.
 // TODO IGNITE-1936 Refactor this controller.
-consoleModule.controller('auth', ['$scope', '$focus', 'Auth', 'IgniteCountries', function ($scope, $focus, Auth, countries) {
+consoleModule.controller('auth', ['$scope', '$focus', 'Auth', 'IgniteCountries', ($scope, $focus, Auth, countries) => {
     $scope.auth = Auth.auth;
 
     $scope.action = 'signin';
@@ -2069,7 +2067,7 @@ consoleModule.controller('auth', ['$scope', '$focus', 'Auth', 'IgniteCountries',
 
 // Navigation bar controller.
 consoleModule.controller('notebooks', ['$scope', '$modal', '$state', '$http', '$common',
-    function ($scope, $modal, $state, $http, $common) {
+    ($scope, $modal, $state, $http, $common) => {
     $scope.$root.notebooks = [];
 
     // Pre-fetch modal dialogs.
@@ -2127,3 +2125,5 @@ consoleModule.controller('notebooks', ['$scope', '$modal', '$state', '$http', '$
 
     $scope.$root.reloadNotebooks();
 }]);
+
+export default consoleModule;

http://git-wip-us.apache.org/repos/asf/ignite/blob/2b0ddb51/modules/control-center-web/src/main/js/controllers/domains-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/domains-controller.js b/modules/control-center-web/src/main/js/controllers/domains-controller.js
index d90f2a7..d8ae37e 100644
--- a/modules/control-center-web/src/main/js/controllers/domains-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/domains-controller.js
@@ -16,6 +16,8 @@
  */
 
 // Controller for Domain model screen.
+import consoleModule from 'controllers/common-module';
+
 consoleModule.controller('domainsController', [
     '$scope', '$http', '$state', '$filter', '$timeout', '$modal', '$common', '$focus', '$confirm', '$confirmBatch', '$clone', '$table', '$preview', '$loading', '$unsavedChangesGuard', 'IgniteAgentMonitor',
     function ($scope, $http, $state, $filter, $timeout, $modal, $common, $focus, $confirm, $confirmBatch, $clone, $table, $preview, $loading, $unsavedChangesGuard, IgniteAgentMonitor) {

http://git-wip-us.apache.org/repos/asf/ignite/blob/2b0ddb51/modules/control-center-web/src/main/js/controllers/ext-searchbox.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/ext-searchbox.js b/modules/control-center-web/src/main/js/controllers/ext-searchbox.js
deleted file mode 100644
index 343db34..0000000
--- a/modules/control-center-web/src/main/js/controllers/ext-searchbox.js
+++ /dev/null
@@ -1,420 +0,0 @@
-/* */ 
-
-// TODO This code MUST BE refactored before SOURCE release!!!
-
-"format global";
-ace.define("ace/ext/searchbox",["require","exports","module","ace/lib/dom","ace/lib/lang","ace/lib/event","ace/keyboard/hash_handler","ace/lib/keys"], function(require, exports, module) {
-"use strict";
-
-var dom = require("../lib/dom");
-var lang = require("../lib/lang");
-var event = require("../lib/event");
-var searchboxCss = "\
-.ace_search {\
-background-color: #ddd;\
-border: 1px solid #cbcbcb;\
-border-top: 0 none;\
-max-width: 325px;\
-overflow: hidden;\
-margin: 0;\
-padding: 4px;\
-padding-right: 6px;\
-padding-bottom: 0;\
-position: absolute;\
-top: 0px;\
-z-index: 99;\
-white-space: normal;\
-}\
-.ace_search.left {\
-border-left: 0 none;\
-border-radius: 0px 0px 5px 0px;\
-left: 0;\
-}\
-.ace_search.right {\
-border-radius: 0px 0px 0px 5px;\
-border-right: 0 none;\
-right: 0;\
-}\
-.ace_search_form, .ace_replace_form {\
-border-radius: 3px;\
-border: 1px solid #cbcbcb;\
-float: left;\
-margin-bottom: 4px;\
-overflow: hidden;\
-}\
-.ace_search_form.ace_nomatch {\
-outline: 1px solid red;\
-}\
-.ace_search_field {\
-background-color: white;\
-border-right: 1px solid #cbcbcb;\
-border: 0 none;\
--webkit-box-sizing: border-box;\
--moz-box-sizing: border-box;\
-box-sizing: border-box;\
-float: left;\
-height: 22px;\
-outline: 0;\
-padding: 0 7px;\
-width: 214px;\
-margin: 0;\
-}\
-.ace_searchbtn,\
-.ace_replacebtn {\
-background: #fff;\
-border: 0 none;\
-border-left: 1px solid #dcdcdc;\
-cursor: pointer;\
-float: left;\
-height: 22px;\
-margin: 0;\
-position: relative;\
-}\
-.ace_searchbtn:last-child,\
-.ace_replacebtn:last-child {\
-border-top-right-radius: 3px;\
-border-bottom-right-radius: 3px;\
-}\
-.ace_searchbtn:disabled {\
-background: none;\
-cursor: default;\
-}\
-.ace_searchbtn {\
-background-position: 50% 50%;\
-background-repeat: no-repeat;\
-width: 27px;\
-}\
-.ace_searchbtn.prev {\
-background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAFCAYAAAB4ka1VAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAADFJREFUeNpiSU1NZUAC/6E0I0yACYskCpsJiySKIiY0SUZk40FyTEgCjGgKwTRAgAEAQJUIPCE+qfkAAAAASUVORK5CYII=);    \
-}\
-.ace_searchbtn.next {\
-background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAFCAYAAAB4ka1VAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAADRJREFUeNpiTE1NZQCC/0DMyIAKwGJMUAYDEo3M/s+EpvM/mkKwCQxYjIeLMaELoLMBAgwAU7UJObTKsvAAAAAASUVORK5CYII=);    \
-}\
-.ace_searchbtn_close {\
-background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAcCAYAAABRVo5BAAAAZ0lEQVR42u2SUQrAMAhDvazn8OjZBilCkYVVxiis8H4CT0VrAJb4WHT3C5xU2a2IQZXJjiQIRMdkEoJ5Q2yMqpfDIo+XY4k6h+YXOyKqTIj5REaxloNAd0xiKmAtsTHqW8sR2W5f7gCu5nWFUpVjZwAAAABJRU5ErkJggg==) no-repeat 50% 0;\
-border-radius: 50%;\
-border: 0 none;\
-color: #656565;\
-cursor: pointer;\
-float: right;\
-font: 16px/16px Arial;\
-height: 14px;\
-margin: 5px 1px 9px 5px;\
-padding: 0;\
-text-align: center;\
-width: 14px;\
-}\
-.ace_searchbtn_close:hover {\
-background-color: #656565;\
-background-position: 50% 100%;\
-color: white;\
-}\
-.ace_replacebtn.prev {\
-width: 54px\
-}\
-.ace_replacebtn.next {\
-width: 27px\
-}\
-.ace_button {\
-margin-left: 2px;\
-cursor: pointer;\
--webkit-user-select: none;\
--moz-user-select: none;\
--o-user-select: none;\
--ms-user-select: none;\
-user-select: none;\
-overflow: hidden;\
-opacity: 0.7;\
-border: 1px solid rgba(100,100,100,0.23);\
-padding: 1px;\
--moz-box-sizing: border-box;\
-box-sizing:    border-box;\
-color: black;\
-}\
-.ace_button:hover {\
-background-color: #eee;\
-opacity:1;\
-}\
-.ace_button:active {\
-background-color: #ddd;\
-}\
-.ace_button.checked {\
-border-color: #3399ff;\
-opacity:1;\
-}\
-.ace_search_options{\
-margin-bottom: 3px;\
-text-align: right;\
--webkit-user-select: none;\
--moz-user-select: none;\
--o-user-select: none;\
--ms-user-select: none;\
-user-select: none;\
-}";
-var HashHandler = require("../keyboard/hash_handler").HashHandler;
-var keyUtil = require("../lib/keys");
-
-dom.importCssString(searchboxCss, "ace_searchbox");
-
-var html = '<div class="ace_search right">\
-    <button type="button" action="hide" class="ace_searchbtn_close"></button>\
-    <div class="ace_search_form">\
-        <input class="ace_search_field" placeholder="Search for" spellcheck="false"></input>\
-        <button type="button" action="findNext" class="ace_searchbtn next"></button>\
-        <button type="button" action="findPrev" class="ace_searchbtn prev"></button>\
-        <button type="button" action="findAll" class="ace_searchbtn" title="Alt-Enter">All</button>\
-    </div>\
-    <div class="ace_replace_form">\
-        <input class="ace_search_field" placeholder="Replace with" spellcheck="false"></input>\
-        <button type="button" action="replaceAndFindNext" class="ace_replacebtn">Replace</button>\
-        <button type="button" action="replaceAll" class="ace_replacebtn">All</button>\
-    </div>\
-    <div class="ace_search_options">\
-        <span action="toggleRegexpMode" class="ace_button" title="RegExp Search">.*</span>\
-        <span action="toggleCaseSensitive" class="ace_button" title="CaseSensitive Search">Aa</span>\
-        <span action="toggleWholeWords" class="ace_button" title="Whole Word Search">\\b</span>\
-    </div>\
-</div>'.replace(/>\s+/g, ">");
-
-var SearchBox = function(editor, range, showReplaceForm) {
-    var div = dom.createElement("div");
-    div.innerHTML = html;
-    this.element = div.firstChild;
-
-    this.$init();
-    this.setEditor(editor);
-};
-
-(function() {
-    this.setEditor = function(editor) {
-        editor.searchBox = this;
-        editor.container.appendChild(this.element);
-        this.editor = editor;
-    };
-
-    this.$initElements = function(sb) {
-        this.searchBox = sb.querySelector(".ace_search_form");
-        this.replaceBox = sb.querySelector(".ace_replace_form");
-        this.searchOptions = sb.querySelector(".ace_search_options");
-        this.regExpOption = sb.querySelector("[action=toggleRegexpMode]");
-        this.caseSensitiveOption = sb.querySelector("[action=toggleCaseSensitive]");
-        this.wholeWordOption = sb.querySelector("[action=toggleWholeWords]");
-        this.searchInput = this.searchBox.querySelector(".ace_search_field");
-        this.replaceInput = this.replaceBox.querySelector(".ace_search_field");
-    };
-    
-    this.$init = function() {
-        var sb = this.element;
-        
-        this.$initElements(sb);
-        
-        var _this = this;
-        event.addListener(sb, "mousedown", function(e) {
-            setTimeout(function(){
-                _this.activeInput.focus();
-            }, 0);
-            event.stopPropagation(e);
-        });
-        event.addListener(sb, "click", function(e) {
-            var t = e.target || e.srcElement;
-            var action = t.getAttribute("action");
-            if (action && _this[action])
-                _this[action]();
-            else if (_this.$searchBarKb.commands[action])
-                _this.$searchBarKb.commands[action].exec(_this);
-            event.stopPropagation(e);
-        });
-
-        event.addCommandKeyListener(sb, function(e, hashId, keyCode) {
-            var keyString = keyUtil.keyCodeToString(keyCode);
-            var command = _this.$searchBarKb.findKeyCommand(hashId, keyString);
-            if (command && command.exec) {
-                command.exec(_this);
-                event.stopEvent(e);
-            }
-        });
-
-        this.$onChange = lang.delayedCall(function() {
-            _this.find(false, false);
-        });
-
-        event.addListener(this.searchInput, "input", function() {
-            _this.$onChange.schedule(20);
-        });
-        event.addListener(this.searchInput, "focus", function() {
-            _this.activeInput = _this.searchInput;
-            _this.searchInput.value && _this.highlight();
-        });
-        event.addListener(this.replaceInput, "focus", function() {
-            _this.activeInput = _this.replaceInput;
-            _this.searchInput.value && _this.highlight();
-        });
-    };
-    this.$closeSearchBarKb = new HashHandler([{
-        bindKey: "Esc",
-        name: "closeSearchBar",
-        exec: function(editor) {
-            editor.searchBox.hide();
-        }
-    }]);
-    this.$searchBarKb = new HashHandler();
-    this.$searchBarKb.bindKeys({
-        "Ctrl-f|Command-f": function(sb) {
-            var isReplace = sb.isReplace = !sb.isReplace;
-            sb.replaceBox.style.display = isReplace ? "" : "none";
-            sb.searchInput.focus();
-        },
-        "Ctrl-H|Command-Option-F": function(sb) {
-            sb.replaceBox.style.display = "";
-            sb.replaceInput.focus();
-        },
-        "Ctrl-G|Command-G": function(sb) {
-            sb.findNext();
-        },
-        "Ctrl-Shift-G|Command-Shift-G": function(sb) {
-            sb.findPrev();
-        },
-        "esc": function(sb) {
-            setTimeout(function() { sb.hide();});
-        },
-        "Return": function(sb) {
-            if (sb.activeInput == sb.replaceInput)
-                sb.replace();
-            sb.findNext();
-        },
-        "Shift-Return": function(sb) {
-            if (sb.activeInput == sb.replaceInput)
-                sb.replace();
-            sb.findPrev();
-        },
-        "Alt-Return": function(sb) {
-            if (sb.activeInput == sb.replaceInput)
-                sb.replaceAll();
-            sb.findAll();
-        },
-        "Tab": function(sb) {
-            (sb.activeInput == sb.replaceInput ? sb.searchInput : sb.replaceInput).focus();
-        }
-    });
-
-    this.$searchBarKb.addCommands([{
-        name: "toggleRegexpMode",
-        bindKey: {win: "Alt-R|Alt-/", mac: "Ctrl-Alt-R|Ctrl-Alt-/"},
-        exec: function(sb) {
-            sb.regExpOption.checked = !sb.regExpOption.checked;
-            sb.$syncOptions();
-        }
-    }, {
-        name: "toggleCaseSensitive",
-        bindKey: {win: "Alt-C|Alt-I", mac: "Ctrl-Alt-R|Ctrl-Alt-I"},
-        exec: function(sb) {
-            sb.caseSensitiveOption.checked = !sb.caseSensitiveOption.checked;
-            sb.$syncOptions();
-        }
-    }, {
-        name: "toggleWholeWords",
-        bindKey: {win: "Alt-B|Alt-W", mac: "Ctrl-Alt-B|Ctrl-Alt-W"},
-        exec: function(sb) {
-            sb.wholeWordOption.checked = !sb.wholeWordOption.checked;
-            sb.$syncOptions();
-        }
-    }]);
-
-    this.$syncOptions = function() {
-        dom.setCssClass(this.regExpOption, "checked", this.regExpOption.checked);
-        dom.setCssClass(this.wholeWordOption, "checked", this.wholeWordOption.checked);
-        dom.setCssClass(this.caseSensitiveOption, "checked", this.caseSensitiveOption.checked);
-        this.find(false, false);
-    };
-
-    this.highlight = function(re) {
-        this.editor.session.highlight(re || this.editor.$search.$options.re);
-        this.editor.renderer.updateBackMarkers()
-    };
-    this.find = function(skipCurrent, backwards, preventScroll) {
-        var range = this.editor.find(this.searchInput.value, {
-            skipCurrent: skipCurrent,
-            backwards: backwards,
-            wrap: true,
-            regExp: this.regExpOption.checked,
-            caseSensitive: this.caseSensitiveOption.checked,
-            wholeWord: this.wholeWordOption.checked,
-            preventScroll: preventScroll
-        });
-        var noMatch = !range && this.searchInput.value;
-        dom.setCssClass(this.searchBox, "ace_nomatch", noMatch);
-        this.editor._emit("findSearchBox", { match: !noMatch });
-        this.highlight();
-    };
-    this.findNext = function() {
-        this.find(true, false);
-    };
-    this.findPrev = function() {
-        this.find(true, true);
-    };
-    this.findAll = function(){
-        var range = this.editor.findAll(this.searchInput.value, {            
-            regExp: this.regExpOption.checked,
-            caseSensitive: this.caseSensitiveOption.checked,
-            wholeWord: this.wholeWordOption.checked
-        });
-        var noMatch = !range && this.searchInput.value;
-        dom.setCssClass(this.searchBox, "ace_nomatch", noMatch);
-        this.editor._emit("findSearchBox", { match: !noMatch });
-        this.highlight();
-        this.hide();
-    };
-    this.replace = function() {
-        if (!this.editor.getReadOnly())
-            this.editor.replace(this.replaceInput.value);
-    };    
-    this.replaceAndFindNext = function() {
-        if (!this.editor.getReadOnly()) {
-            this.editor.replace(this.replaceInput.value);
-            this.findNext()
-        }
-    };
-    this.replaceAll = function() {
-        if (!this.editor.getReadOnly())
-            this.editor.replaceAll(this.replaceInput.value);
-    };
-
-    this.hide = function() {
-        this.element.style.display = "none";
-        this.editor.keyBinding.removeKeyboardHandler(this.$closeSearchBarKb);
-        this.editor.focus();
-    };
-    this.show = function(value, isReplace) {
-        this.element.style.display = "";
-        this.replaceBox.style.display = isReplace ? "" : "none";
-
-        this.isReplace = isReplace;
-
-        if (value)
-            this.searchInput.value = value;
-        
-        this.find(false, false, true);
-        
-        this.searchInput.focus();
-        this.searchInput.select();
-
-        this.editor.keyBinding.addKeyboardHandler(this.$closeSearchBarKb);
-    };
-
-    this.isFocused = function() {
-        var el = document.activeElement;
-        return el == this.searchInput || el == this.replaceInput;
-    }
-}).call(SearchBox.prototype);
-
-exports.SearchBox = SearchBox;
-
-exports.Search = function(editor, isReplace) {
-    var sb = editor.searchBox || new SearchBox(editor);
-    sb.show(editor.session.getTextRange(), isReplace);
-};
-
-});
-                (function() {
-                    ace.require(["ace/ext/searchbox"], function() {});
-                })();

http://git-wip-us.apache.org/repos/asf/ignite/blob/2b0ddb51/modules/control-center-web/src/main/js/controllers/igfs-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/igfs-controller.js b/modules/control-center-web/src/main/js/controllers/igfs-controller.js
index 2263940..71b024a 100644
--- a/modules/control-center-web/src/main/js/controllers/igfs-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/igfs-controller.js
@@ -16,6 +16,8 @@
  */
 
 // Controller for IGFS screen.
+import consoleModule from 'controllers/common-module';
+
 consoleModule.controller('igfsController', [
     '$scope', '$http', '$state', '$filter', '$timeout', '$common', '$confirm', '$clone', '$loading', '$cleanup', '$unsavedChangesGuard',
     function ($scope, $http, $state, $filter, $timeout, $common, $confirm, $clone, $loading, $cleanup, $unsavedChangesGuard) {

http://git-wip-us.apache.org/repos/asf/ignite/blob/2b0ddb51/modules/control-center-web/src/main/js/controllers/profile-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/profile-controller.js b/modules/control-center-web/src/main/js/controllers/profile-controller.js
index cf03252..2272ade 100644
--- a/modules/control-center-web/src/main/js/controllers/profile-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/profile-controller.js
@@ -16,6 +16,8 @@
  */
 
 // Controller for Profile screen.
+import consoleModule from 'controllers/common-module';
+
 consoleModule.controller('profileController', [
     '$rootScope', '$scope', '$http', '$common', '$focus', '$confirm', 'IgniteCountries',
     function ($rootScope, $scope, $http, $common, $focus, $confirm, countries) {

http://git-wip-us.apache.org/repos/asf/ignite/blob/2b0ddb51/modules/control-center-web/src/main/js/controllers/sql-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/sql-controller.js b/modules/control-center-web/src/main/js/controllers/sql-controller.js
index abae869..9ffe32b 100644
--- a/modules/control-center-web/src/main/js/controllers/sql-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/sql-controller.js
@@ -16,6 +16,8 @@
  */
 
 // Controller for SQL notebook screen.
+import consoleModule from 'controllers/common-module';
+
 consoleModule.controller('sqlController', [
     '$scope', '$http', '$timeout', '$interval', '$animate', '$location', '$anchorScroll', '$state', '$modal', '$popover', '$loading', '$common', '$confirm', 'IgniteAgentMonitor', 'IgniteChartColors', 'QueryNotebooks', 'uiGridExporterConstants',
     function ($scope, $http, $timeout, $interval, $animate, $location, $anchorScroll, $state, $modal, $popover, $loading, $common, $confirm, IgniteAgentMonitor, IgniteChartColors, QueryNotebooks, uiGridExporterConstants) {


Mime
View raw message