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/9af8ef7b Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/9af8ef7b Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/9af8ef7b Branch: refs/heads/master Commit: 9af8ef7be38d27c52e84d1e7d69e730f52d97e40 Parents: 29bd106 2781d99 Author: Sajith Kariyawasam <[email protected]> Authored: Tue Feb 11 12:16:06 2014 +0530 Committer: Sajith Kariyawasam <[email protected]> Committed: Tue Feb 11 12:16:06 2014 +0530 ---------------------------------------------------------------------- .../cloud/controller/pojo/CartridgeConfig.java | 10 + .../cloud/controller/pojo/CartridgeInfo.java | 10 + .../apache/stratos/manager/dto/Cartridge.java | 16 +- .../manager/CartridgeSubscriptionManager.java | 10 +- .../service/ApplicationManagementService.java | 2 +- .../subscription/CartridgeSubscription.java | 9 + .../definition/CartridgeDefinitionBean.java | 2 + .../bean/util/converter/PojoConverter.java | 3 + .../rest/endpoint/services/ServiceUtils.java | 53 +- .../rest/endpoint/services/StratosAdmin.java | 21 + .../main/resources/CloudControllerService.wsdl | 604 ++++++++++--------- 11 files changed, 424 insertions(+), 316 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/9af8ef7b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/CartridgeSubscription.java ----------------------------------------------------------------------
