Updated Branches: refs/heads/master e1e6a7b9c -> a037318a6
fixing error handling, cartridge category issues and adding missed new files Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/a037318a Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/a037318a Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/a037318a Branch: refs/heads/master Commit: a037318a6e4821296396a053cbf127ec68c65714 Parents: e1e6a7b Author: rekathiru <[email protected]> Authored: Fri Feb 14 12:55:01 2014 +0530 Committer: rekathiru <[email protected]> Committed: Fri Feb 14 12:55:01 2014 +0530 ---------------------------------------------------------------------- .../console/cartridges.jag | 26 +++++-- .../controllers/cartridgeUnsubscribeSubmit.jag | 11 +++ .../themes/theme1/renderers/cartridges.js | 3 +- .../console/themes/theme1/ui/js/mycartridges.js | 12 +++ .../console/themes/theme1/ui/js/popup.js | 80 ++++++++++++++++++++ .../stratos/rest/endpoint/bean/Error.java | 25 ++++++ 6 files changed, 150 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a037318a/components/org.apache.stratos.manager.console/console/cartridges.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/cartridges.jag b/components/org.apache.stratos.manager.console/console/cartridges.jag index 9c020bb..82f8e2f 100644 --- a/components/org.apache.stratos.manager.console/console/cartridges.jag +++ b/components/org.apache.stratos.manager.console/console/cartridges.jag @@ -1,8 +1,22 @@ <% -var caramel = require('caramel') -var utils = require('/util/utility.jag'); -var availableSingleTenantCartridges = utils.consoleAppUtil.getCartridges(); -caramel.render({ - cartridges:availableSingleTenantCartridges -}); + var caramel = require('caramel') + var utils = require('/util/utility.jag'); + var availableSingleTenantCartridges = utils.consoleAppUtil.getCartridges(); + availableSingleTenantCartridges = availableSingleTenantCartridges.cartridge; + + + var log = new Log("config.stratos"); + for(var i=0;i<availableSingleTenantCartridges.length;i++) { + if(availableSingleTenantCartridges[i].loadBalancer == true ) { + availableSingleTenantCartridges.splice(i,1); + i = i - 1; + } + } + log.info("~~~~~~~~~~~~~: " + stringify(availableSingleTenantCartridges)); + + var availableLbCartridges = utils.consoleAppUtil.getLbCartridges(); + caramel.render({ + cartridges:availableSingleTenantCartridges, + lbcartridges:availableLbCartridges + }); %> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a037318a/components/org.apache.stratos.manager.console/console/controllers/cartridgeUnsubscribeSubmit.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/controllers/cartridgeUnsubscribeSubmit.jag b/components/org.apache.stratos.manager.console/console/controllers/cartridgeUnsubscribeSubmit.jag new file mode 100755 index 0000000..e71a4fd --- /dev/null +++ b/components/org.apache.stratos.manager.console/console/controllers/cartridgeUnsubscribeSubmit.jag @@ -0,0 +1,11 @@ +<% +(function(){ + var log = new Log("controller.cartridgeSubscribeSubmit"); + var utils = require('/util/utility.jag'); + var alias = request.getParameter('alias'); + log.info("(((((((((((((((((((((((((((((("); + log.info(alias); + var result = utils.consoleAppUtil.unsubscribeCartridge(alias); + response.sendRedirect(request.getContextPath() + '/index.jag'); +}()); +%> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a037318a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/cartridges.js ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/cartridges.js b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/cartridges.js index 4e8e156..c68995c 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/cartridges.js +++ b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/cartridges.js @@ -1,7 +1,8 @@ var render = function (theme, data, meta, require) { // Re-create the data structure of the cartridges. var log = new Log(); - var cartridges_old = data.cartridges.cartridge; + var cartridges_old = data.cartridges; + var lb_cartridges_old = data.availableLbCartridges; var cartridges_new = [ { kind: "Framework", http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a037318a/components/org.apache.stratos.manager.console/console/themes/theme1/ui/js/mycartridges.js ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/ui/js/mycartridges.js b/components/org.apache.stratos.manager.console/console/themes/theme1/ui/js/mycartridges.js new file mode 100644 index 0000000..e3614e8 --- /dev/null +++ b/components/org.apache.stratos.manager.console/console/themes/theme1/ui/js/mycartridges.js @@ -0,0 +1,12 @@ +$(function () { + $('#unsubscribeBtn').click(function () { + $('#alias').val($(this).attr('data-alias')); + popbox.message({content: '<div>Un-subscribe will delete all your instances.</div><div>Are you sure you want to un-subscribe?</div>', type: 'confirm', + okCallback: function () { + $('#cForm').submit(); + }, + cancelCallback: function () { + } + }); + }); +}); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a037318a/components/org.apache.stratos.manager.console/console/themes/theme1/ui/js/popup.js ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/ui/js/popup.js b/components/org.apache.stratos.manager.console/console/themes/theme1/ui/js/popup.js new file mode 100644 index 0000000..b326551 --- /dev/null +++ b/components/org.apache.stratos.manager.console/console/themes/theme1/ui/js/popup.js @@ -0,0 +1,80 @@ +var popbox = popbox || {}; + +(function () { +popbox.messageDisplay = function (params) { + $('#messageModal').html($('#confirmation-data').html()); + if(params.title == undefined){ + $('#messageModal h3.modal-title').html('API Store'); + }else{ + $('#messageModal h3.modal-title').html(params.title); + } + $('#messageModal div.modal-body').html(params.content); + if(params.buttons != undefined){ + $('#messageModal a.btn-primary').hide(); + for(var i=0;i<params.buttons.length;i++){ + $('#messageModal div.modal-footer').append($('<a class="btn '+params.buttons[i].cssClass+'">'+params.buttons[i].name+'</a>').click(params.buttons[i].cbk)); + } + }else{ + $('#messageModal a.btn-primary').html('OK').click(function() { + $('#messageModal').modal('hide'); + }); + } + $('#messageModal a.btn-other').hide(); + $('#messageModal').modal(); +}; +/* + usage + Show info dialog + popbox.message({content:'foo',type:'info', cbk:function(){alert('Do something here.')} }); + + Show warning + dialog popbox.message({content:'foo',type:'warning', cbk:function(){alert('Do something here.')} }); + + Show error dialog + popbox.message({content:'foo',type:'error', cbk:function(){alert('Do something here.')} }); + + Show confirm dialog + popbox.message({content:'foo',type:'confirm',okCallback:function(){},cancelCallback:function(){}}); + */ +popbox.message = function(params){ + if(params.type == "custom"){ + popbox.messageDisplay(params); + return; + } + if(params.type == "confirm"){ + if( params.title == undefined ){ params.title = "API Store"} + popbox.messageDisplay({content:params.content,title:params.title ,buttons:[ + {name:"Yes",cssClass:"btn btn-primary",cbk:function() { + $('#messageModal').modal('hide'); + if(typeof params.okCallback == "function") {params.okCallback()}; + }}, + {name:"No",cssClass:"btn",cbk:function() { + $('#messageModal').modal('hide'); + if(typeof params.cancelCallback == "function") {params.cancelCallback()}; + }} + ] + }); + return; + } + var iconClass = "fa fa-times-circle-o"; + if(params.type == "info"){ iconClass = "info fa fa-info-circle"} + if(params.type == "warning"){ iconClass = "warning fa fa-exclamation-circle"} + if(params.type == "error"){ iconClass = "error fa fa-times-circle-o"} + if(params.type == "confirm"){ iconClass = "confirm fa fa-question-circle"} + params.content = '<table class="msg-table"><tr><td class="imageCell"><i class="'+iconClass+'"></i></td><td><span class="messageText">'+params.content+'</span></td></tr></table>'; + var type = ""; + if(params.title == undefined){ + if(params.type == "info"){ type = "Notification"} + if(params.type == "warning"){ type = "Warning"} + if(params.type == "error"){ type = "Error"} + } + popbox.messageDisplay({content:params.content,title:"API Store - " + type,buttons:[ + {name:"OK",cssClass:"btn btn-primary",cbk:function() { + $('#messageModal').modal('hide'); + if(params.cbk && typeof params.cbk == "function") + params.cbk(); + }} + ] + }); +}; +}()); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a037318a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/Error.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/Error.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/Error.java new file mode 100644 index 0000000..5711dee --- /dev/null +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/Error.java @@ -0,0 +1,25 @@ +package org.apache.stratos.rest.endpoint.bean; + +import javax.xml.bind.annotation.XmlRootElement; + +@XmlRootElement(name = "error") +public class Error { + private int errorCode; + private String errorMessage; + + public int getErrorCode() { + return errorCode; + } + + public void setErrorCode(int errorCode) { + this.errorCode = errorCode; + } + + public String getErrorMessage() { + return errorMessage; + } + + public void setErrorMessage(String errorMessage) { + this.errorMessage = errorMessage; + } +}
