uddating applications topic
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/ea9337d3 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/ea9337d3 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/ea9337d3 Branch: refs/heads/docker-grouping-merge Commit: ea9337d36508111c9ad095aadf61e66c43ec4ecf Parents: f0ba4be Author: reka <[email protected]> Authored: Fri Oct 31 12:23:17 2014 +0530 Committer: reka <[email protected]> Committed: Fri Oct 31 12:23:39 2014 +0530 ---------------------------------------------------------------------- .../AutoscalerTopologyEventReceiver.java | 1 + .../ApplicationStatusTopicReceiver.java | 62 ++++++------- .../controller/topology/TopologyBuilder.java | 45 ++++++---- .../AppStatusMessageProcessorChain.java | 94 ++++++++++---------- .../topology/TopologyMessageProcessorChain.java | 1 + 5 files changed, 107 insertions(+), 96 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/ea9337d3/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/topology/AutoscalerTopologyEventReceiver.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/topology/AutoscalerTopologyEventReceiver.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/topology/AutoscalerTopologyEventReceiver.java index fe4d9df..97ba3f1 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/topology/AutoscalerTopologyEventReceiver.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/topology/AutoscalerTopologyEventReceiver.java @@ -44,6 +44,7 @@ import org.apache.stratos.messaging.domain.applications.GroupStatus; import org.apache.stratos.messaging.domain.topology.*; import org.apache.stratos.messaging.event.Event; import org.apache.stratos.messaging.event.topology.*; +import org.apache.stratos.messaging.listener.applications.ApplicationUndeployedEventListener; import org.apache.stratos.messaging.listener.topology.*; import org.apache.stratos.messaging.message.receiver.topology.TopologyEventReceiver; import org.apache.stratos.messaging.message.receiver.topology.TopologyManager; http://git-wip-us.apache.org/repos/asf/stratos/blob/ea9337d3/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/application/status/receiver/ApplicationStatusTopicReceiver.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/application/status/receiver/ApplicationStatusTopicReceiver.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/application/status/receiver/ApplicationStatusTopicReceiver.java index 9db0998..d83a7d3 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/application/status/receiver/ApplicationStatusTopicReceiver.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/application/status/receiver/ApplicationStatusTopicReceiver.java @@ -22,8 +22,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.cloud.controller.topology.TopologyBuilder; import org.apache.stratos.messaging.event.Event; -import org.apache.stratos.messaging.event.application.status.*; -import org.apache.stratos.messaging.listener.application.status.*; +import org.apache.stratos.messaging.event.applications.*; +import org.apache.stratos.messaging.listener.applications.*; import org.apache.stratos.messaging.message.receiver.application.status.ApplicationStatusEventReceiver; public class ApplicationStatusTopicReceiver implements Runnable { @@ -64,74 +64,74 @@ public class ApplicationStatusTopicReceiver implements Runnable { private void addEventListeners() { // Listen to topology events that affect clusters - statusEventReceiver.addEventListener(new AppStatusClusterCreatedEventListener() { + statusEventReceiver.addEventListener(new AppClusterCreatedEventListener() { @Override protected void onEvent(Event event) { - TopologyBuilder.handleClusterCreated((AppStatusClusterCreatedEvent) event); + TopologyBuilder.handleClusterCreated((AppClusterCreatedEvent) event); } }); - statusEventReceiver.addEventListener(new AppStatusClusterActivatedEventListener() { + statusEventReceiver.addEventListener(new AppClusterActivatedEventListener() { @Override protected void onEvent(Event event) { - TopologyBuilder.handleClusterActivatedEvent((AppStatusClusterActivatedEvent) event); + TopologyBuilder.handleClusterActivatedEvent((AppClusterActivatedEvent) event); } }); - statusEventReceiver.addEventListener(new AppStatusClusterTerminatedEventListener() { + statusEventReceiver.addEventListener(new AppClusterTerminatedEventListener() { @Override protected void onEvent(Event event) { - TopologyBuilder.handleClusterTerminatedEvent((AppStatusClusterTerminatedEvent) event); + TopologyBuilder.handleClusterTerminatedEvent((AppClusterTerminatedEvent) event); } }); - statusEventReceiver.addEventListener(new AppStatusClusterTerminatingEventListener(){ + statusEventReceiver.addEventListener(new AppClusterTerminatingEventListener(){ @Override protected void onEvent(Event event) { - TopologyBuilder.handleClusterTerminatingEvent((AppStatusClusterTerminatingEvent) event); + TopologyBuilder.handleClusterTerminatingEvent((AppClusterTerminatingEvent) event); } }); - statusEventReceiver.addEventListener(new AppStatusClusterInactivateEventListener() { + statusEventReceiver.addEventListener(new AppClusterInactivateEventListener() { @Override protected void onEvent(Event event) { - TopologyBuilder.handleClusterInActivateEvent((AppStatusClusterInactivateEvent) event); + TopologyBuilder.handleClusterInActivateEvent((AppClusterInactivateEvent) event); } }); - statusEventReceiver.addEventListener(new AppStatusGroupCreatedEventListener() { + statusEventReceiver.addEventListener(new GroupCreatedEventListener() { @Override protected void onEvent(Event event) { - TopologyBuilder.handleGroupCreated((AppStatusGroupCreatedEvent) event); + TopologyBuilder.handleGroupCreated((GroupCreatedEvent) event); } }); - statusEventReceiver.addEventListener(new AppStatusGroupActivatedEventListener() { + statusEventReceiver.addEventListener(new GroupActivatedEventListener() { @Override protected void onEvent(Event event) { - TopologyBuilder.handleGroupActivatedEvent((AppStatusGroupActivatedEvent) event); + TopologyBuilder.handleGroupActivatedEvent((GroupActivatedEvent) event); } }); - statusEventReceiver.addEventListener(new AppStatusGroupTerminatedEventListener() { + statusEventReceiver.addEventListener(new GroupTerminatedEventListener() { @Override protected void onEvent(Event event) { - TopologyBuilder.handleGroupTerminatedEvent((AppStatusGroupTerminatedEvent) event); + TopologyBuilder.handleGroupTerminatedEvent((GroupTerminatedEvent) event); } }); - statusEventReceiver.addEventListener(new AppStatusGroupTerminatingEventListener() { + statusEventReceiver.addEventListener(new GroupTerminatingEventListener() { @Override protected void onEvent(Event event) { - TopologyBuilder.handleGroupTerminatingEvent((AppStatusGroupTerminatingEvent) event); + TopologyBuilder.handleGroupTerminatingEvent((GroupTerminatingEvent) event); } }); - statusEventReceiver.addEventListener(new AppStatusGroupInactivateEventListener() { + statusEventReceiver.addEventListener(new GroupInactivateEventListener() { @Override protected void onEvent(Event event) { TopologyBuilder.handleGroupInActiveEvent((AppStatusGroupInactivateEvent) event); @@ -139,44 +139,44 @@ public class ApplicationStatusTopicReceiver implements Runnable { } }); - statusEventReceiver.addEventListener(new AppStatusApplicationActivatedEventListener() { + statusEventReceiver.addEventListener(new ApplicationActivatedEventListener() { @Override protected void onEvent(Event event) { - TopologyBuilder.handleApplicationActivatedEvent((AppStatusApplicationActivatedEvent) event); + TopologyBuilder.handleApplicationActivatedEvent((ApplicationActivatedEvent) event); } }); - statusEventReceiver.addEventListener(new AppStatusApplicationInactivatedEventListener() { + statusEventReceiver.addEventListener(new ApplicationInactivatedEventListener() { @Override protected void onEvent(Event event) { - TopologyBuilder.handleApplicationInActivatedEvent((AppStatusApplicationInactivatedEvent) event); + TopologyBuilder.handleApplicationInActivatedEvent((ApplicationInactivatedEvent) event); } }); - statusEventReceiver.addEventListener(new AppStatusApplicationCreatedEventListener() { + statusEventReceiver.addEventListener(new ApplicationCreatedEventListener() { @Override protected void onEvent(Event event) { - TopologyBuilder.handleApplicationCreatedEvent((AppStatusApplicationCreatedEvent) event); + TopologyBuilder.handleApplicationCreatedEvent((ApplicationCreatedEvent) event); } }); - statusEventReceiver.addEventListener(new AppStatusApplicationTerminatingEventListener() { + statusEventReceiver.addEventListener(new ApplicationTerminatingEventListener() { @Override protected void onEvent(Event event) { - TopologyBuilder.handleApplicationTerminatingEvent((AppStatusApplicationTerminatingEvent) event); + TopologyBuilder.handleApplicationTerminatingEvent((ApplicationTerminatingEvent) event); } }); - statusEventReceiver.addEventListener(new AppStatusApplicationTerminatedEventListener() { + statusEventReceiver.addEventListener(new ApplicationTerminatedEventListener() { @Override protected void onEvent(Event event) { - TopologyBuilder.handleApplicationTerminatedEvent((AppStatusApplicationTerminatedEvent) event); + TopologyBuilder.handleApplicationTerminatedEvent((ApplicationTerminatedEvent) event); } }); http://git-wip-us.apache.org/repos/asf/stratos/blob/ea9337d3/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java index e31cf32..3bc7b5a 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java @@ -31,7 +31,16 @@ import org.apache.stratos.cloud.controller.runtime.FasterLookUpDataHolder; import org.apache.stratos.cloud.controller.util.CloudControllerUtil; import org.apache.stratos.messaging.domain.applications.*; import org.apache.stratos.messaging.domain.topology.*; -import org.apache.stratos.messaging.event.application.status.*; +import org.apache.stratos.messaging.event.applications.*; +import org.apache.stratos.messaging.event.applications.ApplicationActivatedEvent; +import org.apache.stratos.messaging.event.applications.ApplicationCreatedEvent; +import org.apache.stratos.messaging.event.applications.ApplicationInactivatedEvent; +import org.apache.stratos.messaging.event.applications.ApplicationTerminatedEvent; +import org.apache.stratos.messaging.event.applications.ApplicationTerminatingEvent; +import org.apache.stratos.messaging.event.applications.GroupActivatedEvent; +import org.apache.stratos.messaging.event.applications.GroupCreatedEvent; +import org.apache.stratos.messaging.event.applications.GroupTerminatedEvent; +import org.apache.stratos.messaging.event.applications.GroupTerminatingEvent; import org.apache.stratos.messaging.event.instance.status.InstanceActivatedEvent; import org.apache.stratos.messaging.event.instance.status.InstanceMaintenanceModeEvent; import org.apache.stratos.messaging.event.instance.status.InstanceReadyToShutdownEvent; @@ -115,7 +124,7 @@ public class TopologyBuilder { } } - public static void handleClusterCreated (AppStatusClusterCreatedEvent event) { + public static void handleClusterCreated (AppClusterCreatedEvent event) { TopologyManager.acquireWriteLock(); @@ -152,7 +161,7 @@ public class TopologyBuilder { event.getClusterId()); } - public static void handleGroupCreated (AppStatusGroupCreatedEvent event) { + public static void handleGroupCreated (GroupCreatedEvent event) { TopologyManager.acquireWriteLock(); @@ -186,7 +195,7 @@ public class TopologyBuilder { TopologyManager.releaseWriteLock(); } - TopologyEventPublisher.sendGroupCreatedEvent(new GroupCreatedEvent(event.getAppId(), event.getGroupId())); + TopologyEventPublisher.sendGroupCreatedEvent(new org.apache.stratos.messaging.event.topology.GroupCreatedEvent(event.getAppId(), event.getGroupId())); } public static void handleClusterCreated(Registrant registrant, boolean isLb) { @@ -713,7 +722,7 @@ public class TopologyBuilder { } - public static void handleClusterActivatedEvent(AppStatusClusterActivatedEvent clusterActivatedEvent) { + public static void handleClusterActivatedEvent(AppClusterActivatedEvent clusterActivatedEvent) { Topology topology = TopologyManager.getTopology(); Service service = topology.getService(clusterActivatedEvent.getServiceName()); //update the status of the cluster @@ -751,7 +760,7 @@ public class TopologyBuilder { } public static void handleClusterInActivateEvent( - AppStatusClusterInactivateEvent clusterInActivateEvent) { + AppClusterInactivateEvent clusterInActivateEvent) { Topology topology = TopologyManager.getTopology(); Service service = topology.getService(clusterInActivateEvent.getServiceName()); //update the status of the cluster @@ -788,7 +797,7 @@ public class TopologyBuilder { TopologyEventPublisher.sendClusterInActivateEvent(clusterActivatedEvent1); } - public static void handleGroupActivatedEvent(AppStatusGroupActivatedEvent groupActivatedEvent) { + public static void handleGroupActivatedEvent(GroupActivatedEvent groupActivatedEvent) { Topology topology = TopologyManager.getTopology(); Application application = topology.getApplication(groupActivatedEvent.getAppId()); //update the status of the Group @@ -822,7 +831,7 @@ public class TopologyBuilder { TopologyEventPublisher.sendGroupActivatedEvent(groupActivatedEvent1); } - public static void handleApplicationActivatedEvent(AppStatusApplicationActivatedEvent applicationActivatedEvent) { + public static void handleApplicationActivatedEvent(ApplicationActivatedEvent applicationActivatedEvent) { Topology topology = TopologyManager.getTopology(); Application application = topology.getApplication(applicationActivatedEvent.getAppId()); //update the status of the Group @@ -848,7 +857,7 @@ public class TopologyBuilder { TopologyEventPublisher.sendApplicationActivatedEvent(applicationActivatedEvent1); } - public static void handleApplicationInActivatedEvent(AppStatusApplicationInactivatedEvent event) { + public static void handleApplicationInActivatedEvent(ApplicationInactivatedEvent event) { Topology topology = TopologyManager.getTopology(); Application application = topology.getApplication(event.getAppId()); //update the status of the Group @@ -874,7 +883,7 @@ public class TopologyBuilder { TopologyEventPublisher.sendApplicationInactivatedEvent(applicationActivatedEvent); } - public static void handleApplicationCreatedEvent(AppStatusApplicationCreatedEvent event) { + public static void handleApplicationCreatedEvent(ApplicationCreatedEvent event) { Topology topology = TopologyManager.getTopology(); Application application = topology.getApplication(event.getAppId()); //update the status of the Group @@ -907,7 +916,7 @@ public class TopologyBuilder { TopologyEventPublisher.sendApplicationCreatedEvent(applicationActivatedEvent); } - public static void handleApplicationTerminatingEvent(AppStatusApplicationTerminatingEvent event) { + public static void handleApplicationTerminatingEvent(ApplicationTerminatingEvent event) { String applicationId = event.getAppId(); @@ -956,7 +965,7 @@ public class TopologyBuilder { } } - public static void handleApplicationTerminatedEvent(AppStatusApplicationTerminatedEvent event) { + public static void handleApplicationTerminatedEvent(ApplicationTerminatedEvent event) { Topology topology = TopologyManager.getTopology(); @@ -1018,7 +1027,7 @@ public class TopologyBuilder { log.info("Removed application [ " + event.getAppId() + " ] from Topology"); - TopologyEventPublisher.sendApplicationTerminatedEvent(new ApplicationTerminatedEvent(event.getAppId(), + TopologyEventPublisher.sendApplicationTerminatedEvent(new org.apache.stratos.messaging.event.topology.ApplicationTerminatedEvent(event.getAppId(), clusterData, tenantId, tenantDomain)); } @@ -1027,7 +1036,7 @@ public class TopologyBuilder { } } - private static void deleteAppResourcesFromMetadataService(AppStatusApplicationTerminatedEvent event) { + private static void deleteAppResourcesFromMetadataService(ApplicationTerminatedEvent event) { try { MetaDataServiceClient metadataClient = new DefaultMetaDataServiceClient(); metadataClient.deleteApplicationProperties(event.getAppId()); @@ -1071,7 +1080,7 @@ public class TopologyBuilder { } - public static void handleGroupTerminatedEvent(AppStatusGroupTerminatedEvent event) { + public static void handleGroupTerminatedEvent(GroupTerminatedEvent event) { Topology topology = TopologyManager.getTopology(); Application application = topology.getApplication(event.getAppId()); //update the status of the Group @@ -1105,7 +1114,7 @@ public class TopologyBuilder { TopologyEventPublisher.sendGroupTerminatedEvent(groupTerminatedTopologyEvent); } - public static void handleGroupTerminatingEvent(AppStatusGroupTerminatingEvent event) { + public static void handleGroupTerminatingEvent(GroupTerminatingEvent event) { Topology topology = TopologyManager.getTopology(); Application application = topology.getApplication(event.getAppId()); //update the status of the Group @@ -1139,7 +1148,7 @@ public class TopologyBuilder { TopologyEventPublisher.sendGroupTerminatingEvent(groupTerminatingTopologyEvent); } - public static void handleClusterTerminatedEvent(AppStatusClusterTerminatedEvent event) { + public static void handleClusterTerminatedEvent(AppClusterTerminatedEvent event) { TopologyManager.acquireWriteLock(); @@ -1166,7 +1175,7 @@ public class TopologyBuilder { TopologyEventPublisher.sendClusterTerminatedEvent(clusterTerminatedEvent); } - public static void handleClusterTerminatingEvent(AppStatusClusterTerminatingEvent event) { + public static void handleClusterTerminatingEvent(AppClusterTerminatingEvent event) { TopologyManager.acquireWriteLock(); http://git-wip-us.apache.org/repos/asf/stratos/blob/ea9337d3/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/applications/AppStatusMessageProcessorChain.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/applications/AppStatusMessageProcessorChain.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/applications/AppStatusMessageProcessorChain.java index 1524b00..3705f1e 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/applications/AppStatusMessageProcessorChain.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/applications/AppStatusMessageProcessorChain.java @@ -21,7 +21,7 @@ package org.apache.stratos.messaging.message.processor.applications; 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.*; +import org.apache.stratos.messaging.listener.applications.*; import org.apache.stratos.messaging.message.processor.MessageProcessorChain; /** @@ -31,68 +31,68 @@ import org.apache.stratos.messaging.message.processor.MessageProcessorChain; public class AppStatusMessageProcessorChain extends MessageProcessorChain { private static final Log log = LogFactory.getLog(AppStatusMessageProcessorChain.class); - private AppStatusClusterCreatedMessageProcessor clusterCreatedMessageProcessor; - private AppStatusClusterActivatedMessageProcessor clusterActivatedMessageProcessor; - private AppStatusClusterInactivateMessageProcessor clusterInActivateMessageProcessor; - private AppStatusClusterTerminatingMessageProcessor clusterTerminatingMessageProcessor; - private AppStatusClusterTerminatedMessageProcessor clusterTerminatedMessageProcessor; - private AppStatusGroupCreatedMessageProcessor groupCreatedMessageProcessor; - private AppStatusGroupActivatedMessageProcessor groupActivatedMessageProcessor; - private AppStatusGroupInactivatedMessageProcessor groupInActivateMessageProcessor; - private AppStatusApplicationActivatedMessageProcessor appActivatedMessageProcessor; - private AppStatusApplicationCreatedMessageProcessor applicationStatusAppCreatedMessageProcessor; - private AppStatusApplicationInactivatedMessageProcessor applicationStatusAppInActivatedMessageProcessor; - private AppStatusApplicationTerminatedMessageProcessor applicationStatusAppTerminatedMessageProcessor; - private AppStatusApplicationTerminatingMessageProcessor applicationStatusAppTerminatingMessageProcessor; - - private AppStatusGroupTerminatedMessageProcessor groupTerminatedMessageProcessor; - private AppStatusGroupTerminatingMessageProcessor groupTerminatingMessageProcessor; + private AppClusterCreatedMessageProcessor clusterCreatedMessageProcessor; + private AppClusterActivatedMessageProcessor clusterActivatedMessageProcessor; + private AppClusterInactivateMessageProcessor clusterInActivateMessageProcessor; + private AppClusterTerminatingMessageProcessor clusterTerminatingMessageProcessor; + private AppClusterTerminatedMessageProcessor clusterTerminatedMessageProcessor; + private GroupCreatedMessageProcessor groupCreatedMessageProcessor; + private GroupActivatedMessageProcessor groupActivatedMessageProcessor; + private GroupInactivatedMessageProcessor groupInActivateMessageProcessor; + private ApplicationActivatedMessageProcessor appActivatedMessageProcessor; + private ApplicationCreatedMessageProcessor applicationStatusAppCreatedMessageProcessor; + private ApplicationInactivatedMessageProcessor applicationStatusAppInActivatedMessageProcessor; + private ApplicationTerminatedMessageProcessor applicationStatusAppTerminatedMessageProcessor; + private ApplicationTerminatingMessageProcessor applicationStatusAppTerminatingMessageProcessor; + + private GroupTerminatedMessageProcessor groupTerminatedMessageProcessor; + private GroupTerminatingMessageProcessor groupTerminatingMessageProcessor; public void initialize() { // Add instance notifier event processors - clusterCreatedMessageProcessor= new AppStatusClusterCreatedMessageProcessor(); + clusterCreatedMessageProcessor= new AppClusterCreatedMessageProcessor(); add(clusterCreatedMessageProcessor); - clusterActivatedMessageProcessor = new AppStatusClusterActivatedMessageProcessor(); + clusterActivatedMessageProcessor = new AppClusterActivatedMessageProcessor(); add(clusterActivatedMessageProcessor); - clusterInActivateMessageProcessor = new AppStatusClusterInactivateMessageProcessor(); + clusterInActivateMessageProcessor = new AppClusterInactivateMessageProcessor(); add(clusterInActivateMessageProcessor); - clusterTerminatingMessageProcessor = new AppStatusClusterTerminatingMessageProcessor(); + clusterTerminatingMessageProcessor = new AppClusterTerminatingMessageProcessor(); add(clusterTerminatingMessageProcessor); - clusterTerminatedMessageProcessor = new AppStatusClusterTerminatedMessageProcessor(); + clusterTerminatedMessageProcessor = new AppClusterTerminatedMessageProcessor(); add(clusterTerminatedMessageProcessor); - groupCreatedMessageProcessor = new AppStatusGroupCreatedMessageProcessor(); + groupCreatedMessageProcessor = new GroupCreatedMessageProcessor(); add(groupCreatedMessageProcessor); - groupActivatedMessageProcessor = new AppStatusGroupActivatedMessageProcessor(); + groupActivatedMessageProcessor = new GroupActivatedMessageProcessor(); add(groupActivatedMessageProcessor); - groupInActivateMessageProcessor = new AppStatusGroupInactivatedMessageProcessor(); + groupInActivateMessageProcessor = new GroupInactivatedMessageProcessor(); add(groupInActivateMessageProcessor); - appActivatedMessageProcessor = new AppStatusApplicationActivatedMessageProcessor(); + appActivatedMessageProcessor = new ApplicationActivatedMessageProcessor(); add(appActivatedMessageProcessor); - applicationStatusAppCreatedMessageProcessor = new AppStatusApplicationCreatedMessageProcessor(); + applicationStatusAppCreatedMessageProcessor = new ApplicationCreatedMessageProcessor(); this.add(applicationStatusAppCreatedMessageProcessor); - applicationStatusAppInActivatedMessageProcessor = new AppStatusApplicationInactivatedMessageProcessor(); + applicationStatusAppInActivatedMessageProcessor = new ApplicationInactivatedMessageProcessor(); this.add(applicationStatusAppInActivatedMessageProcessor); - applicationStatusAppTerminatedMessageProcessor = new AppStatusApplicationTerminatedMessageProcessor(); + applicationStatusAppTerminatedMessageProcessor = new ApplicationTerminatedMessageProcessor(); this.add(applicationStatusAppTerminatedMessageProcessor); - applicationStatusAppTerminatingMessageProcessor = new AppStatusApplicationTerminatingMessageProcessor(); + applicationStatusAppTerminatingMessageProcessor = new ApplicationTerminatingMessageProcessor(); this.add(applicationStatusAppTerminatingMessageProcessor); - groupTerminatedMessageProcessor = new AppStatusGroupTerminatedMessageProcessor(); + groupTerminatedMessageProcessor = new GroupTerminatedMessageProcessor(); this.add(groupTerminatedMessageProcessor); - groupTerminatingMessageProcessor = new AppStatusGroupTerminatingMessageProcessor(); + groupTerminatingMessageProcessor = new GroupTerminatingMessageProcessor(); this.add(groupTerminatingMessageProcessor); if (log.isDebugEnabled()) { @@ -101,35 +101,35 @@ public class AppStatusMessageProcessorChain extends MessageProcessorChain { } public void addEventListener(EventListener eventListener) { - if(eventListener instanceof AppStatusClusterCreatedEventListener) { + if(eventListener instanceof AppClusterCreatedEventListener) { clusterCreatedMessageProcessor.addEventListener(eventListener); - } else if (eventListener instanceof AppStatusClusterActivatedEventListener) { + } else if (eventListener instanceof AppClusterActivatedEventListener) { clusterActivatedMessageProcessor.addEventListener(eventListener); - } else if (eventListener instanceof AppStatusClusterInactivateEventListener) { + } else if (eventListener instanceof AppClusterInactivateEventListener) { clusterInActivateMessageProcessor.addEventListener(eventListener); - } else if(eventListener instanceof AppStatusGroupCreatedEventListener) { + } else if(eventListener instanceof GroupCreatedEventListener) { groupCreatedMessageProcessor.addEventListener(eventListener); - } else if (eventListener instanceof AppStatusGroupActivatedEventListener) { + } else if (eventListener instanceof GroupActivatedEventListener) { groupActivatedMessageProcessor.addEventListener(eventListener); - } else if(eventListener instanceof AppStatusClusterTerminatedEventListener){ + } else if(eventListener instanceof AppClusterTerminatedEventListener){ clusterTerminatedMessageProcessor.addEventListener(eventListener); - } else if(eventListener instanceof AppStatusClusterTerminatingEventListener){ + } else if(eventListener instanceof AppClusterTerminatingEventListener){ clusterTerminatingMessageProcessor.addEventListener(eventListener); - }else if (eventListener instanceof AppStatusGroupInactivateEventListener) { + }else if (eventListener instanceof GroupInactivateEventListener) { groupInActivateMessageProcessor.addEventListener(eventListener); - } else if (eventListener instanceof AppStatusApplicationActivatedEventListener) { + } else if (eventListener instanceof ApplicationActivatedEventListener) { appActivatedMessageProcessor.addEventListener(eventListener); - } else if(eventListener instanceof AppStatusApplicationInactivatedEventListener){ + } else if(eventListener instanceof ApplicationInactivatedEventListener){ applicationStatusAppInActivatedMessageProcessor.addEventListener(eventListener); - } else if(eventListener instanceof AppStatusApplicationCreatedEventListener){ + } else if(eventListener instanceof ApplicationCreatedEventListener){ applicationStatusAppCreatedMessageProcessor.addEventListener(eventListener); - } else if(eventListener instanceof AppStatusApplicationTerminatingEventListener){ + } else if(eventListener instanceof ApplicationTerminatingEventListener){ applicationStatusAppTerminatingMessageProcessor.addEventListener(eventListener); - } else if(eventListener instanceof AppStatusApplicationTerminatedEventListener){ + } else if(eventListener instanceof ApplicationTerminatedEventListener){ applicationStatusAppTerminatedMessageProcessor.addEventListener(eventListener); - } else if (eventListener instanceof AppStatusGroupTerminatingEventListener){ + } else if (eventListener instanceof GroupTerminatingEventListener){ groupTerminatingMessageProcessor.addEventListener(eventListener); - } else if (eventListener instanceof AppStatusGroupTerminatedEventListener){ + } else if (eventListener instanceof GroupTerminatedEventListener){ groupTerminatedMessageProcessor.addEventListener(eventListener); } else { http://git-wip-us.apache.org/repos/asf/stratos/blob/ea9337d3/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 1ed5576..d8d25d9 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,6 +22,7 @@ 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.applications.ApplicationUndeployedEventListener; import org.apache.stratos.messaging.listener.topology.*; import org.apache.stratos.messaging.message.processor.MessageProcessorChain;
