adding complete applications support
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/696bc0d2 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/696bc0d2 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/696bc0d2 Branch: refs/heads/docker-grouping-merge Commit: 696bc0d24d25bf70a0bbcf8c1303fab7ad7e66d8 Parents: 0f7d7b0 Author: reka <[email protected]> Authored: Fri Oct 31 14:54:25 2014 +0530 Committer: reka <[email protected]> Committed: Fri Oct 31 14:54:34 2014 +0530 ---------------------------------------------------------------------- .../autoscaler/grouping/topic/ClusterStatusEventPublisher.java | 4 ++-- .../status/receiver/ApplicationStatusTopicReceiver.java | 6 ++---- .../stratos/cloud/controller/topology/TopologyBuilder.java | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/696bc0d2/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/grouping/topic/ClusterStatusEventPublisher.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/grouping/topic/ClusterStatusEventPublisher.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/grouping/topic/ClusterStatusEventPublisher.java index 2a05b2e..9a43418 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/grouping/topic/ClusterStatusEventPublisher.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/grouping/topic/ClusterStatusEventPublisher.java @@ -48,8 +48,8 @@ public class ClusterStatusEventPublisher { log.info("Publishing Cluster created event for [application]: " + appId + " [cluster]: " + clusterId); } - ClusterStatusClusterCreatedEvent clusterCreatedEvent = - new ClusterStatusClusterCreatedEvent(appId, serviceName, clusterId); + ClusterStatusClusterResettedEvent clusterCreatedEvent = + new ClusterStatusClusterResettedEvent(appId, serviceName, clusterId); publishEvent(clusterCreatedEvent); } else { http://git-wip-us.apache.org/repos/asf/stratos/blob/696bc0d2/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 fe97f99..d75039d 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,9 +22,7 @@ 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.applications.*; import org.apache.stratos.messaging.event.cluster.status.*; -import org.apache.stratos.messaging.listener.applications.*; import org.apache.stratos.messaging.listener.cluster.status.*; import org.apache.stratos.messaging.message.receiver.applications.ApplicationsEventReceiver; @@ -66,10 +64,10 @@ public class ApplicationStatusTopicReceiver implements Runnable { private void addEventListeners() { // Listen to topology events that affect clusters - statusEventReceiver.addEventListener(new ClusterStatusClusterCreatedEventListener() { + statusEventReceiver.addEventListener(new ClusterStatusClusterResetEventListener() { @Override protected void onEvent(Event event) { - TopologyBuilder.handleClusterCreated((ClusterStatusClusterCreatedEvent) event); + TopologyBuilder.handleClusterCreated((ClusterStatusClusterResettedEvent) event); } }); http://git-wip-us.apache.org/repos/asf/stratos/blob/696bc0d2/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 2941027..dcbeb48 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 @@ -125,7 +125,7 @@ public class TopologyBuilder { } } - public static void handleClusterCreated (ClusterStatusClusterCreatedEvent event) { + public static void handleClusterCreated (ClusterStatusClusterResettedEvent event) { TopologyManager.acquireWriteLock();
