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/20a61a92 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/20a61a92 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/20a61a92 Branch: refs/heads/master Commit: 20a61a92103035922467d09d206c3fc666fae1c3 Parents: 6207e28 1f94362 Author: Melan Nimesh <[email protected]> Authored: Mon Feb 17 18:39:22 2014 +0530 Committer: Melan Nimesh <[email protected]> Committed: Mon Feb 17 18:39:22 2014 +0530 ---------------------------------------------------------------------- .../health/AutoscalerHealthStatReceiver.java | 7 +- .../topology/AutoscalerTopologyReceiver.java | 7 +- .../stratos/cartridge/agent/CartridgeAgent.java | 3 + .../agent/util/CartridgeAgentConstants.java | 1 + .../cartridge/agent/util/ExtensionUtils.java | 21 + .../stratos/cli/RestCommandLineService.java | 469 ++++++++++--------- .../cli/beans/cartridge/CartridgeInfoBean.java | 30 +- .../stratos/cli/commands/SubscribeCommand.java | 53 ++- .../apache/stratos/cli/utils/CliConstants.java | 9 + .../controller/iaases/OpenstackNovaIaas.java | 8 +- .../impl/CloudControllerServiceImpl.java | 81 +++- .../cloud/controller/pojo/Cartridge.java | 33 +- .../cloud/controller/pojo/CartridgeConfig.java | 30 +- .../cloud/controller/pojo/CartridgeInfo.java | 22 +- .../cloud/controller/pojo/ClusterContext.java | 16 +- .../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 +- .../SubscriptionSingleTenantBehaviour.java | 19 +- .../StratosManagerTopologyReceiver.java | 4 + .../utils/ApplicationManagementUtil.java | 2 +- .../health/stat/HealthStatReceiver.java | 7 +- .../InstanceNotifierEventMessageReceiver.java | 7 +- .../message/receiver/tenant/TenantReceiver.java | 7 +- .../receiver/topology/TopologyReceiver.java | 7 +- .../stratos/messaging/util/Constants.java | 1 + .../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 | 42 +- .../rest/endpoint/services/StratosAdmin.java | 16 +- .../main/webapp/stratos/WEB-INF/cxf-servlet.xml | 2 +- .../extension/FaultHandlingWindowProcessor.java | 8 +- .../src/main/extensions/mount_volumes.sh | 56 +++ .../main/resources/CloudControllerService.wsdl | 26 +- 46 files changed, 886 insertions(+), 591 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/20a61a92/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java ----------------------------------------------------------------------
