You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ai...@apache.org on 2008/02/28 18:50:02 UTC
svn commit: r632074 - in /incubator/qpid/branches/thegreatmerge/qpid: ./
java/broker/etc/ java/broker/src/main/java/org/apache/qpid/server/
java/broker/src/main/java/org/apache/qpid/server/transport/
java/client/src/main/java/org/apache/qpid/client/pro...
Author: aidan
Date: Thu Feb 28 09:49:55 2008
New Revision: 632074
URL: http://svn.apache.org/viewvc?rev=632074&view=rev
Log:
Merged revisions 632054-632055,632070 via svnmerge from
https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1
........
r632054 | ritchiem | 2008-02-28 16:51:12 +0000 (Thu, 28 Feb 2008) | 1 line
QPID-821 Set default to false for MultiIO and Buffer Limiting.
........
r632055 | ritchiem | 2008-02-28 16:58:43 +0000 (Thu, 28 Feb 2008) | 1 line
QPID-822 Set default to false for JMSXUserID.
........
r632070 | ritchiem | 2008-02-28 17:38:20 +0000 (Thu, 28 Feb 2008) | 1 line
QPID-822 Setting default to false for JMSXUserID cause this test to fail. Now test only validates the JMSXUserID if it exists.
........
Modified:
incubator/qpid/branches/thegreatmerge/qpid/ (props changed)
incubator/qpid/branches/thegreatmerge/qpid/java/broker/etc/acl.config.xml
incubator/qpid/branches/thegreatmerge/qpid/java/broker/etc/config.xml
incubator/qpid/branches/thegreatmerge/qpid/java/broker/etc/persistent_config.xml
incubator/qpid/branches/thegreatmerge/qpid/java/broker/etc/transient_config.xml
incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ConnectorConfiguration.java
incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java
incubator/qpid/branches/thegreatmerge/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java
Propchange: incubator/qpid/branches/thegreatmerge/qpid/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: incubator/qpid/branches/thegreatmerge/qpid/java/broker/etc/acl.config.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/broker/etc/acl.config.xml?rev=632074&r1=632073&r2=632074&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/java/broker/etc/acl.config.xml (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/java/broker/etc/acl.config.xml Thu Feb 28 09:49:55 2008
@@ -52,7 +52,7 @@
<enableDirectBuffers>false</enableDirectBuffers>
<framesize>65535</framesize>
<compressBufferOnQueue>false</compressBufferOnQueue>
- <enableJMSXUserID>true</enableJMSXUserID>
+ <enableJMSXUserID>false</enableJMSXUserID>
</advanced>
<security>
Modified: incubator/qpid/branches/thegreatmerge/qpid/java/broker/etc/config.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/broker/etc/config.xml?rev=632074&r1=632073&r2=632074&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/java/broker/etc/config.xml (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/java/broker/etc/config.xml Thu Feb 28 09:49:55 2008
@@ -32,8 +32,8 @@
<keystorePath>/path/to/keystore.ks</keystorePath>
<keystorePassword>keystorepass</keystorePassword>
</ssl>-->
- <qpidnio>true</qpidnio>
- <protectio>true</protectio>
+ <qpidnio>false</qpidnio>
+ <protectio>false</protectio>
<transport>nio</transport>
<port>5672</port>
<sslport>8672</sslport>
@@ -51,6 +51,7 @@
<enableDirectBuffers>false</enableDirectBuffers>
<framesize>65535</framesize>
<compressBufferOnQueue>false</compressBufferOnQueue>
+ <enableJMSXUserID>false</enableJMSXUserID>
</advanced>
<security>
Modified: incubator/qpid/branches/thegreatmerge/qpid/java/broker/etc/persistent_config.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/broker/etc/persistent_config.xml?rev=632074&r1=632073&r2=632074&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/java/broker/etc/persistent_config.xml (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/java/broker/etc/persistent_config.xml Thu Feb 28 09:49:55 2008
@@ -28,7 +28,6 @@
<work>${QPID_WORK}</work>
<conf>${prefix}/etc</conf>
<connector>
- <qpidnio>true</qpidnio>
<transport>nio</transport>
<port>5672</port>
<sslport>8672</sslport>
Modified: incubator/qpid/branches/thegreatmerge/qpid/java/broker/etc/transient_config.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/broker/etc/transient_config.xml?rev=632074&r1=632073&r2=632074&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/java/broker/etc/transient_config.xml (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/java/broker/etc/transient_config.xml Thu Feb 28 09:49:55 2008
@@ -28,7 +28,6 @@
<work>${QPID_WORK}</work>
<conf>${prefix}/etc</conf>
<connector>
- <qpidnio>true</qpidnio>
<transport>nio</transport>
<port>5672</port>
<sslport>8672</sslport>
Modified: incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java?rev=632074&r1=632073&r2=632074&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java Thu Feb 28 09:49:55 2008
@@ -119,7 +119,7 @@
private boolean _closing;
@Configured(path = "advanced.enableJMSXUserID",
- defaultValue = "true")
+ defaultValue = "false")
public boolean ENABLE_JMSXUserID;
public AMQChannel(AMQProtocolSession session, int channelId, TransactionManager transactionManager,
Modified: incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ConnectorConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ConnectorConfiguration.java?rev=632074&r1=632073&r2=632074&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ConnectorConfiguration.java (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ConnectorConfiguration.java Thu Feb 28 09:49:55 2008
@@ -94,7 +94,7 @@
public String certType;
@Configured(path = "connector.qpidnio",
- defaultValue = "true")
+ defaultValue = "false")
public boolean _multiThreadNIO;
Modified: incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java?rev=632074&r1=632073&r2=632074&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java Thu Feb 28 09:49:55 2008
@@ -213,7 +213,7 @@
e.printStackTrace();
}
- if (!System.getProperties().containsKey("protectio") || Boolean.getBoolean("protectio"))
+ if (Boolean.getBoolean("protectio"))
{
try
{
Modified: incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java?rev=632074&r1=632073&r2=632074&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java Thu Feb 28 09:49:55 2008
@@ -122,7 +122,7 @@
{
SocketConnector result;
// FIXME - this needs to be sorted to use the new Mina MultiThread SA.
- if (!System.getProperties().containsKey("qpidnio") || Boolean.getBoolean("qpidnio"))
+ if (Boolean.getBoolean("qpidnio"))
{
_logger.warn("Using Qpid MultiThreaded NIO - " + (System.getProperties().containsKey("qpidnio")
? "Qpid NIO is new default"
Modified: incubator/qpid/branches/thegreatmerge/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/thegreatmerge/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java?rev=632074&r1=632073&r2=632074&view=diff
==============================================================================
--- incubator/qpid/branches/thegreatmerge/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java (original)
+++ incubator/qpid/branches/thegreatmerge/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java Thu Feb 28 09:49:55 2008
@@ -287,7 +287,14 @@
((AMQMessage) m).setVoidProperty(new AMQShortString("void"));
Assert.assertTrue("Check void properties are correctly transported",
- ((AMQMessage) m).getPropertyHeaders().containsKey("void"));
+ ((AMQMessage) m).getPropertyHeaders().containsKey("void"));
+
+ //JMSXUserID
+ if (m.getStringProperty("JMSXUserID") != null)
+ {
+ Assert.assertEquals("Check 'JMSXUserID' is supported ", USERNAME,
+ m.getStringProperty("JMSXUserID"));
+ }
}
received.clear();