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/496d989d Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/496d989d Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/496d989d Branch: refs/heads/master Commit: 496d989d146edb4d43d6ec9ca8cd789b7e9206df Parents: d93f687 bba371d Author: Melan Nimesh <[email protected]> Authored: Mon Feb 24 08:41:01 2014 +0530 Committer: Melan Nimesh <[email protected]> Committed: Mon Feb 24 08:41:01 2014 +0530 ---------------------------------------------------------------------- .../topology/AutoscalerTopologyReceiver.java | 52 +- .../rule/AutoscalerRuleEvaluator.java | 5 + .../stratos/cartridge/agent/CartridgeAgent.java | 9 +- .../publisher/HealthStatisticsReader.java | 32 +- .../stratos/cli/RestCommandLineService.java | 84 ++ .../apache/stratos/cli/StratosApplication.java | 3 + .../stratos/cli/beans/TenantInfoBean.java | 28 + .../stratos/cli/commands/ListAllTenants.java | 65 ++ .../stratos/cli/commands/PartitionCommand.java | 1 - .../apache/stratos/cli/utils/CliConstants.java | 5 + .../cloud/controller/iaases/AWSEC2Iaas.java | 87 +- .../controller/iaases/OpenstackNovaIaas.java | 6 + .../cloud/controller/iaases/VCloudIaas.java | 5 + .../impl/CloudControllerServiceImpl.java | 160 +-- .../cloud/controller/interfaces/Iaas.java | 8 +- .../controller/topology/TopologyBuilder.java | 4 +- .../validate/AWSEC2PartitionValidator.java | 7 +- .../OpenstackNovaPartitionValidator.java | 7 +- .../apache/stratos/common/util/CommonUtil.java | 6 +- .../balancer/LoadBalancerTenantReceiver.java | 7 +- .../balancer/LoadBalancerTopologyReceiver.java | 7 +- .../controllers/cartridgeSubscribeSubmit.jag | 10 + .../console/tenant_management.jag | 2 +- .../console/themes/theme1/pages/index.hbs | 1 + .../console/themes/theme1/pages/plain.hbs | 2 +- .../themes/theme1/partials/cartridge_info.hbs | 4 +- .../themes/theme1/partials/cartridges.hbs | 2 +- .../partials/configure_stratos_wizard.hbs | 52 +- .../theme1/partials/subscribe_cartridge.hbs | 11 +- .../themes/theme1/partials/tenant_new.hbs | 97 +- .../themes/theme1/renderers/cartridges.js | 2 + .../console/themes/theme1/renderers/index.js | 3 +- .../theme1/renderers/tenant_management.js | 3 +- .../console/themes/theme1/ui/css/main.css | 12 +- .../console/themes/theme1/ui/img/favicon.png | Bin 0 -> 585 bytes .../themes/theme1/ui/js/tenant_management.js | 4 +- .../manager/client/AutoscalerServiceClient.java | 12 + .../listener/InstanceStatusListener.java | 20 +- .../manager/payload/BasicPayloadData.java | 23 + .../manager/utils/CartridgeConstants.java | 2 + .../messaging/domain/topology/MemberStatus.java | 19 +- .../topology/MemberMaintenanceListener.java | 24 + .../MemberMaintenanceModeProcessor.java | 147 +++ .../topology/TopologyMessageProcessorChain.java | 7 + .../stratos/messaging/util/Constants.java | 1 + .../rest/endpoint/services/ServiceUtils.java | 58 +- .../rest/endpoint/services/StratosAdmin.java | 13 +- .../main/autoscale-policies/economyPolicy.xml | 20 +- .../distribution/src/main/assembly/bin.xml | 1 + .../src/main/extensions/mount_volumes.sh | 73 +- .../distribution/src/main/conf/log4j.properties | 17 +- .../src/main/conf/cartridge-config.properties | 3 + .../modules/p2-profile-gen/pom.xml | 4 +- tools/puppet/agent/root/bin/ec2_init.sh | 128 ++- tools/puppet3/auth.conf | 116 ++ tools/puppet3/autosign.conf | 1 + tools/puppet3/fileserver.conf | 41 + tools/puppet3/manifests/nodes.pp | 148 +++ tools/puppet3/manifests/site.pp | 1 + tools/puppet3/modules/agent/manifests/init.pp | 55 + .../modules/agent/manifests/initialize.pp | 59 + .../modules/agent/manifests/push_templates.pp | 27 + tools/puppet3/modules/agent/manifests/start.pp | 27 + .../modules/agent/templates/bin/stratos.sh.erb | 44 + .../conf/templates/jndi.properties.template.erb | 26 + .../templates/extensions/addons/_mysql.erb | 15 + .../agent/templates/extensions/addons/_ruby.erb | 17 + .../extensions/artifacts-updated.sh.erb | 29 + .../agent/templates/extensions/clean.sh.erb | 28 + .../extensions/instance-activated.sh.erb | 28 + .../extensions/instance-started.sh.erb | 36 + .../templates/extensions/start-servers.sh.erb | 28 + 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 0 -> 183364 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 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 | 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/java/manifests/init.pp | 32 + .../modules/java/templates/java_home.sh.erb | 1 + tools/puppet3/modules/lb/LICENSE | 13 + .../modules/lb/files/configs/bin/stratos.sh | 302 ++++++ tools/puppet3/modules/lb/manifests/clean.pp | 45 + tools/puppet3/modules/lb/manifests/deploy.pp | 43 + tools/puppet3/modules/lb/manifests/init.pp | 95 ++ .../puppet3/modules/lb/manifests/initialize.pp | 59 + tools/puppet3/modules/lb/manifests/params.pp | 66 ++ .../modules/lb/manifests/push_templates.pp | 26 + tools/puppet3/modules/lb/manifests/start.pp | 27 + .../lb/templates/conf/axis2/axis2.xml.erb | 527 +++++++++ .../lb/templates/conf/loadbalancer.conf.erb | 141 +++ tools/puppet3/modules/manager/LICENSE | 13 + .../manager/files/configs/bin/stratos.sh | 301 ++++++ .../lib/mysql-connector-java-5.1.26-bin.jar | Bin 0 -> 855948 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 ++++++++++ tools/puppet3/modules/mysql/manifests/init.pp | 56 + .../modules/mysql/templates/phpMyAdmin.conf.erb | 73 ++ tools/puppet3/modules/nodejs/manifests/init.pp | 37 + tools/puppet3/modules/php/files/90forceyes | 23 + .../modules/php/lib/facter/stratos_facts.rb | 12 + tools/puppet3/modules/php/manifests/init.pp | 94 ++ .../puppet3/modules/php/manifests/init.pp.back | 131 +++ tools/puppet3/modules/php/manifests/init.pp.deb | 102 ++ tools/puppet3/modules/php/manifests/init.pp.rpm | 78 ++ .../php/templates/apache2/apache2.conf.erb | 256 +++++ .../apache2/sites-available/default-ssl.erb | 195 ++++ .../apache2/sites-available/default.erb | 64 ++ .../modules/php/templates/httpd/httpd.conf.erb | 1009 ++++++++++++++++++ tools/puppet3/modules/ruby/manifests/init.pp | 43 + .../modules/ruby/templates/ruby-start.sh.erb | 18 + tools/puppet3/modules/tomcat/manifests/init.pp | 51 + .../puppet3/modules/wordpress/manifests/init.pp | 70 ++ .../wordpress/templates/httpd/httpd.conf.erb | 1009 ++++++++++++++++++ tools/puppet3/puppet.conf | 14 + tools/stratos-installer/conf/setup.conf | 4 + .../repository/conf/cartridge-config.properties | 2 + tools/stratos-installer/setup.sh | 14 + 216 files changed, 17981 insertions(+), 302 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/496d989d/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/VCloudIaas.java ----------------------------------------------------------------------
