You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rh...@apache.org on 2007/08/03 06:00:42 UTC
svn commit: r562323 - in /incubator/qpid/trunk/qpid/java: ./
client/src/main/java/org/apache/qpid/nclient/impl/
client/src/main/java/org/apache/qpid/nclient/jms/
common/src/main/java/org/apache/qpidity/ integrationtests/
Author: rhs
Date: Thu Aug 2 21:00:41 2007
New Revision: 562323
URL: http://svn.apache.org/viewvc?view=rev&rev=562323
Log:
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
Modified:
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/impl/ClientSession.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/jms/MessageConsumerImpl.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/Session.java
incubator/qpid/trunk/qpid/java/integrationtests/pom.xml
incubator/qpid/trunk/qpid/java/pom.xml
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/impl/ClientSession.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/impl/ClientSession.java?view=diff&rev=562323&r1=562322&r2=562323
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/impl/ClientSession.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/impl/ClientSession.java Thu Aug 2 21:00:41 2007
@@ -2,21 +2,28 @@
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
+ }
+
}
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/jms/MessageConsumerImpl.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/jms/MessageConsumerImpl.java?view=diff&rev=562323&r1=562322&r2=562323
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/jms/MessageConsumerImpl.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/nclient/jms/MessageConsumerImpl.java Thu Aug 2 21:00:41 2007
@@ -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 @@
/**
* The underlying qpid receiver
*/
- private MessageReceiver _qpidReceiver;
+ /* private MessageReceiver _qpidReceiver;*/
/**
* This MessageConsumer's messageselector.
@@ -186,14 +186,14 @@
*/
void stop() throws JMSException
{
- try
+ /*try
{
_qpidReceiver.stop();
}
catch (QpidException e)
{
throw ExceptionHelper.convertQpidExceptionToJMSException(e);
- }
+ }*/
}
/**
@@ -203,13 +203,13 @@
*/
void start() throws JMSException
{
- try
+ /*try
{
_qpidReceiver.start();
}
catch (QpidException e)
{
throw ExceptionHelper.convertQpidExceptionToJMSException(e);
- }
+ }*/
}
}
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/Session.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/Session.java?view=diff&rev=562323&r1=562322&r2=562323
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/Session.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/Session.java Thu Aug 2 21:00:41 2007
@@ -69,60 +69,55 @@
// -----------------------------------------
// 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);
- }
-
+ }
+
}
Modified: incubator/qpid/trunk/qpid/java/integrationtests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/integrationtests/pom.xml?view=diff&rev=562323&r1=562322&r2=562323
==============================================================================
--- incubator/qpid/trunk/qpid/java/integrationtests/pom.xml (original)
+++ incubator/qpid/trunk/qpid/java/integrationtests/pom.xml Thu Aug 2 21:00:41 2007
@@ -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>
Modified: incubator/qpid/trunk/qpid/java/pom.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/pom.xml?view=diff&rev=562323&r1=562322&r2=562323
==============================================================================
--- incubator/qpid/trunk/qpid/java/pom.xml (original)
+++ incubator/qpid/trunk/qpid/java/pom.xml Thu Aug 2 21:00:41 2007
@@ -526,7 +526,7 @@
<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>