Add exchange information to newMessage.

tools.descartes.prisma.core/src/tools/descartes/prisma/core/MessageBus.java

@@ -5,7 +5,7 @@ import java.util.Map;
 public interface MessageBus {
 
 	public interface Listener {
-		void newMessage(String routingKey, Map<String, Object> headers, String message);
+		void newMessage(String exchange, String routingKey, Map<String, Object> headers, String message);
 	}
 
 	public enum ExchangeType {

tools.descartes.prisma.core/src/tools/descartes/prisma/core/agent/AgentController.java

@@ -175,7 +175,7 @@ public class AgentController {
 	public void handleNotification(ModelNotification notification) {
 	}
 
-	public String[] getDelegationDestinations(EObject object) {
+	public String[] getDelegationDestinations(String exchange, String routingKey, EObject object) {
 		return new String[0];
 	}
 

tools.descartes.prisma.core/src/tools/descartes/prisma/core/impl/RabbitMQMessageBus.java

@@ -150,7 +150,8 @@ public class RabbitMQMessageBus implements MessageBus {
 				@Override
 				public void handleDelivery(String consumerTag, Envelope envelope, BasicProperties properties,
 						byte[] body) throws IOException {
-					listener.newMessage(envelope.getRoutingKey(), properties.getHeaders(), new String(body));
+					listener.newMessage(envelope.getExchange(), envelope.getRoutingKey(), properties.getHeaders(),
+							new String(body));
 					channel.basicAck(envelope.getDeliveryTag(), false);
 				}
 			});

tools.descartes.prisma.core/src/tools/descartes/prisma/core/scopes/AgentScope.java

@@ -82,11 +82,11 @@ public abstract class AgentScope extends Scope {
 		}
 
 		@Override
-		public void newMessage(String routingKey, Map<String, Object> headers, String message) {
+		public void newMessage(String exchange, String routingKey, Map<String, Object> headers, String message) {
 			if (controller != null) {
 				ModelNotification notification = new ModelNotification(getModelRepository(), headers);
 				EObject instance = notification.getInstance();
-				String[] destinations = controller.getDelegationDestinations(instance);
+				String[] destinations = controller.getDelegationDestinations(exchange, routingKey, instance);
 				for (String curScopeName : destinations) {
 					AgentScope curScope = scopeCache.get(curScopeName);
 					if (curScope == null) {
@@ -310,7 +310,7 @@ public abstract class AgentScope extends Scope {
 		getMessageBus().bindQueue(queueName, exchange, routingKey);
 		getMessageBus().addMessageListener(queueName, new Listener() {
 			@Override
-			public void newMessage(String routingKey, Map<String, Object> headers, String message) {
+			public void newMessage(String exchange, String routingKey, Map<String, Object> headers, String message) {
 				agent.handleNotification(new ModelNotification(getModelRepository(), headers));
 			}
 		});