From 043e8c35429e7dbcf6cfb63206f7980d1afeccdd Mon Sep 17 00:00:00 2001 From: "Rafael H. Schloming" Date: Fri, 3 Aug 2007 04:00:41 +0000 Subject: fixed build failures caused by sloppy checkins and SNAPSHOT dependencies, changed the junit-toolkit version from 0.6-SNAPSHOT to 0.6-20070718.144514-11 git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@562323 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/qpid/nclient/impl/ClientSession.java | 29 +++--- .../qpid/nclient/jms/MessageConsumerImpl.java | 12 +-- .../src/main/java/org/apache/qpidity/Session.java | 101 ++++++++++----------- java/integrationtests/pom.xml | 7 +- java/pom.xml | 2 +- 5 files changed, 76 insertions(+), 75 deletions(-) (limited to 'java') 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 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 filter, Option... _options) throws QpidException + { + // TODO + } + + public void messageSubscribe(String queue, String destination, Map 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 @@ qpid-client - - org.slf4j - slf4j-log4j12 + + org.slf4j + slf4j-log4j12 1.4.0 uk.co.thebadgerset junit-toolkit - 0.6-SNAPSHOT compile 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. uk.co.thebadgerset junit-toolkit - 0.6-SNAPSHOT + 0.6-20070718.144514-11 compile -- cgit v1.2.1