deleting some commented out methods
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/63f931f4 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/63f931f4 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/63f931f4 Branch: refs/heads/master Commit: 63f931f4e3ae7b5d3074cd0c1b47f6c2b2967b75 Parents: 617258b Author: Isuru Haththotuwa <[email protected]> Authored: Thu Dec 17 21:39:47 2015 +0530 Committer: Isuru Haththotuwa <[email protected]> Committed: Thu Dec 24 20:05:57 2015 +0530 ---------------------------------------------------------------------- .../application/ApplicationsEventReceiver.java | 10 ---------- .../signup/ApplicationSignUpEventReceiver.java | 10 ---------- .../cluster/status/ClusterStatusEventReceiver.java | 15 --------------- .../domain/mapping/DomainMappingEventReceiver.java | 2 -- .../health/stat/HealthStatEventReceiver.java | 16 ---------------- .../initializer/InitializerEventReceiver.java | 8 -------- .../notifier/InstanceNotifierEventReceiver.java | 5 +---- .../status/InstanceStatusEventReceiver.java | 8 -------- .../receiver/tenant/TenantEventReceiver.java | 6 ------ .../receiver/topology/TopologyEventReceiver.java | 2 -- 10 files changed, 1 insertion(+), 81 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/63f931f4/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/application/ApplicationsEventReceiver.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/application/ApplicationsEventReceiver.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/application/ApplicationsEventReceiver.java index e94bafd..69dba01 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/application/ApplicationsEventReceiver.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/application/ApplicationsEventReceiver.java @@ -29,8 +29,6 @@ import org.apache.stratos.messaging.listener.EventListener; import org.apache.stratos.messaging.message.receiver.StratosEventReceiver; import org.apache.stratos.messaging.util.MessagingUtil; -import java.util.concurrent.ExecutorService; - public class ApplicationsEventReceiver extends StratosEventReceiver{ private static final Log log = LogFactory.getLog(ApplicationsEventReceiver.class); @@ -117,12 +115,4 @@ public class ApplicationsEventReceiver extends StratosEventReceiver{ } }); } - -// public ExecutorService getExecutorService() { -// return executorService; -// } -// -// public void setExecutorService(ExecutorService executorService) { -// this.executorService = executorService; -// } } http://git-wip-us.apache.org/repos/asf/stratos/blob/63f931f4/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/application/signup/ApplicationSignUpEventReceiver.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/application/signup/ApplicationSignUpEventReceiver.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/application/signup/ApplicationSignUpEventReceiver.java index dde214d..df90cf9 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/application/signup/ApplicationSignUpEventReceiver.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/application/signup/ApplicationSignUpEventReceiver.java @@ -30,8 +30,6 @@ import org.apache.stratos.messaging.listener.EventListener; import org.apache.stratos.messaging.message.receiver.StratosEventReceiver; import org.apache.stratos.messaging.util.MessagingUtil; -import java.util.concurrent.ExecutorService; - /** * Application signup event receiver. */ @@ -119,12 +117,4 @@ public class ApplicationSignUpEventReceiver extends StratosEventReceiver { eventSubscriber.terminate(); messageDelegator.terminate(); } - -// public ExecutorService getExecutorService() { -// return executorService; -// } - -// public void setExecutorService(ExecutorService executorService) { -// this.executorService = executorService; -// } } http://git-wip-us.apache.org/repos/asf/stratos/blob/63f931f4/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/cluster/status/ClusterStatusEventReceiver.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/cluster/status/ClusterStatusEventReceiver.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/cluster/status/ClusterStatusEventReceiver.java index 2b4d557..e191799 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/cluster/status/ClusterStatusEventReceiver.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/cluster/status/ClusterStatusEventReceiver.java @@ -27,7 +27,6 @@ import org.apache.stratos.messaging.listener.EventListener; import org.apache.stratos.messaging.message.receiver.StratosEventReceiver; import org.apache.stratos.messaging.util.MessagingUtil; -import java.util.concurrent.ExecutorService; /** * A thread for receiving instance notifier information from message broker. @@ -91,18 +90,4 @@ public class ClusterStatusEventReceiver extends StratosEventReceiver { public boolean isSubscribed() { return ((eventSubscriber != null) && (eventSubscriber.isSubscribed())); } - -// public void terminate() { -// eventSubscriber.terminate(); -// messageDelegator.terminate(); -// terminated = true; -// } -// -// public ExecutorService getExecutorService() { -// return executorService; -// } -// -// public void setExecutorService(ExecutorService executorService) { -// this.executorService = executorService; -// } } http://git-wip-us.apache.org/repos/asf/stratos/blob/63f931f4/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/domain/mapping/DomainMappingEventReceiver.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/domain/mapping/DomainMappingEventReceiver.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/domain/mapping/DomainMappingEventReceiver.java index a37941c..4e4c04b 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/domain/mapping/DomainMappingEventReceiver.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/domain/mapping/DomainMappingEventReceiver.java @@ -27,8 +27,6 @@ import org.apache.stratos.messaging.listener.EventListener; import org.apache.stratos.messaging.message.receiver.StratosEventReceiver; import org.apache.stratos.messaging.util.MessagingUtil; -import java.util.concurrent.ExecutorService; - /** * Domain mapping event receiver. */ http://git-wip-us.apache.org/repos/asf/stratos/blob/63f931f4/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/health/stat/HealthStatEventReceiver.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/health/stat/HealthStatEventReceiver.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/health/stat/HealthStatEventReceiver.java index ede8f17..ba124a7 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/health/stat/HealthStatEventReceiver.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/health/stat/HealthStatEventReceiver.java @@ -27,8 +27,6 @@ import org.apache.stratos.messaging.listener.EventListener; import org.apache.stratos.messaging.message.receiver.StratosEventReceiver; import org.apache.stratos.messaging.util.MessagingUtil; -import java.util.concurrent.ExecutorService; - /** * A thread for receiving health stat information from message broker */ @@ -84,18 +82,4 @@ public class HealthStatEventReceiver extends StratosEventReceiver { } } } - -// public void terminate() { -// eventSubscriber.terminate(); -// messageDelegator.terminate(); -// terminated = true; -// } -// -// public ExecutorService getExecutorService() { -// return executorService; -// } -// -// public void setExecutorService(ExecutorService executorService) { -// this.executorService = executorService; -// } } http://git-wip-us.apache.org/repos/asf/stratos/blob/63f931f4/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/initializer/InitializerEventReceiver.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/initializer/InitializerEventReceiver.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/initializer/InitializerEventReceiver.java index e6429e2..805a8bf 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/initializer/InitializerEventReceiver.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/initializer/InitializerEventReceiver.java @@ -85,12 +85,4 @@ public class InitializerEventReceiver extends StratosEventReceiver { eventSubscriber.terminate(); messageDelegator.terminate(); } - -// public ExecutorService getExecutorService() { -// return executorService; -// } -// -// public void setExecutorService(ExecutorService executorService) { -// this.executorService = executorService; -// } } http://git-wip-us.apache.org/repos/asf/stratos/blob/63f931f4/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/notifier/InstanceNotifierEventReceiver.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/notifier/InstanceNotifierEventReceiver.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/notifier/InstanceNotifierEventReceiver.java index 33f5de8..e0b8e9f 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/notifier/InstanceNotifierEventReceiver.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/notifier/InstanceNotifierEventReceiver.java @@ -43,10 +43,7 @@ public class InstanceNotifierEventReceiver extends StratosEventReceiver { this.executorService = StratosThreadPool.getExecutorService("topology-event-receiver", 100); InstanceNotifierEventMessageQueue messageQueue = new InstanceNotifierEventMessageQueue(); this.messageDelegator = new InstanceNotifierEventMessageDelegator(messageQueue); - messageListener = new InstanceNotifierEventMessageListener(messageQueue); - // Start topic subscriber thread - eventSubscriber = new EventSubscriber(MessagingUtil.Topics.INSTANCE_NOTIFIER_TOPIC.getTopicName(), - messageListener); + this.messageListener = new InstanceNotifierEventMessageListener(messageQueue); execute(); } http://git-wip-us.apache.org/repos/asf/stratos/blob/63f931f4/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/status/InstanceStatusEventReceiver.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/status/InstanceStatusEventReceiver.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/status/InstanceStatusEventReceiver.java index a2a1623..a565ea9 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/status/InstanceStatusEventReceiver.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/instance/status/InstanceStatusEventReceiver.java @@ -93,12 +93,4 @@ public class InstanceStatusEventReceiver extends StratosEventReceiver { messageDelegator.terminate(); // terminated = true; } - -// public ExecutorService getExecutorService() { -// return executorService; -// } -// -// public void setExecutorService(ExecutorService executorService) { -// this.executorService = executorService; -// } } http://git-wip-us.apache.org/repos/asf/stratos/blob/63f931f4/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/tenant/TenantEventReceiver.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/tenant/TenantEventReceiver.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/tenant/TenantEventReceiver.java index 1c519b9..a52cb20 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/tenant/TenantEventReceiver.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/tenant/TenantEventReceiver.java @@ -30,8 +30,6 @@ import org.apache.stratos.messaging.listener.EventListener; import org.apache.stratos.messaging.message.receiver.StratosEventReceiver; import org.apache.stratos.messaging.util.MessagingUtil; -import java.util.concurrent.ExecutorService; - /** * A thread for receiving tenant information from message broker and * build tenant information in tenant manager. @@ -68,10 +66,6 @@ public class TenantEventReceiver extends StratosEventReceiver { messageDelegator.addEventListener(eventListener); } -// public void setExecutorService(ExecutorService executorService) { -// this.executorService = executorService; -// } - private void execute() { try { // Start topic subscriber thread http://git-wip-us.apache.org/repos/asf/stratos/blob/63f931f4/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/topology/TopologyEventReceiver.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/topology/TopologyEventReceiver.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/topology/TopologyEventReceiver.java index 8378486..bfa3950 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/topology/TopologyEventReceiver.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/receiver/topology/TopologyEventReceiver.java @@ -30,8 +30,6 @@ import org.apache.stratos.messaging.listener.EventListener; import org.apache.stratos.messaging.message.receiver.StratosEventReceiver; import org.apache.stratos.messaging.util.MessagingUtil; -import java.util.concurrent.ExecutorService; - /** * A thread for receiving topology information from message broker and * build topology in topology manager.
