Updated Branches: refs/heads/master 8fef6c851 -> 64a5cc85f
fixing subscription for multi tenant cartirdges Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/64a5cc85 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/64a5cc85 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/64a5cc85 Branch: refs/heads/master Commit: 64a5cc85f50a86cb2292739bcf51c971752e7900 Parents: 8fef6c8 Author: rekathiru <[email protected]> Authored: Fri Feb 14 13:49:01 2014 +0530 Committer: rekathiru <[email protected]> Committed: Fri Feb 14 13:49:01 2014 +0530 ---------------------------------------------------------------------- .../org.apache.stratos.manager.console/console/cartridges.jag | 4 ++-- .../org/apache/stratos/rest/endpoint/services/ServiceUtils.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/64a5cc85/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 ecb3795..999cc44 100644 --- a/components/org.apache.stratos.manager.console/console/cartridges.jag +++ b/components/org.apache.stratos.manager.console/console/cartridges.jag @@ -1,8 +1,8 @@ <% var caramel = require('caramel') var utils = require('/util/utility.jag'); -var availableSingleTenantCartridges = utils.consoleAppUtil.getAvailableSingleTenantCartridges(); +var availableCartridges = utils.consoleAppUtil.getCartridges(); caramel.render({ - cartridges:availableSingleTenantCartridges + cartridges:availableCartridges }); %> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/64a5cc85/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java index feb8e66..2ff0ff4 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java @@ -422,7 +422,7 @@ public class ServiceUtils { } static Cartridge getAvailableSingleTenantCartridgeInfo(String cartridgeType, Boolean multiTenant, ConfigurationContext configurationContext) throws ADCException, RestAPIException { - List<Cartridge> cartridges = getAvailableCartridges(null, multiTenant, configurationContext); + List<Cartridge> cartridges = getAvailableCartridges(null, null, configurationContext); for(Cartridge cartridge : cartridges) { if(cartridge.getCartridgeType().equals(cartridgeType)) { return cartridge;
