5 files changed, 76 insertions, 75 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);
-        }
+            }*/
     }
 }
diff --git a/java/common/src/main/java/org/apache/qpidity/Session.java b/java/common/src/main/java/org/apache/qpidity/Session.java
index 48860309a0..32fa5f55b3 100644
--- a/java/common/src/main/java/org/apache/qpidity/Session.java
+++ b/java/common/src/main/java/org/apache/qpidity/Session.java
@@ -69,60 +69,55 @@ public class Session extends Invoker
     // -----------------------------------------
     //          Messaging Methods
     // ------------------------------------------
-    public void messageTransfer(String destination, Message msg) throws QpidException
-	{
-				
-	}
-    
-	public void data(byte[] src) throws QpidException
-	{
-		// TODO Auto-generated method stub
-		
-	}
-
-	public void endData() throws QpidException
-	{
-		// TODO Auto-generated method stub
-		
-	}
-
-	public void messageHeaders(Header... headers) throws QpidException
-	{
-		// TODO Auto-generated method stub
-		
-	}
-
-	public void messageTransfer(String destination,Option... options) throws QpidException
-	{
-		// TODO Auto-generated method stub
-		
-	}
-	
-	public void messageAcknowledge() throws QpidException
-	{
-		// TODO Auto-generated method stub		
-	}
-
-	public boolean messageAcquire() throws QpidException
-	{
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	public void messageReject() throws QpidException
-	{
-		// TODO Auto-generated method stub
-		
-	}
-
-	public void messageRelease() throws QpidException
-	{
-		// TODO Auto-generated method stub		
-	}	
+    public void messageTransfer(String destination, Message msg, Option ... _options) throws QpidException
+    {
 	
-    public void addMessageListener(String destination,StreamingMessageListener listener)
+    }
+
+    public void data(byte[] src) throws QpidException
+    {
+        // TODO Auto-generated method stub
+    }
+
+    public void endData() throws QpidException
+    {
+        // TODO Auto-generated method stub
+    }
+
+    public void messageHeaders(Header... headers) throws QpidException
+    {
+        // TODO Auto-generated method stub
+    }
+
+    public void messageTransfer(String destination,Option... options) throws QpidException
+    {
+        // TODO Auto-generated method stub
+    }
+
+    public void messageAcknowledge() throws QpidException
+    {
+        // TODO Auto-generated method stub
+    }
+
+    public boolean messageAcquire() throws QpidException
+    {
+        // TODO Auto-generated method stub
+        return false;
+    }
+
+    public void messageReject() throws QpidException
+    {
+        // TODO Auto-generated method stub
+    }
+
+    public void messageRelease() throws QpidException
+    {
+        // TODO Auto-generated method stub
+    }
+
+    public void setMessageListener(String destination,StreamingMessageListener listener)
     {
     	messagListeners.put(destination, listener);
-    }    
-    
+    }
+
 }
diff --git a/java/integrationtests/pom.xml b/java/integrationtests/pom.xml
index 9ccd153f54..4733a5aac5 100644
--- a/java/integrationtests/pom.xml
+++ b/java/integrationtests/pom.xml
@@ -46,16 +46,15 @@
             <artifactId>qpid-client</artifactId>
         </dependency>
 
-        <dependency>  
-            <groupId>org.slf4j</groupId> 
-            <artifactId>slf4j-log4j12</artifactId>  
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
             <version>1.4.0</version>
         </dependency>
 
         <dependency>
             <groupId>uk.co.thebadgerset</groupId>
             <artifactId>junit-toolkit</artifactId>
-            <version>0.6-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/java/pom.xml b/java/pom.xml
index ede9ee553f..7331212d47 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -526,7 +526,7 @@ under the License.
             <dependency>
                 <groupId>uk.co.thebadgerset</groupId>
                 <artifactId>junit-toolkit</artifactId>
-                <version>0.6-SNAPSHOT</version>
+                <version>0.6-20070718.144514-11</version>
                 <scope>compile</scope>
             </dependency>