Updated Branches: refs/heads/master 1df2f539b -> c514a1cb7
Renamed topology listener to instance status event message listener Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/c514a1cb Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/c514a1cb Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/c514a1cb Branch: refs/heads/master Commit: c514a1cb76824404bcd46ca69f4a578310dcd2c1 Parents: 1df2f53 Author: Imesh Gunaratne <[email protected]> Authored: Wed Dec 25 14:22:00 2013 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Wed Dec 25 14:22:00 2013 +0530 ---------------------------------------------------------------------- .../internal/CloudControllerDSComponent.java | 6 +-- .../InstanceStatusEventMessageDelegator.java | 2 +- .../InstanceStatusEventMessageListener.java | 42 ++++++++++++++++++++ .../controller/topology/TopologyListener.java | 42 -------------------- .../controller/topology/TopologyManager.java | 10 ++--- 5 files changed, 51 insertions(+), 51 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/c514a1cb/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 ad1c5d5..23d07b5 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 @@ -27,7 +27,7 @@ import org.apache.stratos.cloud.controller.exception.CloudControllerException; import org.apache.stratos.cloud.controller.impl.CloudControllerServiceImpl; import org.apache.stratos.cloud.controller.interfaces.CloudControllerService; import org.apache.stratos.cloud.controller.runtime.FasterLookUpDataHolder; -import org.apache.stratos.cloud.controller.topology.TopologyListener; +import org.apache.stratos.cloud.controller.topology.InstanceStatusEventMessageListener; import org.apache.stratos.cloud.controller.util.CloudControllerConstants; import org.apache.stratos.cloud.controller.util.ServiceReferenceHolder; import org.apache.stratos.messaging.broker.publish.EventPublisher; @@ -100,9 +100,9 @@ public class CloudControllerDSComponent { dataHolder.addEventPublisher(new EventPublisher(topic), topic); } - //initialting the subscriber + // Start instance status event message listener TopicSubscriber subscriber = new TopicSubscriber(CloudControllerConstants.INSTANCE_TOPIC); - subscriber.setMessageListener(new TopologyListener()); + subscriber.setMessageListener(new InstanceStatusEventMessageListener()); Thread tsubscriber = new Thread(subscriber); tsubscriber.start(); http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/c514a1cb/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/InstanceStatusEventMessageDelegator.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/InstanceStatusEventMessageDelegator.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/InstanceStatusEventMessageDelegator.java index b8a3e9d..af94659 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/InstanceStatusEventMessageDelegator.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/InstanceStatusEventMessageDelegator.java @@ -36,7 +36,7 @@ public class InstanceStatusEventMessageDelegator implements Runnable { while (true) { try { - TextMessage message = TopologyManager.getInstance().getSharedTopologyDiffQueue().take(); + TextMessage message = TopologyManager.getInstance().getInstanceStatusMessageQueue().take(); // retrieve the header String type = message.getStringProperty(Constants.EVENT_CLASS_NAME); http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/c514a1cb/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/InstanceStatusEventMessageListener.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/InstanceStatusEventMessageListener.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/InstanceStatusEventMessageListener.java new file mode 100644 index 0000000..f363997 --- /dev/null +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/InstanceStatusEventMessageListener.java @@ -0,0 +1,42 @@ +/* + * 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. + */ +package org.apache.stratos.cloud.controller.topology; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import javax.jms.Message; +import javax.jms.MessageListener; +import javax.jms.TextMessage; + +/** + * this is to handle the topology subscription + */ +public class InstanceStatusEventMessageListener implements MessageListener{ + private static final Log log = LogFactory.getLog(InstanceStatusEventMessageListener.class); + + @Override + public void onMessage(Message message) { + TextMessage receivedMessage = (TextMessage) message; + TopologyManager.getInstance().getInstanceStatusMessageQueue().add(receivedMessage); + if(log.isDebugEnabled()) { + log.debug(String.format("Instance status message added to queue: %s", message)); + } + } +} http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/c514a1cb/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyListener.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyListener.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyListener.java deleted file mode 100644 index e2ac43b..0000000 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyListener.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * 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. - */ -package org.apache.stratos.cloud.controller.topology; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import javax.jms.Message; -import javax.jms.MessageListener; -import javax.jms.TextMessage; - -/** - * this is to handle the topology subscription - */ -public class TopologyListener implements MessageListener{ - private static final Log log = LogFactory.getLog(TopologyListener.class); - - @Override - public void onMessage(Message message) { - TextMessage receivedMessage = (TextMessage) message; - TopologyManager.getInstance().getSharedTopologyDiffQueue().add(receivedMessage); - if(log.isDebugEnabled()) { - log.debug(message + "received...."); - } - } -} http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/c514a1cb/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyManager.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyManager.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyManager.java index c3abb10..944aa04 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyManager.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyManager.java @@ -42,7 +42,7 @@ public class TopologyManager { private volatile ReentrantReadWriteLock.WriteLock writeLock = lock.writeLock(); private volatile Topology topology; private static TopologyManager instance; - private BlockingQueue<TextMessage> sharedTopologyDiffQueue = new LinkedBlockingQueue<TextMessage>(); + private BlockingQueue<TextMessage> instanceStatusMessageQueue = new LinkedBlockingQueue<TextMessage>(); private TopologyManager() { @@ -115,12 +115,12 @@ public class TopologyManager { this.topology = topology; } - public BlockingQueue<TextMessage> getSharedTopologyDiffQueue() { - return sharedTopologyDiffQueue; + public BlockingQueue<TextMessage> getInstanceStatusMessageQueue() { + return instanceStatusMessageQueue; } - public void setSharedTopologyDiffQueue(BlockingQueue<TextMessage> sharedTopologyDiffQueue) { - this.sharedTopologyDiffQueue = sharedTopologyDiffQueue; + public void setInstanceStatusMessageQueue(BlockingQueue<TextMessage> instanceStatusMessageQueue) { + this.instanceStatusMessageQueue = instanceStatusMessageQueue; } }
