You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ra...@apache.org on 2007/01/17 21:49:27 UTC
svn commit: r497169 - in
/incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client:
./ message/ protocol/
Author: rajith
Date: Wed Jan 17 12:49:25 2007
New Revision: 497169
URL: http://svn.apache.org/viewvc?view=rev&rev=497169
Log:
fixed the compilation errors in the message classes and changed to use MessageHeaders instead of the old ContentHeaders class
Modified:
incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/AbstractBytesMessage.java
incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/AbstractBytesTypedMessage.java
incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java
incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessageFactory.java
incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/JMSBytesMessage.java
incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/JMSBytesMessageFactory.java
incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/JMSMapMessage.java
incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/JMSMapMessageFactory.java
incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/JMSObjectMessage.java
incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/JMSObjectMessageFactory.java
incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/JMSStreamMessage.java
incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/JMSStreamMessageFactory.java
incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/JMSTextMessage.java
incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/JMSTextMessageFactory.java
incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java
Modified: incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/AMQSession.java?view=diff&rev=497169&r1=497168&r2=497169
==============================================================================
--- incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/AMQSession.java (original)
+++ incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/AMQSession.java Wed Jan 17 12:49:25 2007
@@ -238,7 +238,7 @@
}
}
- else
+ /*else
{
try
{
@@ -271,7 +271,7 @@
{
_logger.error("Caught exception trying to raise undelivered message exception (dump follows) - ignoring...", e);
}
- }
+ }*/
}
public void stopDispatcher()
Modified: incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java?view=diff&rev=497169&r1=497168&r2=497169
==============================================================================
--- incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java (original)
+++ incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java Wed Jan 17 12:49:25 2007
@@ -501,14 +501,14 @@
{
if (_logger.isDebugEnabled())
{
- _logger.debug("notifyMessage called with message number " + messageFrame.content.deliveryTag);
+ _logger.debug("notifyMessage called with message number " + messageFrame.content.getDestination());
}
try
{
- AbstractJMSMessage jmsMessage = _messageFactory.createMessage(messageFrame.content.deliveryTag,
- messageFrame.content.redelivered,
+ AbstractJMSMessage jmsMessage = _messageFactory.createMessage(messageFrame.contentHeader.getDestination(),
+ messageFrame.contentHeader.getr,
messageFrame.contentHeader,
- messageFrame.bodies);
+ messageFrame.content);
_logger.debug("Message is of type: " + jmsMessage.getClass().getName());
jmsMessage.setConsumer(this);
Modified: incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/AbstractBytesMessage.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/AbstractBytesMessage.java?view=diff&rev=497169&r1=497168&r2=497169
==============================================================================
--- incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/AbstractBytesMessage.java (original)
+++ incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/AbstractBytesMessage.java Wed Jan 17 12:49:25 2007
@@ -27,6 +27,7 @@
import javax.jms.MessageEOFException;
import org.apache.mina.common.ByteBuffer;
+import org.apache.qpid.AMQException;
/**
* @author Apache Software Foundation
@@ -67,14 +68,14 @@
_data.setAutoExpand(true);
}
- /*
- AbstractBytesMessage(long messageNbr, ContentHeaderBody contentHeader, ByteBuffer data)
+
+ AbstractBytesMessage(long messageNbr, MessageHeaders contentHeader, ByteBuffer data)
throws AMQException
{
// TODO: this casting is ugly. Need to review whole ContentHeaderBody idea
- super(messageNbr, (BasicContentHeaderProperties) contentHeader.properties, data);
- getJmsContentHeaderProperties().setContentType(getMimeType());
- }*/
+ super(messageNbr, contentHeader, data);
+ getMessageHeaders().setContentType(getMimeType());
+ }
public void clearBodyImpl() throws JMSException
{
Modified: incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/AbstractBytesTypedMessage.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/AbstractBytesTypedMessage.java?view=diff&rev=497169&r1=497168&r2=497169
==============================================================================
--- incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/AbstractBytesTypedMessage.java (original)
+++ incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/AbstractBytesTypedMessage.java Wed Jan 17 12:49:25 2007
@@ -10,6 +10,7 @@
import javax.jms.MessageNotWriteableException;
import org.apache.mina.common.ByteBuffer;
+import org.apache.qpid.AMQException;
/**
* @author Apache Software Foundation
@@ -61,12 +62,12 @@
super(data); // this instanties a content header
}
-/*
- AbstractBytesTypedMessage(long messageNbr, ContentHeaderBody contentHeader, ByteBuffer data)
+
+ AbstractBytesTypedMessage(long messageNbr, MessageHeaders contentHeader, ByteBuffer data)
throws AMQException
{
super(messageNbr, contentHeader, data);
- }*/
+ }
protected byte readWireType() throws MessageFormatException, MessageEOFException,
Modified: incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java?view=diff&rev=497169&r1=497168&r2=497169
==============================================================================
--- incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java (original)
+++ incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java Wed Jan 17 12:49:25 2007
@@ -395,7 +395,13 @@
// we set multiple to true here since acknowledgement implies acknowledge of all previous messages
// received on the session
- _session.acknowledgeMessage(_deliveryTag, true);
+ try {
+ _session.acknowledgeMessage(_deliveryTag, true);
+ } catch (AMQException e) {
+ JMSException ex = new JMSException("Error trying to acknowledge");
+ ex.initCause(e);
+ throw ex;
+ }
}
}
Modified: incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessageFactory.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessageFactory.java?view=diff&rev=497169&r1=497168&r2=497169
==============================================================================
--- incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessageFactory.java (original)
+++ incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessageFactory.java Wed Jan 17 12:49:25 2007
@@ -21,8 +21,7 @@
package org.apache.qpid.client.message;
import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.ContentBody;
-import org.apache.qpid.framing.ContentHeaderBody;
+import org.apache.qpid.framing.Content;
import org.apache.log4j.Logger;
import org.apache.mina.common.ByteBuffer;
@@ -35,44 +34,27 @@
private static final Logger _logger = Logger.getLogger(AbstractJMSMessageFactory.class);
- protected abstract AbstractJMSMessage createMessage(long messageNbr, ByteBuffer data,
- ContentHeaderBody contentHeader) throws AMQException;
+ protected abstract AbstractJMSMessage createMessage(long messageNbr,
+ ByteBuffer data, MessageHeaders contentHeader) throws AMQException;
- protected AbstractJMSMessage createMessageWithBody(long messageNbr,
- ContentHeaderBody contentHeader,
- List bodies) throws AMQException
- {
+ protected AbstractJMSMessage createMessageWithBody(long messageNbr,
+ MessageHeaders contentHeader, Content body) throws AMQException {
ByteBuffer data;
- // we optimise the non-fragmented case to avoid copying
- if (bodies != null && bodies.size() == 1)
- {
- _logger.debug("Non-fragmented message body (bodySize=" + contentHeader.bodySize +")");
- data = ((ContentBody)bodies.get(0)).payload;
- }
- else
- {
- _logger.debug("Fragmented message body (" + bodies.size() + " frames, bodySize=" + contentHeader.bodySize + ")");
- data = ByteBuffer.allocate((int)contentHeader.bodySize); // XXX: Is cast a problem?
- final Iterator it = bodies.iterator();
- while (it.hasNext())
- {
- ContentBody cb = (ContentBody) it.next();
- data.put(cb.payload);
- cb.payload.release();
- }
- data.flip();
- }
+ data = ByteBuffer.allocate(body.content.length);
+ data.put(body.content);
+ data.flip();
+
_logger.debug("Creating message from buffer with position=" + data.position() + " and remaining=" + data.remaining());
return createMessage(messageNbr, data, contentHeader);
}
public AbstractJMSMessage createMessage(long messageNbr, boolean redelivered,
- ContentHeaderBody contentHeader,
- List bodies) throws JMSException, AMQException
+ MessageHeaders contentHeader,
+ Content body) throws JMSException, AMQException
{
- final AbstractJMSMessage msg = createMessageWithBody(messageNbr, contentHeader, bodies);
+ final AbstractJMSMessage msg = createMessageWithBody(messageNbr, contentHeader, body);
msg.setJMSRedelivered(redelivered);
return msg;
}
Modified: incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/JMSBytesMessage.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/JMSBytesMessage.java?view=diff&rev=497169&r1=497168&r2=497169
==============================================================================
--- incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/JMSBytesMessage.java (original)
+++ incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/JMSBytesMessage.java Wed Jan 17 12:49:25 2007
@@ -31,6 +31,7 @@
import javax.jms.MessageFormatException;
import org.apache.mina.common.ByteBuffer;
+import org.apache.qpid.AMQException;
public class JMSBytesMessage extends AbstractBytesMessage implements BytesMessage
{
@@ -52,11 +53,11 @@
super(data); // this instanties a content header
}
- /* JMSBytesMessage(long messageNbr, ContentHeaderBody contentHeader, ByteBuffer data)
+ JMSBytesMessage(long messageNbr, MessageHeaders contentHeader, ByteBuffer data)
throws AMQException
{
super(messageNbr, contentHeader, data);
- }*/
+ }
public void reset()
{
Modified: incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/JMSBytesMessageFactory.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/JMSBytesMessageFactory.java?view=diff&rev=497169&r1=497168&r2=497169
==============================================================================
--- incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/JMSBytesMessageFactory.java (original)
+++ incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/JMSBytesMessageFactory.java Wed Jan 17 12:49:25 2007
@@ -20,15 +20,14 @@
*/
package org.apache.qpid.client.message;
+import javax.jms.JMSException;
+
import org.apache.mina.common.ByteBuffer;
import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.ContentHeaderBody;
-
-import javax.jms.JMSException;
public class JMSBytesMessageFactory extends AbstractJMSMessageFactory
{
- protected AbstractJMSMessage createMessage(long deliveryTag, ByteBuffer data, ContentHeaderBody contentHeader) throws AMQException
+ protected AbstractJMSMessage createMessage(long deliveryTag, ByteBuffer data, MessageHeaders contentHeader) throws AMQException
{
return new JMSBytesMessage(deliveryTag, contentHeader, data);
}
Modified: incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/JMSMapMessage.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/JMSMapMessage.java?view=diff&rev=497169&r1=497168&r2=497169
==============================================================================
--- incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/JMSMapMessage.java (original)
+++ incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/JMSMapMessage.java Wed Jan 17 12:49:25 2007
@@ -31,6 +31,7 @@
import org.apache.log4j.Logger;
import org.apache.mina.common.ByteBuffer;
+import org.apache.qpid.AMQException;
public class JMSMapMessage extends AbstractBytesTypedMessage implements javax.jms.MapMessage
{
@@ -52,6 +53,21 @@
populateMapFromData();
}
+ JMSMapMessage(long messageNbr, MessageHeaders contentHeader, ByteBuffer data)throws AMQException
+ {
+ super(messageNbr, contentHeader, data);
+ try
+ {
+ populateMapFromData();
+ }
+ catch (JMSException je)
+ {
+ throw new AMQException("Error populating MapMessage from ByteBuffer", je);
+
+ }
+ }
+
+
public String toBodyString() throws JMSException
{
return _map.toString();
@@ -69,7 +85,6 @@
writeMapToData();
return super.getData();
}
-
@Override
Modified: incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/JMSMapMessageFactory.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/JMSMapMessageFactory.java?view=diff&rev=497169&r1=497168&r2=497169
==============================================================================
--- incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/JMSMapMessageFactory.java (original)
+++ incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/JMSMapMessageFactory.java Wed Jan 17 12:49:25 2007
@@ -20,12 +20,11 @@
*/
package org.apache.qpid.client.message;
+import javax.jms.JMSException;
+
import org.apache.mina.common.ByteBuffer;
-import org.apache.qpid.framing.ContentHeaderBody;
import org.apache.qpid.AMQException;
-import javax.jms.JMSException;
-
public class JMSMapMessageFactory extends AbstractJMSMessageFactory
{
public AbstractJMSMessage createMessage() throws JMSException
@@ -33,7 +32,7 @@
return new JMSMapMessage();
}
- protected AbstractJMSMessage createMessage(long deliveryTag, ByteBuffer data, ContentHeaderBody contentHeader) throws AMQException
+ protected AbstractJMSMessage createMessage(long deliveryTag, ByteBuffer data, MessageHeaders contentHeader) throws AMQException
{
return new JMSMapMessage(deliveryTag, contentHeader, data);
}
Modified: incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/JMSObjectMessage.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/JMSObjectMessage.java?view=diff&rev=497169&r1=497168&r2=497169
==============================================================================
--- incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/JMSObjectMessage.java (original)
+++ incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/JMSObjectMessage.java Wed Jan 17 12:49:25 2007
@@ -33,6 +33,7 @@
import javax.jms.ObjectMessage;
import org.apache.mina.common.ByteBuffer;
+import org.apache.qpid.AMQException;
public class JMSObjectMessage extends AbstractJMSMessage implements ObjectMessage
{
@@ -62,10 +63,10 @@
/**
* Creates read only message for delivery to consumers
*/
- /* JMSObjectMessage(long messageNbr, ContentHeaderBody contentHeader, ByteBuffer data) throws AMQException
+ JMSObjectMessage(long messageNbr, MessageHeaders contentHeader, ByteBuffer data) throws AMQException
{
- super(messageNbr, (BasicContentHeaderProperties) contentHeader.properties, data);
- }*/
+ super(messageNbr, contentHeader, data);
+ }
public void clearBodyImpl() throws JMSException
{
Modified: incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/JMSObjectMessageFactory.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/JMSObjectMessageFactory.java?view=diff&rev=497169&r1=497168&r2=497169
==============================================================================
--- incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/JMSObjectMessageFactory.java (original)
+++ incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/JMSObjectMessageFactory.java Wed Jan 17 12:49:25 2007
@@ -20,15 +20,14 @@
*/
package org.apache.qpid.client.message;
+import javax.jms.JMSException;
+
import org.apache.mina.common.ByteBuffer;
import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.ContentHeaderBody;
-
-import javax.jms.JMSException;
public class JMSObjectMessageFactory extends AbstractJMSMessageFactory
{
- protected AbstractJMSMessage createMessage(long deliveryTag, ByteBuffer data, ContentHeaderBody contentHeader) throws AMQException
+ protected AbstractJMSMessage createMessage(long deliveryTag, ByteBuffer data, MessageHeaders contentHeader) throws AMQException
{
return new JMSObjectMessage(deliveryTag, contentHeader, data);
}
Modified: incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/JMSStreamMessage.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/JMSStreamMessage.java?view=diff&rev=497169&r1=497168&r2=497169
==============================================================================
--- incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/JMSStreamMessage.java (original)
+++ incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/JMSStreamMessage.java Wed Jan 17 12:49:25 2007
@@ -24,6 +24,7 @@
import javax.jms.StreamMessage;
import org.apache.mina.common.ByteBuffer;
+import org.apache.qpid.AMQException;
/**
* @author Apache Software Foundation
@@ -56,11 +57,11 @@
}
- /* JMSStreamMessage(long messageNbr, ContentHeaderBody contentHeader, ByteBuffer data)
+ JMSStreamMessage(long messageNbr, MessageHeaders contentHeader, ByteBuffer data)
throws AMQException
{
super(messageNbr, contentHeader, data);
- }*/
+ }
public void reset()
{
Modified: incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/JMSStreamMessageFactory.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/JMSStreamMessageFactory.java?view=diff&rev=497169&r1=497168&r2=497169
==============================================================================
--- incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/JMSStreamMessageFactory.java (original)
+++ incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/JMSStreamMessageFactory.java Wed Jan 17 12:49:25 2007
@@ -20,15 +20,14 @@
*/
package org.apache.qpid.client.message;
+import javax.jms.JMSException;
+
import org.apache.mina.common.ByteBuffer;
-import org.apache.qpid.framing.ContentHeaderBody;
import org.apache.qpid.AMQException;
-import javax.jms.JMSException;
-
public class JMSStreamMessageFactory extends AbstractJMSMessageFactory
{
- protected AbstractJMSMessage createMessage(long deliveryTag, ByteBuffer data, ContentHeaderBody contentHeader) throws
+ protected AbstractJMSMessage createMessage(long deliveryTag, ByteBuffer data, MessageHeaders contentHeader) throws
AMQException
{
return new JMSStreamMessage(deliveryTag, contentHeader, data);
Modified: incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/JMSTextMessage.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/JMSTextMessage.java?view=diff&rev=497169&r1=497168&r2=497169
==============================================================================
--- incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/JMSTextMessage.java (original)
+++ incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/JMSTextMessage.java Wed Jan 17 12:49:25 2007
@@ -27,6 +27,7 @@
import javax.jms.JMSException;
import org.apache.mina.common.ByteBuffer;
+import org.apache.qpid.AMQException;
public class JMSTextMessage extends AbstractJMSMessage implements javax.jms.TextMessage
{
@@ -51,13 +52,13 @@
getMessageHeaders().setEncoding(encoding);
}
- /* JMSTextMessage(long deliveryTag, BasicContentHeaderProperties contentHeader, ByteBuffer data)
+ JMSTextMessage(long deliveryTag, MessageHeaders contentHeader, ByteBuffer data)
throws AMQException
{
super(deliveryTag, contentHeader, data);
contentHeader.setContentType(MIME_TYPE);
_data = data;
- }*/
+ }
JMSTextMessage(ByteBuffer data) throws JMSException
{
Modified: incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/JMSTextMessageFactory.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/JMSTextMessageFactory.java?view=diff&rev=497169&r1=497168&r2=497169
==============================================================================
--- incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/JMSTextMessageFactory.java (original)
+++ incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/JMSTextMessageFactory.java Wed Jan 17 12:49:25 2007
@@ -20,12 +20,10 @@
*/
package org.apache.qpid.client.message;
+import javax.jms.JMSException;
+
import org.apache.mina.common.ByteBuffer;
import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.BasicContentHeaderProperties;
-import org.apache.qpid.framing.ContentHeaderBody;
-
-import javax.jms.JMSException;
public class JMSTextMessageFactory extends AbstractJMSMessageFactory
{
@@ -35,8 +33,8 @@
return new JMSTextMessage();
}
- protected AbstractJMSMessage createMessage(long deliveryTag, ByteBuffer data, ContentHeaderBody contentHeader) throws AMQException
+ protected AbstractJMSMessage createMessage(long deliveryTag, ByteBuffer data, MessageHeaders contentHeader) throws AMQException
{
- return new JMSTextMessage(deliveryTag, (BasicContentHeaderProperties) contentHeader.properties, data);
+ return new JMSTextMessage(deliveryTag, contentHeader, data);
}
}
Modified: incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java?view=diff&rev=497169&r1=497168&r2=497169
==============================================================================
--- incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java (original)
+++ incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java Wed Jan 17 12:49:25 2007
@@ -20,6 +20,13 @@
*/
package org.apache.qpid.client.protocol;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+import javax.jms.JMSException;
+import javax.security.sasl.SaslClient;
+
+import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
import org.apache.mina.common.CloseFuture;
import org.apache.mina.common.IdleStatus;
@@ -29,7 +36,6 @@
import org.apache.qpid.client.AMQConnection;
import org.apache.qpid.client.AMQSession;
import org.apache.qpid.client.ConnectionTuneParameters;
-import org.apache.qpid.client.message.UnexpectedBodyReceivedException;
import org.apache.qpid.client.message.UnprocessedMessage;
import org.apache.qpid.client.state.AMQStateManager;
import org.apache.qpid.framing.AMQDataBlock;
@@ -43,12 +49,6 @@
import org.apache.qpid.protocol.AMQMethodEvent;
import org.apache.qpid.protocol.AMQMethodListener;
import org.apache.qpid.protocol.AMQProtocolWriter;
-import org.apache.commons.lang.StringUtils;
-
-import javax.jms.JMSException;
-import javax.security.sasl.SaslClient;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
/**
* Wrapper for protocol session that provides type-safe access to session attributes.