Repository: incubator-ignite Updated Branches: refs/heads/ignite-843 e161346cf -> a03d6876b
IGNITE-843 Implemented agent download. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a03d6876 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a03d6876 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a03d6876 Branch: refs/heads/ignite-843 Commit: a03d6876b9a62f5fbb47267be44dea3cb72479aa Parents: e161346 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Fri Aug 14 13:50:55 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Fri Aug 14 13:50:55 2015 +0700 ---------------------------------------------------------------------- .../main/js/controllers/metadata-controller.js | 27 ++++++++++++++++++-- .../src/main/js/public/stylesheets/style.scss | 4 +++ .../src/main/js/routes/agent.js | 2 +- .../js/views/configuration/metadata-load.jade | 10 ++++++++ .../configuration/CacheConfiguration.java | 4 +-- 5 files changed, 42 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a03d6876/modules/control-center-web/src/main/js/controllers/metadata-controller.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/controllers/metadata-controller.js b/modules/control-center-web/src/main/js/controllers/metadata-controller.js index 7f79808..c3e41cf 100644 --- a/modules/control-center-web/src/main/js/controllers/metadata-controller.js +++ b/modules/control-center-web/src/main/js/controllers/metadata-controller.js @@ -187,8 +187,16 @@ controlCenterModule.controller('metadataController', [ else $common.showError('JDBC drivers not found!'); }) - .error(function (errMsg) { - $common.showError(errMsg); + .error(function (errMsg, status) { + if (status == 503) + loadMetaModal.$promise.then(function () { + $scope.loadMeta.action = 'download'; + $scope.loadMeta.tables = []; + + loadMetaModal.show(); + }); + else + $common.showError(errMsg); }); }; @@ -205,6 +213,21 @@ controlCenterModule.controller('metadataController', [ }); }; + $scope.downloadAgent = function () { + loadMetaModal.hide(); + + var lnk = document.createElement('a'); + + lnk.setAttribute('href', '/agent/agent.zip'); + lnk.style.display = 'none'; + + document.body.appendChild(lnk); + + lnk.click(); + + document.body.removeChild(lnk); + }; + $scope.saveSelectedMetadata = function (preset) { loadMetaModal.hide(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a03d6876/modules/control-center-web/src/main/js/public/stylesheets/style.scss ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/public/stylesheets/style.scss b/modules/control-center-web/src/main/js/public/stylesheets/style.scss index 5bf9c9a..5debf53 100644 --- a/modules/control-center-web/src/main/js/public/stylesheets/style.scss +++ b/modules/control-center-web/src/main/js/public/stylesheets/style.scss @@ -1242,6 +1242,10 @@ a { padding-bottom: 10px; } +.metadata-download { + padding: 10px 10px 10px 20px; +} + .theme-line .panel-title h3 { margin-top: 20px; margin-bottom: 20px; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a03d6876/modules/control-center-web/src/main/js/routes/agent.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/routes/agent.js b/modules/control-center-web/src/main/js/routes/agent.js index 9886e86..6019ba1 100644 --- a/modules/control-center-web/src/main/js/routes/agent.js +++ b/modules/control-center-web/src/main/js/routes/agent.js @@ -25,7 +25,7 @@ function _client(req, res) { var client = agentManager.getAgentManager().findClient(req.currentUserId()); if (!client) { - res.status(500).send("Client not found"); + res.status(503).send("Client not found"); return null; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a03d6876/modules/control-center-web/src/main/js/views/configuration/metadata-load.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/views/configuration/metadata-load.jade b/modules/control-center-web/src/main/js/views/configuration/metadata-load.jade index 9eaeba6..8d514ca 100644 --- a/modules/control-center-web/src/main/js/views/configuration/metadata-load.jade +++ b/modules/control-center-web/src/main/js/views/configuration/metadata-load.jade @@ -22,6 +22,15 @@ include ../includes/controls #errors-container.modal-header.header button.close(type='button' ng-click='$hide()' aria-hidden='true') × h4.modal-title Load metadata from database + .metadata-download(ng-show='loadMeta.action == "download"') + |Connection to web agent is not established!<br/><br/> + |How to extract metadata from database: + ul + li Download web agent. + li Unzip web agent to some folder. + li Create a "driver" subfolder and copy there JDBC driver for your database. + li Start web agent with "agent.sh" (to see agent usage: "agent.sh -h"). + div(ng-show='loadMeta.action == "connect"') form.form-horizontal(name='loadForm' novalidate) .modal-body @@ -51,6 +60,7 @@ include ../includes/controls div(st-pagination st-items-by-page='10' st-displayed-pages='5') .modal-footer + button.btn.btn-primary(ng-show='loadMeta.action == "download"' ng-click='downloadAgent()') Download button.btn.btn-primary(ng-show='loadMeta.action == "connect"' ng-disabled='loadForm.$invalid' ng-click='loadMetadataFromDb()') Load metadata button.btn.btn-primary(ng-show='loadMeta.action == "tables"' ng-click='loadMeta.action = "connect"') Prev button.btn.btn-primary(ng-show='loadMeta.action == "tables"' ng-click='saveSelectedMetadata()') Save http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a03d6876/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java index 3ad0f01..3936b76 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java @@ -749,7 +749,7 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> { * <li>{@link IgniteCache#getAndRemove(Object)}</li> * <li>{@link IgniteCache#getAndReplace(Object, Object)}</li> * <li>{@link IgniteCache#getAndPutIfAbsent(Object, Object)}</li> - *</ul> + * </ul> * * @return Load previous value flag. */ @@ -769,7 +769,7 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> { * <li>{@link IgniteCache#getAndRemove(Object)}</li> * <li>{@link IgniteCache#getAndReplace(Object, Object)}</li> * <li>{@link IgniteCache#getAndPutIfAbsent(Object, Object)}</li> - *</ul> + * </ul> * When not set, default value is {@link #DFLT_LOAD_PREV_VAL}. * * @param loadPrevVal Load previous value flag.
