Author: ritchiem
Date: Fri Feb 9 04:54:13 2007
New Revision: 505275
URL: http://svn.apache.org/viewvc?view=rev&rev=505275
Log:
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
........
Modified:
incubator/qpid/branches/perftesting_persistent/ (props changed)
incubator/qpid/branches/perftesting_persistent/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer.java
incubator/qpid/branches/perftesting_persistent/qpid/java/client/src/main/java/org/apache/qpid/client/CustomJMSXProperty.java
incubator/qpid/branches/perftesting_persistent/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java
incubator/qpid/branches/perftesting_persistent/qpid/java/distribution/src/main/assembly/bin-test.xml
incubator/qpid/branches/perftesting_persistent/qpid/java/distribution/src/main/assembly/bin.xml
Propchange: incubator/qpid/branches/perftesting_persistent/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Feb 9 04:54:13 2007
@@ -1 +1 @@
-/incubator/qpid/trunk:1-504056
+/incubator/qpid/trunk:1-504056,504915-505241,505243-505256
Modified:
incubator/qpid/branches/perftesting_persistent/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/perftesting_persistent/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer.java?view=diff&rev=505275&r1=505274&r2=505275
==============================================================================
---
incubator/qpid/branches/perftesting_persistent/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer.java
(original)
+++
incubator/qpid/branches/perftesting_persistent/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer.java
Fri Feb 9 04:54:13 2007
@@ -24,14 +24,12 @@
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 @@
AbstractJMSMessage message = convertToNativeMessage(origMessage);
- byte type;
+ int type;
if(destination instanceof Topic)
{
type = AMQDestination.TOPIC_TYPE;
@@ -454,7 +452,7 @@
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)
Modified:
incubator/qpid/branches/perftesting_persistent/qpid/java/client/src/main/java/org/apache/qpid/client/CustomJMSXProperty.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/perftesting_persistent/qpid/java/client/src/main/java/org/apache/qpid/client/CustomJMSXProperty.java?view=diff&rev=505275&r1=505274&r2=505275
==============================================================================
---
incubator/qpid/branches/perftesting_persistent/qpid/java/client/src/main/java/org/apache/qpid/client/CustomJMSXProperty.java
(original)
+++
incubator/qpid/branches/perftesting_persistent/qpid/java/client/src/main/java/org/apache/qpid/client/CustomJMSXProperty.java
Fri Feb 9 04:54:13 2007
@@ -26,7 +26,8 @@
public enum CustomJMSXProperty
{
- JMSZ_QPID_DESTTYPE,
+ JMS_AMQP_NULL,
+ JMS_QPID_DESTTYPE,
JMSXGroupID,
JMSXGroupSeq;
Modified:
incubator/qpid/branches/perftesting_persistent/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/perftesting_persistent/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java?view=diff&rev=505275&r1=505274&r2=505275
==============================================================================
---
incubator/qpid/branches/perftesting_persistent/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java
(original)
+++
incubator/qpid/branches/perftesting_persistent/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java
Fri Feb 9 04:54:13 2007
@@ -72,7 +72,7 @@
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;
Modified:
incubator/qpid/branches/perftesting_persistent/qpid/java/distribution/src/main/assembly/bin-test.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/perftesting_persistent/qpid/java/distribution/src/main/assembly/bin-test.xml?view=diff&rev=505275&r1=505274&r2=505275
==============================================================================
---
incubator/qpid/branches/perftesting_persistent/qpid/java/distribution/src/main/assembly/bin-test.xml
(original)
+++
incubator/qpid/branches/perftesting_persistent/qpid/java/distribution/src/main/assembly/bin-test.xml
Fri Feb 9 04:54:13 2007
@@ -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>
Modified:
incubator/qpid/branches/perftesting_persistent/qpid/java/distribution/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/perftesting_persistent/qpid/java/distribution/src/main/assembly/bin.xml?view=diff&rev=505275&r1=505274&r2=505275
==============================================================================
---
incubator/qpid/branches/perftesting_persistent/qpid/java/distribution/src/main/assembly/bin.xml
(original)
+++
incubator/qpid/branches/perftesting_persistent/qpid/java/distribution/src/main/assembly/bin.xml
Fri Feb 9 04:54:13 2007
@@ -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>
