fixing merge confilcts in CC component
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/5f3e10b8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/5f3e10b8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/5f3e10b8 Branch: refs/heads/master Commit: 5f3e10b8c88de7f0483d502f42bd7ad7cdbe7b38 Parents: 5660364 0e94cb7 Author: Isuru <[email protected]> Authored: Wed Dec 4 23:26:07 2013 +0530 Committer: Isuru <[email protected]> Committed: Wed Dec 4 23:26:07 2013 +0530 ---------------------------------------------------------------------- .../mgt/listener/InstanceStatusListener.java | 60 ++-- .../stratos/autoscaler/AutoscalerContext.java | 2 +- .../impl/CloudControllerServiceImpl.java | 136 ++++--- .../interfaces/CloudControllerService.java | 8 + .../cloud/controller/pojo/Cartridge.java | 6 + .../cloud/controller/pojo/CartridgeConfig.java | 2 + .../cloud/controller/pojo/IaasConfig.java | 64 +++- .../cloud/controller/pojo/IaasProvider.java | 48 +-- .../controller/util/CloudControllerUtil.java | 101 ++++++ .../statistics/WSO2CEPStatsPublisher.java | 10 +- .../load/balancer/LoadBalancerContext.java | 2 +- .../internal/LoadBalancerServiceComponent.java | 7 +- .../broker/publish/TopicPublisher.java | 2 +- .../cartridge-agent/ec2/php/cartridge-agent.sh | 75 +--- .../git/impl/GitBasedArtifactRepository.java | 21 ++ .../event/subscriber/ArtifactListener.java | 57 ++- .../subscriber/CartridgeAgentConstants.java | 3 + .../event/subscriber/LaunchParamsUtil.java | 58 +++ .../cartridge/agent/event/subscriber/Main.java | 22 +- .../pom.xml | 131 +++++++ .../src/main/resources/AutoScalerService.wsdl | 359 +++++++++++++++++++ .../main/resources/CloudControllerService.wsdl | 144 +++++++- 22 files changed, 1088 insertions(+), 230 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5f3e10b8/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/CartridgeConfig.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5f3e10b8/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/IaasConfig.java ---------------------------------------------------------------------- diff --cc components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/IaasConfig.java index 70ac73d,b20f2d3..dfddde8 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/IaasConfig.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/pojo/IaasConfig.java @@@ -27,8 -27,16 +27,17 @@@ import java.io.Serializable */ public class IaasConfig implements Serializable { - private String type; + + private static final long serialVersionUID = 3329046207651171707L; + + private String type; + + private String className; + + private String name; + + private String provider, identity, credential; + private String imageId; private int maxInstanceLimit;
