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/de87ec62 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/de87ec62 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/de87ec62 Branch: refs/heads/master Commit: de87ec6262927f36ff7e5810374c70e8b2ffdcad Parents: 19c8cda eadddc1 Author: Lahiru Sandaruwan <[email protected]> Authored: Mon Mar 31 00:12:14 2014 -0700 Committer: Lahiru Sandaruwan <[email protected]> Committed: Mon Mar 31 00:12:14 2014 -0700 ---------------------------------------------------------------------- .../org.apache.stratos.cloud.controller/pom.xml | 6 +- .../TopologySynchronizerTaskScheduler.java | 91 +-- .../main/resources/conf/cloud-controller.xml | 1 - tools/puppet3/modules/autoscaler/LICENSE | 13 - .../autoscaler/files/configs/bin/stratos.sh | 298 -------- .../configs/repository/conf/autoscaler.xml | 34 - .../modules/autoscaler/manifests/clean.pp | 45 -- .../modules/autoscaler/manifests/deploy.pp | 43 -- .../modules/autoscaler/manifests/init.pp | 97 --- .../modules/autoscaler/manifests/initialize.pp | 59 -- .../modules/autoscaler/manifests/params.pp | 66 -- .../autoscaler/manifests/push_templates.pp | 26 - .../modules/autoscaler/manifests/start.pp | 27 - .../templates/conf/autoscaler.xml.erb | 39 - .../templates/conf/axis2/axis2.xml.erb | 701 ------------------ .../autoscaler/templates/conf/carbon.xml.erb | 625 ---------------- .../templates/conf/jndi.properties.erb | 4 - .../economy-autoscale.xml.erb | 26 - .../economy-deployment.xml.erb | 23 - .../server/partitions/partitions.xml.erb | 19 - tools/puppet3/modules/cc/LICENSE | 13 - .../modules/cc/files/configs/bin/stratos.sh | 299 -------- .../repository/conf/cloud-controller.xml | 81 --- ....stratos.cloud.controller_4.0.0.SNAPSHOT.jar | Bin 183364 -> 0 bytes tools/puppet3/modules/cc/manifests/clean.pp | 45 -- tools/puppet3/modules/cc/manifests/deploy.pp | 43 -- tools/puppet3/modules/cc/manifests/init.pp | 96 --- .../puppet3/modules/cc/manifests/initialize.pp | 59 -- tools/puppet3/modules/cc/manifests/params.pp | 66 -- .../modules/cc/manifests/push_templates.pp | 26 - tools/puppet3/modules/cc/manifests/start.pp | 27 - .../cc/templates/conf/axis2/axis2.xml.erb | 703 ------------------ .../modules/cc/templates/conf/carbon.xml.erb | 625 ---------------- .../cc/templates/conf/jndi.properties.erb | 4 - tools/puppet3/modules/cep/LICENSE | 13 - .../modules/cep/files/configs/bin/wso2server.sh | 304 -------- .../dropins/activemq_client_5.8.0_1.0.0.jar | Bin 1032400 -> 0 bytes .../dropins/andes_client_0.13.wso2v8_1.0.0.jar | Bin 1854829 -> 0 bytes ...che.stratos.cep.extension-1.0.0-SNAPSHOT.jar | Bin 16495 -> 0 bytes .../repository/conf/siddhi/siddhi.extension | 3 - .../repository/conf/stream-manager-config.xml | 177 ----- .../HealthStatisticsEventBuilder.xml | 10 - .../InstanceStatusStatisticsBuilder.xml | 10 - .../LoadBalancerStatisticsEventBuilder.xml | 10 - .../AverageInFlightRequestsEventFormatter.xml | 11 - .../AverageLoadAverageEventFormatter.xml | 11 - .../AverageMemoryConsumptionEventFormatter.xml | 11 - .../FaultMessageEventFormatter.xml | 11 - .../GradientInFlightRequestsEventFormatter.xml | 11 - .../GradientLoadAverageEventFormatter.xml | 11 - .../GradientMemoryConsumptionEventFormatter.xml | 11 - .../MemberAverageLoadAverageEventFormatter.xml | 11 - ...erAverageMemoryConsumptionEventFormatter.xml | 11 - .../MemberGradientLoadAverageEventFormatter.xml | 11 - ...rGradientMemoryConsumptionEventFormatter.xml | 11 - ...econdDerivativeLoadAverageEventFormatter.xml | 11 - ...erivativeMemoryConsumptionEventFormatter.xml | 11 - ...DerivativeInFlightRequestsEventFormatter.xml | 11 - ...econdDerivativeLoadAverageEventFormatter.xml | 11 - ...erivativeMemoryConsumptionEventFormatter.xml | 11 - .../executionplans/AverageHeathRequest.xml | 29 - .../AverageInFlightRequestsFinder.xml | 19 - .../executionplans/GradientOfHealthRequest.xml | 30 - .../GradientOfRequestsInFlightFinder.xml | 18 - .../SecondDerivativeOfHealthRequest.xml | 27 - ...SecondDerivativeOfRequestsInFlightFinder.xml | 19 - .../DefaultWSO2EventInputAdaptor.xml | 3 - .../DefaultWSO2EventOutputAdaptor.xml | 8 - .../outputeventadaptors/JMSOutputAdaptor.xml | 8 - .../streamdefinitions/stream-manager-config.xml | 269 ------- tools/puppet3/modules/cep/manifests/clean.pp | 45 -- tools/puppet3/modules/cep/manifests/deploy.pp | 43 -- tools/puppet3/modules/cep/manifests/init.pp | 101 --- .../puppet3/modules/cep/manifests/initialize.pp | 59 -- tools/puppet3/modules/cep/manifests/params.pp | 69 -- .../modules/cep/manifests/push_templates.pp | 26 - tools/puppet3/modules/cep/manifests/start.pp | 27 - .../cep/templates/conf/axis2/axis2.xml.erb | 698 ------------------ .../modules/cep/templates/conf/carbon.xml.erb | 609 ---------------- .../cep/templates/conf/jndi.properties.erb | 32 - .../JMSOutputAdaptor.xml.erb | 8 - tools/puppet3/modules/manager/LICENSE | 13 - .../manager/files/configs/bin/stratos.sh | 301 -------- .../lib/mysql-connector-java-5.1.26-bin.jar | Bin 855948 -> 0 bytes .../repository/conf/cartridge-config.properties | 63 -- .../conf/datasources/master-datasources.xml | 27 - .../conf/datasources/stratos-datasources.xml | 66 -- .../repository/conf/stratos-datasources.xml | 66 -- .../puppet3/modules/manager/manifests/clean.pp | 45 -- .../puppet3/modules/manager/manifests/deploy.pp | 43 -- tools/puppet3/modules/manager/manifests/init.pp | 99 --- .../modules/manager/manifests/initialize.pp | 59 -- .../puppet3/modules/manager/manifests/params.pp | 66 -- .../modules/manager/manifests/push_templates.pp | 26 - .../puppet3/modules/manager/manifests/start.pp | 27 - .../manager/templates/conf/axis2/axis2.xml.erb | 702 ------------------ .../manager/templates/conf/carbon.xml.erb | 625 ---------------- .../conf/cartridge-config.properties.erb | 73 -- .../conf/datasources/master-datasources.xml.erb | 27 - .../datasources/stratos-datasources.xml.erb | 66 -- .../manager/templates/conf/jndi.properties.erb | 4 - tools/puppet3/modules/messagebroker/LICENSE | 13 - .../files/configs/bin/wso2server.sh | 300 -------- .../modules/messagebroker/manifests/clean.pp | 45 -- .../modules/messagebroker/manifests/deploy.pp | 43 -- .../modules/messagebroker/manifests/init.pp | 99 --- .../messagebroker/manifests/initialize.pp | 59 -- .../modules/messagebroker/manifests/params.pp | 66 -- .../messagebroker/manifests/push_templates.pp | 26 - .../modules/messagebroker/manifests/start.pp | 27 - .../templates/conf/axis2/axis2.xml.erb | 719 ------------------- .../messagebroker/templates/conf/carbon.xml.erb | 583 --------------- .../cc/repository/conf/cloud-controller.xml | 1 - 113 files changed, 42 insertions(+), 11517 deletions(-) ----------------------------------------------------------------------
