2 files changed, 24 insertions, 17 deletions

diff --git a/java/client/src/main/java/org/apache/qpid/nclient/impl/ClientSession.java b/java/client/src/main/java/org/apache/qpid/nclient/impl/ClientSession.java
index f6a52ec14a..c9e5d03948 100644
--- a/java/client/src/main/java/org/apache/qpid/nclient/impl/ClientSession.java
+++ b/java/client/src/main/java/org/apache/qpid/nclient/impl/ClientSession.java
@@ -2,21 +2,28 @@ package org.apache.qpid.nclient.impl;
 
 import java.util.Map;
 
+import org.apache.qpidity.api.StreamingMessageListener;
 import org.apache.qpid.nclient.api.MessageListener;
 import org.apache.qpidity.Option;
 import org.apache.qpidity.QpidException;
 import org.apache.qpidity.Session;
 
 public class ClientSession extends Session implements org.apache.qpid.nclient.api.Session
-{	
-	public void addMessageListener(String destination,MessageListener listener)
-	{
-		super.addMessageListener(destination, new StreamingListenerAdapter(listener));
-	}
-	
-	//temproary until rafi updates the xml when the new message stuff is voted in.
-	public void messageSubscribe(String queue, String destination, Map<String, ?> filter, Option... _options) throws QpidException
-	{
-		// TODO Auto-generated method stub		
-	}
+{
+
+    public void setMessageListener(String destination,MessageListener listener)
+    {
+        super.setMessageListener(destination, new StreamingListenerAdapter(listener));
+    }
+
+    public void messageSubscribe(String queue, String destination, Map<String, ?> filter, Option... _options) throws QpidException
+    {
+        // TODO
+    }
+
+    public void messageSubscribe(String queue, String destination, Map<String, ?> filter, StreamingMessageListener listener, Option... _options) throws QpidException
+    {
+        // TODO
+    }
+
 }
diff --git a/java/client/src/main/java/org/apache/qpid/nclient/jms/MessageConsumerImpl.java b/java/client/src/main/java/org/apache/qpid/nclient/jms/MessageConsumerImpl.java
index a9d4161edb..a350ceecee 100644
--- a/java/client/src/main/java/org/apache/qpid/nclient/jms/MessageConsumerImpl.java
+++ b/java/client/src/main/java/org/apache/qpid/nclient/jms/MessageConsumerImpl.java
@@ -17,7 +17,7 @@
  */
 package org.apache.qpid.nclient.jms;
 
-import org.apache.qpid.nclient.api.MessageReceiver;
+//import org.apache.qpid.nclient.api.MessageReceiver;
 import org.apache.qpidity.QpidException;
 
 import javax.jms.JMSException;
@@ -33,7 +33,7 @@ public class MessageConsumerImpl extends MessageActor implements MessageConsumer
     /**
      * The underlying qpid receiver
      */
-    private MessageReceiver _qpidReceiver;
+    /*    private MessageReceiver _qpidReceiver;*/
 
     /**
      * This MessageConsumer's messageselector.
@@ -186,14 +186,14 @@ public class MessageConsumerImpl extends MessageActor implements MessageConsumer
      */
     void stop() throws JMSException
     {
-        try
+        /*try
         {
             _qpidReceiver.stop();
         }
         catch (QpidException e)
         {
             throw ExceptionHelper.convertQpidExceptionToJMSException(e);
-        }
+            }*/
     }
 
     /**
@@ -203,13 +203,13 @@ public class MessageConsumerImpl extends MessageActor implements MessageConsumer
      */
     void start() throws JMSException
     {
-        try
+        /*try
         {
             _qpidReceiver.start();
         }
         catch (QpidException e)
         {
             throw ExceptionHelper.convertQpidExceptionToJMSException(e);
-        }
+            }*/
     }
 }