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/16e32f40 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/16e32f40 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/16e32f40 Branch: refs/heads/master Commit: 16e32f409e500ef0fbc52fc6ceda08b5f336d34c Parents: b7d5e7e 419a460 Author: Udara Liyanage <[email protected]> Authored: Thu Dec 5 10:39:08 2013 -0500 Committer: Udara Liyanage <[email protected]> Committed: Thu Dec 5 10:39:08 2013 -0500 ---------------------------------------------------------------------- .../client/CloudControllerServiceClient.java | 27 +++ .../impl/CloudControllerServiceImpl.java | 140 ++++++++---- .../interfaces/CloudControllerService.java | 8 + .../cloud/controller/pojo/Cartridge.java | 6 + .../cloud/controller/pojo/CartridgeConfig.java | 216 +++++++++++++++++++ .../cloud/controller/pojo/IaasConfig.java | 153 +++++++++++++ .../cloud/controller/pojo/IaasProvider.java | 48 ++--- .../cloud/controller/pojo/PortMapping.java | 5 + .../stratos/cloud/controller/pojo/Property.java | 4 + .../controller/util/CloudControllerUtil.java | 101 +++++++++ .../org.apache.stratos.rest.endpoint/pom.xml | 8 +- .../stratos/rest/endpoint/ServiceHolder.java | 7 + .../definition/CartridgeDefinitionBean.java | 108 ++++++++++ .../cartridge/definition/DeploymentBean.java | 46 ++++ .../cartridge/definition/IaasProviderBean.java | 62 ++++++ .../cartridge/definition/LoadBalancerBean.java | 44 ++++ .../cartridge/definition/PortMappingBean.java | 36 ++++ .../bean/cartridge/definition/PropertyBean.java | 30 +++ .../endpoint/bean/util/type/list/ListType.java | 39 ++++ .../endpoint/exception/RestAPIException.java | 50 +++++ .../rest/endpoint/services/ServiceUtils.java | 169 ++++++++++++++- .../rest/endpoint/services/StratosAdmin.java | 24 ++- .../main/resources/CloudControllerService.wsdl | 144 ++++++++++++- service-stubs/pom.xml | 1 + 24 files changed, 1393 insertions(+), 83 deletions(-) ----------------------------------------------------------------------
