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/81399c54 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/81399c54 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/81399c54 Branch: refs/heads/master Commit: 81399c54ac3e857200ada840363103c3d39e957f Parents: 75dbd67 e20b3ea Author: Nirmal Fernando <[email protected]> Authored: Thu Mar 27 11:51:40 2014 +0530 Committer: Nirmal Fernando <[email protected]> Committed: Thu Mar 27 11:51:40 2014 +0530 ---------------------------------------------------------------------- .../cloud/controller/pojo/Cartridge.java | 12 +++ .../cloud/controller/pojo/CartridgeConfig.java | 12 +++ .../controller/util/CloudControllerUtil.java | 2 +- .../apache/stratos/manager/dto/Cartridge.java | 10 +++ .../manager/service/RepositoryInfoBean.java | 11 +-- .../InternalRepoBasedCartridgeSubscription.java | 78 ++++++++++++++++++++ .../manager/subscription/SubscriptionData.java | 9 +++ .../factory/CartridgeSubscriptionFactory.java | 3 + .../manager/utils/CartridgeConstants.java | 3 + .../manager/utils/RepositoryCreator.java | 18 +++-- .../rest/endpoint/bean/CartridgeInfoBean.java | 9 +++ .../definition/CartridgeDefinitionBean.java | 2 + .../bean/util/converter/PojoConverter.java | 2 +- .../rest/endpoint/services/ServiceUtils.java | 3 +- .../main/resources/CloudControllerService.wsdl | 1 + 15 files changed, 157 insertions(+), 18 deletions(-) ----------------------------------------------------------------------
