Merge branch 'master' of https://github.com/apache/stratos
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/1a66d340 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/1a66d340 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/1a66d340 Branch: refs/heads/master Commit: 1a66d3403a018b0d5aa742554927bbd2aae7a0b1 Parents: 94e03bd ddf1602 Author: Chamila de Alwis <[email protected]> Authored: Sun Nov 16 23:28:28 2014 +0530 Committer: Chamila de Alwis <[email protected]> Committed: Sun Nov 16 23:28:28 2014 +0530 ---------------------------------------------------------------------- .../stratos/autoscaler/AutoscalerContext.java | 32 +- .../autoscaler/api/AutoScalerServiceImpl.java | 69 +- .../dependency/DependencyBuilder.java | 174 +- .../applications/dependency/DependencyTree.java | 121 +- .../context/ApplicationChildContext.java | 123 ++ .../context/ApplicationChildContextFactory.java | 101 + .../dependency/context/ApplicationContext.java | 113 - .../context/ApplicationContextFactory.java | 101 - .../dependency/context/ClusterChildContext.java | 38 + .../dependency/context/ClusterContext.java | 38 - .../dependency/context/GroupChildContext.java | 25 + .../dependency/context/GroupContext.java | 25 - .../applications/topic/ApplicationBuilder.java | 156 +- .../publisher/ClusterStatusEventPublisher.java | 35 +- .../AutoscalerTopologyEventReceiver.java | 19 +- .../stratos/autoscaler/monitor/Monitor.java | 51 +- .../monitor/ParentComponentMonitor.java | 272 ++- .../monitor/application/ApplicationMonitor.java | 46 +- .../application/ApplicationMonitorFactory.java | 42 +- .../monitor/cluster/AbstractClusterMonitor.java | 111 +- .../monitor/cluster/VMClusterMonitor.java | 4 +- .../cluster/VMServiceClusterMonitor.java | 6 +- .../autoscaler/monitor/group/GroupMonitor.java | 27 +- .../autoscaler/registry/RegistryManager.java | 67 +- .../autoscaler/rule/RuleTasksDelegator.java | 63 +- .../status/checker/StatusChecker.java | 160 +- .../org.apache.stratos.cloud.controller/pom.xml | 8 + .../cloud/controller/iaases/AWSEC2Iaas.java | 1 - .../impl/CloudControllerServiceImpl.java | 29 +- .../cloud/controller/interfaces/Iaas.java | 2 +- .../topology/TopologyEventPublisher.java | 2 +- .../util/CloudControllerConstants.java | 11 +- .../console/errorhtml/error-404.html | 71 +- .../console/errorhtml/error.html | 70 +- .../theme0/partials/applications_form.hbs | 8 +- .../themes/theme0/partials/configure_form.hbs | 8 +- .../manager/client/AutoscalerServiceClient.java | 19 +- .../deployer/DefaultServiceGroupDeployer.java | 300 +-- .../grouping/deployer/ServiceGroupDeployer.java | 8 +- .../manager/ServiceGroupingManager.java | 15 +- .../listener/InstanceStatusListener.java | 187 +- components/org.apache.stratos.messaging/pom.xml | 10 - .../messaging/broker/connect/MQTTConnector.java | 67 - .../broker/connect/MqttTopicConnector.java | 147 ++ .../broker/connect/TopicConnector.java | 57 + .../broker/connect/TopicConnectorFactory.java | 33 + .../broker/publish/EventPublisher.java | 9 +- .../broker/publish/EventPublisherPool.java | 3 +- .../broker/publish/TopicPublisher.java | 50 +- .../broker/subscribe/MessageListener.java | 33 + .../broker/subscribe/TopicSubscriber.java | 36 +- .../stratos/messaging/domain/Message.java | 49 + .../domain/applications/GroupStatus.java | 3 +- .../domain/applications/ScalingOrder.java | 12 +- .../domain/applications/StartupOrder.java | 12 +- .../ApplicationCreatedMessageProcessor.java | 2 +- .../ApplicationTerminatedMessageProcessor.java | 4 - .../CompleteApplicationsMessageProcessor.java | 8 +- ...licationClustersCreatedMessageProcessor.java | 4 +- ...licationClustersRemovedMessageProcessor.java | 10 +- .../topology/ClusterActivatedProcessor.java | 4 +- .../ClusterCreatedMessageProcessor.java | 4 +- .../topology/ClusterInActivateProcessor.java | 4 +- .../ClusterRemovedMessageProcessor.java | 4 +- .../topology/ClusterResetMessageProcessor.java | 4 +- .../topology/ClusterTerminatedProcessor.java | 4 +- .../topology/ClusterTerminatingProcessor.java | 4 +- .../InstanceSpawnedMessageProcessor.java | 4 +- .../MemberActivatedMessageProcessor.java | 4 +- .../MemberMaintenanceModeProcessor.java | 4 +- .../MemberReadyToShutdownMessageProcessor.java | 4 +- .../topology/MemberStartedMessageProcessor.java | 4 +- .../MemberSuspendedMessageProcessor.java | 4 +- .../MemberTerminatedMessageProcessor.java | 4 +- .../ServiceCreatedMessageProcessor.java | 4 +- .../ServiceRemovedMessageProcessor.java | 4 +- .../ApplicationsEventMessageDelegator.java | 7 +- .../ApplicationsEventMessageListener.java | 39 +- .../ApplicationsEventMessageQueue.java | 4 +- .../ClusterStatusEventMessageDelegator.java | 7 +- .../ClusterStatusEventMessageListener.java | 46 +- .../status/ClusterStatusEventMessageQueue.java | 4 +- .../stat/HealthStatEventMessageDelegator.java | 3 +- .../stat/HealthStatEventMessageListener.java | 61 +- .../stat/HealthStatEventMessageQueue.java | 4 +- .../InstanceNotifierEventMessageDelegator.java | 7 +- .../InstanceNotifierEventMessageListener.java | 65 +- .../InstanceNotifierEventMessageQueue.java | 4 +- .../InstanceStatusEventMessageDelegator.java | 7 +- .../InstanceStatusEventMessageListener.java | 39 +- .../status/InstanceStatusEventMessageQueue.java | 4 +- .../tenant/TenantEventMessageDelegator.java | 7 +- .../tenant/TenantEventMessageListener.java | 61 +- .../tenant/TenantEventMessageQueue.java | 4 +- .../topology/TopologyEventMessageDelegator.java | 10 +- .../topology/TopologyEventMessageListener.java | 38 +- .../topology/TopologyEventMessageQueue.java | 4 +- .../messaging/publish/MessagePublisher.java | 71 - .../rest/endpoint/api/StratosApiV41.java | 92 +- .../rest/endpoint/api/StratosApiV41Utils.java | 12 +- .../pom.xml | 6 + .../main/resources/conf/cloud-controller.xml | 18 + hs_err_pid19968.log | 1394 +++++++++++++ .../src/main/conf/drools/scaling.drl | 10 +- .../src/main/resources/AutoScalerService.wsdl | 1957 +++++++++--------- tools/puppet3/manifests/nodes/base.pp | 2 +- 106 files changed, 4621 insertions(+), 2737 deletions(-) ----------------------------------------------------------------------
