Merge branch '4.0.0-grouping' of https://git-wip-us.apache.org/repos/asf/stratos into 4.0.0-grouping
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/1e7c6006 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/1e7c6006 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/1e7c6006 Branch: refs/heads/4.0.0-grouping Commit: 1e7c6006f366634d341ac237c5c71ce6da49bf57 Parents: c3105c8 02bb386 Author: Udara Liyanage <[email protected]> Authored: Wed Oct 8 15:34:24 2014 +0530 Committer: Udara Liyanage <[email protected]> Committed: Wed Oct 8 15:34:24 2014 +0530 ---------------------------------------------------------------------- .../grouping/dependency/DependencyBuilder.java | 11 +- .../dependency/context/ApplicationContext.java | 15 + .../AutoscalerHealthStatEventReceiver.java | 18 +- .../AutoscalerTopologyEventReceiver.java | 155 ++- .../monitor/AbstractClusterMonitor.java | 51 +- .../autoscaler/monitor/EventHandler.java | 33 + .../stratos/autoscaler/monitor/Monitor.java | 137 +- .../monitor/MonitorStatusEventBuilder.java | 55 + .../monitor/application/ApplicationMonitor.java | 104 +- .../monitor/cluster/ClusterMonitor.java | 51 +- .../events/ApplicationActivatedEvent.java | 42 - .../monitor/events/ApplicationStatusEvent.java | 36 + .../monitor/events/ClusterActivatedEvent.java | 54 - .../events/ClusterInMaintenanceEvent.java | 25 - .../monitor/events/ClusterStatusEvent.java | 36 + .../monitor/events/GroupActivatedEvent.java | 48 - .../monitor/events/GroupInMaintenanceEvent.java | 25 - .../monitor/events/GroupStatusEvent.java | 31 + .../autoscaler/monitor/events/MonitorEvent.java | 27 - .../monitor/events/MonitorStatusEvent.java | 27 +- .../autoscaler/monitor/group/GroupMonitor.java | 74 +- .../parser/DefaultApplicationParser.java | 45 +- .../impl/CloudControllerServiceImpl.java | 21 +- .../cloud/controller/pojo/Dependencies.java | 20 +- .../pojo/application/DependencyContext.java | 20 +- .../controller/topology/TopologyBuilder.java | 14 +- .../topology/TopologyEventPublisher.java | 6 +- .../LoadBalancerTopologyEventReceiver.java | 77 +- .../DefaultCompositeApplicationParser.java | 32 +- .../structure/CompositeAppContext.java | 12 +- .../application/structure/GroupContext.java | 17 +- .../definitions/DependencyDefinitions.java | 23 +- .../deployer/DefaultServiceGroupDeployer.java | 35 +- .../StratosManagerTopologyEventReceiver.java | 78 +- .../messaging/domain/topology/Service.java | 9 +- .../messaging/domain/topology/Topology.java | 11 +- .../domain/topology/locking/TopologyLock.java | 49 + .../topology/locking/TopologyLockHierarchy.java | 147 ++ .../event/topology/ApplicationRemovedEvent.java | 15 +- .../ApplicationActivatedMessageProcessor.java | 52 +- .../ApplicationCreatedMessageProcessor.java | 75 +- .../ApplicationRemovedMessageProcessor.java | 103 +- .../topology/ClusterActivatedProcessor.java | 106 +- .../ClusterCreatedMessageProcessor.java | 129 +- .../ClusterMaintenanceModeMessageProcessor.java | 102 +- .../ClusterRemovedMessageProcessor.java | 105 +- .../CompleteTopologyMessageProcessor.java | 200 +-- .../topology/GroupActivatedProcessor.java | 68 +- .../InstanceSpawnedMessageProcessor.java | 150 +- .../MemberActivatedMessageProcessor.java | 183 +-- .../MemberMaintenanceModeProcessor.java | 159 ++- .../MemberReadyToShutdownMessageProcessor.java | 160 ++- .../topology/MemberStartedMessageProcessor.java | 157 ++- .../MemberSuspendedMessageProcessor.java | 155 ++- .../MemberTerminatedMessageProcessor.java | 139 +- .../ServiceCreatedMessageProcessor.java | 74 +- .../ServiceRemovedMessageProcessor.java | 71 +- .../topology/TopologyMessageProcessorChain.java | 10 +- .../topology/TopologyEventMessageDelegator.java | 10 +- .../receiver/topology/TopologyManager.java | 451 +++++- .../topology/locking/TopologyLockingTest.java | 209 +++ .../bean/util/converter/PojoConverter.java | 21 +- .../webapp/stratos/WEB-INF/schemas/schema.xsd | 11 +- .../main/resources/CloudControllerService.wsdl | 1298 +++++++++--------- 64 files changed, 3627 insertions(+), 2257 deletions(-) ----------------------------------------------------------------------
