Repository: stratos Updated Branches: refs/heads/4.0.0-grouping 069b61a84 -> 4b0ef9864
adding cluster and group in_active processor to processor chain Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/4b0ef986 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/4b0ef986 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/4b0ef986 Branch: refs/heads/4.0.0-grouping Commit: 4b0ef9864f394919a902ad60ab93e685a1cab1f8 Parents: 069b61a Author: reka <[email protected]> Authored: Wed Oct 22 14:18:58 2014 +0530 Committer: reka <[email protected]> Committed: Wed Oct 22 14:21:51 2014 +0530 ---------------------------------------------------------------------- .../ApplicationStatusMessageProcessorChain.java | 14 ++++++++++++ .../topology/GroupInActivateProcessor.java | 5 ++--- .../topology/TopologyMessageProcessorChain.java | 23 ++++++++++++++++---- 3 files changed, 35 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/4b0ef986/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/application/status/ApplicationStatusMessageProcessorChain.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/application/status/ApplicationStatusMessageProcessorChain.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/application/status/ApplicationStatusMessageProcessorChain.java index 93f9558..3c32de8 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/application/status/ApplicationStatusMessageProcessorChain.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/application/status/ApplicationStatusMessageProcessorChain.java @@ -34,7 +34,9 @@ public class ApplicationStatusMessageProcessorChain extends MessageProcessorChai private static final Log log = LogFactory.getLog(ApplicationStatusMessageProcessorChain.class); private ApplicationStatusClusterActivatedMessageProcessor clusterActivatedMessageProcessor; + private ApplicationStatusClusterInActivateMessageProcessor clusterInActivateMessageProcessor; private ApplicationStatusGroupActivatedMessageProcessor groupActivatedMessageProcessor; + private ApplicationStatusGroupInActivateMessageProcessor groupInActivateMessageProcessor; private ApplicationStatusAppActivatedMessageProcessor appActivatedMessageProcessor; private ApplicationStatusAppCreatedMessageProcessor applicationStatusAppCreatedMessageProcessor; private ApplicationStatusAppInActivatedMessageProcessor applicationStatusAppInActivatedMessageProcessor; @@ -45,8 +47,16 @@ public class ApplicationStatusMessageProcessorChain extends MessageProcessorChai // Add instance notifier event processors clusterActivatedMessageProcessor = new ApplicationStatusClusterActivatedMessageProcessor(); add(clusterActivatedMessageProcessor); + + clusterInActivateMessageProcessor = new ApplicationStatusClusterInActivateMessageProcessor(); + add(clusterInActivateMessageProcessor); + groupActivatedMessageProcessor = new ApplicationStatusGroupActivatedMessageProcessor(); add(groupActivatedMessageProcessor); + + groupInActivateMessageProcessor = new ApplicationStatusGroupInActivateMessageProcessor(); + add(groupInActivateMessageProcessor); + appActivatedMessageProcessor = new ApplicationStatusAppActivatedMessageProcessor(); add(appActivatedMessageProcessor); @@ -71,8 +81,12 @@ public class ApplicationStatusMessageProcessorChain extends MessageProcessorChai public void addEventListener(EventListener eventListener) { if (eventListener instanceof ClusterActivatedEventListener) { clusterActivatedMessageProcessor.addEventListener(eventListener); + } else if (eventListener instanceof ClusterInActivateEventListener) { + clusterInActivateMessageProcessor.addEventListener(eventListener); } else if (eventListener instanceof GroupActivatedEventListener) { groupActivatedMessageProcessor.addEventListener(eventListener); + } else if (eventListener instanceof GroupInActivateEventListener) { + groupInActivateMessageProcessor.addEventListener(eventListener); } else if (eventListener instanceof ApplicationActivatedEventListener) { appActivatedMessageProcessor.addEventListener(eventListener); } else if(eventListener instanceof ApplicationInActivatedEventListener){ http://git-wip-us.apache.org/repos/asf/stratos/blob/4b0ef986/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/GroupInActivateProcessor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/GroupInActivateProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/GroupInActivateProcessor.java index 571fc74..ed8488c 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/GroupInActivateProcessor.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/GroupInActivateProcessor.java @@ -22,6 +22,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.messaging.domain.topology.Application; import org.apache.stratos.messaging.domain.topology.Group; +import org.apache.stratos.messaging.domain.topology.GroupStatus; import org.apache.stratos.messaging.domain.topology.Topology; import org.apache.stratos.messaging.event.topology.GroupActivatedEvent; import org.apache.stratos.messaging.event.topology.GroupInActivateEvent; @@ -92,9 +93,7 @@ public class GroupInActivateProcessor extends MessageProcessor { event.getGroupId())); } } else { - // Apply changes to the topology - //TODO - // group.setStatus(Status.Activated); + group.setStatus(GroupStatus.Inactive); if (log.isInfoEnabled()) { log.info(String.format("Group updated as activated : %s", group.getUniqueIdentifier())); http://git-wip-us.apache.org/repos/asf/stratos/blob/4b0ef986/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/TopologyMessageProcessorChain.java ---------------------------------------------------------------------- diff --git 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 index 8a54916..77e4b01 100644 --- 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 @@ -22,10 +22,14 @@ package org.apache.stratos.messaging.message.processor.topology; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.messaging.listener.EventListener; -import org.apache.stratos.messaging.listener.application.status.ApplicationInActivatedEventListener; -import org.apache.stratos.messaging.listener.application.status.ApplicationTerminatedEventListener; -import org.apache.stratos.messaging.listener.application.status.ApplicationTerminatingEventListener; +import org.apache.stratos.messaging.listener.application.status.*; import org.apache.stratos.messaging.listener.topology.*; +import org.apache.stratos.messaging.listener.topology.ApplicationActivatedEventListener; +import org.apache.stratos.messaging.listener.topology.ApplicationCreatedEventListener; +import org.apache.stratos.messaging.listener.topology.ClusterActivatedEventListener; +import org.apache.stratos.messaging.listener.topology.ClusterInActivateEventListener; +import org.apache.stratos.messaging.listener.topology.GroupActivatedEventListener; +import org.apache.stratos.messaging.listener.topology.GroupInActivateEventListener; import org.apache.stratos.messaging.message.processor.MessageProcessorChain; /** @@ -40,6 +44,7 @@ public class TopologyMessageProcessorChain extends MessageProcessorChain { private ServiceRemovedMessageProcessor serviceRemovedMessageProcessor; private ClusterCreatedMessageProcessor clusterCreatedMessageProcessor; private ClusterActivatedProcessor clusterActivatedProcessor; + private ClusterInActivateProcessor clusterInActivateProcessor; private ClusterRemovedMessageProcessor clusterRemovedMessageProcessor; private InstanceSpawnedMessageProcessor instanceSpawnedMessageProcessor; private MemberStartedMessageProcessor memberStartedMessageProcessor; @@ -49,7 +54,7 @@ public class TopologyMessageProcessorChain extends MessageProcessorChain { private MemberSuspendedMessageProcessor memberSuspendedMessageProcessor; private MemberTerminatedMessageProcessor memberTerminatedMessageProcessor; private GroupActivatedProcessor groupActivatedProcessor; - //private CompositeApplicationRemovedMessageProcessor compositeApplicationRemovedMessageProcessor; + private GroupInActivateProcessor groupInActivateProcessor; private ApplicationCreatedMessageProcessor applicationCreatedMessageProcessor; private ApplicationUndeployedMessageProcessor applicationUndeployedMessageProcessor; private ApplicationRemovedMessageProcessor applicationRemovedMessageProcessor; @@ -75,6 +80,9 @@ public class TopologyMessageProcessorChain extends MessageProcessorChain { clusterActivatedProcessor = new ClusterActivatedProcessor(); add(clusterActivatedProcessor); + clusterInActivateProcessor = new ClusterInActivateProcessor(); + add(clusterInActivateProcessor); + clusterRemovedMessageProcessor = new ClusterRemovedMessageProcessor(); add(clusterRemovedMessageProcessor); @@ -102,6 +110,9 @@ public class TopologyMessageProcessorChain extends MessageProcessorChain { groupActivatedProcessor = new GroupActivatedProcessor(); add(groupActivatedProcessor); + groupInActivateProcessor = new GroupInActivateProcessor(); + add(groupInActivateProcessor); + applicationCreatedMessageProcessor = new ApplicationCreatedMessageProcessor(); add(applicationCreatedMessageProcessor); @@ -135,6 +146,8 @@ public class TopologyMessageProcessorChain extends MessageProcessorChain { clusterCreatedMessageProcessor.addEventListener(eventListener); } else if (eventListener instanceof ClusterActivatedEventListener) { clusterActivatedProcessor.addEventListener(eventListener); + } else if (eventListener instanceof ClusterInActivateEventListener) { + clusterInActivateProcessor.addEventListener(eventListener); } else if (eventListener instanceof ClusterRemovedEventListener) { clusterRemovedMessageProcessor.addEventListener(eventListener); } else if (eventListener instanceof InstanceSpawnedEventListener) { @@ -157,6 +170,8 @@ public class TopologyMessageProcessorChain extends MessageProcessorChain { memberMaintenanceModeProcessor.addEventListener(eventListener); } else if (eventListener instanceof GroupActivatedEventListener) { groupActivatedProcessor.addEventListener(eventListener); + } else if (eventListener instanceof GroupInActivateEventListener) { + groupInActivateProcessor.addEventListener(eventListener); } else if (eventListener instanceof ApplicationCreatedEventListener) { applicationCreatedMessageProcessor.addEventListener(eventListener); } else if (eventListener instanceof ApplicationUndeployedEventListener) {
