Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/b9adfbf0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/b9adfbf0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/b9adfbf0 Branch: refs/heads/master Commit: b9adfbf0c51313c22d4d3df562b0fe9e0cde5075 Parents: e5c87ce 66f843e Author: Manula Thantriwatte <[email protected]> Authored: Tue Feb 11 14:17:42 2014 +0530 Committer: Manula Thantriwatte <[email protected]> Committed: Tue Feb 11 14:17:42 2014 +0530 ---------------------------------------------------------------------- .gitignore | 3 + .../cloud/controller/pojo/CartridgeConfig.java | 10 + .../cloud/controller/pojo/CartridgeInfo.java | 10 + .../console/cartridge_info.jag | 9 + .../console/index.jag | 1 - .../console/modules/pinch.min.js | 4 + .../console/subscribe_cartridge.jag | 6 +- .../themes/theme1/partials/cartridge_info.hbs | 37 ++ .../themes/theme1/partials/cartridges.hbs | 18 +- .../themes/theme1/partials/mycartridges.hbs | 18 +- .../theme1/partials/subscribe_cartridge.hbs | 53 +- .../themes/theme1/renderers/cartridge_info.js | 42 ++ .../theme1/renderers/subscribe_cartridge.js | 8 +- .../console/themes/theme1/ui/css/main.css | 6 +- .../themes/theme1/ui/custom-fonts/style.css | 25 +- .../console/util/utility.jag | 7 + .../apache/stratos/manager/dto/Cartridge.java | 16 +- .../manager/lookup/LookupDataHolder.java | 21 + .../manager/lookup/SubscriptionContext.java | 2 + .../manager/CartridgeSubscriptionManager.java | 10 +- .../DataInsertionAndRetrievalManager.java | 15 + .../service/ApplicationManagementService.java | 2 +- .../subscription/CartridgeSubscription.java | 9 + .../utils/CartridgeSubscriptionUtils.java | 4 +- .../definition/CartridgeDefinitionBean.java | 2 + .../bean/util/converter/PojoConverter.java | 3 + .../rest/endpoint/services/ServiceUtils.java | 39 +- .../rest/endpoint/services/StratosAdmin.java | 10 + .../main/resources/CloudControllerService.wsdl | 604 ++++++++++--------- 29 files changed, 621 insertions(+), 373 deletions(-) ----------------------------------------------------------------------
