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/4abba97e Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/4abba97e Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/4abba97e Branch: refs/heads/master Commit: 4abba97e2860bb69354c036f6f5d1a1024c4ff0a Parents: 9f52ce6 5d0796a Author: Nirmal Fernando <[email protected]> Authored: Mon Feb 17 18:03:06 2014 +0530 Committer: Nirmal Fernando <[email protected]> Committed: Mon Feb 17 18:03:06 2014 +0530 ---------------------------------------------------------------------- .../stratos/cartridge/agent/CartridgeAgent.java | 3 + .../agent/util/CartridgeAgentConstants.java | 1 + .../cartridge/agent/util/ExtensionUtils.java | 21 +++++ .../stratos/cli/RestCommandLineService.java | 7 +- .../cli/beans/cartridge/CartridgeInfoBean.java | 21 ++++- .../stratos/cli/commands/SubscribeCommand.java | 33 +++++++- .../apache/stratos/cli/utils/CliConstants.java | 6 ++ .../impl/CloudControllerServiceImpl.java | 42 +++++----- .../cloud/controller/pojo/Cartridge.java | 33 ++++---- .../cloud/controller/pojo/CartridgeConfig.java | 30 +++---- .../cloud/controller/pojo/CartridgeInfo.java | 22 ++--- .../controller/pojo/PersistanceMapping.java | 84 -------------------- .../cloud/controller/pojo/Persistence.java | 48 +++++++++++ .../stratos/cloud/controller/pojo/Volume.java | 67 ++++++++++++++++ .../controller/util/CloudControllerUtil.java | 7 +- .../theme1/partials/subscribe_cartridge.hbs | 2 +- .../apache/stratos/manager/dto/Cartridge.java | 28 +++---- .../manager/CartridgeSubscriptionManager.java | 3 - .../subscription/CartridgeSubscription.java | 10 --- .../manager/subscription/SubscriptionData.java | 11 +-- .../utils/ApplicationManagementUtil.java | 2 +- .../rest/endpoint/bean/CartridgeInfoBean.java | 9 --- .../definition/CartridgeDefinitionBean.java | 14 +--- .../definition/PersistanceMappingBean.java | 38 --------- .../cartridge/definition/PersistenceBean.java | 46 +++++++++++ .../bean/cartridge/definition/VolumeBean.java | 39 +++++++++ .../rest/endpoint/bean/topology/Cluster.java | 17 ++++ .../rest/endpoint/bean/topology/Member.java | 17 ++++ .../bean/util/converter/PojoConverter.java | 43 +++++----- .../rest/endpoint/services/ServiceUtils.java | 16 +--- .../main/webapp/stratos/WEB-INF/cxf-servlet.xml | 2 +- .../src/main/extensions/mount_volumes.sh | 56 +++++++++++++ .../main/resources/CloudControllerService.wsdl | 26 +++--- 33 files changed, 497 insertions(+), 307 deletions(-) ----------------------------------------------------------------------
