Repository: stratos Updated Branches: refs/heads/4.0.0-grouping aef9c12cb -> 2f1b92be4
using correct events and processors Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/2f1b92be Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/2f1b92be Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/2f1b92be Branch: refs/heads/4.0.0-grouping Commit: 2f1b92be4b4f74b90da78cc0655523c232225a96 Parents: aef9c12 Author: reka <[email protected]> Authored: Mon Oct 27 18:43:28 2014 +0530 Committer: reka <[email protected]> Committed: Mon Oct 27 18:43:28 2014 +0530 ---------------------------------------------------------------------- .../grouping/topic/StatusEventPublisher.java | 20 +++----------------- .../topology/GroupInActivateProcessor.java | 2 +- 2 files changed, 4 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/2f1b92be/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/grouping/topic/StatusEventPublisher.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/grouping/topic/StatusEventPublisher.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/grouping/topic/StatusEventPublisher.java index 3a3af88..ee75f74 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/grouping/topic/StatusEventPublisher.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/grouping/topic/StatusEventPublisher.java @@ -14,8 +14,6 @@ import org.apache.stratos.messaging.event.application.status.AppStatusApplicatio import org.apache.stratos.messaging.event.application.status.AppStatusClusterActivatedEvent; import org.apache.stratos.messaging.event.application.status.AppStatusClusterInactivateEvent; import org.apache.stratos.messaging.event.application.status.AppStatusGroupActivatedEvent; -import org.apache.stratos.messaging.event.topology.*; -import org.apache.stratos.messaging.event.topology.GroupInactivateEvent; import org.apache.stratos.messaging.util.Constants; import java.util.Set; @@ -26,19 +24,6 @@ import java.util.Set; public class StatusEventPublisher { private static final Log log = LogFactory.getLog(StatusEventPublisher.class); - public static void sendClusterCreatedEvent(String appId, String serviceName, String clusterId) { - - if (log.isInfoEnabled()) { - log.info("Publishing Cluster activated event for [application]: " + appId + - " [cluster]: " + clusterId); - } - - - ClusterCreatedEvent clusterCreatedEvent = new ClusterCreatedEvent(appId, serviceName, clusterId); - - publishEvent(clusterCreatedEvent); - } - public static void sendClusterActivatedEvent(String appId, String serviceName, String clusterId) { if (log.isInfoEnabled()) { @@ -110,9 +95,10 @@ public class StatusEventPublisher { " [group]: " + groupId); } - GroupInactivateEvent groupInactivateEvent = new GroupInactivateEvent(appId, groupId); + AppStatusGroupInactivateEvent appStatusGroupInactivateEvent= new + AppStatusGroupInactivateEvent(appId, groupId); - publishEvent(groupInactivateEvent); + publishEvent(appStatusGroupInactivateEvent); } public static void sendGroupTerminatingEvent(String appId, String groupId) { http://git-wip-us.apache.org/repos/asf/stratos/blob/2f1b92be/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 f8fe705..094196b 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 @@ -46,7 +46,7 @@ public class GroupInActivateProcessor extends MessageProcessor { public boolean process(String type, String message, Object object) { Topology topology = (Topology) object; - if (GroupActivatedEvent.class.getName().equals(type)) { + if (GroupInactivateEvent.class.getName().equals(type)) { // Return if topology has not been initialized if (!topology.isInitialized()) return false;
