Updated Branches:
  refs/heads/master de793d35f -> 8830cc4e1

Refactored cloud controller topology event publisher


Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/8830cc4e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/8830cc4e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/8830cc4e

Branch: refs/heads/master
Commit: 8830cc4e1aedec2a866d3d34795aec8c487f7b5f
Parents: de793d3
Author: Imesh Gunaratne <[email protected]>
Authored: Wed Dec 25 16:42:48 2013 +0530
Committer: Imesh Gunaratne <[email protected]>
Committed: Wed Dec 25 16:42:48 2013 +0530

----------------------------------------------------------------------
 .../internal/CloudControllerDSComponent.java    |  31 +---
 .../controller/topology/TopologyBuilder.java    |  17 +-
 .../topology/TopologyEventPublisher.java        | 151 ++++++++++++++++++
 .../topology/TopologyEventSender.java           | 154 -------------------
 .../topology/TopologySynchronizerTask.java      |   2 +-
 5 files changed, 161 insertions(+), 194 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8830cc4e/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerDSComponent.java
----------------------------------------------------------------------
diff --git 
a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerDSComponent.java
 
b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerDSComponent.java
index 466e569..9102c5b 100644
--- 
a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerDSComponent.java
+++ 
b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerDSComponent.java
@@ -71,42 +71,13 @@ public class CloudControllerDSComponent {
 
     protected void activate(ComponentContext context) {
         try {
-            
-            // register deployers of CC
-//            AxisConfiguration axisConfig = 
ServiceReferenceHolder.getInstance().getAxisConfiguration();
-//            
-//            if(axisConfig ==  null) {
-//                String msg = "Axis Configuration is null. Cannot register 
deployers.";
-//                log.error(msg);
-//                throw new CloudControllerException(msg);
-//            }
-//            
-//            DeploymentEngine deploymentEngine = (DeploymentEngine) 
axisConfig.getConfigurator();
-//            Deployer cloudControllerDeployer = new CloudControllerDeployer();
-//            Deployer cartridgeDeployer = new CartridgeDeployer();
-//            deploymentEngine.addDeployer(cloudControllerDeployer, 
"../../conf", "xml");
-//            deploymentEngine.addDeployer(cartridgeDeployer, "cartridges", 
"xml");
-               
-            // get all the topics - comma separated list
-            String topicsString = 
dataHolder.getTopologyConfig().getProperty(CloudControllerConstants.TOPICS_PROPERTY);
-            
-            if(topicsString == null || topicsString.isEmpty()) {
-                topicsString = Constants.TOPOLOGY_TOPIC;
-            } 
-            
-            String[] topics = topicsString.split(",");
-            for (String topic : topics) {
-                
-                dataHolder.addEventPublisher(new EventPublisher(topic), topic);
-            }
-
             // Start instance status event message listener
             TopicSubscriber subscriber = new 
TopicSubscriber(CloudControllerConstants.INSTANCE_TOPIC);
             subscriber.setMessageListener(new 
InstanceStatusEventMessageListener());
             Thread tsubscriber = new Thread(subscriber);
             tsubscriber.start();
                
-               // initialize the topic publishers
+               // Register cloud controller service
             BundleContext bundleContext = context.getBundleContext();
             
bundleContext.registerService(CloudControllerService.class.getName(), new 
CloudControllerServiceImpl(), null);
 

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8830cc4e/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 bc4da0f..58f682e 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
@@ -20,7 +20,6 @@ package org.apache.stratos.cloud.controller.topology;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.cloud.controller.deployment.partition.Partition;
 import org.apache.stratos.cloud.controller.pojo.Cartridge;
 import org.apache.stratos.cloud.controller.pojo.ClusterContext;
 import org.apache.stratos.cloud.controller.pojo.PortMapping;
@@ -72,7 +71,7 @@ public class TopologyBuilder {
         } finally {
             TopologyManager.releaseWriteLock();
         }
-        TopologyEventSender.sendServiceCreateEvent(cartridgeList);
+        TopologyEventPublisher.sendServiceCreateEvent(cartridgeList);
 
     }
 
