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/cc572dbb Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/cc572dbb Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/cc572dbb Branch: refs/heads/master Commit: cc572dbb8723db8702e271c79ead1f15ef36d23b Parents: 96b1946 44a220a Author: Pradeep Fernando <[email protected]> Authored: Fri Dec 20 13:17:34 2013 +0530 Committer: Pradeep Fernando <[email protected]> Committed: Fri Dec 20 13:17:34 2013 +0530 ---------------------------------------------------------------------- .../src/conf/cartridge-config.properties | 64 -- .../adc/mgt/client/AutoscalerServiceClient.java | 13 +- .../client/CloudControllerServiceClient.java | 9 +- .../stratos/adc/mgt/deploy/service/Service.java | 5 +- .../service/ServiceDeploymentManager.java | 15 +- .../service/multitenant/MultiTenantService.java | 5 +- .../internal/ADCManagementServerComponent.java | 2 +- .../mgt/listener/InstanceStatusListener.java | 19 +- .../manager/CartridgeSubscriptionManager.java | 21 +- .../adc/mgt/payload/BasicPayloadData.java | 4 +- .../mgt/publisher/ArtifactUpdatePublisher.java | 2 +- .../service/ApplicationManagementService.java | 35 +- .../utils/CartridgeSubscriptionUtils.java | 34 + .../StratosManagerTopologyReceiver.java | 15 + .../adc/mgt/utils/CartridgeConstants.java | 5 + .../adc/mgt/utils/PersistenceManager.java | 42 ++ .../stratos/autoscaler/AutoscalerContext.java | 20 + .../stratos/autoscaler/ClusterMonitor.java | 251 ------- .../stratos/autoscaler/LbClusterMonitor.java | 226 ------ .../autoscaler/NetworkPartitionContext.java | 7 +- .../autoscaler/api/AutoScalerServiceImpl.java | 2 +- .../cloud/controller/CloudControllerClient.java | 96 ++- .../health/HealthEventMessageDelegator.java | 77 +- .../autoscaler/monitor/AbstractMonitor.java | 180 +++++ .../autoscaler/monitor/ClusterMonitor.java | 131 ++++ .../autoscaler/monitor/LbClusterMonitor.java | 110 +++ .../autoscaler/policy/PolicyManager.java | 16 +- .../topology/AutoscalerTopologyReceiver.java | 71 +- .../stratos/autoscaler/util/AutoscalerUtil.java | 14 +- .../autoscaler/TestObsoletedMemberRule.java | 7 +- .../org.apache.stratos.cartridge.agent/pom.xml | 98 +++ .../stratos/cartridge/agent/CartridgeAgent.java | 131 ++++ .../apache/stratos/cartridge/agent/Main.java | 57 ++ .../cartridge/agent/RepositoryFileListener.java | 41 ++ .../synchronizer/RepositoryInformation.java | 65 ++ .../git/impl/GitBasedArtifactRepository.java | 682 ++++++++++++++++++ .../CustomJschConfigSessionFactory.java | 64 ++ .../GitDeploymentSynchronizerConstants.java | 61 ++ .../git/internal/RepositoryContext.java | 131 ++++ .../synchronizer/git/util/Utilities.java | 73 ++ .../config/CartridgeAgentConfiguration.java | 163 +++++ .../config/configurator/JndiConfigurator.java | 105 +++ .../publisher/CartridgeAgentEventPublisher.java | 52 ++ .../publisher/HealthStatisticsNotifier.java | 113 +++ .../publisher/HealthStatisticsPublisher.java | 90 +++ .../publisher/HealthStatisticsReader.java | 47 ++ .../agent/util/CartridgeAgentConstants.java | 41 ++ .../agent/util/CartridgeAgentUtils.java | 114 +++ .../org/apache/stratos/cli/AutoscalePolicy.java | 52 -- .../java/org/apache/stratos/cli/Cartridge.java | 201 ------ .../apache/stratos/cli/CartridgeInfoBean.java | 124 ---- .../apache/stratos/cli/GenericRestClient.java | 6 +- .../java/org/apache/stratos/cli/Partition.java | 76 -- .../org/apache/stratos/cli/PropertyBean.java | 42 -- .../java/org/apache/stratos/cli/RestClient.java | 24 +- .../stratos/cli/RestCommandLineService.java | 312 ++++++--- .../apache/stratos/cli/StratosApplication.java | 10 +- .../apache/stratos/cli/SubscriptionInfo.java | 44 -- .../org/apache/stratos/cli/TenantInfoBean.java | 85 --- .../stratos/cli/beans/AutoscalePolicy.java | 52 ++ .../org/apache/stratos/cli/beans/Cartridge.java | 201 ++++++ .../stratos/cli/beans/CartridgeInfoBean.java | 124 ++++ .../stratos/cli/beans/DeploymentPolicy.java | 31 + .../org/apache/stratos/cli/beans/Partition.java | 76 ++ .../apache/stratos/cli/beans/PropertyBean.java | 42 ++ .../stratos/cli/beans/SubscriptionInfo.java | 44 ++ .../stratos/cli/beans/TenantInfoBean.java | 85 +++ .../cli/commands/AutoscalePolicyCommand.java | 3 - .../cli/commands/DeploymentPolicyCommand.java | 48 ++ .../stratos/cli/commands/SubscribeCommand.java | 16 +- .../apache/stratos/cli/utils/CliConstants.java | 10 +- .../impl/CloudControllerServiceImpl.java | 3 +- .../controller/topology/TopologyBuilder.java | 3 +- .../topology/TopologyEventMessageDelegator.java | 5 +- components/org.apache.stratos.common/pom.xml | 22 +- .../publisher/StatisticsPublisher.java | 45 ++ .../publisher/WSO2CEPStatisticsPublisher.java | 106 +++ .../pom.xml | 10 +- .../statistics/LoadBalancerStatsPublisher.java | 45 -- .../WSO2CEPFaultyMemberPublisher.java | 74 -- .../WSO2CEPInFlightRequestPublisher.java | 76 -- .../statistics/WSO2CEPStatsPublisher.java | 106 --- .../publisher/WSO2CEPFaultyMemberPublisher.java | 75 ++ .../WSO2CEPInFlightRequestPublisher.java | 77 ++ ...oadBalancerInFlightRequestCountNotifier.java | 4 +- .../balancer/LoadBalancerTenantReceiver.java | 37 +- .../conf/configurator/SynapseConfigurator.java | 6 +- .../TopologyFilterConfigurator.java | 27 +- .../internal/LoadBalancerServiceComponent.java | 15 + .../WSO2CEPInFlightRequestCountObserver.java | 2 +- .../broker/subscribe/TopicSubscriber.java | 11 +- .../synchronization/ArtifactUpdatedEvent.java | 82 --- .../instance/notifier/ArtifactUpdatedEvent.java | 90 +++ .../notifier/InstanceNotifierEvent.java | 31 + .../notifier/ArtifactUpdateEventListener.java | 28 + .../messaging/message/filter/MessageFilter.java | 6 +- .../ArtifactUpdateMessageProcessor.java | 61 ++ .../InstanceNotifierMessageProcessorChain.java | 53 ++ .../InstanceNotifierEventMessageDelegator.java | 91 +++ .../InstanceNotifierEventMessageListener.java | 54 ++ .../InstanceNotifierEventMessageQueue.java | 44 ++ .../InstanceNotifierEventMessageReceiver.java | 81 +++ .../tenant/TenantEventMessageListener.java | 1 - .../stratos/messaging/util/Constants.java | 2 +- .../messaging/test/MessageFilterTest.java | 81 +++ .../rest/endpoint/services/ServiceUtils.java | 17 +- components/pom.xml | 2 + .../executionplans/AverageHeathRequest.xml | 2 +- .../extension/FaultHandlingWindowProcessor.java | 6 +- .../src/main/bin/haproxy-extension.sh | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../distribution/src/main/conf/autoscaler.xml | 1 + .../ec2/load-balancer/cartridge-agent.sh | 89 --- .../ec2/load-balancer/start-load-balancer.sh | 82 --- .../templates/loadbalancer.conf.template | 136 ---- .../ec2/mysql/cartridge-agent.sh | 142 ---- .../modules/cartridge-agent/ec2/mysql/clean.sh | 33 - .../ec2/mysql/get-launch-params.rb | 54 -- .../cartridge-agent/ec2/mysql/healthcheck.sh | 33 - .../cartridge-agent/ec2/php/cartridge-agent.sh | 86 --- .../modules/cartridge-agent/ec2/php/clean.sh | 39 -- .../ec2/php/get-launch-params.rb | 54 -- .../cartridge-agent/ec2/php/healthcheck.sh | 33 - .../ec2/tomcat/cartridge-agent.sh | 227 ------ .../modules/cartridge-agent/ec2/tomcat/clean.sh | 39 -- .../ec2/tomcat/get-launch-params.rb | 54 -- .../cartridge-agent/ec2/tomcat/healthcheck.sh | 33 - .../openstack/php/cartridge-agent.sh | 261 ------- .../cartridge-agent/openstack/php/clean.sh | 39 -- .../openstack/php/get-launch-params.rb | 54 -- .../openstack/php/healthcheck.sh | 33 - .../modules/deployment-synchronizer/pom.xml | 81 --- .../synchronizer/ArtifactRepository.java | 31 - .../synchronizer/RepositoryInformation.java | 65 -- .../git/impl/GitBasedArtifactRepository.java | 699 ------------------- .../CustomJschConfigSessionFactory.java | 64 -- .../GitDeploymentSynchronizerConstants.java | 61 -- .../git/internal/RepositoryContext.java | 131 ---- .../GitDeploymentSyncronizerConfiguration.java | 29 - .../synchronizer/git/util/Utilities.java | 73 -- .../modules/distribution/pom.xml | 95 +++ .../distribution/src/main/assembly/bin.xml | 79 +++ .../src/main/bin/cartridge-agent.sh | 39 ++ .../distribution/src/main/conf/jndi.properties | 23 + .../distribution/src/main/conf/log4j.properties | 39 ++ .../conf/templates/jndi.properties.template | 28 + .../src/main/resources/jndi.properties | 23 + .../src/main/security/client-truststore.jks | Bin 0 -> 35240 bytes .../modules/event-publisher/pom.xml | 120 ---- .../event-publisher/src/main/assembly/bin.xml | 63 -- .../src/main/bin/event-publisher.sh | 29 - .../agent/event/publisher/EventPublisher.java | 108 --- .../event/publisher/EventPublisherClient.java | 102 --- .../cartridge/agent/event/publisher/Main.java | 67 -- .../src/main/resources/jndi.properties | 23 - .../src/main/resources/log4j.properties | 37 - .../member-activated-event.json.template | 1 - .../member-started-event.json.template | 1 - .../modules/event-subscriber/pom.xml | 125 ---- .../event-subscriber/src/main/assembly/bin.xml | 71 -- .../src/main/bin/event-subscriber.sh | 28 - .../event/subscriber/ArtifactListener.java | 119 ---- .../subscriber/CartridgeAgentConstants.java | 36 - .../agent/event/subscriber/EventSubscriber.java | 108 --- .../event/subscriber/EventSubscriberClient.java | 103 --- .../event/subscriber/LaunchParamsUtil.java | 58 -- .../cartridge/agent/event/subscriber/Main.java | 80 --- .../subscriber/RepositoryFileListener.java | 38 - .../src/main/resources/jndi.properties | 23 - .../src/main/resources/log4j.properties | 37 - .../member-activated-event.json.template | 1 - .../member-started-event.json.template | 1 - .../modules/health-stats/pom.xml | 145 ---- .../health-stats/src/main/assembly/bin.xml | 62 -- .../src/main/bin/health-publisher.sh | 34 - .../agent/health/publisher/HealthPublisher.java | 139 ---- .../health/publisher/HealthPublisherClient.java | 92 --- .../cartridge/agent/health/publisher/Main.java | 53 -- .../src/main/resources/jndi.properties | 23 - .../src/main/resources/log4j.properties | 37 - .../src/main/security/client-truststore.jks | Bin 35240 -> 0 bytes .../ec2/load-balancer/cartridge-agent.sh | 89 +++ .../ec2/load-balancer/start-load-balancer.sh | 82 +++ .../templates/loadbalancer.conf.template | 136 ++++ .../scripts/ec2/mysql/cartridge-agent.sh | 142 ++++ .../modules/scripts/ec2/mysql/clean.sh | 33 + .../scripts/ec2/mysql/get-launch-params.rb | 54 ++ .../modules/scripts/ec2/mysql/healthcheck.sh | 33 + .../modules/scripts/ec2/php/cartridge-agent.sh | 86 +++ .../modules/scripts/ec2/php/clean.sh | 39 ++ .../scripts/ec2/php/get-launch-params.rb | 54 ++ .../modules/scripts/ec2/php/healthcheck.sh | 33 + .../scripts/ec2/tomcat/cartridge-agent.sh | 227 ++++++ .../modules/scripts/ec2/tomcat/clean.sh | 39 ++ .../scripts/ec2/tomcat/get-launch-params.rb | 54 ++ .../modules/scripts/ec2/tomcat/healthcheck.sh | 33 + .../scripts/openstack/php/cartridge-agent.sh | 261 +++++++ .../modules/scripts/openstack/php/clean.sh | 39 ++ .../scripts/openstack/php/get-launch-params.rb | 54 ++ .../scripts/openstack/php/healthcheck.sh | 33 + products/cartridge-agent/pom.xml | 5 +- products/stratos-cli/README.txt | 31 +- .../src/main/conf/cartridge-config.properties | 11 +- tools/puppet/agent/etc/rc.local | 26 + tools/puppet/agent/root/bin/ec2_init.sh | 95 +++ tools/puppet/agent/ruby/stratos_sendinfo.rb | 30 + .../puppet/etc/puppet/files/cartridge-agent.sh | 12 +- .../puppet/etc/puppet/files/event-subscriber.sh | 2 +- tools/stratos-installer/clean.sh | 27 +- tools/stratos-installer/conf/setup.conf | 3 + tools/stratos-installer/setup.sh | 43 +- tools/stratos-installer/start-servers.sh | 11 +- 214 files changed, 7062 insertions(+), 6632 deletions(-) ----------------------------------------------------------------------
