Merge remote-tracking branch 'origin/ignite-843' into ignite-843
Conflicts:
modules/web-control-center/nodejs/views/error.jade
modules/webconfig/src/main/webapp/login.html
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b32bd3d9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b32bd3d9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b32bd3d9
Branch: refs/heads/ignite-843
Commit: b32bd3d94c80fada02d3d524065d201ee1bdfed8
Parents: 92c0698 8e79260
Author: AKuznetsov <akuznet...@gridgain.com>
Authored: Thu Jul 2 15:28:31 2015 +0700
Committer: AKuznetsov <akuznet...@gridgain.com>
Committed: Thu Jul 2 15:28:31 2015 +0700
----------------------------------------------------------------------
.../web-control-center/licenses/apache-2.0.txt | 202 ++++
modules/web-control-center/nodejs/.gitignore | 1 +
modules/web-control-center/nodejs/DEVNOTES.txt | 14 +
modules/web-control-center/nodejs/app.js | 125 +++
modules/web-control-center/nodejs/bin/www | 90 ++
.../nodejs/config/default.json | 8 +
.../web-control-center/nodejs/configuration.js | 22 +
modules/web-control-center/nodejs/db.js | 320 ++++++
modules/web-control-center/nodejs/package.json | 36 +
.../nodejs/public/favicon.ico | Bin 0 -> 1150 bytes
.../nodejs/public/form-models/caches.json | 804 +++++++++++++++
.../nodejs/public/form-models/clusters.json | 849 ++++++++++++++++
.../nodejs/public/form-models/persistence.json | 66 ++
.../nodejs/public/images/docker.png | Bin 0 -> 994 bytes
.../nodejs/public/images/java.png | Bin 0 -> 170 bytes
.../nodejs/public/images/logo.png | Bin 0 -> 8148 bytes
.../nodejs/public/images/xml.png | Bin 0 -> 232 bytes
.../nodejs/public/javascripts/bundle.js | 18 +
.../public/javascripts/controllers/caches.js | 237 +++++
.../public/javascripts/controllers/clusters.js | 207 ++++
.../public/javascripts/controllers/common.js | 169 ++++
.../javascripts/controllers/persistences.js | 202 ++++
.../public/javascripts/controllers/summary.js | 137 +++
.../nodejs/public/javascripts/dataStructures.js | 84 ++
.../nodejs/public/stylesheets/style.css | 1 +
.../nodejs/public/stylesheets/style.less | 997 +++++++++++++++++++
.../web-control-center/nodejs/routes/auth.js | 74 ++
.../web-control-center/nodejs/routes/caches.js | 91 ++
.../nodejs/routes/clusters.js | 100 ++
.../nodejs/routes/configGenerator.js | 69 ++
.../web-control-center/nodejs/routes/pages.js | 68 ++
.../nodejs/routes/persistences.js | 313 ++++++
.../nodejs/test/routes/persistence.js | 32 +
.../nodejs/utils/generatorJava.js | 555 +++++++++++
.../nodejs/utils/generatorUtils.js | 227 +++++
.../nodejs/utils/generatorXml.js | 502 ++++++++++
.../web-control-center/nodejs/views/caches.jade | 68 ++
.../nodejs/views/clients.jade | 26 +
.../nodejs/views/clusters.jade | 71 ++
.../web-control-center/nodejs/views/error.jade | 22 +
.../nodejs/views/includes/controls.jade | 193 ++++
.../nodejs/views/includes/footer.jade | 23 +
.../nodejs/views/includes/header.jade | 36 +
.../web-control-center/nodejs/views/index.jade | 29 +
.../nodejs/views/layout-sidebar.jade | 37 +
.../web-control-center/nodejs/views/layout.jade | 59 ++
.../web-control-center/nodejs/views/login.jade | 47 +
.../nodejs/views/persistence.jade | 115 +++
.../web-control-center/nodejs/views/sql.jade | 23 +
.../nodejs/views/summary.jade | 93 ++
.../nodejs/views/templates/select.jade | 26 +
modules/webconfig/licenses/apache-2.0.txt | 202 ----
modules/webconfig/nodejs/.gitignore | 1 -
modules/webconfig/nodejs/DEVNOTES.txt | 14 -
modules/webconfig/nodejs/app.js | 125 ---
modules/webconfig/nodejs/bin/www | 90 --
modules/webconfig/nodejs/config/default.json | 8 -
modules/webconfig/nodejs/configuration.js | 22 -
modules/webconfig/nodejs/db.js | 320 ------
modules/webconfig/nodejs/package.json | 36 -
modules/webconfig/nodejs/public/favicon.ico | Bin 1150 -> 0 bytes
.../nodejs/public/form-models/caches.json | 804 ---------------
.../nodejs/public/form-models/clusters.json | 849 ----------------
.../nodejs/public/form-models/persistence.json | 66 --
.../webconfig/nodejs/public/images/docker.png | Bin 994 -> 0 bytes
modules/webconfig/nodejs/public/images/java.png | Bin 170 -> 0 bytes
modules/webconfig/nodejs/public/images/logo.png | Bin 8148 -> 0 bytes
modules/webconfig/nodejs/public/images/xml.png | Bin 232 -> 0 bytes
.../nodejs/public/javascripts/bundle.js | 18 -
.../public/javascripts/controllers/caches.js | 237 -----
.../public/javascripts/controllers/clusters.js | 207 ----
.../public/javascripts/controllers/common.js | 169 ----
.../javascripts/controllers/persistences.js | 202 ----
.../public/javascripts/controllers/summary.js | 137 ---
.../nodejs/public/javascripts/dataStructures.js | 84 --
.../nodejs/public/stylesheets/style.css | 1 -
.../nodejs/public/stylesheets/style.less | 997 -------------------
modules/webconfig/nodejs/routes/auth.js | 74 --
modules/webconfig/nodejs/routes/caches.js | 91 --
modules/webconfig/nodejs/routes/clusters.js | 100 --
.../webconfig/nodejs/routes/configGenerator.js | 69 --
modules/webconfig/nodejs/routes/pages.js | 68 --
modules/webconfig/nodejs/routes/persistences.js | 313 ------
.../webconfig/nodejs/test/routes/persistence.js | 32 -
modules/webconfig/nodejs/utils/generatorJava.js | 555 -----------
.../webconfig/nodejs/utils/generatorUtils.js | 227 -----
modules/webconfig/nodejs/utils/generatorXml.js | 502 ----------
modules/webconfig/nodejs/views/caches.jade | 68 --
modules/webconfig/nodejs/views/clients.jade | 26 -
modules/webconfig/nodejs/views/clusters.jade | 71 --
.../nodejs/views/includes/controls.jade | 193 ----
.../webconfig/nodejs/views/includes/footer.jade | 23 -
.../webconfig/nodejs/views/includes/header.jade | 36 -
modules/webconfig/nodejs/views/index.jade | 29 -
.../webconfig/nodejs/views/layout-sidebar.jade | 37 -
modules/webconfig/nodejs/views/layout.jade | 59 --
modules/webconfig/nodejs/views/login.jade | 47 -
modules/webconfig/nodejs/views/persistence.jade | 115 ---
modules/webconfig/nodejs/views/sql.jade | 23 -
modules/webconfig/nodejs/views/summary.jade | 93 --
.../nodejs/views/templates/select.jade | 26 -
modules/webconfig/pom.xml | 172 ----
.../server/auth/AjaxAuthenticationHandler.java | 80 --
.../server/auth/AuthenticationProviderImpl.java | 62 --
.../server/auth/UserAuthentication.java | 103 --
.../ClusterConfigurationController.java | 57 --
.../server/controller/JsonResponseBean.java | 76 --
.../server/controller/UsersController.java | 128 ---
.../server/dao/ClusterConfigurationDao.java | 41 -
.../ignite/webconfig/server/dao/UserDao.java | 45 -
.../impl/MongoClusterConfigurationDaoImpl.java | 54 -
.../server/dao/impl/MongoSpringBean.java | 103 --
.../server/dao/impl/MongoUserDaoImpl.java | 135 ---
.../server/dao/impl/MorphiaSpringBean.java | 58 --
.../webconfig/server/launcher/Launcher.java | 44 -
.../server/model/ClusterConfiguration.java | 117 ---
.../ignite/webconfig/server/model/User.java | 104 --
.../webconfig/src/main/webapp/WEB-INF/web.xml | 40 -
modules/webconfig/src/main/webapp/login.html | 42 -
119 files changed, 7488 insertions(+), 8927 deletions(-)
----------------------------------------------------------------------
