From 91b5375d201f83c80bef23b74c87a86cbc71bb59 Mon Sep 17 00:00:00 2001 From: Martin Ritchie Date: Fri, 9 Feb 2007 12:54:13 +0000 Subject: Merged revisions 504915-505241,505243-505256 via svnmerge from https://svn.apache.org/repos/asf/incubator/qpid/trunk ........ r504915 | rgreig | 2007-02-08 14:36:16 +0000 (Thu, 08 Feb 2007) | 1 line QPID-353 : Amend type of JMS destination type from byte to int ........ r505255 | marnie | 2007-02-09 11:32:52 +0000 (Fri, 09 Feb 2007) | 1 line Rerverted to octal values for fileMode as we have reverted to assembly 2.1 ........ r505256 | marnie | 2007-02-09 11:38:06 +0000 (Fri, 09 Feb 2007) | 1 line Rerverted to octal values for fileMode as we have reverted to assembly 2.1 ........ git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/perftesting_persistent@505275 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/qpid/client/BasicMessageProducer.java | 6 ++---- .../org/apache/qpid/client/CustomJMSXProperty.java | 3 ++- .../qpid/client/message/AbstractJMSMessage.java | 2 +- .../distribution/src/main/assembly/bin-test.xml | 18 ++++++++++++------ qpid/java/distribution/src/main/assembly/bin.xml | 22 ++++++++++++++-------- 5 files changed, 31 insertions(+), 20 deletions(-) diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer.java b/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer.java index f56fc40360..f4fda40be5 100644 --- a/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer.java +++ b/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer.java @@ -24,14 +24,12 @@ import org.apache.log4j.Logger; import org.apache.mina.common.ByteBuffer; import org.apache.qpid.AMQException; import org.apache.qpid.client.message.AbstractJMSMessage; -import org.apache.qpid.client.message.JMSBytesMessage; import org.apache.qpid.client.message.MessageConverter; import org.apache.qpid.client.protocol.AMQProtocolHandler; import org.apache.qpid.framing.*; import javax.jms.*; import java.io.UnsupportedEncodingException; -import java.util.Enumeration; public class BasicMessageProducer extends Closeable implements org.apache.qpid.jms.MessageProducer { @@ -440,7 +438,7 @@ public class BasicMessageProducer extends Closeable implements org.apache.qpid.j AbstractJMSMessage message = convertToNativeMessage(origMessage); - byte type; + int type; if(destination instanceof Topic) { type = AMQDestination.TOPIC_TYPE; @@ -454,7 +452,7 @@ public class BasicMessageProducer extends Closeable implements org.apache.qpid.j type = AMQDestination.UNKNOWN_TYPE; } - message.getJmsHeaders().setByte(CustomJMSXProperty.JMSZ_QPID_DESTTYPE.getShortStringName(), + message.getJmsHeaders().setInteger(CustomJMSXProperty.JMS_QPID_DESTTYPE.getShortStringName(), type); // AMQP version change: Hardwire the version to 0-8 (major=8, minor=0) diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/CustomJMSXProperty.java b/qpid/java/client/src/main/java/org/apache/qpid/client/CustomJMSXProperty.java index 319077c45e..18e6ac4ca0 100644 --- a/qpid/java/client/src/main/java/org/apache/qpid/client/CustomJMSXProperty.java +++ b/qpid/java/client/src/main/java/org/apache/qpid/client/CustomJMSXProperty.java @@ -26,7 +26,8 @@ import java.util.*; public enum CustomJMSXProperty { - JMSZ_QPID_DESTTYPE, + JMS_AMQP_NULL, + JMS_QPID_DESTTYPE, JMSXGroupID, JMSXGroupSeq; diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java index 113cce4ef6..8b6f2b4ab1 100644 --- a/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java +++ b/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java @@ -72,7 +72,7 @@ public abstract class AbstractJMSMessage extends AMQMessage implements org.apach this(contentHeader, deliveryTag); - byte type = contentHeader.getHeaders().getByte(CustomJMSXProperty.JMSZ_QPID_DESTTYPE.getShortStringName()); + int type = contentHeader.getHeaders().getInteger(CustomJMSXProperty.JMS_QPID_DESTTYPE.getShortStringName()); AMQDestination dest; diff --git a/qpid/java/distribution/src/main/assembly/bin-test.xml b/qpid/java/distribution/src/main/assembly/bin-test.xml index b7896bd697..6d78687fa7 100644 --- a/qpid/java/distribution/src/main/assembly/bin-test.xml +++ b/qpid/java/distribution/src/main/assembly/bin-test.xml @@ -74,67 +74,73 @@ ../common/etc/qpid-run.conf qpid-${qpid.version}/etc qpid-run.conf + 420 ../broker/etc/config.xml qpid-${qpid.version}/etc config.xml + 420 ../broker/etc/log4j.xml qpid-${qpid.version}/etc log4j.xml + 420 ../broker/etc/passwd qpid-${qpid.version}/etc passwd + 420 ../broker/etc/qpid-server.conf qpid-${qpid.version}/etc qpid-server.conf + 420 ../broker/etc/virtualhosts.xml qpid-${qpid.version}/etc virtualhosts.xml + 420 ../common/bin/qpid-run qpid-${qpid.version}/bin qpid-run - 0755 + 493 ../broker/bin/qpid-server qpid-${qpid.version}/bin qpid-server - 0755 + 493 ../broker/bin/qpid-server.bat qpid-${qpid.version}/bin qpid-server.bat - 0755 + 493 ../broker/bin/run.bat qpid-${qpid.version}/bin run.bat - 0755 + 493 ../broker/bin/run.sh qpid-${qpid.version}/bin run.sh - 0755 + 493 ../broker/bin/runAll qpid-${qpid.version}/bin runAll - 0755 + 493 diff --git a/qpid/java/distribution/src/main/assembly/bin.xml b/qpid/java/distribution/src/main/assembly/bin.xml index 978ee4df82..27eb239d28 100644 --- a/qpid/java/distribution/src/main/assembly/bin.xml +++ b/qpid/java/distribution/src/main/assembly/bin.xml @@ -68,73 +68,79 @@ - + ../common/etc/qpid-run.conf qpid-${qpid.version}/etc qpid-run.conf + 420 ../broker/etc/config.xml qpid-${qpid.version}/etc config.xml + 420 ../broker/etc/log4j.xml qpid-${qpid.version}/etc log4j.xml + 420 ../broker/etc/passwd qpid-${qpid.version}/etc passwd + 420 ../broker/etc/qpid-server.conf qpid-${qpid.version}/etc qpid-server.conf + 420 ../broker/etc/virtualhosts.xml qpid-${qpid.version}/etc virtualhosts.xml + 420 ../common/bin/qpid-run qpid-${qpid.version}/bin qpid-run - 0755 + 493 ../broker/bin/qpid-server qpid-${qpid.version}/bin qpid-server - 0755 + 493 ../broker/bin/qpid-server.bat qpid-${qpid.version}/bin qpid-server.bat - 0755 + 493 ../broker/bin/run.bat qpid-${qpid.version}/bin run.bat - 0755 + 493 ../broker/bin/run.sh qpid-${qpid.version}/bin run.sh - 0755 + 493 ../broker/bin/runAll qpid-${qpid.version}/bin runAll - 0755 + 493 -- cgit v1.2.1