Author: grkvlt
Date: Fri Oct 15 07:19:51 2010
New Revision: 1022843
URL: http://svn.apache.org/viewvc?rev=1022843&view=rev
Log:
Tidyup
Added:
qpid/branches/grkvlt-network-20101013/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/temporaryqueue/TemporaryQueueNameTest.java
Modified:
qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageTransferHeader.java
qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
qpid/branches/grkvlt-network-20101013/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java
qpid/branches/grkvlt-network-20101013/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_8.java
qpid/branches/grkvlt-network-20101013/qpid/java/common/src/main/java/org/apache/qpid/configuration/ClientProperties.java
qpid/branches/grkvlt-network-20101013/qpid/java/common/src/main/java/org/apache/qpid/pool/ReferenceCountingExecutorService.java
qpid/branches/grkvlt-network-20101013/qpid/java/common/src/main/java/org/apache/qpid/thread/Threading.java
qpid/branches/grkvlt-network-20101013/qpid/java/common/src/main/java/org/apache/qpid/transport/network/mina/MinaNetworkHandler.java
qpid/branches/grkvlt-network-20101013/qpid/java/common/src/main/java/org/apache/qpid/transport/network/mina/MinaNetworkTransport.java
qpid/branches/grkvlt-network-20101013/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionCloseTest.java
qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/JavaInVMExcludes
qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/test-provider.properties
Modified:
qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageTransferHeader.java
URL:
http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageTransferHeader.java?rev=1022843&r1=1022842&r2=1022843&view=diff
==============================================================================
---
qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageTransferHeader.java
(original)
+++
qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageTransferHeader.java
Fri Oct 15 07:19:51 2010
@@ -26,6 +26,7 @@ import org.apache.qpid.transport.Message
import java.util.Set;
import java.util.Map;
+import java.util.UUID;
class MessageTransferHeader implements AMQMessageHeader
{
@@ -61,7 +62,9 @@ class MessageTransferHeader implements A
public String getMessageId()
{
- return _messageProps == null ? null :
String.valueOf(_messageProps.getMessageId());
+ UUID id = _messageProps == null ? null : _messageProps.getMessageId();
+
+ return id == null ? null : String.valueOf(id);
}
public String getMimeType()
Modified:
qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
URL:
http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java?rev=1022843&r1=1022842&r2=1022843&view=diff
==============================================================================
---
qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
(original)
+++
qpid/branches/grkvlt-network-20101013/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
Fri Oct 15 07:19:51 2010
@@ -58,6 +58,7 @@ public class PrincipalDatabaseAuthentica
private Map<String, Map<String, ?>> _serverCreationProperties = new
HashMap<String, Map<String, ?>>();
private AuthenticationManager _default = null;
+
/** The name for the required SASL Server mechanisms */
public static final String PROVIDER_NAME= "AMQSASLProvider-Server";
@@ -74,6 +75,7 @@ public class PrincipalDatabaseAuthentica
if (name == null || hostConfig == null)
{
+ Security.removeProvider(PROVIDER_NAME);
initialiseAuthenticationMechanisms(providerMap,
ApplicationRegistry.getInstance().getDatabaseManager().getDatabases());
}
else
@@ -82,7 +84,6 @@ public class PrincipalDatabaseAuthentica
if (databaseName == null)
{
-
_default =
ApplicationRegistry.getInstance().getAuthenticationManager();
return;
}
Modified:
qpid/branches/grkvlt-network-20101013/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java
URL:
http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20101013/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java?rev=1022843&r1=1022842&r2=1022843&view=diff
==============================================================================
---
qpid/branches/grkvlt-network-20101013/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java
(original)
+++
qpid/branches/grkvlt-network-20101013/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java
Fri Oct 15 07:19:51 2010
@@ -217,7 +217,7 @@ public class AMQMessageDelegate_0_10 ext
else
{
SoftReference<Destination> ref = _destinationCache.get(replyTo);
- Destination dest = ref.get();
+ Destination dest = ref == null ? null : ref.get();
if (dest == null)
{
String exchange = replyTo.getExchange();
Modified:
qpid/branches/grkvlt-network-20101013/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_8.java
URL:
http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20101013/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_8.java?rev=1022843&r1=1022842&r2=1022843&view=diff
==============================================================================
---
qpid/branches/grkvlt-network-20101013/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_8.java
(original)
+++
qpid/branches/grkvlt-network-20101013/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_8.java
Fri Oct 15 07:19:51 2010
@@ -183,7 +183,7 @@ public class AMQMessageDelegate_0_8 exte
else
{
SoftReference<Destination> ref =
_destinationCache.get(replyToEncoding);
- Destination dest = ref.get();
+ Destination dest = ref == null ? null : ref.get();
if (dest == null)
{
try
Modified:
qpid/branches/grkvlt-network-20101013/qpid/java/common/src/main/java/org/apache/qpid/configuration/ClientProperties.java
URL:
http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20101013/qpid/java/common/src/main/java/org/apache/qpid/configuration/ClientProperties.java?rev=1022843&r1=1022842&r2=1022843&view=diff
==============================================================================
---
qpid/branches/grkvlt-network-20101013/qpid/java/common/src/main/java/org/apache/qpid/configuration/ClientProperties.java
(original)
+++
qpid/branches/grkvlt-network-20101013/qpid/java/common/src/main/java/org/apache/qpid/configuration/ClientProperties.java
Fri Oct 15 07:19:51 2010
@@ -23,7 +23,6 @@ package org.apache.qpid.configuration;
*/
public class ClientProperties
{
-
/**
* Currently with Qpid it is not possible to change the client ID.
* If one is not specified upon connection construction, an id is
generated automatically.
@@ -86,7 +85,7 @@ public class ClientProperties
public static final String USE_LEGACY_MAP_MESSAGE_FORMAT =
"qpid.use_legacy_map_message";
- /**
+ /*
* ==========================================================
* Those properties are used when the io size should be bounded
* ==========================================================
@@ -99,7 +98,7 @@ public class ClientProperties
* speed.
* type: boolean
*/
- public static final String PROTECTIO_PROP_NAME = "protectio";
+ public static final String PROTECTIO_PROP_NAME = "qpid.protectio";
//=== The following properties are only used when the previous one is true.
/**
@@ -107,28 +106,14 @@ public class ClientProperties
* type: int
*/
public static final String READ_BUFFER_LIMIT_PROP_NAME =
"qpid.read.buffer.limit";
- public static final String READ_BUFFER_LIMIT_DEFAULT = "262144";
+ public static final Integer READ_BUFFER_LIMIT_DEFAULT = 256 * 1024;
+
/**
* Max size of written messages that can be stored within the MINA layer
* type: int
*/
- public static final String WRITE_BUFFER_LIMIT_PROP_NAME =
"qpid.read.buffer.limit";
- public static final String WRITE_BUFFER_LIMIT_DEFAULT = "262144";
+ public static final String WRITE_BUFFER_LIMIT_PROP_NAME =
"qpid.write.buffer.limit";
+ public static final Integer WRITE_BUFFER_LIMIT_DEFAULT = 256 * 1024;
public static final String AMQP_VERSION = "qpid.amqp.version";
-
- private static ClientProperties _instance = new ClientProperties();
-
- /*
- public static final QpidProperty<Boolean> IGNORE_SET_CLIENTID_PROP_NAME =
-
QpidProperty.booleanProperty(false,"qpid.ignore_set_client_id","ignore_setclientID");
-
- public static final QpidProperty<Boolean> SYNC_PERSISTENT_PROP_NAME =
-
QpidProperty.booleanProperty(false,"qpid.sync_persistence","sync_persistence");
-
-
- public static final QpidProperty<Integer> MAX_PREFETCH_PROP_NAME =
- QpidProperty.intProperty(500,"qpid.max_prefetch","max_prefetch"); */
-
-
}
Modified:
qpid/branches/grkvlt-network-20101013/qpid/java/common/src/main/java/org/apache/qpid/pool/ReferenceCountingExecutorService.java
URL:
http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20101013/qpid/java/common/src/main/java/org/apache/qpid/pool/ReferenceCountingExecutorService.java?rev=1022843&r1=1022842&r2=1022843&view=diff
==============================================================================
---
qpid/branches/grkvlt-network-20101013/qpid/java/common/src/main/java/org/apache/qpid/pool/ReferenceCountingExecutorService.java
(original)
+++
qpid/branches/grkvlt-network-20101013/qpid/java/common/src/main/java/org/apache/qpid/pool/ReferenceCountingExecutorService.java
Fri Oct 15 07:19:51 2010
@@ -27,6 +27,8 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.qpid.thread.Threading;
+
/**
* ReferenceCountingExecutorService wraps an ExecutorService in order to
provide shared reference to it. It counts
* the references taken, instantiating the service on the first reference, and
shutting it down when the last
@@ -83,9 +85,11 @@ public class ReferenceCountingExecutorSe
private AtomicInteger _refCount = new AtomicInteger(0);
/** Holds the number of executor threads to create. */
- private int _poolSize = Integer.getInteger("amqj.read_write_pool_size",
DEFAULT_POOL_SIZE);
+ private final int _poolSize =
Integer.getInteger("amqj.read_write_pool_size", DEFAULT_POOL_SIZE);
- private final boolean _useBiasedPool =
Boolean.getBoolean("org.apache.qpid.use_write_biased_pool");
+ private final boolean _useFixedPool =
Boolean.getBoolean("qpid.useFixedPool");
+
+ private final boolean _useBiasedPool =
Boolean.getBoolean("qpid.useWriteBiasedPool");
/**
* Retrieves the singleton instance of this reference counter.
@@ -112,18 +116,24 @@ public class ReferenceCountingExecutorSe
{
if (_refCount.getAndIncrement() == 0)
{
-// _pool = Executors.newFixedThreadPool(_poolSize);
-
- // Use a job queue that biases to writes
- if(_useBiasedPool)
+ if (_useBiasedPool)
{
+ // Use a job queue that biases to writes
_pool = new ThreadPoolExecutor(_poolSize, _poolSize,
0L, TimeUnit.MILLISECONDS,
- new ReadWriteJobQueue());
+ new ReadWriteJobQueue(),
+ Threading.getThreadFactory(),
+ new ThreadPoolExecutor.AbortPolicy());
+ }
+ else if (_useFixedPool)
+ {
+ // Use a fixed size pool of threads
+ _pool = Executors.newFixedThreadPool(_poolSize,
Threading.getThreadFactory());
}
else
{
- _pool = Executors.newFixedThreadPool(_poolSize);
+ // Use a thread pool that caches threads
+ _pool =
Executors.newCachedThreadPool(Threading.getThreadFactory());
}
}
Modified:
qpid/branches/grkvlt-network-20101013/qpid/java/common/src/main/java/org/apache/qpid/thread/Threading.java
URL:
http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20101013/qpid/java/common/src/main/java/org/apache/qpid/thread/Threading.java?rev=1022843&r1=1022842&r2=1022843&view=diff
==============================================================================
---
qpid/branches/grkvlt-network-20101013/qpid/java/common/src/main/java/org/apache/qpid/thread/Threading.java
(original)
+++
qpid/branches/grkvlt-network-20101013/qpid/java/common/src/main/java/org/apache/qpid/thread/Threading.java
Fri Oct 15 07:19:51 2010
@@ -30,7 +30,7 @@ public final class Threading
static {
try
{
- String factoryName = System.getProperty("qpid.thread_factory");
+ String factoryName = System.getProperty("qpid.threadFactory");
if (factoryName == null)
{
_factory = Executors.defaultThreadFactory();
Modified:
qpid/branches/grkvlt-network-20101013/qpid/java/common/src/main/java/org/apache/qpid/transport/network/mina/MinaNetworkHandler.java
URL:
http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20101013/qpid/java/common/src/main/java/org/apache/qpid/transport/network/mina/MinaNetworkHandler.java?rev=1022843&r1=1022842&r2=1022843&view=diff
==============================================================================
---
qpid/branches/grkvlt-network-20101013/qpid/java/common/src/main/java/org/apache/qpid/transport/network/mina/MinaNetworkHandler.java
(original)
+++
qpid/branches/grkvlt-network-20101013/qpid/java/common/src/main/java/org/apache/qpid/transport/network/mina/MinaNetworkHandler.java
Fri Oct 15 07:19:51 2010
@@ -21,6 +21,7 @@
package org.apache.qpid.transport.network.mina;
import static org.apache.qpid.transport.util.Functions.*;
+import static org.apache.qpid.configuration.ClientProperties.*;
import org.apache.mina.common.ByteBuffer;
import org.apache.mina.common.IdleStatus;
@@ -46,9 +47,6 @@ public class MinaNetworkHandler extends
{
private static final Logger _log =
LoggerFactory.getLogger(MinaNetworkHandler.class);
- /** Default buffer size for pending messages reads */
- private static final String DEFAULT_READ_BUFFER_LIMIT = "262144";
-
private NetworkTransport _transport = null;
private SSLContextFactory _sslFactory = null;
private ReceiverFactory _factory = null;
@@ -117,12 +115,12 @@ public class MinaNetworkHandler extends
}
// Add IO Protection Read Filter
- if (Boolean.getBoolean("qpid.protectio"))
+ if (Boolean.getBoolean(PROTECTIO_PROP_NAME))
{
try
{
ReadThrottleFilterBuilder readFilter = new
ReadThrottleFilterBuilder();
-
readFilter.setMaximumConnectionBufferSize(Integer.parseInt(System.getProperty("qpid.read.buffer.limit",
DEFAULT_READ_BUFFER_LIMIT)));
+
readFilter.setMaximumConnectionBufferSize(Integer.getInteger(READ_BUFFER_LIMIT_PROP_NAME,
READ_BUFFER_LIMIT_DEFAULT));
readFilter.attach(chain);
_log.info("Using IO Read/Write Filter Protection");
}
Modified:
qpid/branches/grkvlt-network-20101013/qpid/java/common/src/main/java/org/apache/qpid/transport/network/mina/MinaNetworkTransport.java
URL:
http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20101013/qpid/java/common/src/main/java/org/apache/qpid/transport/network/mina/MinaNetworkTransport.java?rev=1022843&r1=1022842&r2=1022843&view=diff
==============================================================================
---
qpid/branches/grkvlt-network-20101013/qpid/java/common/src/main/java/org/apache/qpid/transport/network/mina/MinaNetworkTransport.java
(original)
+++
qpid/branches/grkvlt-network-20101013/qpid/java/common/src/main/java/org/apache/qpid/transport/network/mina/MinaNetworkTransport.java
Fri Oct 15 07:19:51 2010
@@ -108,7 +108,7 @@ public class MinaNetworkTransport implem
if (_settings.getProtocol().equalsIgnoreCase(Transport.TCP))
{
_address = new InetSocketAddress(_settings.getHost(),
_settings.getPort());
- _connector = new SocketConnector(_threads, _executor); //
non-blocking connector
+ _connector = new SocketConnector(1, _executor); // non-blocking
connector
}
else if (_settings.getProtocol().equalsIgnoreCase(Transport.UDP))
{
@@ -133,7 +133,7 @@ public class MinaNetworkTransport implem
"with 'socket://<SocketID>'
transport");
}
_address = socket.getRemoteSocketAddress();
- _connector = new ExistingSocketConnector(_threads, _executor);
+ _connector = new ExistingSocketConnector(1, _executor);
((ExistingSocketConnector) _connector).setOpenSocket(socket);
}
else
@@ -271,7 +271,7 @@ public class MinaNetworkTransport implem
{
_receiver.closed();
}
- if (_session != null && _session.isConnected())
+ if (_session != null)
{
_session.close();
}
Modified:
qpid/branches/grkvlt-network-20101013/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionCloseTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20101013/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionCloseTest.java?rev=1022843&r1=1022842&r2=1022843&view=diff
==============================================================================
---
qpid/branches/grkvlt-network-20101013/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionCloseTest.java
(original)
+++
qpid/branches/grkvlt-network-20101013/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionCloseTest.java
Fri Oct 15 07:19:51 2010
@@ -77,7 +77,7 @@ public class ConnectionCloseTest extends
// This should leave the finalizer enough time to notify those threads
synchronized (this)
{
- this.wait(10000);
+ this.wait(60000);
}
Map<Thread,StackTraceElement[]> after = Thread.getAllStackTraces();
@@ -92,7 +92,7 @@ public class ConnectionCloseTest extends
assertTrue("Spurious thread creation exceeded threshold, " +
delta.size() + " threads created.",
- delta.size() < 50);
+ delta.size() < 100);
}
private void dumpStacks(Map<Thread,StackTraceElement[]> map)
Added:
qpid/branches/grkvlt-network-20101013/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/temporaryqueue/TemporaryQueueNameTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20101013/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/temporaryqueue/TemporaryQueueNameTest.java?rev=1022843&view=auto
==============================================================================
---
qpid/branches/grkvlt-network-20101013/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/temporaryqueue/TemporaryQueueNameTest.java
(added)
+++
qpid/branches/grkvlt-network-20101013/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/temporaryqueue/TemporaryQueueNameTest.java
Fri Oct 15 07:19:51 2010
@@ -0,0 +1,117 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.qpid.test.unit.client.temporaryqueue;
+
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
+import java.net.UnknownHostException;
+
+import org.apache.mina.transport.vmpipe.VmPipeAddress;
+import org.apache.qpid.client.AMQConnection;
+import org.apache.qpid.client.protocol.AMQProtocolHandler;
+import org.apache.qpid.client.protocol.AMQProtocolSession;
+import org.apache.qpid.framing.AMQShortString;
+import org.apache.qpid.ssl.SSLContextFactory;
+import org.apache.qpid.test.utils.QpidBrokerTestCase;
+import org.apache.qpid.transport.ConnectionSettings;
+import org.apache.qpid.transport.TestNetworkConnection;
+import org.apache.qpid.transport.TestNetworkTransport;
+import org.apache.qpid.transport.network.Transport;
+
+public class TemporaryQueueNameTest extends QpidBrokerTestCase
+{
+ private class QueueNameSession extends AMQProtocolSession
+ {
+ public QueueNameSession(AMQProtocolHandler protocolHandler,
AMQConnection connection)
+ {
+ super(protocolHandler, connection);
+ }
+
+ public AMQShortString genQueueName()
+ {
+ return generateQueueName();
+ }
+ }
+
+ private class QueueNameProtocolHandler extends AMQProtocolHandler
+ {
+ public QueueNameProtocolHandler(AMQConnection connection)
+ {
+ super(connection);
+ }
+
+ @Override
+ public SocketAddress getLocalAddress()
+ {
+ return _transport.getAddress();
+ }
+ }
+
+ private QueueNameSession _queueNameSession;
+ private TestNetworkTransport _transport;
+
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+ AMQConnection con = (AMQConnection) getConnection("guest", "guest");
+ QueueNameProtocolHandler queueNameHandler = new
QueueNameProtocolHandler(con);
+ _queueNameSession = new QueueNameSession(queueNameHandler , con);
+ _transport = new TestNetworkTransport();
+ }
+
+ public void testTemporaryQueueWildcard() throws UnknownHostException
+ {
+ checkTempQueueName(new InetSocketAddress(1234),
"tmp_0_0_0_0_0_0_0_0_1234_");
+ }
+
+ public void testTemporaryQueueLocalhostAddr() throws UnknownHostException
+ {
+ checkTempQueueName(new
InetSocketAddress(InetAddress.getByName("127.0.0.1"), 1234),
"tmp_127_0_0_1_1234_");
+ }
+
+ public void testTemporaryQueueLocalhostName() throws UnknownHostException
+ {
+ checkTempQueueName(new
InetSocketAddress(InetAddress.getByName("localhost"), 1234),
"tmp_localhost_127_0_0_1_1234_");
+ }
+
+ public void testTemporaryQueueInet4() throws UnknownHostException
+ {
+ checkTempQueueName(new
InetSocketAddress(InetAddress.getByName("192.168.1.2"), 1234),
"tmp_192_168_1_2_1234_");
+ }
+
+ public void testTemporaryQueueInet6() throws UnknownHostException
+ {
+ checkTempQueueName(new
InetSocketAddress(InetAddress.getByName("1080:0:0:0:8:800:200C:417A"), 1234),
"tmp_1080_0_0_0_8_800_200c_417a_1234_");
+ }
+
+ public void testTemporaryQueuePipe() throws UnknownHostException
+ {
+ checkTempQueueName(new VmPipeAddress(1), "tmp_vm_1_");
+ }
+
+ private void checkTempQueueName(SocketAddress address, String
expectedQueueName)
+ {
+ _transport.setAddress(address);
+ String queueName = _queueNameSession.genQueueName().asString();
+ assertTrue("Wrong queue name: " + queueName,
queueName.startsWith(expectedQueueName));
+ }
+}
Modified:
qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/JavaInVMExcludes
URL:
http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/JavaInVMExcludes?rev=1022843&r1=1022842&r2=1022843&view=diff
==============================================================================
---
qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/JavaInVMExcludes
(original)
+++
qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/JavaInVMExcludes
Fri Oct 15 07:19:51 2010
@@ -18,6 +18,8 @@ org.apache.qpid.test.client.QueueBrowser
org.apache.qpid.test.testcases.FailoverTest#*
org.apache.qpid.test.client.failover.FailoverTest#*
org.apache.qpid.server.failover.MessageDisappearWithIOExceptionTest#*
+org.apache.qpid.test.unit.publish.DirtyTransactedPublishTest#*
+org.apache.qpid.test.unit.ack.RecoverTest#*
// The FirewallPlugin only operates for TCP connections, the tests NO-OP when
run InVM
org.apache.qpid.server.security.firewall.FirewallConfigTest#*
Modified:
qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/test-provider.properties
URL:
http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/test-provider.properties?rev=1022843&r1=1022842&r2=1022843&view=diff
==============================================================================
---
qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/test-provider.properties
(original)
+++
qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/test-provider.properties
Fri Oct 15 07:19:51 2010
@@ -35,6 +35,7 @@ connectionfactory.default.udp = amqp://u
connectionfactory.failover =
amqp://username:passw...@clientid/test?brokerlist='tcp://localhost:${test.port.alt};tcp://localhost:${test.port}'&sync_ack='true'&sync_publish='all'&failover='roundrobin?cyclecount='20''
connectionfactory.failover.ssl =
amqp://username:passw...@clientid/test?brokerlist='tcp://localhost:${test.port.alt.ssl}?ssl='true';tcp://localhost:${test.port.ssl}?ssl='true''&sync_ack='true'&sync_publish='all'&failover='roundrobin?cyclecount='20''
+connectionfactory.failover.vm =
amqp://username:passw...@clientid/test?brokerlist='vm://:1'&failover='nofailover'
connectionfactory.failover.udp =
amqp://username:passw...@clientid/test?brokerlist='udp://localhost:${test.port.alt};udp://localhost:${test.port}'&failover='roundrobin?cyclecount='20''
connectionfactory.connection1 =
amqp://username:passw...@clientid/test?brokerlist='tcp://localhost:${test.port}'
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
