You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2015/03/12 16:41:48 UTC
svn commit: r1666224 [7/7] - in /qpid/trunk: ./ qpid/ qpid/cpp/src/
qpid/cpp/src/qpid/broker/ qpid/cpp/src/qpid/management/ qpid/cpp/src/tests/
qpid/java/
qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/
qpid/java/bdbstore/src/...
Modified: qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/sasl/SASLSender.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/sasl/SASLSender.java?rev=1666224&r1=1666223&r2=1666224&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/sasl/SASLSender.java (original)
+++ qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/sasl/SASLSender.java Thu Mar 12 15:41:46 2015
@@ -21,22 +21,24 @@
package org.apache.qpid.transport.network.security.sasl;
-import org.apache.qpid.transport.Sender;
-import org.apache.qpid.transport.SenderException;
-import org.apache.qpid.transport.util.Logger;
-
-import javax.security.sasl.SaslException;
import java.nio.ByteBuffer;
import java.util.concurrent.atomic.AtomicBoolean;
-public class SASLSender extends SASLEncryptor implements Sender<ByteBuffer> {
+import javax.security.sasl.SaslException;
+
+import org.apache.qpid.transport.ByteBufferSender;
+import org.apache.qpid.transport.SenderException;
+import org.apache.qpid.transport.util.Logger;
+
+public class SASLSender extends SASLEncryptor implements ByteBufferSender
+{
- private Sender<ByteBuffer> delegate;
+ private ByteBufferSender delegate;
private byte[] appData;
private final AtomicBoolean closed = new AtomicBoolean(false);
private static final Logger log = Logger.get(SASLSender.class);
- public SASLSender(Sender<ByteBuffer> delegate)
+ public SASLSender(ByteBufferSender delegate)
{
this.delegate = delegate;
log.debug("SASL Sender enabled");
@@ -103,11 +105,6 @@ public class SASLSender extends SASLEncr
}
}
- public void setIdleTimeout(int i)
- {
- delegate.setIdleTimeout(i);
- }
-
public void securityLayerEstablished()
{
appData = new byte[getSendBuffSize()];
Modified: qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLBufferingSender.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLBufferingSender.java?rev=1666224&r1=1666223&r2=1666224&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLBufferingSender.java (original)
+++ qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLBufferingSender.java Thu Mar 12 15:41:46 2015
@@ -1,274 +0,0 @@
-/*
- * 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.transport.network.security.ssl;
-
-import java.nio.ByteBuffer;
-import java.util.concurrent.atomic.AtomicBoolean;
-import javax.net.ssl.SSLEngine;
-import javax.net.ssl.SSLEngineResult;
-import javax.net.ssl.SSLEngineResult.HandshakeStatus;
-import javax.net.ssl.SSLEngineResult.Status;
-import javax.net.ssl.SSLException;
-import org.apache.qpid.transport.Sender;
-import org.apache.qpid.transport.SenderException;
-import org.apache.qpid.transport.network.security.SSLStatus;
-import org.apache.qpid.transport.util.Logger;
-
-public class SSLBufferingSender implements Sender<ByteBuffer>
-{
- private static final Logger log = Logger.get(SSLBufferingSender.class);
- private static final ByteBuffer EMPTY_BYTE_BUFFER = ByteBuffer.allocate(0);
-
- private final Sender<ByteBuffer> delegate;
- private final SSLEngine engine;
- private final int sslBufSize;
- private final ByteBuffer netData;
- private final SSLStatus _sslStatus;
-
- private String _hostname;
-
- private final AtomicBoolean closed = new AtomicBoolean(false);
- private ByteBuffer _appData = EMPTY_BYTE_BUFFER;
-
-
- public SSLBufferingSender(SSLEngine engine, Sender<ByteBuffer> delegate, SSLStatus sslStatus)
- {
- this.engine = engine;
- this.delegate = delegate;
- sslBufSize = engine.getSession().getPacketBufferSize();
- netData = ByteBuffer.allocate(sslBufSize);
- _sslStatus = sslStatus;
- }
-
- public void setHostname(String hostname)
- {
- _hostname = hostname;
- }
-
- public void close()
- {
- if (!closed.getAndSet(true))
- {
- if (engine.isOutboundDone())
- {
- return;
- }
- log.debug("Closing SSL connection");
- doSend();
- engine.closeOutbound();
- try
- {
- tearDownSSLConnection();
- }
- catch(Exception e)
- {
- throw new SenderException("Error closing SSL connection",e);
- }
-
-
- synchronized(_sslStatus.getSslLock())
- {
- while (!engine.isOutboundDone())
- {
- try
- {
- _sslStatus.getSslLock().wait();
- }
- catch(InterruptedException e)
- {
- // pass
- }
-
- }
- }
- delegate.close();
- }
- }
-
- private void tearDownSSLConnection() throws Exception
- {
- SSLEngineResult result = engine.wrap(ByteBuffer.allocate(0), netData);
- Status status = result.getStatus();
- int read = result.bytesProduced();
- while (status != Status.CLOSED)
- {
- if (status == Status.BUFFER_OVERFLOW)
- {
- netData.clear();
- }
- if(read > 0)
- {
- int limit = netData.limit();
- netData.limit(netData.position());
- netData.position(netData.position() - read);
-
- ByteBuffer data = netData.slice();
-
- netData.limit(limit);
- netData.position(netData.position() + read);
-
- delegate.send(data);
- flush();
- }
- result = engine.wrap(ByteBuffer.allocate(0), netData);
- status = result.getStatus();
- read = result.bytesProduced();
- }
- }
-
- public void flush()
- {
- delegate.flush();
- }
-
- public void send()
- {
- if(!closed.get())
- {
- doSend();
- }
- }
-
- public synchronized void send(ByteBuffer appData)
- {
- boolean buffered;
- if(buffered = _appData.hasRemaining())
- {
- ByteBuffer newBuf = ByteBuffer.allocate(_appData.remaining()+appData.remaining());
- newBuf.put(_appData);
- newBuf.put(appData);
- newBuf.flip();
- _appData = newBuf;
- }
- if (closed.get())
- {
- throw new SenderException("SSL Sender is closed");
- }
- doSend();
- if(!appData.hasRemaining())
- {
- _appData = EMPTY_BYTE_BUFFER;
- }
- else if(!buffered)
- {
- _appData = ByteBuffer.allocate(appData.remaining());
- _appData.put(appData);
- _appData.flip();
- }
- }
-
- private synchronized void doSend()
- {
-
- HandshakeStatus handshakeStatus;
- Status status;
-
- while((_appData.hasRemaining() || engine.getHandshakeStatus() == HandshakeStatus.NEED_WRAP)
- && !_sslStatus.getSslErrorFlag())
- {
- int read = 0;
- try
- {
- SSLEngineResult result = engine.wrap(_appData, netData);
- read = result.bytesProduced();
- status = result.getStatus();
- handshakeStatus = result.getHandshakeStatus();
- }
- catch(SSLException e)
- {
- // Should this set _sslError??
- throw new SenderException("SSL, Error occurred while encrypting data",e);
- }
-
- if(read > 0)
- {
- int limit = netData.limit();
- netData.limit(netData.position());
- netData.position(netData.position() - read);
-
- ByteBuffer data = netData.slice();
-
- netData.limit(limit);
- netData.position(netData.position() + read);
-
- delegate.send(data);
- }
-
- switch(status)
- {
- case CLOSED:
- throw new SenderException("SSLEngine is closed");
-
- case BUFFER_OVERFLOW:
- netData.clear();
- continue;
-
- case OK:
- break; // do nothing
-
- default:
- throw new IllegalStateException("SSLReceiver: Invalid State " + status);
- }
-
- switch (handshakeStatus)
- {
- case NEED_WRAP:
- if (netData.hasRemaining())
- {
- continue;
- }
-
- case NEED_TASK:
- doTasks();
- break;
-
- case NEED_UNWRAP:
- flush();
- return;
-
- case FINISHED:
- if (_hostname != null)
- {
- SSLUtil.verifyHostname(engine, _hostname);
- }
-
- case NOT_HANDSHAKING:
- break; //do nothing
-
- default:
- throw new IllegalStateException("SSLSender: Invalid State " + status);
- }
-
- }
- }
-
- private void doTasks()
- {
- Runnable runnable;
- while ((runnable = engine.getDelegatedTask()) != null) {
- runnable.run();
- }
- }
-
- public void setIdleTimeout(int i)
- {
- delegate.setIdleTimeout(i);
- }
-}
Modified: qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLReceiver.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLReceiver.java?rev=1666224&r1=1666223&r2=1666224&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLReceiver.java (original)
+++ qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLReceiver.java Thu Mar 12 15:41:46 2015
@@ -28,16 +28,16 @@ import javax.net.ssl.SSLEngineResult.Han
import javax.net.ssl.SSLEngineResult.Status;
import javax.net.ssl.SSLException;
-import org.apache.qpid.transport.Receiver;
+import org.apache.qpid.transport.ByteBufferReceiver;
import org.apache.qpid.transport.TransportException;
import org.apache.qpid.transport.network.security.SSLStatus;
import org.apache.qpid.transport.util.Logger;
-public class SSLReceiver implements Receiver<ByteBuffer>
+public class SSLReceiver implements ByteBufferReceiver
{
private static final Logger log = Logger.get(SSLReceiver.class);
- private final Receiver<ByteBuffer> delegate;
+ private final ByteBufferReceiver delegate;
private final SSLEngine engine;
private final int sslBufSize;
private final ByteBuffer localBuffer;
@@ -47,7 +47,7 @@ public class SSLReceiver implements Rece
private String _hostname;
- public SSLReceiver(final SSLEngine engine, final Receiver<ByteBuffer> delegate, final SSLStatus sslStatus)
+ public SSLReceiver(final SSLEngine engine, final ByteBufferReceiver delegate, final SSLStatus sslStatus)
{
this.engine = engine;
this.delegate = delegate;
Modified: qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLSender.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLSender.java?rev=1666224&r1=1666223&r2=1666224&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLSender.java (original)
+++ qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLSender.java Thu Mar 12 15:41:46 2015
@@ -19,24 +19,25 @@
*/
package org.apache.qpid.transport.network.security.ssl;
-import org.apache.qpid.transport.Sender;
-import org.apache.qpid.transport.SenderException;
-import org.apache.qpid.transport.network.security.SSLStatus;
-import org.apache.qpid.transport.util.Logger;
+import java.nio.ByteBuffer;
+import java.util.concurrent.atomic.AtomicBoolean;
import javax.net.ssl.SSLEngine;
import javax.net.ssl.SSLEngineResult;
import javax.net.ssl.SSLEngineResult.HandshakeStatus;
import javax.net.ssl.SSLEngineResult.Status;
import javax.net.ssl.SSLException;
-import java.nio.ByteBuffer;
-import java.util.concurrent.atomic.AtomicBoolean;
-public class SSLSender implements Sender<ByteBuffer>
+import org.apache.qpid.transport.ByteBufferSender;
+import org.apache.qpid.transport.SenderException;
+import org.apache.qpid.transport.network.security.SSLStatus;
+import org.apache.qpid.transport.util.Logger;
+
+public class SSLSender implements ByteBufferSender
{
private static final Logger log = Logger.get(SSLSender.class);
- private final Sender<ByteBuffer> delegate;
+ private final ByteBufferSender delegate;
private final SSLEngine engine;
private final int sslBufSize;
private final ByteBuffer netData;
@@ -48,7 +49,7 @@ public class SSLSender implements Sender
private final AtomicBoolean closed = new AtomicBoolean(false);
- public SSLSender(SSLEngine engine, Sender<ByteBuffer> delegate, SSLStatus sslStatus)
+ public SSLSender(SSLEngine engine, ByteBufferSender delegate, SSLStatus sslStatus)
{
this.engine = engine;
this.delegate = delegate;
@@ -264,8 +265,4 @@ public class SSLSender implements Sender
}
}
- public void setIdleTimeout(int i)
- {
- delegate.setIdleTimeout(i);
- }
}
Modified: qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/network/TransportTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/network/TransportTest.java?rev=1666224&r1=1666223&r2=1666224&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/network/TransportTest.java (original)
+++ qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/network/TransportTest.java Thu Mar 12 15:41:46 2015
@@ -21,16 +21,16 @@
package org.apache.qpid.transport.network;
-import java.nio.ByteBuffer;
+import java.util.Set;
import javax.net.ssl.SSLContext;
import org.apache.qpid.framing.ProtocolVersion;
import org.apache.qpid.protocol.ProtocolEngineFactory;
import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.transport.ByteBufferReceiver;
import org.apache.qpid.transport.ConnectionSettings;
import org.apache.qpid.transport.NetworkTransportConfiguration;
-import org.apache.qpid.transport.Receiver;
import org.apache.qpid.transport.TransportException;
import org.apache.qpid.transport.network.io.IoNetworkTransport;
@@ -129,7 +129,7 @@ public class TransportTest extends QpidT
}
public NetworkConnection connect(ConnectionSettings settings,
- Receiver<ByteBuffer> delegate,
+ ByteBufferReceiver delegate,
TransportActivity transportActivity)
{
throw new UnsupportedOperationException();
@@ -150,7 +150,9 @@ public class TransportTest extends QpidT
}
public void accept(NetworkTransportConfiguration config,
- ProtocolEngineFactory factory, SSLContext sslContext)
+ ProtocolEngineFactory factory,
+ SSLContext sslContext,
+ final Set<TransportEncryption> encryptionSet)
{
throw new UnsupportedOperationException();
}
Modified: qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/network/io/IdleTimeoutTickerTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/network/io/IdleTimeoutTickerTest.java?rev=1666224&r1=1666223&r2=1666224&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/network/io/IdleTimeoutTickerTest.java (original)
+++ qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/network/io/IdleTimeoutTickerTest.java Thu Mar 12 15:41:46 2015
@@ -21,14 +21,12 @@
package org.apache.qpid.transport.network.io;
-import junit.framework.TestCase;
-
import java.net.SocketAddress;
-import java.nio.ByteBuffer;
import java.security.Principal;
-import org.apache.qpid.test.utils.QpidTestCase;
-import org.apache.qpid.transport.Sender;
+import junit.framework.TestCase;
+
+import org.apache.qpid.transport.ByteBufferSender;
import org.apache.qpid.transport.network.NetworkConnection;
import org.apache.qpid.transport.network.TransportActivity;
@@ -193,7 +191,7 @@ public class IdleTimeoutTickerTest exten
//-------------------------------------------------------------------------
@Override
- public Sender<ByteBuffer> getSender()
+ public ByteBufferSender getSender()
{
return null;
}
Modified: qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/network/io/IoAcceptor.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/network/io/IoAcceptor.java?rev=1666224&r1=1666223&r2=1666224&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/network/io/IoAcceptor.java (original)
+++ qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/network/io/IoAcceptor.java Thu Mar 12 15:41:46 2015
@@ -20,16 +20,15 @@
*/
package org.apache.qpid.transport.network.io;
-import org.apache.log4j.Logger;
-import org.apache.qpid.transport.Binding;
-import org.apache.qpid.transport.TransportException;
-
import java.io.IOException;
import java.net.InetSocketAddress;
import java.net.ServerSocket;
import java.net.Socket;
import java.net.SocketAddress;
-import java.nio.ByteBuffer;
+
+import org.apache.log4j.Logger;
+
+import org.apache.qpid.transport.Binding;
/**
@@ -44,9 +43,9 @@ public class IoAcceptor<E> extends Threa
private volatile boolean _closed = false;
private ServerSocket socket;
- private Binding<E,ByteBuffer> binding;
+ private Binding<E> binding;
- public IoAcceptor(SocketAddress address, Binding<E,ByteBuffer> binding)
+ public IoAcceptor(SocketAddress address, Binding<E> binding)
throws IOException
{
socket = new ServerSocket();
@@ -70,7 +69,7 @@ public class IoAcceptor<E> extends Threa
}
}
- public IoAcceptor(String host, int port, Binding<E,ByteBuffer> binding)
+ public IoAcceptor(String host, int port, Binding<E> binding)
throws IOException
{
this(new InetSocketAddress(host, port), binding);
Modified: qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/network/io/IoTransport.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/network/io/IoTransport.java?rev=1666224&r1=1666223&r2=1666224&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/network/io/IoTransport.java (original)
+++ qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/network/io/IoTransport.java Thu Mar 12 15:41:46 2015
@@ -20,10 +20,9 @@
package org.apache.qpid.transport.network.io;
import java.net.Socket;
-import java.nio.ByteBuffer;
import org.apache.qpid.transport.Binding;
-import org.apache.qpid.transport.Sender;
+import org.apache.qpid.transport.ByteBufferSender;
import org.apache.qpid.transport.util.Logger;
/**
@@ -48,18 +47,18 @@ public final class IoTransport<E>
("amqj.sendBufferSize", DEFAULT_READ_WRITE_BUFFER_SIZE);
private Socket socket;
- private Sender<ByteBuffer> sender;
+ private ByteBufferSender sender;
private E endpoint;
private IoReceiver receiver;
private long timeout = 60000;
- IoTransport(Socket socket, Binding<E,ByteBuffer> binding)
+ IoTransport(Socket socket, Binding<E> binding)
{
this.socket = socket;
setupTransport(socket, binding);
}
- private void setupTransport(Socket socket, Binding<E, ByteBuffer> binding)
+ private void setupTransport(Socket socket, Binding<E> binding)
{
IoSender ios = new IoSender(socket, 2*writeBufferSize, timeout);
ios.initiate();
@@ -73,7 +72,7 @@ public final class IoTransport<E>
ios.setReceiver(this.receiver);
}
- public Sender<ByteBuffer> getSender()
+ public ByteBufferSender getSender()
{
return sender;
}
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/InternalBrokerHolder.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/InternalBrokerHolder.java?rev=1666224&r1=1666223&r2=1666224&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/InternalBrokerHolder.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/InternalBrokerHolder.java Thu Mar 12 15:41:46 2015
@@ -21,16 +21,16 @@
package org.apache.qpid.test.utils;
import java.security.PrivilegedAction;
-import java.util.Map;
import java.util.Set;
+import javax.security.auth.Subject;
+
import org.apache.log4j.Logger;
import org.apache.qpid.server.Broker;
import org.apache.qpid.server.BrokerOptions;
import org.apache.qpid.server.security.SecurityManager;
-
-import javax.security.auth.Subject;
+import org.apache.qpid.server.util.Action;
public class InternalBrokerHolder implements BrokerHolder
{
@@ -50,7 +50,14 @@ public class InternalBrokerHolder implem
{
LOGGER.info("Starting internal broker (same JVM)");
- _broker = new Broker();
+ _broker = new Broker(new Action<Integer>()
+ {
+ @Override
+ public void performAction(final Integer object)
+ {
+ _broker = null;
+ }
+ });
_broker.startup(options);
}
@@ -63,7 +70,10 @@ public class InternalBrokerHolder implem
@Override
public Object run()
{
- _broker.shutdown();
+ if(_broker != null)
+ {
+ _broker.shutdown();
+ }
return null;
}
Propchange: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 12 15:41:46 2015
@@ -1,6 +1,7 @@
/qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java:886720-886722,887145,892761,894875,916304,916325,930288,931179
/qpid/branches/0.5.x-dev/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java:886720-886722
/qpid/branches/QPID-6125-ProtocolRefactoring/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java:1628068-1632579
+/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java:1643238-1666219
/qpid/branches/java-broker-0-10/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java:795950-829653
/qpid/branches/java-broker-bdb-ha2/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java:1576683-1583556
/qpid/branches/java-broker-config-store-changes/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java:1584338-1584926
Modified: qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java?rev=1666224&r1=1666223&r2=1666224&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java Thu Mar 12 15:41:46 2015
@@ -20,12 +20,6 @@
*/
package org.apache.qpid.client;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.test.utils.QpidBrokerTestCase;
-
import javax.jms.Connection;
import javax.jms.Message;
import javax.jms.MessageConsumer;
@@ -33,13 +27,19 @@ import javax.jms.MessageProducer;
import javax.jms.Session;
import javax.jms.TextMessage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.qpid.framing.AMQShortString;
+import org.apache.qpid.test.utils.QpidBrokerTestCase;
+
public class AMQQueueDeferredOrderingTest extends QpidBrokerTestCase
{
private Connection con;
private Session session;
private AMQQueue queue;
private MessageConsumer consumer;
- private int numMessages;
+ private int _numMessages;
private static final Logger _logger = LoggerFactory.getLogger(AMQQueueDeferredOrderingTest.class);
@@ -86,7 +86,7 @@ public class AMQQueueDeferredOrderingTes
{
super.setUp();
- numMessages = isBrokerStorePersistent() ? 300 : 1000;
+ _numMessages = isBrokerStorePersistent() ? 300 : 1000;
_logger.info("Create Connection");
con = getConnection();
@@ -106,30 +106,31 @@ public class AMQQueueDeferredOrderingTes
// Setup initial messages
_logger.info("Creating first producer thread");
- producerThread = new ASyncProducer(queue, 0, numMessages / 2);
+ producerThread = new ASyncProducer(queue, 0, _numMessages / 2);
producerThread.start();
// Wait for them to be done
producerThread.join();
// Setup second set of messages to produce while we consume
_logger.info("Creating second producer thread");
- producerThread = new ASyncProducer(queue, numMessages / 2, numMessages);
+ producerThread = new ASyncProducer(queue, _numMessages / 2, _numMessages);
producerThread.start();
// Start consuming and checking they're in order
_logger.info("Consuming messages");
- for (int i = 0; i < numMessages; i++)
+ for (int i = 0; i < _numMessages; i++)
{
Message msg = consumer.receive(3000);
+
assertNotNull("Message " + i + " should not be null", msg);
assertTrue("Message " + i + " should be a text message", msg instanceof TextMessage);
- assertEquals("Message content " + i + "does not match expected", Integer.toString(i), ((TextMessage) msg).getText());
+ assertEquals("Message content " + i + " does not match expected", Integer.toString(i), ((TextMessage) msg).getText());
}
}
protected void tearDown() throws Exception
{
- _logger.info("Interuptting producer thread");
+ _logger.info("Interrupting producer thread");
producerThread.interrupt();
_logger.info("Closing connection");
con.close();
Modified: qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/client/AsynchMessageListenerTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/client/AsynchMessageListenerTest.java?rev=1666224&r1=1666223&r2=1666224&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/client/AsynchMessageListenerTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/client/AsynchMessageListenerTest.java Thu Mar 12 15:41:46 2015
@@ -70,6 +70,9 @@ public class AsynchMessageListenerTest e
}
+
+
+
public void testMessageListener() throws Exception
{
CountingMessageListener countingMessageListener = new CountingMessageListener(MSG_COUNT);
Modified: qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/client/ssl/SSLTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/client/ssl/SSLTest.java?rev=1666224&r1=1666223&r2=1666224&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/client/ssl/SSLTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/client/ssl/SSLTest.java Thu Mar 12 15:41:46 2015
@@ -290,7 +290,8 @@ public class SSLTest extends QpidBrokerT
ByteArrayOutputStream bout = new ByteArrayOutputStream();
e.printStackTrace(new PrintStream(bout));
String strace = bout.toString();
- assertTrue("Correct exception not thrown", strace.contains(expectedString));
+ assertTrue("Correct exception not thrown, expecting : " + expectedString + " got : " +e,
+ strace.contains(expectedString));
}
public void testVerifyLocalHost() throws Exception
Modified: qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java?rev=1666224&r1=1666223&r2=1666224&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java Thu Mar 12 15:41:46 2015
@@ -33,7 +33,6 @@ import java.util.EnumSet;
import java.util.Iterator;
import java.util.Set;
-import org.apache.qpid.protocol.ServerProtocolEngine;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.Port;
import org.apache.qpid.server.model.Protocol;
@@ -41,7 +40,7 @@ import org.apache.qpid.server.model.port
import org.apache.qpid.server.util.BrokerTestHelper;
import org.apache.qpid.server.virtualhost.VirtualHostImpl;
import org.apache.qpid.test.utils.QpidTestCase;
-import org.apache.qpid.transport.Sender;
+import org.apache.qpid.transport.ByteBufferSender;
import org.apache.qpid.transport.network.NetworkConnection;
public class MultiVersionProtocolEngineFactoryTest extends QpidTestCase
@@ -161,7 +160,7 @@ public class MultiVersionProtocolEngineF
when(port.getContextValue(eq(Long.class),eq(Port.CONNECTION_MAXIMUM_AUTHENTICATION_DELAY))).thenReturn(10000l);
MultiVersionProtocolEngineFactory factory =
- new MultiVersionProtocolEngineFactory(_broker, null, false, false, protocols, null, port,
+ new MultiVersionProtocolEngineFactory(_broker, protocols, null, port,
org.apache.qpid.server.model.Transport.TCP);
//create a dummy to retrieve the 'current' ID number
@@ -215,7 +214,7 @@ public class MultiVersionProtocolEngineF
try
{
- new MultiVersionProtocolEngineFactory(_broker, null, false, false, versions, Protocol.AMQP_0_9, null,
+ new MultiVersionProtocolEngineFactory(_broker, versions, Protocol.AMQP_0_9, null,
org.apache.qpid.server.model.Transport.TCP);
fail("should not have been allowed to create the factory");
}
@@ -230,16 +229,12 @@ public class MultiVersionProtocolEngineF
private String _remoteHost = "127.0.0.1";
private String _localHost = "127.0.0.1";
private int _port = 1;
- private final Sender<ByteBuffer> _sender;
+ private final ByteBufferSender _sender;
public TestNetworkConnection()
{
- _sender = new Sender<ByteBuffer>()
+ _sender = new ByteBufferSender()
{
- public void setIdleTimeout(int i)
- {
- }
-
public void send(ByteBuffer msg)
{
}
@@ -300,7 +295,7 @@ public class MultiVersionProtocolEngineF
}
@Override
- public Sender<ByteBuffer> getSender()
+ public ByteBufferSender getSender()
{
return _sender;
}
Modified: qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java?rev=1666224&r1=1666223&r2=1666224&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java Thu Mar 12 15:41:46 2015
@@ -386,7 +386,7 @@ public class VirtualHostMessageStoreTest
assertEquals("Incorrect number of exchanges registered after second recovery",
origExchangeCount, _virtualHost.getExchanges().size());
assertNull("Durable exchange was not removed:" + directExchangeName,
- _virtualHost.getExchange(directExchangeName));
+ _virtualHost.getExchange(directExchangeName));
}
/**
Modified: qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/ConnectionManagementTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/ConnectionManagementTest.java?rev=1666224&r1=1666223&r2=1666224&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/ConnectionManagementTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/ConnectionManagementTest.java Thu Mar 12 15:41:46 2015
@@ -23,13 +23,7 @@ import java.util.Date;
import java.util.Iterator;
import java.util.List;
-import javax.jms.Connection;
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.Queue;
-import javax.jms.Session;
+import javax.jms.*;
import javax.management.JMException;
import javax.management.openmbean.CompositeData;
import javax.management.openmbean.CompositeDataSupport;
@@ -74,6 +68,38 @@ public class ConnectionManagementTest ex
}
}
+ public void testManagementClosesConnection() throws Exception
+ {
+ assertEquals("Expected no managed connections", 0, getManagedConnections().size());
+
+ _connection = getConnection();
+ assertEquals("Expected one managed connection", 1, getManagedConnections().size());
+
+
+ ManagedConnection managedConnection = getManagedConnections().get(0);
+
+ managedConnection.closeConnection();
+
+ assertEquals("Expected no managed connections", 0, getManagedConnections().size());
+
+ /*
+ try
+ {
+
+ _connection.start();
+ fail("Exception not thrown");
+ }
+ catch (javax.jms.IllegalStateException ise)
+ {
+ ise.printStackTrace();
+ // PASS
+ }*/
+
+ }
+
+
+
+
public void testNumberOfManagedConnectionsMatchesNumberOfClientConnections() throws Exception
{
assertEquals("Expected no managed connections", 0, getManagedConnections().size());
Modified: qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/LogRecordsRestTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/LogRecordsRestTest.java?rev=1666224&r1=1666223&r2=1666224&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/LogRecordsRestTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/LogRecordsRestTest.java Thu Mar 12 15:41:46 2015
@@ -36,7 +36,6 @@ public class LogRecordsRestTest extends
assertNotNull("Message id cannot be null", record.get("id"));
assertNotNull("Message timestamp cannot be null", record.get("timestamp"));
assertEquals("Unexpected log level", "INFO", record.get("level"));
- assertEquals("Unexpected thread", "main", record.get("thread"));
assertEquals("Unexpected logger", "qpid.message.broker.ready", record.get("logger"));
}
Modified: qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java?rev=1666224&r1=1666223&r2=1666224&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java Thu Mar 12 15:41:46 2015
@@ -148,7 +148,6 @@ public class QueueBrowserAutoAckTest ext
assertEquals("Session reports Queue expectedDepth not as expected", expectedDepth, queueDepth);
-
// Browse the queue to get a second opinion
int msgCount = 0;
Enumeration msgs = queueBrowser.getEnumeration();
@@ -268,7 +267,7 @@ public class QueueBrowserAutoAckTest ext
//validate all browsers get right message count.
for (int count = 0; count < browserEnumerationCount; count++)
{
- assertEquals(msgCount[count], expectedMessages);
+ assertEquals("Unexpected count for browser " + count, expectedMessages, msgCount[count]);
}
try
@@ -317,7 +316,7 @@ public class QueueBrowserAutoAckTest ext
//Close this new connection
connection.close();
- _logger.info("All messages recevied from queue");
+ _logger.info("All messages received from queue");
//ensure no message left.
checkQueueDepth(0);
@@ -344,7 +343,7 @@ public class QueueBrowserAutoAckTest ext
/*
* Test Messages Remain on Queue
- * Create a queu and send messages to it. Browse them and then receive them all to verify they were still there
+ * Create a queue and send messages to it. Browse them and then receive them all to verify they were still there
*
*/
public void testQueueBrowserMsgsRemainOnQueue() throws Exception
Modified: qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java?rev=1666224&r1=1666223&r2=1666224&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java Thu Mar 12 15:41:46 2015
@@ -32,7 +32,7 @@ import org.apache.qpid.client.protocol.A
import org.apache.qpid.client.protocol.AMQProtocolSession;
import org.apache.qpid.framing.AMQShortString;
import org.apache.qpid.test.utils.QpidBrokerTestCase;
-import org.apache.qpid.transport.Sender;
+import org.apache.qpid.transport.ByteBufferSender;
import org.apache.qpid.transport.network.NetworkConnection;
public class AMQProtocolSessionTest extends QpidBrokerTestCase
@@ -107,18 +107,13 @@ public class AMQProtocolSessionTest exte
private String _localHost = "127.0.0.1";
private int _port = 1;
private SocketAddress _localAddress = null;
- private final Sender<ByteBuffer> _sender;
+ private final ByteBufferSender _sender;
public TestNetworkConnection()
{
- _sender = new Sender<ByteBuffer>()
+ _sender = new ByteBufferSender()
{
- public void setIdleTimeout(int i)
- {
-
- }
-
public void send(ByteBuffer msg)
{
@@ -186,7 +181,7 @@ public class AMQProtocolSessionTest exte
_localAddress = address;
}
- public Sender<ByteBuffer> getSender()
+ public ByteBufferSender getSender()
{
return _sender;
}
Modified: qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/transport/MaxFrameSizeTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/transport/MaxFrameSizeTest.java?rev=1666224&r1=1666223&r2=1666224&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/transport/MaxFrameSizeTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/transport/MaxFrameSizeTest.java Thu Mar 12 15:41:46 2015
@@ -313,14 +313,10 @@ public class MaxFrameSizeTest extends Qp
_maxFrameSize,
actualHeartbeatInterval);
- int idleTimeout = (int)(actualHeartbeatInterval * 1000 * heartbeatTimeoutFactor);
conn.getNetworkConnection().setMaxReadIdle((int)(actualHeartbeatInterval*heartbeatTimeoutFactor));
conn.getNetworkConnection().setMaxWriteIdle(actualHeartbeatInterval);
conn.setMaxFrameSize(_maxFrameSize);
-
- conn.setIdleTimeout(idleTimeout);
-
int channelMax = tune.getChannelMax();
conn.setChannelMax(channelMax == 0 ? Connection.MAX_CHANNEL_MAX : channelMax);
Propchange: qpid/trunk/qpid/java/test-profiles/CPPExcludes
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 12 15:41:46 2015
@@ -1,4 +1,5 @@
/incubator/qpid/trunk/qpid/java/test-profiles/010Excludes:443187-726139
+/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/test-profiles/CPPExcludes:1643238-1666219
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/010Excludes:795950-829653
/qpid/branches/java-broker-bdb-ha2/qpid/java/test-profiles/CPPExcludes:1576683-1583556
/qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/CPPExcludes:1584338-1584926
Modified: qpid/trunk/qpid/java/test-profiles/JavaExcludes
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/JavaExcludes?rev=1666224&r1=1666223&r2=1666224&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/JavaExcludes (original)
+++ qpid/trunk/qpid/java/test-profiles/JavaExcludes Thu Mar 12 15:41:46 2015
@@ -26,3 +26,11 @@ org.apache.qpid.test.client.queue.QueueP
//QPID-4153 Messages causing a runtime selector error should be dead-lettered (or something similar)
org.apache.qpid.test.client.message.SelectorTest#testRuntimeSelectorError
+
+
+org.apache.qpid.server.protocol.v0_8.AckTest#*
+org.apache.qpid.server.protocol.v0_8.AcknowledgeTest#*
+org.apache.qpid.server.protocol.v0_8.AMQChannelTest#*
+org.apache.qpid.server.protocol.v0_8.QueueBrowserUsesNoAckTest#*
+org.apache.qpid.server.protocol.v0_8.MaxChannelsTest#*
+
Propchange: qpid/trunk/qpid/java/test-profiles/JavaExcludes
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 12 15:41:46 2015
@@ -1,4 +1,5 @@
/incubator/qpid/trunk/qpid/java/test-profiles/08Excludes:443187-726139
+/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/test-profiles/JavaExcludes:1643238-1666219
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/08Excludes:795950-829653
/qpid/branches/java-broker-vhost-refactor/java/test-profiles/JavaExcludes:1493674-1494547
/qpid/branches/java-network-refactor/qpid/java/test-profiles/08Excludes:805429-821809
Modified: qpid/trunk/qpid/java/test-profiles/JavaTransientExcludes
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/JavaTransientExcludes?rev=1666224&r1=1666223&r2=1666224&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/JavaTransientExcludes (original)
+++ qpid/trunk/qpid/java/test-profiles/JavaTransientExcludes Thu Mar 12 15:41:46 2015
@@ -47,6 +47,7 @@ org.apache.qpid.server.store.VirtualHost
org.apache.qpid.server.store.berkeleydb.*
org.apache.qpid.server.store.berkeleydb.replication.*
org.apache.qpid.server.store.berkeleydb.upgrade.*
+org.apache.qpid.server.virtualhostnode.berkeleydb.*
org.apache.qpid.systest.management.jmx.QueueManagementTest#testAlternateExchangeSurvivesRestart
org.apache.qpid.systest.management.jmx.QueueManagementTest#testQueueDescriptionSurvivesRestart
Propchange: qpid/trunk/qpid/java/test-profiles/JavaTransientExcludes
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 12 15:41:46 2015
@@ -1,4 +1,5 @@
/incubator/qpid/trunk/qpid/java/test-profiles/08TransientExcludes:443187-726139
+/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/test-profiles/JavaTransientExcludes:1643238-1666219
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/08TransientExcludes:795950-829653
/qpid/branches/java-broker-bdb-ha2/qpid/java/test-profiles/JavaTransientExcludes:1576683-1583556
/qpid/branches/java-broker-config-store-changes/qpid/java/test-profiles/JavaTransientExcludes:1584338-1584926
Propchange: qpid/trunk/qpid/java/test-profiles/test_resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 12 15:41:46 2015
@@ -1,4 +1,5 @@
/incubator/qpid/trunk/qpid/java/test-profiles/test_resources:443187-726139
+/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/test-profiles/test_resources:1643238-1666219
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/test_resources:795950-829653
/qpid/branches/java-broker-vhost-refactor/java/test-profiles/test_resources:1493674-1494547
/qpid/branches/java-network-refactor/qpid/java/test-profiles/test_resources:805429-821809
Propchange: qpid/trunk/qpid/java/test-profiles/test_resources/spawned-broker-log4j.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 12 15:41:46 2015
@@ -1,5 +1,6 @@
/incubator/qpid/trunk/qpid/java/test-profiles/log4j-test.xml:443187-726139
/qpid/branches/0.5.x-dev/qpid/java/test-profiles/log4j-test.xml:931179
+/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/test-profiles/test_resources/spawned-broker-log4j.xml:1655057-1666219
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/log4j-test.xml:795950-829653
/qpid/branches/java-broker-vhost-refactor/java/test-profiles/log4j-test.xml:1493674-1494547
/qpid/branches/java-network-refactor/qpid/java/test-profiles/log4j-test.xml:805429-821809
Propchange: qpid/trunk/qpid/python/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 12 15:41:46 2015
@@ -1,4 +1,5 @@
/qpid/branches/0.5.x-dev/qpid/python:892761,894875
+/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/python:1643238-1666219
/qpid/branches/java-broker-bdb-ha2/qpid/python:1576683-1583556
/qpid/branches/java-network-refactor/qpid/python:805429-825319
/qpid/branches/qmfv2/qpid/python:902858,902894
Propchange: qpid/trunk/qpid/tools/src/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 12 15:41:46 2015
@@ -1,6 +1,7 @@
/qpid/branches/0.5.x-dev/qpid/tools/src/java:892761,894875
/qpid/branches/0.6-release-windows-installer/qpid/tools/src/java:926803,927233
/qpid/branches/0.6-release-windows-installer/tools/src/java:926803
+/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/tools/src/java:1643238-1666219
/qpid/branches/java-network-refactor/qpid/tools/src/java:805429-825319
/qpid/branches/mcpierce-QPID-4719/qpid/tools/src/java:1477004-1477093
/qpid/branches/qpid-2935/qpid/tools/src/java:1061302-1072333
Propchange: qpid/trunk/qpid/tools/src/java/qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 12 15:41:46 2015
@@ -1,6 +1,7 @@
/qpid/branches/0.5.x-dev/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools:892761,894875
/qpid/branches/0.6-release-windows-installer/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools:926803,927233
/qpid/branches/0.6-release-windows-installer/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools:926803
+/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/tools/src/java/qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools:1643238-1666219
/qpid/branches/java-network-refactor/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools:805429-825319
/qpid/branches/mcpierce-QPID-4719/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools:1477004-1477093
/qpid/branches/qpid-2935/qpid/tools/src/java/src/main/java/org/apache/qpid/qmf2/tools:1061302-1072333
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org