Author: ritchiem
Date: Thu Feb 1 01:37:39 2007
New Revision: 502172
URL: http://svn.apache.org/viewvc?view=rev&rev=502172
Log:
QPID-333 Committed test class rename to stop it being picked up by Surefire
AMQTopic.java - whitespace
Added:
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/message/NonQpidObjectMessage.java
- copied, changed from r501823,
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/message/TestNonQpidTextMessage.java
Removed:
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/message/TestNonQpidTextMessage.java
Modified:
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQTopic.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/MessageConverter.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java
Modified:
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQTopic.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQTopic.java?view=diff&rev=502172&r1=502171&r2=502172
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQTopic.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQTopic.java
Thu Feb 1 01:37:39 2007
@@ -28,12 +28,12 @@
import javax.jms.Topic;
public class AMQTopic extends AMQDestination implements Topic
- {
+{
/**
- * Constructor for use in creating a topic using a BindingURL.
+ * Constructor for use in creating a topic using a BindingURL.
*
* @param binding The binding url object.
- */
+ */
public AMQTopic(BindingURL binding)
{
super(binding);
@@ -78,7 +78,7 @@
return super.getDestinationName().toString();
}
- public AMQShortString getRoutingKey()
+ public AMQShortString getRoutingKey()
{
return getDestinationName();
}
@@ -93,7 +93,7 @@
* Override since the queue is always private and we must ensure it
remains null. If not,
* reuse of the topic when registering consumers will make all consumers
listen on the same (private) queue rather
* than getting their own (private) queue.
- *
+ * <p/>
* This is relatively nasty but it is difficult to come up with a more
elegant solution, given
* the requirement in the case on AMQQueue and possibly other
AMQDestination subclasses to
* use the underlying queue name even where it is server generated.
Modified:
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/MessageConverter.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/MessageConverter.java?view=diff&rev=502172&r1=502171&r2=502172
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/MessageConverter.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/MessageConverter.java
Thu Feb 1 01:37:39 2007
@@ -121,8 +121,9 @@
public MessageConverter(Message message) throws JMSException
{
- //TODO; Do we really want to create an empty message here ?
- BytesMessage nativeMessage = new JMSBytesMessage();
+ //Send a message with just properties.
+ // Throwing away content
+ BytesMessage nativeMessage = new JMSBytesMessage();
_newMessage = (AbstractJMSMessage) nativeMessage;
setMessageProperties(message);
Copied:
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/message/NonQpidObjectMessage.java
(from r501823,
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/message/TestNonQpidTextMessage.java)
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/message/NonQpidObjectMessage.java?view=diff&rev=502172&p1=incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/message/TestNonQpidTextMessage.java&r1=501823&p2=incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/message/NonQpidObjectMessage.java&r2=502172
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/message/TestNonQpidTextMessage.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/message/NonQpidObjectMessage.java
Thu Feb 1 01:37:39 2007
@@ -24,7 +24,7 @@
import java.util.Enumeration;
import java.io.Serializable;
-public class TestNonQpidTextMessage implements ObjectMessage {
+public class NonQpidObjectMessage implements ObjectMessage {
private JMSObjectMessage _realMessage;
private String _contentString;
@@ -34,7 +34,7 @@
* does not inherit from the Qpid message superclasses
* and expand our unit testing of MessageConverter et al
*/
- public TestNonQpidTextMessage()
+ public NonQpidObjectMessage()
{
_realMessage = new JMSObjectMessage();
}
Modified:
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java?view=diff&rev=502172&r1=502171&r2=502172
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java
Thu Feb 1 01:37:39 2007
@@ -26,7 +26,7 @@
import org.apache.qpid.client.AMQConnection;
import org.apache.qpid.client.AMQSession;
import org.apache.qpid.client.AMQQueue;
-import org.apache.qpid.client.message.TestNonQpidTextMessage;
+import org.apache.qpid.client.message.NonQpidObjectMessage;
import org.apache.qpid.framing.AMQShortString;
import javax.jms.*;
@@ -71,7 +71,7 @@
MessageProducer producer = producerSession.createProducer(queue);
//create a test message to send
- ObjectMessage sentMsg = new TestNonQpidTextMessage();
+ ObjectMessage sentMsg = new NonQpidObjectMessage();
sentMsg.setJMSCorrelationID(JMS_CORR_ID);
sentMsg.setJMSDeliveryMode(JMS_DELIV_MODE);
sentMsg.setJMSType(JMS_TYPE);