@@ -89,7 +88,7 @@ public class TopologyBuilder {
                     } finally {
                         TopologyManager.releaseWriteLock();
                     }
-                    TopologyEventSender.sendServiceRemovedEvent(cartridgeList);
+                    
TopologyEventPublisher.sendServiceRemovedEvent(cartridgeList);
                 } else {
                     throw new RuntimeException(String.format("Service %s does 
not exist..", cartridge.getType()));
                 }
@@ -135,7 +134,7 @@ public class TopologyBuilder {
                 service.addCluster(cluster);
             }
             TopologyManager.updateTopology(topology);
-            TopologyEventSender.sendClusterCreatedEvent(cartridgeType, 
clusterId, cluster);
+            TopologyEventPublisher.sendClusterCreatedEvent(cartridgeType, 
clusterId, cluster);
 
         } finally {
             TopologyManager.releaseWriteLock();
@@ -163,7 +162,7 @@ public class TopologyBuilder {
         } finally {
             TopologyManager.releaseWriteLock();
         }
-        TopologyEventSender.sendClusterRemovedEvent(ctxt);
+        TopologyEventPublisher.sendClusterRemovedEvent(ctxt);
     }
 
     public static void handleMemberSpawned(String memberId, String 
serviceName, String clusterId,
@@ -188,7 +187,7 @@ public class TopologyBuilder {
         } finally {
             TopologyManager.releaseWriteLock();
         }
-        TopologyEventSender.sendInstanceSpawnedEvent(serviceName, clusterId, 
networkPartitionId, partitionId, memberId, lbClusterId);
+        TopologyEventPublisher.sendInstanceSpawnedEvent(serviceName, 
clusterId, networkPartitionId, partitionId, memberId, lbClusterId);
     }
 
     public static void handleMemberStarted(InstanceStartedEvent 
instanceStartedEvent) {
@@ -220,7 +219,7 @@ public class TopologyBuilder {
             TopologyManager.releaseWriteLock();
         }
         //memberStartedEvent.
-        TopologyEventSender.sendMemberStartedEvent(instanceStartedEvent);
+        TopologyEventPublisher.sendMemberStartedEvent(instanceStartedEvent);
     }
 
     public static void handleMemberActivated(InstanceActivatedEvent 
instanceActivatedEvent) {
@@ -270,7 +269,7 @@ public class TopologyBuilder {
         } finally {
             TopologyManager.releaseWriteLock();
         }
-        TopologyEventSender.sendMemberActivatedEvent(memberActivatedEvent);
+        TopologyEventPublisher.sendMemberActivatedEvent(memberActivatedEvent);
     }
 
     public static void handleMemberTerminated(String serviceName, String 
clusterId, String networkPartitionId, String partitionId, String memberId) {
@@ -291,7 +290,7 @@ public class TopologyBuilder {
         } finally {
             TopologyManager.releaseWriteLock();
         }
-        TopologyEventSender.sendMemberTerminatedEvent(serviceName, clusterId, 
networkPartitionId, partitionId, memberId);
+        TopologyEventPublisher.sendMemberTerminatedEvent(serviceName, 
clusterId, networkPartitionId, partitionId, memberId);
     }
 
     public static void handleMemberSuspended() {

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8830cc4e/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyEventPublisher.java
----------------------------------------------------------------------
diff --git 
a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyEventPublisher.java
 
b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyEventPublisher.java
new file mode 100644
index 0000000..efe335b
--- /dev/null
+++ 
b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyEventPublisher.java
@@ -0,0 +1,151 @@
+package org.apache.stratos.cloud.controller.topology;
+ /*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.stratos.cloud.controller.pojo.Cartridge;
+import org.apache.stratos.cloud.controller.pojo.ClusterContext;
+import org.apache.stratos.cloud.controller.pojo.PortMapping;
+import org.apache.stratos.cloud.controller.pojo.Registrant;
+import org.apache.stratos.cloud.controller.runtime.FasterLookUpDataHolder;
+import org.apache.stratos.cloud.controller.util.CloudControllerUtil;
+import org.apache.stratos.messaging.broker.publish.EventPublisher;
+import org.apache.stratos.messaging.domain.topology.Cluster;
+import org.apache.stratos.messaging.domain.topology.Port;
+import org.apache.stratos.messaging.domain.topology.ServiceType;
+import org.apache.stratos.messaging.domain.topology.Topology;
+import org.apache.stratos.messaging.event.Event;
+import org.apache.stratos.messaging.event.instance.status.InstanceStartedEvent;
+import org.apache.stratos.messaging.event.topology.*;
+import org.apache.stratos.messaging.util.Constants;
+
+import java.util.List;
+import java.util.Properties;
+
+/**
+ * this is to send the relevant events from cloud controller to topology topic
+ */
+public class TopologyEventPublisher {
+    private static final Log log = 
LogFactory.getLog(TopologyEventPublisher.class);
+
+
+    public static void sendServiceCreateEvent(List<Cartridge> cartridgeList) {
+        ServiceCreatedEvent serviceCreatedEvent;
+        for(Cartridge cartridge : cartridgeList) {
+            serviceCreatedEvent = new ServiceCreatedEvent(cartridge.getType(), 
(cartridge.isMultiTenant() ? ServiceType.MultiTenant : 
ServiceType.SingleTenant));
+
+            // Add ports to the event
+            Port port;
+            List<PortMapping> portMappings = cartridge.getPortMappings();
+            for(PortMapping portMapping : portMappings) {
+                port = new Port(portMapping.getProtocol(),
+                                Integer.parseInt(portMapping.getPort()),
+                                Integer.parseInt(portMapping.getProxyPort()));
+                serviceCreatedEvent.addPort(port);
+            }
+
+            if(log.isInfoEnabled()) {
+                log.info(String.format("Publishing service created event: 
[service] %s", cartridge.getType()));
+            }
+            publishEvent(serviceCreatedEvent);
+        }
+    }
+
+    public static void sendServiceRemovedEvent(List<Cartridge> cartridgeList) {
+        ServiceRemovedEvent serviceRemovedEvent;
+        for(Cartridge cartridge : cartridgeList) {
+            serviceRemovedEvent = new ServiceRemovedEvent(cartridge.getType());
+            if(log.isInfoEnabled()) {
+                log.info(String.format("Publishing service removed event: 
[service] %s", serviceRemovedEvent.getServiceName()));
+            }
+            publishEvent(serviceRemovedEvent);
+        }
+    }
+
+    public static void sendClusterCreatedEvent(String serviceName, String 
clusterId, Cluster cluster) {
+        ClusterCreatedEvent clusterCreatedEvent = new 
ClusterCreatedEvent(serviceName, clusterId, cluster);
+
+        if(log.isInfoEnabled()) {
+            log.info("Publishing cluster created event: " +cluster.toString());
+        }
+        publishEvent(clusterCreatedEvent);
+
+    }
+
+    public static void sendClusterRemovedEvent(ClusterContext ctxt) {
+        ClusterRemovedEvent clusterRemovedEvent = new 
ClusterRemovedEvent(ctxt.getCartridgeType(), ctxt.getClusterId());
+
+        if(log.isInfoEnabled()) {
+            log.info(String.format("Publishing cluster removed event: 
[service] %s [cluster] %s", ctxt.getCartridgeType(), ctxt.getClusterId()));
+        }
+        publishEvent(clusterRemovedEvent);
+
+    }
+
+    public static void sendInstanceSpawnedEvent(String serviceName, String 
clusterId, String networkPartitionId, String partitionId, String memberId, 
String lbClusterId) {
+        InstanceSpawnedEvent instanceSpawnedEvent = new 
InstanceSpawnedEvent(serviceName, clusterId, networkPartitionId, partitionId, 
memberId);
+        instanceSpawnedEvent.setLbClusterId(lbClusterId);
+        if(log.isInfoEnabled()) {
+            log.info(String.format("Publishing instance spawned event: 
[service] %s [cluster] %s [network-partition] %s [partition] %s [member] %s 
[lb-cluster-id] %s",
+                    serviceName, clusterId, networkPartitionId, partitionId, 
memberId, lbClusterId));
+        }
+        publishEvent(instanceSpawnedEvent);
+    }
+
+    public static void sendMemberStartedEvent(InstanceStartedEvent 
instanceStartedEvent) {
+        MemberStartedEvent memberStartedEventTopology = new 
MemberStartedEvent(instanceStartedEvent.getServiceName(),
+                           instanceStartedEvent.getClusterId(), 
instanceStartedEvent.getNetworkPartitionId(), 
instanceStartedEvent.getPartitionId(), instanceStartedEvent.getMemberId());
+
+        if(log.isInfoEnabled()) {
+            log.info(String.format("Publishing member started event: [service] 
%s [cluster] %s [network-partition] %s [partition] %s [member] %s",
+                    instanceStartedEvent.getServiceName(), 
instanceStartedEvent.getClusterId(), 
instanceStartedEvent.getNetworkPartitionId(), 
instanceStartedEvent.getPartitionId(), instanceStartedEvent.getMemberId()));
+        }
+        publishEvent(memberStartedEventTopology);
+    }
+
+     public static void sendMemberActivatedEvent(MemberActivatedEvent 
memberActivatedEvent) {
+         if(log.isInfoEnabled()) {
+            log.info(String.format("Publishing member activated event: 
[service] %s [cluster] %s [network-partition] %s [partition] %s [member] %s",
+                    memberActivatedEvent.getServiceName(), 
memberActivatedEvent.getClusterId(), 
memberActivatedEvent.getNetworkPartitionId(), 
memberActivatedEvent.getPartitionId(), memberActivatedEvent.getMemberId()));
+         }
+         publishEvent(memberActivatedEvent);
+    }
+
+    public static void sendMemberTerminatedEvent(String serviceName, String 
clusterId, String networkPartitionId, String partitionId, String memberId) {
+        MemberTerminatedEvent memberTerminatedEvent = new 
MemberTerminatedEvent(serviceName, clusterId, networkPartitionId, partitionId, 
memberId);
+        if(log.isInfoEnabled()) {
+            log.info(String.format("Publishing member terminated event: 
[service] %s [cluster] %s [network-partition] %s [partition] %s [member] %s", 
serviceName, clusterId, networkPartitionId, partitionId, memberId));
+        }
+        publishEvent(memberTerminatedEvent);
+    }
+
+    public static void sendCompleteTopologyEvent(Topology topology) {
+        CompleteTopologyEvent completeTopologyEvent = new 
CompleteTopologyEvent(topology);
+
+        if(log.isDebugEnabled()) {
+            log.debug(String.format("Publishing complete topology event"));
+        }
+        publishEvent(completeTopologyEvent);
+    }
+
+    public static void publishEvent(Event event) {
+        EventPublisher eventPublisher = new 
EventPublisher(Constants.TOPOLOGY_TOPIC);
+        eventPublisher.publish(event);
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8830cc4e/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyEventSender.java
----------------------------------------------------------------------
diff --git 
a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyEventSender.java
 
b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyEventSender.java
deleted file mode 100644
index 060dd00..0000000
--- 
a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyEventSender.java
+++ /dev/null
@@ -1,154 +0,0 @@
-package org.apache.stratos.cloud.controller.topology;
- /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.cloud.controller.pojo.Cartridge;
-import org.apache.stratos.cloud.controller.pojo.ClusterContext;
-import org.apache.stratos.cloud.controller.pojo.PortMapping;
-import org.apache.stratos.cloud.controller.pojo.Registrant;
-import org.apache.stratos.cloud.controller.runtime.FasterLookUpDataHolder;
-import org.apache.stratos.cloud.controller.util.CloudControllerUtil;
-import org.apache.stratos.messaging.broker.publish.EventPublisher;
-import org.apache.stratos.messaging.domain.topology.Cluster;
-import org.apache.stratos.messaging.domain.topology.Port;
-import org.apache.stratos.messaging.domain.topology.ServiceType;
-import org.apache.stratos.messaging.domain.topology.Topology;
-import org.apache.stratos.messaging.event.Event;
-import org.apache.stratos.messaging.event.instance.status.InstanceStartedEvent;
-import org.apache.stratos.messaging.event.topology.*;
-
-import java.util.List;
-import java.util.Properties;
-
-/**
- * this is to send the relevant events from cloud controller to topology topic
- */
-public class TopologyEventSender {
-    private static final Log log = LogFactory.getLog(TopologyBuilder.class);
-
-
-    public static void sendServiceCreateEvent(List<Cartridge> cartridgeList) {
-        ServiceCreatedEvent serviceCreatedEvent;
-        for(Cartridge cartridge : cartridgeList) {
-            serviceCreatedEvent = new ServiceCreatedEvent(cartridge.getType(), 
(cartridge.isMultiTenant() ? ServiceType.MultiTenant : 
ServiceType.SingleTenant));
-
-            // Add ports to the event
-            Port port;
-            List<PortMapping> portMappings = cartridge.getPortMappings();
-            for(PortMapping portMapping : portMappings) {
-                port = new Port(portMapping.getProtocol(),
-                                Integer.parseInt(portMapping.getPort()),
-                                Integer.parseInt(portMapping.getProxyPort()));
-                serviceCreatedEvent.addPort(port);
-            }
-
-            if(log.isInfoEnabled()) {
-                log.info(String.format("Publishing service created event: 
[service] %s", cartridge.getType()));
-            }
-            publishEvent(serviceCreatedEvent);
-        }
-    }
-
-    public static void sendServiceRemovedEvent(List<Cartridge> cartridgeList) {
-        ServiceRemovedEvent serviceRemovedEvent;
-        for(Cartridge cartridge : cartridgeList) {
-            serviceRemovedEvent = new ServiceRemovedEvent(cartridge.getType());
-            if(log.isInfoEnabled()) {
-                log.info(String.format("Publishing service removed event: 
[service] %s", serviceRemovedEvent.getServiceName()));
-            }
-            publishEvent(serviceRemovedEvent);
-        }
-    }
-
-    public static void sendClusterCreatedEvent(String serviceName, String 
clusterId, Cluster cluster) {
-        ClusterCreatedEvent clusterCreatedEvent = new 
ClusterCreatedEvent(serviceName, clusterId, cluster);
-
-        if(log.isInfoEnabled()) {
-            log.info("Publishing cluster created event: " +cluster.toString());
-        }
-        publishEvent(clusterCreatedEvent);
-
-    }
-
-    public static void sendClusterRemovedEvent(ClusterContext ctxt) {
-        ClusterRemovedEvent clusterRemovedEvent = new 
ClusterRemovedEvent(ctxt.getCartridgeType(), ctxt.getClusterId());
-
-        if(log.isInfoEnabled()) {
-            log.info(String.format("Publishing cluster removed event: 
[service] %s [cluster] %s", ctxt.getCartridgeType(), ctxt.getClusterId()));
-        }
-        publishEvent(clusterRemovedEvent);
-
-    }
-
-    public static void sendInstanceSpawnedEvent(String serviceName, String 
clusterId, String networkPartitionId, String partitionId, String memberId, 
String lbClusterId) {
-        InstanceSpawnedEvent instanceSpawnedEvent = new 
InstanceSpawnedEvent(serviceName, clusterId, networkPartitionId, partitionId, 
memberId);
-        instanceSpawnedEvent.setLbClusterId(lbClusterId);
-        if(log.isInfoEnabled()) {
-            log.info(String.format("Publishing instance spawned event: 
[service] %s [cluster] %s [network-partition] %s [partition] %s [member] %s 
[lb-cluster-id] %s",
-                    serviceName, clusterId, networkPartitionId, partitionId, 
memberId, lbClusterId));
-        }
-        publishEvent(instanceSpawnedEvent);
-    }
-
-    public static void sendMemberStartedEvent(InstanceStartedEvent 
instanceStartedEvent) {
-        MemberStartedEvent memberStartedEventTopology = new 
MemberStartedEvent(instanceStartedEvent.getServiceName(),
-                           instanceStartedEvent.getClusterId(), 
instanceStartedEvent.getNetworkPartitionId(), 
instanceStartedEvent.getPartitionId(), instanceStartedEvent.getMemberId());
-
-        if(log.isInfoEnabled()) {
-            log.info(String.format("Publishing member started event: [service] 
%s [cluster] %s [network-partition] %s [partition] %s [member] %s",
-                    instanceStartedEvent.getServiceName(), 
instanceStartedEvent.getClusterId(), 
instanceStartedEvent.getNetworkPartitionId(), 
instanceStartedEvent.getPartitionId(), instanceStartedEvent.getMemberId()));
-        }
-        publishEvent(memberStartedEventTopology);
-    }
-
-     public static void sendMemberActivatedEvent(MemberActivatedEvent 
memberActivatedEvent) {
-         if(log.isInfoEnabled()) {
-            log.info(String.format("Publishing member activated event: 
[service] %s [cluster] %s [network-partition] %s [partition] %s [member] %s",
-                    memberActivatedEvent.getServiceName(), 
memberActivatedEvent.getClusterId(), 
memberActivatedEvent.getNetworkPartitionId(), 
memberActivatedEvent.getPartitionId(), memberActivatedEvent.getMemberId()));
-         }
-         publishEvent(memberActivatedEvent);
-    }
-
-    public static void sendMemberTerminatedEvent(String serviceName, String 
clusterId, String networkPartitionId, String partitionId, String memberId) {
-        MemberTerminatedEvent memberTerminatedEvent = new 
MemberTerminatedEvent(serviceName, clusterId, networkPartitionId, partitionId, 
memberId);
-        if(log.isInfoEnabled()) {
-            log.info(String.format("Publishing member terminated event: 
[service] %s [cluster] %s [network-partition] %s [partition] %s [member] %s", 
serviceName, clusterId, networkPartitionId, partitionId, memberId));
-        }
-        publishEvent(memberTerminatedEvent);
-    }
-
-    public static void sendCompleteTopologyEvent(Topology topology) {
-        CompleteTopologyEvent completeTopologyEvent = new 
CompleteTopologyEvent(topology);
-
-        if(log.isDebugEnabled()) {
-            log.debug(String.format("Publishing complete topology event"));
-        }
-        publishEvent(completeTopologyEvent);
-    }
-
-    public static void publishEvent(Event topologyEvent) {
-        List<EventPublisher> topicPublishers = 
FasterLookUpDataHolder.getInstance().getAllEventPublishers();
-
-        for(EventPublisher topicPublisher : topicPublishers) {
-            topicPublisher.publish(topologyEvent);
-        }
-
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8830cc4e/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologySynchronizerTask.java
----------------------------------------------------------------------
diff --git 
a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologySynchronizerTask.java
 
b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologySynchronizerTask.java
index af1842d..521c415 100644
--- 
a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologySynchronizerTask.java
+++ 
b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologySynchronizerTask.java
@@ -45,7 +45,7 @@ public class TopologySynchronizerTask implements Task{
         
        // publish to the topic 
         if (TopologyManager.getTopology() != null) {
-            
TopologyEventSender.sendCompleteTopologyEvent(TopologyManager.getTopology());
+            
TopologyEventPublisher.sendCompleteTopologyEvent(TopologyManager.getTopology());
         }
     }
     

Reply via email to