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/081f9fc9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/081f9fc9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/081f9fc9 Branch: refs/heads/master Commit: 081f9fc950f1fd032bb0c803d611010a9246f000 Parents: 3e1c83e e2c0a2a Author: Sajith Kariyawasam <[email protected]> Authored: Thu Dec 12 17:47:44 2013 +0530 Committer: Sajith Kariyawasam <[email protected]> Committed: Thu Dec 12 17:47:44 2013 +0530 ---------------------------------------------------------------------- .../adc/mgt/client/AutoscalerServiceClient.java | 6 +- .../adc/mgt/client/CartridgeAgentClient.java | 4 +- .../client/CloudControllerServiceClient.java | 2 +- .../mgt/publisher/TenantSynzhronizerTask.java | 4 +- .../adc/mgt/utils/CartridgeConstants.java | 3 +- .../org.apache.stratos.autoscaler/pom.xml | 4 +- .../src/main/resources/META-INF/component.xml | 5 +- .../apache/stratos/cli/CartridgeInfoBean.java | 18 ++++ .../stratos/cli/RestCommandLineService.java | 27 +++-- .../apache/stratos/cli/StratosApplication.java | 11 ++ .../stratos/cli/commands/SubscribeCommand.java | 54 +++++++--- .../apache/stratos/cli/utils/CliConstants.java | 24 +++-- .../impl/CloudControllerServiceImpl.java | 103 ++++++------------- .../cloud/controller/pojo/Cartridge.java | 9 -- .../runtime/FasterLookUpDataHolder.java | 4 + .../controller/topology/TopologyBuilder.java | 52 ++++------ .../topology/TopologyEventSender.java | 4 +- .../controller/util/CloudControllerUtil.java | 5 +- .../bean/util/converter/PojoConverter.java | 4 +- .../AverageLoadAverageEventFormatter.xml | 2 +- .../AverageMemoryConsumptionEventFormatter.xml | 2 +- .../FaultMessageEventFormatter.xml | 2 +- .../GradientLoadAverageEventFormatter.xml | 2 +- .../GradientMemoryConsumptionEventFormatter.xml | 2 +- ...econdDerivativeLoadAverageEventFormatter.xml | 2 +- ...erivativeMemoryConsumptionEventFormatter.xml | 2 +- .../execution-plans/AverageHeathRequest.xml | 6 +- .../AverageInFlightRequestsFinder.xml | 2 +- .../execution-plans/GradientOfHealthRequest.xml | 6 +- .../GradientOfRequestsInFlightFinder.xml | 2 +- .../SecondDerivativeOfHealthRequest.xml | 4 +- ...SecondDerivativeOfRequestsInFlightFinder.xml | 2 +- .../stream-manager-config.xml | 6 -- .../pom.xml | 8 ++ .../ec2/load-balancer/cartridge-agent.sh | 89 ++++++++++++++++ .../ec2/load-balancer/start-load-balancer.sh | 7 ++ .../templates/loadbalancer.conf.template | 10 +- .../agent/health/publisher/HealthPublisher.java | 10 +- .../modules/distribution/src/assembly/bin.xml | 3 +- .../src/main/conf/cartridge-config.properties | 65 ++++++++++++ .../resources/stratos_foundation.sql | 2 +- 41 files changed, 389 insertions(+), 190 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/081f9fc9/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/utils/CartridgeConstants.java ----------------------------------------------------------------------
