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/76b75e51 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/76b75e51 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/76b75e51 Branch: refs/heads/master Commit: 76b75e51633f9e8ca40e00623aee55de0c04f7e8 Parents: 85d8ab9 fc59089 Author: Nirmal Fernando <[email protected]> Authored: Wed Mar 26 15:20:45 2014 +0530 Committer: Nirmal Fernando <[email protected]> Committed: Wed Mar 26 15:20:45 2014 +0530 ---------------------------------------------------------------------- .../impl/CloudControllerServiceImpl.java | 5 + .../interfaces/CloudControllerService.java | 13 +- .../category/DefaultLoadBalancerCategory.java | 1 + .../main/resources/CloudControllerService.wsdl | 391 +++++----- .../puppet/manifests/nodes.pp.sample.multinode | 107 +++ .../puppet/manifests/nodes.pp.sample.singlenode | 112 +++ tools/puppet/modules/agent/LICENSE | 16 + tools/puppet/modules/agent/manifests/init.pp | 76 ++ .../modules/agent/manifests/initialize.pp | 63 ++ .../modules/agent/manifests/push_templates.pp | 31 + tools/puppet/modules/agent/manifests/start.pp | 31 + .../modules/agent/templates/bin/stratos.sh.erb | 44 ++ .../conf/templates/jndi.properties.template.erb | 26 + .../templates/extensions/addons/_mysql.erb | 21 + .../templates/extensions/addons/_nodejs.erb | 4 + .../agent/templates/extensions/addons/_php.erb | 1 + .../extensions/artifacts-updated.sh.erb | 33 + .../agent/templates/extensions/clean.sh.erb | 28 + .../extensions/instance-activated.sh.erb | 28 + .../extensions/instance-started.sh.erb | 33 + .../templates/extensions/start-servers.sh.erb | 31 + tools/puppet/modules/autoscaler/LICENSE | 16 + .../autoscaler/files/configs/bin/stratos.sh | 298 ++++++++ .../modules/autoscaler/manifests/clean.pp | 50 ++ .../modules/autoscaler/manifests/deploy.pp | 47 ++ .../puppet/modules/autoscaler/manifests/init.pp | 102 +++ .../modules/autoscaler/manifests/initialize.pp | 64 ++ .../modules/autoscaler/manifests/params.pp | 43 ++ .../autoscaler/manifests/push_templates.pp | 31 + .../modules/autoscaler/manifests/start.pp | 33 + .../templates/conf/autoscaler.xml.erb | 42 ++ .../templates/conf/axis2/axis2.xml.erb | 701 ++++++++++++++++++ .../autoscaler/templates/conf/carbon.xml.erb | 625 ++++++++++++++++ .../templates/conf/jndi.properties.erb | 4 + tools/puppet/modules/cc/LICENSE | 16 + tools/puppet/modules/cc/manifests/clean.pp | 49 ++ tools/puppet/modules/cc/manifests/deploy.pp | 47 ++ tools/puppet/modules/cc/manifests/init.pp | 102 +++ tools/puppet/modules/cc/manifests/initialize.pp | 63 ++ tools/puppet/modules/cc/manifests/params.pp | 71 ++ .../modules/cc/manifests/push_templates.pp | 31 + tools/puppet/modules/cc/manifests/start.pp | 32 + .../cc/templates/conf/axis2/axis2.xml.erb | 703 ++++++++++++++++++ .../modules/cc/templates/conf/carbon.xml.erb | 625 ++++++++++++++++ .../cc/templates/conf/cloud-controller.xml.erb | 61 ++ .../cc/templates/conf/cloud-controller/_ec2.erb | 13 + .../conf/cloud-controller/_openstack.erb | 14 + .../cc/templates/conf/jndi.properties.erb | 4 + tools/puppet/modules/cep/LICENSE | 13 + .../modules/cep/files/configs/bin/wso2server.sh | 304 ++++++++ .../dropins/activemq_client_5.8.0_1.0.0.jar | Bin 0 -> 1032400 bytes .../dropins/andes_client_0.13.wso2v8_1.0.0.jar | Bin 0 -> 1854829 bytes ...che.stratos.cep.extension-1.0.0-SNAPSHOT.jar | Bin 0 -> 16495 bytes .../repository/conf/siddhi/siddhi.extension | 3 + .../repository/conf/stream-manager-config.xml | 269 +++++++ .../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 + tools/puppet/modules/cep/manifests/clean.pp | 45 ++ tools/puppet/modules/cep/manifests/deploy.pp | 43 ++ tools/puppet/modules/cep/manifests/init.pp | 101 +++ .../puppet/modules/cep/manifests/initialize.pp | 59 ++ tools/puppet/modules/cep/manifests/params.pp | 69 ++ .../modules/cep/manifests/push_templates.pp | 26 + tools/puppet/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/puppet/modules/haproxy/LICENSE | 16 + tools/puppet/modules/haproxy/manifests/init.pp | 71 ++ .../modules/haproxy/manifests/initialize.pp | 64 ++ .../modules/haproxy/manifests/push_templates.pp | 31 + tools/puppet/modules/haproxy/manifests/start.pp | 31 + .../templates/bin/haproxy-extension.sh.erb | 48 ++ .../haproxy/templates/conf/jndi.properties.erb | 23 + tools/puppet/modules/lb/LICENSE | 16 + tools/puppet/modules/lb/manifests/clean.pp | 50 ++ tools/puppet/modules/lb/manifests/deploy.pp | 48 ++ tools/puppet/modules/lb/manifests/init.pp | 95 +++ tools/puppet/modules/lb/manifests/initialize.pp | 64 ++ tools/puppet/modules/lb/manifests/params.pp | 43 ++ .../modules/lb/manifests/push_templates.pp | 31 + tools/puppet/modules/lb/manifests/start.pp | 32 + .../lb/templates/conf/axis2/axis2.xml.erb | 527 ++++++++++++++ .../lb/templates/conf/loadbalancer.conf.erb | 142 ++++ tools/puppet/modules/manager/LICENSE | 16 + tools/puppet/modules/manager/README | 3 + .../lib/copy_mysql-connector-jar_here | 0 tools/puppet/modules/manager/manifests/clean.pp | 49 ++ .../puppet/modules/manager/manifests/deploy.pp | 48 ++ tools/puppet/modules/manager/manifests/init.pp | 104 +++ .../modules/manager/manifests/initialize.pp | 63 ++ .../puppet/modules/manager/manifests/params.pp | 46 ++ .../modules/manager/manifests/push_templates.pp | 31 + tools/puppet/modules/manager/manifests/start.pp | 33 + .../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/puppet/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 +++++++++++++++ 138 files changed, 12689 insertions(+), 168 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/76b75e51/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java ----------------------------------------------------------------------
