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/731e22ed Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/731e22ed Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/731e22ed Branch: refs/heads/4.0.0-grouping Commit: 731e22ed07a97996b77e93fc228618ab6ecb9dd8 Parents: dda0db8 b92a27d Author: Udara Liyanage <[email protected]> Authored: Wed Oct 22 13:52:18 2014 +0530 Committer: Udara Liyanage <[email protected]> Committed: Wed Oct 22 13:52:18 2014 +0530 ---------------------------------------------------------------------- .../grouping/dependency/DependencyTree.java | 73 ++- .../dependency/context/ApplicationContext.java | 9 +- .../grouping/topic/StatusEventPublisher.java | 75 ++- .../AutoscalerTopologyEventReceiver.java | 96 +-- .../monitor/AbstractClusterMonitor.java | 27 +- .../monitor/ApplicationMonitorFactory.java | 41 +- .../autoscaler/monitor/EventHandler.java | 16 + .../stratos/autoscaler/monitor/Monitor.java | 22 +- .../monitor/MonitorStatusEventBuilder.java | 3 +- .../monitor/ParentComponentMonitor.java | 153 ++++- .../monitor/application/ApplicationMonitor.java | 114 ++-- .../monitor/cluster/ClusterMonitor.java | 25 +- .../monitor/cluster/LbClusterMonitor.java | 15 +- .../monitor/events/ClusterStatusEvent.java | 1 - .../monitor/events/GroupTerminateAllEvent.java | 29 + .../autoscaler/monitor/events/MonitorEvent.java | 31 + .../monitor/events/MonitorScalingEvent.java | 30 + .../monitor/events/MonitorStartAllEvent.java | 28 + .../monitor/events/MonitorStatusEvent.java | 5 +- .../events/MonitorTerminateAllEvent.java | 29 + .../autoscaler/monitor/group/GroupMonitor.java | 159 ++--- .../status/checker/StatusChecker.java | 196 +++--- .../termination-change.patch | 596 +++++++++++++++++++ .../impl/CloudControllerServiceImpl.java | 6 +- .../controller/topology/TopologyBuilder.java | 175 ++++-- .../topology/TopologyEventPublisher.java | 28 +- .../CompositeApplicationManager.java | 4 +- .../beans/ApplicationDefinition.java | 67 +++ .../beans/CompositeAppDefinition.java | 67 --- .../DefaultCompositeApplicationParser.java | 14 +- .../DataInsertionAndRetrievalManager.java | 2 +- .../stratos/manager/utils/Serializer.java | 2 +- .../domain/topology/ApplicationStatus.java | 15 +- .../messaging/domain/topology/Cluster.java | 63 +- .../domain/topology/ClusterStatus.java | 15 +- .../messaging/domain/topology/GroupStatus.java | 13 +- .../messaging/domain/topology/MemberStatus.java | 17 +- .../domain/topology/ParentComponent.java | 10 - .../messaging/domain/topology/Status.java | 40 -- .../lifecycle/LifeCycleStateManager.java | 23 +- .../status/ApplicationTerminatedEvent.java | 11 +- .../topology/ApplicationUndeployedEvent.java | 43 ++ .../event/topology/ClusterCreatedEvent.java | 22 +- .../topology/ClusterMaintenanceModeEvent.java | 58 -- .../ApplicationUndeployedEventListener.java | 26 + .../ClusterMaintenanceModeEventListener.java | 25 - .../ApplicationActivatedMessageProcessor.java | 6 +- .../ApplicationUndeployedMessageProcessor.java | 138 +++++ .../topology/ClusterActivatedProcessor.java | 11 +- .../ClusterCreatedMessageProcessor.java | 9 +- .../topology/ClusterInActivateProcessor.java | 19 +- .../ClusterMaintenanceModeMessageProcessor.java | 129 ---- .../topology/GroupActivatedProcessor.java | 4 +- .../topology/GroupInActivateProcessor.java | 5 +- .../topology/TopologyMessageProcessorChain.java | 12 +- .../bean/util/converter/PojoConverter.java | 4 +- .../rest/endpoint/services/ServiceUtils.java | 140 +---- .../rest/endpoint/services/StratosAdmin.java | 6 +- 58 files changed, 1981 insertions(+), 1021 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/731e22ed/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/TopologyMessageProcessorChain.java ---------------------------------------------------------------------- diff --cc components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/TopologyMessageProcessorChain.java index b0cefbb,6a58d17..206b7db --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/TopologyMessageProcessorChain.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/TopologyMessageProcessorChain.java @@@ -53,11 -48,9 +52,12 @@@ public class TopologyMessageProcessorCh private GroupActivatedProcessor groupActivatedProcessor; //private CompositeApplicationRemovedMessageProcessor compositeApplicationRemovedMessageProcessor; private ApplicationCreatedMessageProcessor applicationCreatedMessageProcessor; + private ApplicationUndeployedMessageProcessor applicationUndeployedMessageProcessor; private ApplicationRemovedMessageProcessor applicationRemovedMessageProcessor; private ApplicationActivatedMessageProcessor applicationActivatedMessageProcessor; + private ApplicationInactivatedMessageProcessor applicationInactivatedMessageProcessor; + private ApplicationTerminatedMessageProcessor applicationTerminatedMessageProcessor; + private ApplicationTerminatingMessageProcessor applicationTerminatingMessageProcessor; public void initialize() { // Add topology event processors http://git-wip-us.apache.org/repos/asf/stratos/blob/731e22ed/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java ---------------------------------------------------------------------- diff --cc components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java index 5970415,d4002ea..d1d2f4b --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java @@@ -19,12 -19,11 +19,12 @@@ package org.apache.stratos.rest.endpoint.bean.util.converter; -import org.apache.commons.logging.LogFactory; import org.apache.commons.lang.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.stratos.cloud.controller.stub.pojo.*; import org.apache.stratos.cloud.controller.stub.pojo.application.*; - import org.apache.stratos.manager.composite.application.beans.CompositeAppDefinition; + import org.apache.stratos.manager.composite.application.beans.ApplicationDefinition; import org.apache.stratos.manager.composite.application.beans.GroupDefinition; import org.apache.stratos.manager.composite.application.beans.SubscribableDefinition; import org.apache.stratos.manager.composite.application.beans.SubscribableInfo; http://git-wip-us.apache.org/repos/asf/stratos/blob/731e22ed/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/731e22ed/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java ----------------------------------------------------------------------
