Merge remote-tracking branch 'origin/ignite-843-rc1' into ignite-843-rc1
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9653af51 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9653af51 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9653af51 Branch: refs/heads/ignite-843-rc2 Commit: 9653af519dc2b519180dc63cecef2d1b507d6d03 Parents: ac2ef81 3d1a6c0 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Mon Nov 30 17:33:29 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Mon Nov 30 17:33:29 2015 +0700 ---------------------------------------------------------------------- .../control-center-web/src/main/js/.gitignore | 1 + modules/control-center-web/src/main/js/app.js | 4 + .../control-center-web/src/main/js/app/index.js | 34 ++ .../app/modules/configuration-sidebar/main.js | 54 +++ modules/control-center-web/src/main/js/bin/www | 2 +- .../control-center-web/src/main/js/config.js | 436 +++++++++++++++++++ .../main/js/controllers/clusters-controller.js | 28 +- .../src/main/js/controllers/common-module.js | 98 ++++- .../src/main/js/controllers/igfs-controller.js | 79 ++-- .../main/js/controllers/metadata-controller.js | 5 +- .../src/main/js/controllers/models/caches.json | 12 +- .../main/js/controllers/models/clusters.json | 10 + .../src/main/js/controllers/models/igfs.json | 22 +- .../main/js/controllers/models/metadata.json | 9 - .../src/main/js/controllers/sql-controller.js | 80 ++-- .../main/js/controllers/summary-controller.js | 10 +- modules/control-center-web/src/main/js/db.js | 16 +- .../src/main/js/gulpfile.js/tasks/build.js | 2 +- .../src/main/js/gulpfile.js/tasks/bundle.js | 7 + .../src/main/js/gulpfile.js/tasks/copy.js | 30 +- .../main/js/gulpfile.js/tasks/inject-plugins.js | 4 +- .../src/main/js/gulpfile.js/tasks/jade.js | 33 +- .../src/main/js/helpers/common-utils.js | 10 + .../src/main/js/helpers/configuration-loader.js | 30 ++ .../js/helpers/generator/generator-common.js | 42 +- .../main/js/helpers/generator/generator-java.js | 249 ++++++----- .../main/js/helpers/generator/generator-pom.js | 95 ++-- .../helpers/generator/generator-properties.js | 15 + .../main/js/helpers/generator/generator-xml.js | 89 ++-- .../src/main/js/ignite_modules/README.txt | 6 + .../control-center-web/src/main/js/package.json | 159 ++++++- .../src/main/js/public/js/Blob.js | 211 --------- .../src/main/js/public/js/FileSaver.min.js | 2 - .../src/main/js/public/js/jszip.min.js | 14 - .../src/main/js/public/stylesheets/style.scss | 9 +- .../src/main/js/routes/clusters.js | 2 +- .../main/js/views/configuration/metadata.jade | 1 - .../main/js/views/configuration/sidebar.jade | 27 +- .../js/views/configuration/summary-tabs.jade | 1 + .../main/js/views/configuration/summary.jade | 24 +- .../src/main/js/views/includes/controls.jade | 14 +- .../src/main/js/views/includes/header.jade | 13 +- .../src/main/js/views/settings/profile.jade | 1 - .../src/main/js/views/sql/sql.jade | 14 +- .../src/main/js/views/templates/layout.jade | 40 +- .../store/jdbc/CacheAbstractJdbcStore.java | 34 +- .../dht/preloader/GridDhtPartitionSupplier.java | 3 + .../scala/org/apache/ignite/visor/visor.scala | 3 +- 48 files changed, 1415 insertions(+), 669 deletions(-) ----------------------------------------------------------------------