From fb2cf5fb5dd4d9cef5585deaaab62d80ba29d5e1 Mon Sep 17 00:00:00 2001
From: Gary Russell <grussell@vmware.com>
Date: Mon, 9 Jan 2012 13:42:20 -0500
Subject: [PATCH] AMQP-195 Update AMQP Client to 2.7.1

LongString moved from client.impl to client

Channel.setReturnListener changed to Channel.addReturnListener
---
 spring-amqp-parent/pom.xml                                      | 2 +-
 .../amqp/rabbit/support/DefaultMessagePropertiesConverter.java  | 2 +-
 .../java/org/springframework/amqp/rabbit/MulticastMain.java     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/spring-amqp-parent/pom.xml b/spring-amqp-parent/pom.xml
index e544d053..1f0ba8a9 100644
--- a/spring-amqp-parent/pom.xml
+++ b/spring-amqp-parent/pom.xml
@@ -20,7 +20,7 @@
 		<org.mockito.version>1.8.4</org.mockito.version>
 		<org.codehaus.jackson.version>1.4.3</org.codehaus.jackson.version>
 		<org.erlang.otp.version>1.5.3</org.erlang.otp.version>
-		<com.rabbitmq.version>2.5.0</com.rabbitmq.version>
+		<com.rabbitmq.version>2.7.1</com.rabbitmq.version>
 		<org.springframework.version>3.0.5.RELEASE</org.springframework.version>
 	</properties>
 	<licenses>
diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/support/DefaultMessagePropertiesConverter.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/support/DefaultMessagePropertiesConverter.java
index 4cbc1e82..61a93796 100644
--- a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/support/DefaultMessagePropertiesConverter.java
+++ b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/support/DefaultMessagePropertiesConverter.java
@@ -29,7 +29,7 @@ import org.springframework.util.CollectionUtils;
 
 import com.rabbitmq.client.AMQP.BasicProperties;
 import com.rabbitmq.client.Envelope;
-import com.rabbitmq.client.impl.LongString;
+import com.rabbitmq.client.LongString;
 
 /**
  * Default implementation of the {@link MessagePropertiesConverter} strategy.
diff --git a/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/MulticastMain.java b/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/MulticastMain.java
index fbc8c06b..40e37863 100644
--- a/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/MulticastMain.java
+++ b/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/MulticastMain.java
@@ -136,7 +136,7 @@ public class MulticastMain {
 				channel.exchangeDeclare(exchangeName, exchangeType);
 				final Producer p = new Producer(channel, exchangeName, id, flags, producerTxSize,
 						1000L * samplingInterval, rateLimit, minMsgSize, timeLimit, messageCount);
-				channel.setReturnListener(p);
+				channel.addReturnListener(p);
 				Thread t = new Thread(p);
 				producerThreads[i] = t;
 				t.start();