Merge remote-tracking branch 'origin/ignite-843' into ignite-843 # Conflicts: # modules/webconfig/nodejs/routes/persistence.js
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2b403d22 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2b403d22 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2b403d22 Branch: refs/heads/ignite-843 Commit: 2b403d22b1abff5eb4dbc750197f709143f57c5f Parents: f350d12 9005bd1 Author: Andrey <anovi...@gridgain.com> Authored: Thu Jun 25 11:06:23 2015 +0700 Committer: Andrey <anovi...@gridgain.com> Committed: Thu Jun 25 11:06:23 2015 +0700 ---------------------------------------------------------------------- modules/webconfig/nodejs/db.js | 100 ++++++--- .../nodejs/public/form-models/caches.json | 200 +++++++++++++++--- .../nodejs/public/form-models/persistence.json | 20 +- .../javascripts/controllers/persistence.js | 17 +- .../webconfig/nodejs/routes/configGenerator.js | 2 +- modules/webconfig/nodejs/routes/persistence.js | 74 ++++++- modules/webconfig/nodejs/utils/generatorJava.js | 170 ++++++++------- .../webconfig/nodejs/utils/generatorUtils.js | 71 ++++++- modules/webconfig/nodejs/utils/generatorXml.js | 210 ++++++++++++++++--- modules/webconfig/nodejs/views/clusters.jade | 2 +- .../nodejs/views/includes/controls.jade | 7 + modules/webconfig/nodejs/views/persistence.jade | 14 +- 12 files changed, 719 insertions(+), 168 deletions(-) ----------------------------------------------------------------------
