diff options
Diffstat (limited to 'qpid/java')
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 @@ <source>../common/etc/qpid-run.conf</source> <outputDirectory>qpid-${qpid.version}/etc</outputDirectory> <destName>qpid-run.conf</destName> + <fileMode>420</fileMode> </file> <file> <source>../broker/etc/config.xml</source> <outputDirectory>qpid-${qpid.version}/etc</outputDirectory> <destName>config.xml</destName> + <fileMode>420</fileMode> </file> <file> <source>../broker/etc/log4j.xml</source> <outputDirectory>qpid-${qpid.version}/etc</outputDirectory> <destName>log4j.xml</destName> + <fileMode>420</fileMode> </file> <file> <source>../broker/etc/passwd</source> <outputDirectory>qpid-${qpid.version}/etc</outputDirectory> <destName>passwd</destName> + <fileMode>420</fileMode> </file> <file> <source>../broker/etc/qpid-server.conf</source> <outputDirectory>qpid-${qpid.version}/etc</outputDirectory> <destName>qpid-server.conf</destName> + <fileMode>420</fileMode> </file> <file> <source>../broker/etc/virtualhosts.xml</source> <outputDirectory>qpid-${qpid.version}/etc</outputDirectory> <destName>virtualhosts.xml</destName> + <fileMode>420</fileMode> </file> <file> <source>../common/bin/qpid-run</source> <outputDirectory>qpid-${qpid.version}/bin</outputDirectory> <destName>qpid-run</destName> - <fileMode>0755</fileMode> + <fileMode>493</fileMode> </file> <file> <source>../broker/bin/qpid-server</source> <outputDirectory>qpid-${qpid.version}/bin</outputDirectory> <destName>qpid-server</destName> - <fileMode>0755</fileMode> + <fileMode>493</fileMode> </file> <file> <source>../broker/bin/qpid-server.bat</source> <outputDirectory>qpid-${qpid.version}/bin</outputDirectory> <destName>qpid-server.bat</destName> - <fileMode>0755</fileMode> + <fileMode>493</fileMode> </file> <file> <source>../broker/bin/run.bat</source> <outputDirectory>qpid-${qpid.version}/bin</outputDirectory> <destName>run.bat</destName> - <fileMode>0755</fileMode> + <fileMode>493</fileMode> </file> <file> <source>../broker/bin/run.sh</source> <outputDirectory>qpid-${qpid.version}/bin</outputDirectory> <destName>run.sh</destName> - <fileMode>0755</fileMode> + <fileMode>493</fileMode> </file> <file> <source>../broker/bin/runAll</source> <outputDirectory>qpid-${qpid.version}/bin</outputDirectory> <destName>runAll</destName> - <fileMode>0755</fileMode> + <fileMode>493</fileMode> </file> </files> <dependencySets> 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 @@ </fileSet> </fileSets> <files> - <!-- due to a bug in the assembly plugin (MASSEMBLY-153) you have - to use decimal numbers to specify fileMode --> + <!-- due to a bug in the assembly 2.1 plugin (MASSEMBLY-153) you have + to use octal numbers to specify fileMode note not valid in 2.2 assembly plugin --> <file> <source>../common/etc/qpid-run.conf</source> <outputDirectory>qpid-${qpid.version}/etc</outputDirectory> <destName>qpid-run.conf</destName> + <fileMode>420</fileMode> </file> <file> <source>../broker/etc/config.xml</source> <outputDirectory>qpid-${qpid.version}/etc</outputDirectory> <destName>config.xml</destName> + <fileMode>420</fileMode> </file> <file> <source>../broker/etc/log4j.xml</source> <outputDirectory>qpid-${qpid.version}/etc</outputDirectory> <destName>log4j.xml</destName> + <fileMode>420</fileMode> </file> <file> <source>../broker/etc/passwd</source> <outputDirectory>qpid-${qpid.version}/etc</outputDirectory> <destName>passwd</destName> + <fileMode>420</fileMode> </file> <file> <source>../broker/etc/qpid-server.conf</source> <outputDirectory>qpid-${qpid.version}/etc</outputDirectory> <destName>qpid-server.conf</destName> + <fileMode>420</fileMode> </file> <file> <source>../broker/etc/virtualhosts.xml</source> <outputDirectory>qpid-${qpid.version}/etc</outputDirectory> <destName>virtualhosts.xml</destName> + <fileMode>420</fileMode> </file> <file> <source>../common/bin/qpid-run</source> <outputDirectory>qpid-${qpid.version}/bin</outputDirectory> <destName>qpid-run</destName> - <fileMode>0755</fileMode> + <fileMode>493</fileMode> </file> <file> <source>../broker/bin/qpid-server</source> <outputDirectory>qpid-${qpid.version}/bin</outputDirectory> <destName>qpid-server</destName> - <fileMode>0755</fileMode> + <fileMode>493</fileMode> </file> <file> <source>../broker/bin/qpid-server.bat</source> <outputDirectory>qpid-${qpid.version}/bin</outputDirectory> <destName>qpid-server.bat</destName> - <fileMode>0755</fileMode> + <fileMode>493</fileMode> </file> <file> <source>../broker/bin/run.bat</source> <outputDirectory>qpid-${qpid.version}/bin</outputDirectory> <destName>run.bat</destName> - <fileMode>0755</fileMode> + <fileMode>493</fileMode> </file> <file> <source>../broker/bin/run.sh</source> <outputDirectory>qpid-${qpid.version}/bin</outputDirectory> <destName>run.sh</destName> - <fileMode>0755</fileMode> + <fileMode>493</fileMode> </file> <file> <source>../broker/bin/runAll</source> <outputDirectory>qpid-${qpid.version}/bin</outputDirectory> <destName>runAll</destName> - <fileMode>0755</fileMode> + <fileMode>493</fileMode> </file> </files> <dependencySets> |