Updated Branches: refs/heads/master dfe1823e0 -> ddd5558ab
tenant management integration bits Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/ddd5558a Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/ddd5558a Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/ddd5558a Branch: refs/heads/master Commit: ddd5558ab778c9a4975cf902dd264b075cc82d16 Parents: dfe1823 Author: Pradeep Fernando <[email protected]> Authored: Sun Jan 19 18:57:05 2014 +0530 Committer: Pradeep Fernando <[email protected]> Committed: Sun Jan 19 18:57:05 2014 +0530 ---------------------------------------------------------------------- .../console/tenant_management.jag | 7 ++++--- .../console/util/utility.jag | 4 ++++ 2 files changed, 8 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ddd5558a/components/org.apache.stratos.manager.console/console/tenant_management.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/tenant_management.jag b/components/org.apache.stratos.manager.console/console/tenant_management.jag index cfaa805..ca341fd 100644 --- a/components/org.apache.stratos.manager.console/console/tenant_management.jag +++ b/components/org.apache.stratos.manager.console/console/tenant_management.jag @@ -1,11 +1,12 @@ <% +var log = new Log("console.tenant_management"); var caramel = require('caramel'); -var tenants = require('data/tenants.json'); +var utils = require('/util/utility.jag'); +var tenants = utils.consoleAppUtil.getTenants(); var config_status = require('/data/config_status.json'); -var log = new Log(); log.info(tenants); caramel.render({ - tenants:tenants, + tenants:tenants.tenantInfoBean, config_status:config_status }); %> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ddd5558a/components/org.apache.stratos.manager.console/console/util/utility.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/util/utility.jag b/components/org.apache.stratos.manager.console/console/util/utility.jag index aaf66cf..2e36360 100644 --- a/components/org.apache.stratos.manager.console/console/util/utility.jag +++ b/components/org.apache.stratos.manager.console/console/util/utility.jag @@ -89,6 +89,10 @@ consoleAppUtil = new function(){ return this.sendReceive("GET","/cartridge/list/subscribed",{}).data; } + this.getTenants = function(){ + return this.sendReceive("GET","/tenant/list",{}).data; + }; + this.deployCartridgeDefinition = function(cartridgeDefinition){ return this.send("POST","/cartridge/definition",cartridgeDefinition).data; };
