qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kw...@apache.org
Subject svn commit: r1560634 [6/7] - in /qpid/branches/java-broker-bdb-ha: ./ qpid/ qpid/bin/ qpid/cpp/ qpid/cpp/bindings/qmf2/examples/cpp/ qpid/cpp/bindings/qpid/dotnet/src/ qpid/cpp/bindings/qpid/dotnet/src/msvc10/ qpid/cpp/bindings/qpid/dotnet/src/msvc9/ q...
Date Thu, 23 Jan 2014 11:01:08 GMT
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/MethodConverter_0_91.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/MethodConverter_0_91.java?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/MethodConverter_0_91.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/MethodConverter_0_91.java Thu Jan 23 11:01:02 2014
@@ -21,61 +21,22 @@
 
 package org.apache.qpid.framing.amqp_0_91;
 
-import org.apache.qpid.framing.AMQBody;
 import org.apache.qpid.framing.AMQMethodBody;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.BasicPublishBody;
-import org.apache.qpid.framing.ContentBody;
 import org.apache.qpid.framing.abstraction.AbstractMethodConverter;
-import org.apache.qpid.framing.abstraction.ContentChunk;
 import org.apache.qpid.framing.abstraction.MessagePublishInfo;
 import org.apache.qpid.framing.abstraction.MessagePublishInfoImpl;
 import org.apache.qpid.framing.abstraction.ProtocolVersionMethodConverter;
 
 public class MethodConverter_0_91 extends AbstractMethodConverter implements ProtocolVersionMethodConverter
 {
-    private int _basicPublishClassId;
-    private int _basicPublishMethodId;
 
     public MethodConverter_0_91()
     {
         super((byte)0,(byte)9);
-
-
-    }
-
-    public AMQBody convertToBody(ContentChunk contentChunk)
-    {
-        if(contentChunk instanceof ContentChunk_0_9)
-        {
-            return ((ContentChunk_0_9)contentChunk).toBody();
-        }
-        else
-        {
-            return new ContentBody(contentChunk.getData());
-        }
-    }
-
-    public ContentChunk convertToContentChunk(AMQBody body)
-    {
-        final ContentBody contentBodyChunk = (ContentBody) body;
-
-        return new ContentChunk_0_9(contentBodyChunk);
-
     }
 
-    public void configure()
-    {
-
-        _basicPublishClassId = BasicPublishBodyImpl.CLASS_ID;
-        _basicPublishMethodId = BasicPublishBodyImpl.METHOD_ID;
-
-    }
-
-    public AMQBody convertToBody(byte[] data)
-    {
-        return new ContentBody(data);
-    }
 
     public MessagePublishInfo convertToInfo(AMQMethodBody methodBody)
     {
@@ -102,33 +63,4 @@ public class MethodConverter_0_91 extend
 
     }
 
-    private static class ContentChunk_0_9 implements ContentChunk
-    {
-        private final ContentBody _contentBodyChunk;
-
-        public ContentChunk_0_9(final ContentBody contentBodyChunk)
-        {
-            _contentBodyChunk = contentBodyChunk;
-        }
-
-        public int getSize()
-        {
-            return _contentBodyChunk.getSize();
-        }
-
-        public byte[] getData()
-        {
-            return _contentBodyChunk.getPayload();
-        }
-
-        public void reduceToFit()
-        {
-            _contentBodyChunk.reduceBufferToFit();
-        }
-
-        public AMQBody toBody()
-        {
-            return _contentBodyChunk;
-        }
-    }
 }
\ No newline at end of file

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/MethodConverter_8_0.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/MethodConverter_8_0.java?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/MethodConverter_8_0.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/MethodConverter_8_0.java Thu Jan 23 11:01:02 2014
@@ -21,71 +21,21 @@
 
 package org.apache.qpid.framing.amqp_8_0;
 
-import org.apache.qpid.framing.AMQBody;
 import org.apache.qpid.framing.AMQMethodBody;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.BasicPublishBody;
-import org.apache.qpid.framing.ContentBody;
 import org.apache.qpid.framing.abstraction.AbstractMethodConverter;
-import org.apache.qpid.framing.abstraction.ContentChunk;
 import org.apache.qpid.framing.abstraction.MessagePublishInfo;
 import org.apache.qpid.framing.abstraction.MessagePublishInfoImpl;
 import org.apache.qpid.framing.abstraction.ProtocolVersionMethodConverter;
 
 public class MethodConverter_8_0 extends AbstractMethodConverter implements ProtocolVersionMethodConverter
 {
-    private int _basicPublishClassId;
-    private int _basicPublishMethodId;
-
     public MethodConverter_8_0()
     {
         super((byte)8,(byte)0);
-
-
-    }
-
-    public AMQBody convertToBody(ContentChunk contentChunk)
-    {
-        return new ContentBody(contentChunk.getData());
     }
 
-    public ContentChunk convertToContentChunk(AMQBody body)
-    {
-        final ContentBody contentBodyChunk = (ContentBody) body;
-
-        return new ContentChunk()
-        {
-
-            public int getSize()
-            {
-                return contentBodyChunk.getSize();
-            }
-
-            public byte[] getData()
-            {
-                return contentBodyChunk.getPayload();
-            }
-
-            public void reduceToFit()
-            {
-                contentBodyChunk.reduceBufferToFit();
-            }
-        };
-
-    }
-
-    public void configure()
-    {
-
-        _basicPublishClassId = BasicPublishBodyImpl.CLASS_ID;
-        _basicPublishMethodId = BasicPublishBodyImpl.METHOD_ID;
-
-    }
-
-    public AMQBody convertToBody(byte[] data)
-    {
-        return new ContentBody(data);
-    }
 
     public MessagePublishInfo convertToInfo(AMQMethodBody methodBody)
     {

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/common/src/main/java/org/apache/qpid/properties/ConnectionStartProperties.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/common/src/main/java/org/apache/qpid/properties/ConnectionStartProperties.java?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/common/src/main/java/org/apache/qpid/properties/ConnectionStartProperties.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/common/src/main/java/org/apache/qpid/properties/ConnectionStartProperties.java Thu Jan 23 11:01:02 2014
@@ -24,6 +24,7 @@ import java.lang.management.ManagementFa
 import java.lang.management.RuntimeMXBean;
 
 import org.apache.qpid.transport.util.Logger;
+import org.apache.qpid.util.SystemUtils;
 
 /**
  * Constants for the various properties clients can
@@ -88,11 +89,11 @@ public class ConnectionStartProperties
         fullSystemInfo.append(", ");
         fullSystemInfo.append(System.getProperty("java.vendor"));
         fullSystemInfo.append(", ");
-        fullSystemInfo.append(System.getProperty("os.arch"));
+        fullSystemInfo.append(SystemUtils.getOSArch());
         fullSystemInfo.append(", ");
-        fullSystemInfo.append(System.getProperty("os.name"));
+        fullSystemInfo.append(SystemUtils.getOSName());
         fullSystemInfo.append(", ");
-        fullSystemInfo.append(System.getProperty("os.version"));
+        fullSystemInfo.append(SystemUtils.getOSVersion());
         fullSystemInfo.append(", ");
         fullSystemInfo.append(System.getProperty("sun.os.patch.level"));
 

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java Thu Jan 23 11:01:02 2014
@@ -143,6 +143,8 @@ public class ClientDelegate extends Conn
                               actualHeartbeatInterval);
 
         int idleTimeout = (int)(actualHeartbeatInterval * 1000 * heartbeatTimeoutFactor);
+        conn.getNetworkConnection().setMaxReadIdle((int)(actualHeartbeatInterval*heartbeatTimeoutFactor));
+        conn.getNetworkConnection().setMaxWriteIdle(actualHeartbeatInterval);
         conn.setIdleTimeout(idleTimeout);
 
         int channelMax = tune.getChannelMax();

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java Thu Jan 23 11:01:02 2014
@@ -70,6 +70,7 @@ public class Connection extends Connecti
     public static final int MIN_USABLE_CHANNEL_NUM = 0;
     private long _lastSendTime;
     private long _lastReadTime;
+    private NetworkConnection _networkConnection;
 
 
     public enum State { NEW, CLOSED, OPENING, OPEN, CLOSING, CLOSE_RCVD, RESUMING }
@@ -229,12 +230,13 @@ public class Connection extends Connecti
                 addConnectionListener((ConnectionListener)secureReceiver);
             }
 
-            NetworkConnection network = transport.connect(settings, secureReceiver, new ConnectionActivity());
+            _networkConnection = transport.connect(settings, secureReceiver, new ConnectionActivity());
 
-            setRemoteAddress(network.getRemoteAddress());
-            setLocalAddress(network.getLocalAddress());
 
-            final Sender<ByteBuffer> secureSender = securityLayer.sender(network.getSender());
+            setRemoteAddress(_networkConnection.getRemoteAddress());
+            setLocalAddress(_networkConnection.getLocalAddress());
+
+            final Sender<ByteBuffer> secureSender = securityLayer.sender(_networkConnection.getSender());
             if(secureSender instanceof ConnectionListener)
             {
                 addConnectionListener((ConnectionListener)secureSender);
@@ -785,14 +787,26 @@ public class Connection extends Connecti
         @Override
         public void writerIdle()
         {
+            getConnectionDelegate().writerIdle(Connection.this);
             connectionHeartbeat();
         }
 
         @Override
         public void readerIdle()
         {
-            // TODO
-
+            log.error("Closing connection as no heartbeat or other activity detected within specified interval");
+            _networkConnection.close();
         }
     }
+
+
+    public void setNetworkConnection(NetworkConnection network)
+    {
+        _networkConnection = network;
+    }
+
+    public NetworkConnection getNetworkConnection()
+    {
+        return _networkConnection;
+    }
 }

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionDelegate.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionDelegate.java?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionDelegate.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionDelegate.java Thu Jan 23 11:01:02 2014
@@ -105,4 +105,9 @@ public abstract class ConnectionDelegate
             ssn.closed();
         }
     }
+
+    public void writerIdle(final Connection connection)
+    {
+        connection.doHeartBeat();
+    }
 }

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java Thu Jan 23 11:01:02 2014
@@ -26,6 +26,7 @@ import org.apache.qpid.transport.Receive
 import org.apache.qpid.transport.TransportException;
 import org.apache.qpid.transport.network.Ticker;
 import org.apache.qpid.transport.util.Logger;
+import org.apache.qpid.util.SystemUtils;
 
 import javax.net.ssl.SSLSocket;
 import java.io.IOException;
@@ -57,8 +58,7 @@ final class IoReceiver implements Runnab
     private Ticker _ticker;
     static
     {
-        String osName = System.getProperty("os.name");
-        shutdownBroken = osName == null ? false : osName.matches("(?i).*windows.*");
+        shutdownBroken = SystemUtils.isWindows();
     }
 
     public IoReceiver(Socket socket, Receiver<ByteBuffer> receiver, int bufferSize, long timeout)

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoSender.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoSender.java?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoSender.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoSender.java Thu Jan 23 11:01:02 2014
@@ -143,7 +143,7 @@ public final class IoSender implements R
                         {
                             // pass
                         }
-                        elapsed += System.currentTimeMillis() - start;
+                        elapsed = System.currentTimeMillis() - start;
                     }
 
                     checkNotAlreadyClosed();

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/common/src/main/java/org/apache/qpid/url/BindingURLParser.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/common/src/main/java/org/apache/qpid/url/BindingURLParser.java?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/common/src/main/java/org/apache/qpid/url/BindingURLParser.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/common/src/main/java/org/apache/qpid/url/BindingURLParser.java Thu Jan 23 11:01:02 2014
@@ -443,17 +443,17 @@ public class BindingURLParser
 
             for (String url: urls)
             {
-                System.out.println("URL " + url);
+                _logger.info("URL " + url);
                 AMQBindingURL bindingURL = new AMQBindingURL(url);
                 parser.parse(url,bindingURL);
-                System.out.println("\nX " + bindingURL.toString() + " \n");
+                _logger.info("\nX " + bindingURL.toString() + " \n");
 
             }
 
         }
         catch(Exception e)
         {
-            e.printStackTrace();
+            _logger.error("Error with binding urls", e);
         }
     }
 

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/common/src/main/java/org/apache/qpid/util/FileUtils.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/common/src/main/java/org/apache/qpid/util/FileUtils.java?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/common/src/main/java/org/apache/qpid/util/FileUtils.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/common/src/main/java/org/apache/qpid/util/FileUtils.java Thu Jan 23 11:01:02 2014
@@ -129,7 +129,6 @@ public class FileUtils
 
             StringBuffer inBuffer = new StringBuffer();
 
-            String line;
             int read;
 
             while ((read = is.read(data)) != -1)
@@ -157,6 +156,7 @@ public class FileUtils
      *
      * @return An input stream for the file or resource, or null if one could not be opened.
      */
+    @SuppressWarnings("resource")
     public static InputStream openFileOrDefaultResource(String filename, String defaultResource, ClassLoader cl)
     {
         InputStream is = null;
@@ -173,7 +173,6 @@ public class FileUtils
             {
                 is = null;
             }
-
             if (is == null)
             {
                 // failed on filesystem, so try on classpath
@@ -332,6 +331,8 @@ public class FileUtils
 
     public static class UnableToCopyException extends Exception
     {
+        private static final long serialVersionUID = 956249157141857044L;
+
         UnableToCopyException(String msg)
         {
             super(msg);

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java Thu Jan 23 11:01:02 2014
@@ -20,6 +20,7 @@
  */
 package org.apache.qpid.transport;
 
+import org.apache.log4j.Logger;
 import org.apache.qpid.test.utils.QpidTestCase;
 import org.apache.qpid.transport.network.ConnectionBinding;
 import org.apache.qpid.transport.network.io.IoAcceptor;
@@ -41,6 +42,7 @@ import java.util.concurrent.TimeUnit;
  */
 public class ConnectionTest extends QpidTestCase implements SessionListener
 {
+    private static final Logger _logger = Logger.getLogger(ConnectionTest.class);
     private int port;
     private volatile boolean queue = false;
     private List<MessageTransfer> messages = new ArrayList<MessageTransfer>();
@@ -155,7 +157,6 @@ public class ConnectionTest extends Qpid
     {
         final Connection conn = new Connection();
         conn.setConnectionDelegate(new ClientDelegate(new ConnectionSettings()));
-
         conn.addConnectionListener(new ConnectionListener()
         {
             public void opened(Connection conn) {}
@@ -240,7 +241,6 @@ public class ConnectionTest extends Qpid
         }
         catch (IOException e)
         {
-            e.printStackTrace();
             fail("Unable to start Server for test due to:" + e.getMessage());
         }
 
@@ -349,7 +349,10 @@ public class ConnectionTest extends Qpid
         Thread.sleep(6000);
         send(ssn, "SINK 3");
         ssn.sync();
-        System.out.println(messages);
+        if (_logger.isDebugEnabled())
+        {
+            _logger.debug(messages);
+        }
         assertEquals(1, messages.size());
         assertEquals("SINK 3", messages.get(0).getBodyString());
     }

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/common/src/test/java/org/apache/qpid/transport/network/io/IoAcceptor.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/common/src/test/java/org/apache/qpid/transport/network/io/IoAcceptor.java?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/common/src/test/java/org/apache/qpid/transport/network/io/IoAcceptor.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/common/src/test/java/org/apache/qpid/transport/network/io/IoAcceptor.java Thu Jan 23 11:01:02 2014
@@ -20,6 +20,7 @@
  */
 package org.apache.qpid.transport.network.io;
 
+import org.apache.log4j.Logger;
 import org.apache.qpid.transport.Binding;
 import org.apache.qpid.transport.TransportException;
 
@@ -38,7 +39,9 @@ import java.nio.ByteBuffer;
 
 public class IoAcceptor<E> extends Thread
 {
+    private static final Logger _logger = Logger.getLogger(IoAcceptor.class);
 
+    private volatile boolean _closed = false;
 
     private ServerSocket socket;
     private Binding<E,ByteBuffer> binding;
@@ -59,6 +62,8 @@ public class IoAcceptor<E> extends Threa
      */
     public void close() throws IOException
     {
+        _closed = true;
+
         if (!socket.isClosed())
         {
             socket.close();
@@ -73,7 +78,7 @@ public class IoAcceptor<E> extends Threa
 
     public void run()
     {
-        while (true)
+        while (!_closed)
         {
             try
             {
@@ -82,9 +87,36 @@ public class IoAcceptor<E> extends Threa
             }
             catch (IOException e)
             {
-                throw new TransportException(e);
+                if (!_closed)
+                {
+                    _logger.error("Error in IoAcceptor thread", e);
+                    closeSocketIfNecessary(socket);
+                    try
+                    {
+                        Thread.sleep(1000);
+                    }
+                    catch (InterruptedException ie)
+                    {
+                        _logger.debug("Stopping io acceptor due to interrupt request");
+                        _closed = true;
+                    }
+                }
             }
         }
     }
 
+    private void closeSocketIfNecessary(final ServerSocket socket)
+    {
+        if(socket != null)
+        {
+            try
+            {
+                socket.close();
+            }
+            catch (IOException e)
+            {
+                _logger.debug("Exception while closing socket", e);
+            }
+        }
+    }
 }

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/ivy.nexus.xml
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/ivy.nexus.xml?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/ivy.nexus.xml (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/ivy.nexus.xml Thu Jan 23 11:01:02 2014
@@ -117,6 +117,12 @@
     <artifact name="qpid-broker-plugins-jdbc-provider-bone" type="jar.asc" ext="jar.asc"/>
     <artifact name="qpid-broker-plugins-jdbc-provider-bone" type="source" ext="jar" e:classifier="sources"/>
     <artifact name="qpid-broker-plugins-jdbc-provider-bone" type="source.asc" ext="jar.asc" e:classifier="sources"/>
+    <artifact name="qpid-broker-plugins-websocket" type="pom" ext="pom"/>
+    <artifact name="qpid-broker-plugins-websocket" type="pom.asc" ext="pom.asc"/>
+    <artifact name="qpid-broker-plugins-websocket" type="jar" ext="jar"/>
+    <artifact name="qpid-broker-plugins-websocket" type="jar.asc" ext="jar.asc"/>
+    <artifact name="qpid-broker-plugins-websocket" type="source" ext="jar" e:classifier="sources"/>
+    <artifact name="qpid-broker-plugins-websocket" type="source.asc" ext="jar.asc" e:classifier="sources"/>
     <artifact name="qpid-amqp-1-0-common" type="pom" ext="pom"/>
     <artifact name="qpid-amqp-1-0-common" type="pom.asc" ext="pom.asc"/>
     <artifact name="qpid-amqp-1-0-common" type="jar" ext="jar"/>

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/client/QpidTestClient.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/client/QpidTestClient.java?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/client/QpidTestClient.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/client/QpidTestClient.java Thu Jan 23 11:01:02 2014
@@ -120,8 +120,7 @@ public class QpidTestClient
             }
             catch(Exception e)
             {
-                e.printStackTrace();
-                _log.error(e.getMessage());
+                _log.error(e.getMessage(),e);
             }
             finally
             {

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/jca/pom.xml
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/jca/pom.xml?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/jca/pom.xml (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/jca/pom.xml Thu Jan 23 11:01:02 2014
@@ -34,6 +34,13 @@
     </dependency>
 
     <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>${slf4j-version}</version>
+      <scope>compile</scope>
+    </dependency>
+
+    <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
       <version>2.0.0</version>
@@ -104,6 +111,14 @@
         </exclusion>
       </exclusions>
     </dependency>
+
+    <!-- test dependencies -->
+    <dependency>
+      <groupId>org.apache.qpid</groupId>
+      <artifactId>qpid-test-utils</artifactId>
+      <version>0.26-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
    
   <build>

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/jca/rar/pom.xml
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/jca/rar/pom.xml?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/jca/rar/pom.xml (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/jca/rar/pom.xml Thu Jan 23 11:01:02 2014
@@ -24,7 +24,7 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>qpid-rar</artifactId>
+  <artifactId>qpid-ra</artifactId>
   <packaging>rar</packaging>
 
   <dependencies>

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/perftests/pom.xml
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/perftests/pom.xml?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/perftests/pom.xml (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/perftests/pom.xml Thu Jan 23 11:01:02 2014
@@ -26,10 +26,10 @@
   <artifactId>qpid-perftests</artifactId>
 
   <properties>
-    <broker.home.dir>target/qpid-broker/${project.version}</broker.home.dir>
+    <broker.home.dir>target${file.separator}qpid-broker${file.separator}${project.version}</broker.home.dir>
     <!-- test properties -->
-    <qpid.home>${basedir}/${broker.home.dir}</qpid.home>
-    <qpid.home.qbtc.output>${qpid.home}/qbtc-output</qpid.home.qbtc.output>
+    <qpid.home>${basedir}${file.separator}${broker.home.dir}</qpid.home>
+    <qpid.home.qbtc.output>${qpid.home}${file.separator}qbtc-output</qpid.home.qbtc.output>
   </properties>
 
   <dependencies>
@@ -42,34 +42,26 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jms_1.1_spec</artifactId>
-      <version>1.0</version>
-      <scope>provided</scope>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>${log4j-version}</version>
+      <scope>compile</scope>
     </dependency>
 
-    <!-- logging deps -->
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>1.6.4</version>
+      <version>${slf4j-version}</version>
       <scope>compile</scope>
     </dependency>
 
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <version>1.6.4</version>
-      <scope>compile</scope>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-jms_1.1_spec</artifactId>
+      <version>1.0</version>
+      <scope>provided</scope>
     </dependency>
 
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>1.2.16</version>
-      <scope>compile</scope>
-    </dependency> 
-
     <!-- other deps -->
     <dependency>
       <groupId>commons-lang</groupId>
@@ -262,6 +254,9 @@
           <excludes>
             <exclude>**/org/apache/qpid/systest/**/*.java</exclude>
           </excludes>
+          <systemPropertyVariables>
+            <log4j.configuration.file>${project.basedir}${file.separator}..${file.separator}test-profiles${file.separator}log4j-test.xml</log4j.configuration.file>
+          </systemPropertyVariables>
         </configuration>
         <executions>
           <execution>

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/perftests/visualisation-jfc/pom.xml
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/perftests/visualisation-jfc/pom.xml?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/perftests/visualisation-jfc/pom.xml (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/perftests/visualisation-jfc/pom.xml Thu Jan 23 11:01:02 2014
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>1.6.4</version>
+      <version>${slf4j-version}</version>
       <scope>compile</scope>
     </dependency>
 

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/ChartProductionTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/ChartProductionTest.java?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/ChartProductionTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/ChartProductionTest.java Thu Jan 23 11:01:02 2014
@@ -28,6 +28,7 @@ import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 
+import org.apache.log4j.Logger;
 import org.apache.qpid.disttest.charting.ChartType;
 import org.apache.qpid.disttest.charting.definition.ChartingDefinition;
 import org.apache.qpid.disttest.charting.definition.SeriesDefinition;
@@ -49,6 +50,7 @@ import org.jfree.data.general.Dataset;
  */
 public class ChartProductionTest extends QpidTestCase
 {
+    private static final Logger _logger = Logger.getLogger(ChartProductionTest.class);
     private static final String TEST_CHARTTITLE = "TEST_CHARTTITLE";
     private static final String TEST_CHARTSUBTITLE = "TEST_CHARTSUBTITLE";
     private static final String TEST_XAXIS = "TEST_XAXIS";
@@ -95,7 +97,7 @@ public class ChartProductionTest extends
         }
         else
         {
-            System.out.println("Charting directory for manual observation " + chartDir);
+            _logger.info("Charting directory for manual observation " + chartDir);
         }
 
         _writer.setOutputDirectory(chartDir);

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/pom.xml
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/pom.xml?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/pom.xml (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/pom.xml Thu Jan 23 11:01:02 2014
@@ -29,12 +29,10 @@
   <packaging>pom</packaging>
 
   <!-- ###### TODO ######
-    - Fix the jca/rar pom module name, it should be qpid-ra not qpid-rar.
     - Add the Excludes files, log4j config, etc test resources to a module (qpid-test-utils?) which can be
       used (extracted?) by the others to prevent them having to reference outside their directly for the files.
-      - Fix what the systests/perftests do to copy the test-profiles dir to the necessary location.
-      - Fix the log4j configuration property to work with all the modules, resolve the currently generated log4j exceptions during test runs.
-    - Add project details such as Website, Mailing List, SCM.
+        - Fix what the systests/perftests do to copy the test-profiles dir to the necessary location.
+        - Fix the log4j configuration property to work with all the modules.
     - Fix the version numbers in all the modules.
     - Decide on a final name for this parent module, qpid-project isnt necessarily appropriate given it doesnt encompass the whole project.
     - Test deploying the modules to a local Nexus instance (by overriding the repo properties locally).
@@ -59,6 +57,9 @@
       - Remove the QBTC output file mechanics, rely on Surefire to do it?
     - JUnit test profiles instead of Exludes files?
   -->
+  <prerequisites>
+    <maven>3.0.0</maven>
+  </prerequisites>
 
   <properties>
     <!-- dependency version numbers -->
@@ -67,6 +68,8 @@
     <!-- test dependency version numbers -->
     <junit-version>3.8.1</junit-version>
     <mockito-version>1.9.0</mockito-version>
+    <log4j-version>1.2.16</log4j-version>
+    <slf4j-version>1.6.4</slf4j-version>
 
     <!-- plugin version numbers -->
     <maven-antrun-plugin-version>1.7</maven-antrun-plugin-version>
@@ -102,13 +105,12 @@
     <java.target>1.6</java.target>
 
     <!-- enforcer plugin config properties -->
-    <supported-maven-version-range>[3.0.0,)</supported-maven-version-range>
     <supported-test-profiles-regex>(java-mms.0-9-1|java-mms.0-10)</supported-test-profiles-regex>
 
     <!-- test properties -->
     <qpid.home>${basedir}</qpid.home> <!-- override for broker tests -->
-    <qpid.home.qbtc.output>${qpid.home}/target/qbtc-output</qpid.home.qbtc.output> <!-- override for broker tests -->
-    <qpid.work>${project.build.directory}/QPID_WORK</qpid.work>
+    <qpid.home.qbtc.output>${qpid.home}${file.separator}target${file.separator}qbtc-output</qpid.home.qbtc.output> <!-- override for broker tests -->
+    <qpid.work>${project.build.directory}${file.separator}QPID_WORK</qpid.work>
 
     <profile.excludes.java-mms.0-10>JavaTransientExcludes Java010Excludes</profile.excludes.java-mms.0-10>
     <broker.version.java-mms.0-10>v0_10</broker.version.java-mms.0-10>
@@ -132,6 +134,27 @@
       <version>${mockito-version}</version>
       <scope>test</scope>
     </dependency>
+
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>${log4j-version}</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>${slf4j-version}</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <version>${slf4j-version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <modules>
@@ -409,7 +432,7 @@
             <java.naming.factory.initial>org.apache.qpid.jndi.PropertiesFileInitialContextFactory</java.naming.factory.initial>
             <java.naming.provider.url>test-profiles${file.separator}test-provider.properties</java.naming.provider.url>
 
-            <broker.config>${qpid.home}/etc/config-systests.json</broker.config>
+            <broker.config>${qpid.home}${file.separator}etc${file.separator}config-systests.json</broker.config>
             <messagestore.class.name>org.apache.qpid.server.store.MemoryMessageStore</messagestore.class.name>
             <broker.protocol.excludes></broker.protocol.excludes>
             <broker.persistent>false</broker.persistent>
@@ -422,8 +445,8 @@
             <amqj.protocol.logging.level>debug</amqj.protocol.logging.level>
             <root.logging.level>warn</root.logging.level>
 
-            <log4j.configuration.file>test-profiles${file.separator}log4j-test.xml</log4j.configuration.file>
-            <log4j.configuration>file://${basedir}${file.separator}..${file.separator}test-profiles${file.separator}log4j-test.xml</log4j.configuration>
+            <log4j.configuration.file>${project.basedir}${file.separator}test-profiles${file.separator}log4j-test.xml</log4j.configuration.file>
+            <log4j.configuration>log4j-test.xml</log4j.configuration>
 
             <log4j.debug>false</log4j.debug>
 
@@ -450,13 +473,13 @@
             <broker.version>${broker.version.java-mms.0-10}</broker.version>
             <qpid.broker_default_amqp_protocol_excludes>${qpid.broker_default_amqp_protocol_excludes.java-mms.0-10}</qpid.broker_default_amqp_protocol_excludes>
             <broker.stopped>Exception</broker.stopped>
-            <broker.command>${qpid.home}/bin/qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE</broker.command>
+            <broker.command>${qpid.home}${file.separator}bin${file.separator}qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE</broker.command>
+            <broker.command.windows>${qpid.home}${file.separator}bin${file.separator}qpid-server.bat -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE</broker.command.windows>
 
             <broker.ready>BRK-1004</broker.ready>
             <profile>${profile}</profile>
 
-            <!-- This must be a child of qpid home currently
-                 due to the horrible mechanics of QBTC  -->
+            <!-- This must be a child of qpid home currently due to the horrible mechanics of QBTC  -->
             <test.output>${qpid.home.qbtc.output}</test.output>
           </systemPropertyVariables>
         </configuration>
@@ -474,9 +497,6 @@
             </goals>
             <configuration>
               <rules>
-                <requireMavenVersion>
-                  <version>${supported-maven-version-range}</version>
-                </requireMavenVersion>
                 <requireProperty>
                   <property>profile</property>
                   <message>You must set a test profile!</message>
@@ -497,6 +517,41 @@
     </plugins>
   </build>
 
+  <description>
+    Apache Qpid™ makes messaging tools that speak AMQP and support many languages and platforms.
+    AMQP is an open internet protocol for reliably sending and receiving messages. It makes it possible for everyone to build a diverse, coherent messaging ecosystem.
+  </description>
+
+  <url>http://qpid.apache.org</url>
+
+  <issueManagement>
+    <system>JIRA</system>
+    <url>https://issues.apache.org/jira/browse/QPID</url>
+  </issueManagement>
+
+  <mailingLists>
+    <mailingList>
+      <name>Apache Qpid Users</name>
+      <subscribe>users-subscribe@qpid.apache.org</subscribe>
+      <unsubscribe>users-unsubscribe@qpid.apache.org</unsubscribe>
+      <post>users@qpid.apache.org</post>
+      <archive>http://mail-archives.apache.org/mod_mbox/qpid-users/</archive>
+    </mailingList>
+    <mailingList>
+      <name>Apache Qpid Developers</name>
+      <subscribe>dev-subscribe@qpid.apache.org</subscribe>
+      <unsubscribe>dev-unsubscribe@qpid.apache.org</unsubscribe>
+      <post>dev@qpid.apache.org</post>
+      <archive>http://mail-archives.apache.org/mod_mbox/qpid-dev/</archive>
+    </mailingList>
+  </mailingLists>
+
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/qpid/trunk/qpid</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/qpid/trunk/qpid</developerConnection>
+    <url>http://svn.apache.org/viewvc/qpid/</url>
+  </scm>
+
   <reporting>
     <plugins>
       <plugin>

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/qpid-test-utils/pom.xml
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/qpid-test-utils/pom.xml?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/qpid-test-utils/pom.xml (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/qpid-test-utils/pom.xml Thu Jan 23 11:01:02 2014
@@ -33,12 +33,12 @@
       <scope>compile</scope>
     </dependency>
 
-	<dependency>
-	  <groupId>log4j</groupId>
-	  <artifactId>log4j</artifactId>
-	  <version>1.2.16</version>
-	  <scope>provided</scope>
-	</dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>${log4j-version}</version>
+      <scope>compile</scope>
+    </dependency>
 
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/systests/pom.xml
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/systests/pom.xml?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/systests/pom.xml (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/systests/pom.xml Thu Jan 23 11:01:02 2014
@@ -26,10 +26,10 @@
   <artifactId>qpid-systests</artifactId>
 
   <properties>
-    <broker.home.dir>target/qpid-broker/${project.version}</broker.home.dir>
+    <broker.home.dir>target${file.separator}qpid-broker${file.separator}${project.version}</broker.home.dir>
     <!-- test properties -->
-    <qpid.home>${basedir}/${broker.home.dir}</qpid.home>
-    <qpid.home.qbtc.output>${qpid.home}/qbtc-output</qpid.home.qbtc.output>
+    <qpid.home>${basedir}${file.separator}${broker.home.dir}</qpid.home>
+    <qpid.home.qbtc.output>${qpid.home}${file.separator}qbtc-output</qpid.home.qbtc.output>
   </properties>
 
   <dependencies>
@@ -55,6 +55,20 @@
       <scope>compile</scope>
     </dependency>
 
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>${log4j-version}</version>
+      <scope>compile</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>${slf4j-version}</version>
+      <scope>compile</scope>
+    </dependency>
+
     <!-- client deps -->
     <dependency>
       <groupId>org.apache.qpid</groupId>
@@ -242,6 +256,9 @@
           <!-- Skip the default test phase, bind to the
                integration-test phase below instead -->
           <skip>true</skip>
+          <systemPropertyVariables>
+            <log4j.configuration.file>${project.basedir}${file.separator}..${file.separator}test-profiles${file.separator}log4j-test.xml</log4j.configuration.file>
+          </systemPropertyVariables>
         </configuration>
         <executions>
           <execution>

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/ra/QpidRAConnectionTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/ra/QpidRAConnectionTest.java?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/ra/QpidRAConnectionTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/ra/QpidRAConnectionTest.java Thu Jan 23 11:01:02 2014
@@ -20,6 +20,7 @@
  */
 package org.apache.qpid.ra;
 
+import org.apache.log4j.Logger;
 import org.apache.qpid.test.utils.QpidBrokerTestCase;
 
 import javax.jms.Connection;
@@ -33,6 +34,8 @@ import org.apache.qpid.ra.QpidResourceAd
 
 public class QpidRAConnectionTest extends QpidBrokerTestCase
 {
+    private static final Logger _logger = Logger.getLogger(QpidRAConnectionTest.class);
+
     private static final String BROKER_PORT = "15672";
 
     private static final String URL = "amqp://guest:guest@client/test?brokerlist='tcp://localhost:" + BROKER_PORT + "?sasl_mechs='PLAIN''";
@@ -55,7 +58,7 @@ public class QpidRAConnectionTest extend
         }
         catch(Exception e)
         {
-            e.printStackTrace();
+            _logger.error("Commit threw exception", e);
             assertTrue(e instanceof javax.jms.IllegalStateException);
         }
 

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/scripts/QpidPasswdTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/scripts/QpidPasswdTest.java?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/scripts/QpidPasswdTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/scripts/QpidPasswdTest.java Thu Jan 23 11:01:02 2014
@@ -23,6 +23,7 @@ import java.util.concurrent.TimeUnit;
 
 import org.apache.qpid.test.utils.Piper;
 import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.util.SystemUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -35,6 +36,10 @@ public class QpidPasswdTest extends Qpid
 
     public void testRunScript() throws Exception
     {
+        if(SystemUtils.isWindows())
+        {
+            return;
+        }
         Process process = null;
         try
         {

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java Thu Jan 23 11:01:02 2014
@@ -60,7 +60,7 @@ public class ReturnUnroutableMandatoryMe
         if (workdir == null || workdir.equals(""))
         {
             String tempdir = System.getProperty("java.io.tmpdir");
-            System.out.println("QPID_WORK not set using tmp directory: " + tempdir);
+            _logger.info("QPID_WORK not set using tmp directory: " + tempdir);
             System.setProperty("QPID_WORK", tempdir);
         }
     }
@@ -290,14 +290,7 @@ public class ReturnUnroutableMandatoryMe
     {
 
         Exception linkedException = null;
-        try
-        {
-            linkedException = jmsException.getLinkedException();
-        }
-        catch (Exception e)
-        {
-            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
-        }
+        linkedException = jmsException.getLinkedException();
         if (linkedException instanceof AMQNoRouteException)
         {
             AMQNoRouteException noRoute = (AMQNoRouteException) linkedException;

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/server/failover/FailoverMethodTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/server/failover/FailoverMethodTest.java?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/server/failover/FailoverMethodTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/server/failover/FailoverMethodTest.java Thu Jan 23 11:01:02 2014
@@ -29,6 +29,7 @@ import org.apache.qpid.AMQException;
 import org.apache.qpid.client.AMQConnection;
 import org.apache.qpid.client.AMQConnectionURL;
 import org.apache.qpid.test.utils.QpidBrokerTestCase;
+import org.apache.qpid.util.SystemUtils;
 
 import javax.jms.ExceptionListener;
 import javax.jms.JMSException;
@@ -49,6 +50,12 @@ public class FailoverMethodTest extends 
      */
     public void testFailoverRoundRobinDelay() throws Exception
     {
+        if (SystemUtils.isWindows())
+        {
+            //TODO Test requires redevelopment - timings/behaviour on windows mean it fails
+            return;
+        }
+
         //note: The first broker has no connect delay and the default 1 retry
         //        while the tcp:localhost broker has 3 retries with a 2s connect delay
         String connectionString = "amqp://guest:guest@/test?brokerlist=" +
@@ -77,7 +84,7 @@ public class FailoverMethodTest extends 
             long duration = (end - start);
 
             //Failover should take more that 6 seconds.
-            // 3 Retires
+            // 3 Retries
             // so VM Broker NoDelay 0 (Connect) NoDelay 0
             // then TCP NoDelay 0 Delay 1 Delay 2 Delay  3
             // so 3 delays of 2s in total for connection
@@ -99,6 +106,12 @@ public class FailoverMethodTest extends 
 
     public void testFailoverSingleDelay() throws Exception
     {
+        if (SystemUtils.isWindows())
+        {
+            //TODO Test requires redevelopment - timings/behaviour on windows mean it fails
+            return;
+        }
+
         String connectionString = "amqp://guest:guest@/test?brokerlist='tcp://localhost:" + getPort() + "?connectdelay='2000',retries='3''";
 
         AMQConnectionURL url = new AMQConnectionURL(connectionString);
@@ -123,7 +136,7 @@ public class FailoverMethodTest extends 
             long duration = (end - start);
 
             //Failover should take more that 6 seconds.
-            // 3 Retires
+            // 3 Retries
             // so NoDelay 0 (Connect) NoDelay 0 Delay 1 Delay 2 Delay  3
             // so 3 delays of 2s in total for connection
             // so max time is 6 seconds of delay + 1 second of runtime. == 7 seconds
@@ -151,16 +164,9 @@ public class FailoverMethodTest extends 
      */
     public void testNoFailover() throws Exception
     {
-        if (!isInternalBroker())
+        if (SystemUtils.isWindows())
         {
-            // QPID-3359
-            // These tests always used to be inVM tests, then QPID-2815, with removal of ivVM, 
-            // converted the test to use QpidBrokerTestCase.  However, since then we notice this
-            // test fails on slower CI boxes.  It turns out the test design is *extremely*
-            // sensitive the length of time the broker takes to start up.
-            //
-            // Making the test a same-VM test to temporarily avoid the issue.  In long term, test
-            // needs redesigned to avoid the issue.
+            //TODO Test requires redevelopment - timings/behaviour on windows mean it fails
             return;
         }
 
@@ -185,7 +191,7 @@ public class FailoverMethodTest extends 
                     try
                     {
                         //Wait before starting broker
-                        // The wait should allow atleast 1 retries to fail before broker is ready
+                        // The wait should allow at least 1 retries to fail before broker is ready
                         Thread.sleep(750);
                         startBroker();
                     }
@@ -198,15 +204,13 @@ public class FailoverMethodTest extends 
 
             brokerStart.start();
             long start = System.currentTimeMillis();
-
             //Start the connection so it will use the retries
             AMQConnection connection = new AMQConnection(url);
 
             long end = System.currentTimeMillis();
-
             long duration = (end - start);
 
-            // Check that we actually had a delay had a delay in connection
+            // Check that we actually had a delay in connection
             assertTrue("Initial connection should be longer than 1 delay : " + CONNECT_DELAY + " <:(" + duration + ")", duration > CONNECT_DELAY);
 
 
@@ -222,8 +226,7 @@ public class FailoverMethodTest extends 
             stopBroker();
 
             _failoverComplete.await(30, TimeUnit.SECONDS);
-            assertEquals("failoverLatch was not decremented in given timeframe",
-                    0, _failoverComplete.getCount());
+            assertEquals("failoverLatch was not decremented in given timeframe", 0, _failoverComplete.getCount());
 
             end = System.currentTimeMillis();
 

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityQueueTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityQueueTest.java?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityQueueTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityQueueTest.java Thu Jan 23 11:01:02 2014
@@ -20,6 +20,7 @@
 */
 package org.apache.qpid.server.queue;
 
+import org.apache.log4j.Logger;
 import org.apache.qpid.AMQException;
 import org.apache.qpid.client.AMQConnection;
 import org.apache.qpid.client.AMQDestination;
@@ -246,6 +247,8 @@ public class PriorityQueueTest extends Q
 
     private static class ReflectingMessageListener implements MessageListener
     {
+        private static final Logger _logger = Logger.getLogger(PriorityQueueTest.ReflectingMessageListener.class);
+
         private Session _prodSess;
         private Session _consSess;
         private CountDownLatch _latch;
@@ -270,7 +273,7 @@ public class PriorityQueueTest extends Q
             {
                 _latch.countDown();
                 long msgNum = _origCount - _latch.getCount();
-                System.out.println("Received message " + msgNum + " with ID: " + message.getIntProperty("msg"));
+                _logger.info("Received message " + msgNum + " with ID: " + message.getIntProperty("msg"));
 
                 if(_latch.getCount() > 0)
                 {
@@ -287,7 +290,7 @@ public class PriorityQueueTest extends Q
             }
             catch(Throwable t)
             {
-                t.printStackTrace();
+                _logger.error(t.getMessage(), t);
                 _lastThrown = t;
             }
         }

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java Thu Jan 23 11:01:02 2014
@@ -37,6 +37,7 @@ import javax.jms.MessageProducer;
 import javax.jms.Queue;
 import javax.jms.Session;
 
+import org.apache.log4j.Logger;
 import org.apache.qpid.AMQException;
 import org.apache.qpid.client.AMQDestination;
 import org.apache.qpid.client.AMQSession;
@@ -47,6 +48,8 @@ import org.apache.qpid.test.utils.JMXTes
 
 public class ProducerFlowControlTest extends AbstractTestLogging
 {
+    private static final Logger _logger = Logger.getLogger(ProducerFlowControlTest.class);
+
     private static final int TIMEOUT = 10000;
 
     private Connection producerConnection;
@@ -94,7 +97,7 @@ public class ProducerFlowControlTest ext
                 }
                 catch (IOException e)
                 {
-                    e.printStackTrace();
+                    _logger.error("Error closing jmxUtils", e);
                 }
             }
             producerConnection.close();
@@ -426,7 +429,7 @@ public class ProducerFlowControlTest ext
             }
             catch (AMQException e)
             {
-                e.printStackTrace();
+                _logger.error("Error performing sync", e);
                 throw new RuntimeException(e);
             }
 

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/server/store/MessageStoreTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/server/store/MessageStoreTest.java?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/server/store/MessageStoreTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/server/store/MessageStoreTest.java Thu Jan 23 11:01:02 2014
@@ -26,6 +26,7 @@ import java.util.Collection;
 import java.util.Collections;
 import org.apache.commons.configuration.PropertiesConfiguration;
 
+import org.apache.log4j.Logger;
 import org.apache.qpid.AMQException;
 import org.apache.qpid.AMQStoreException;
 import org.apache.qpid.common.AMQPFilterTypes;
@@ -40,6 +41,7 @@ import org.apache.qpid.server.configurat
 import org.apache.qpid.server.exchange.DirectExchange;
 import org.apache.qpid.server.exchange.Exchange;
 import org.apache.qpid.server.exchange.TopicExchange;
+import org.apache.qpid.server.message.InstanceProperties;
 import org.apache.qpid.server.model.Queue;
 import org.apache.qpid.server.protocol.v0_8.AMQMessage;
 import org.apache.qpid.server.protocol.v0_8.MessageMetaData;
@@ -50,8 +52,6 @@ import org.apache.qpid.server.queue.AMQP
 import org.apache.qpid.server.queue.AMQQueue;
 import org.apache.qpid.server.queue.BaseQueue;
 import org.apache.qpid.server.queue.ConflationQueue;
-import org.apache.qpid.server.protocol.v0_8.IncomingMessage;
-import org.apache.qpid.server.queue.QueueArgumentsConverter;
 import org.apache.qpid.server.queue.SimpleAMQQueue;
 import org.apache.qpid.server.txn.AutoCommitTransaction;
 import org.apache.qpid.server.txn.ServerTransaction;
@@ -77,6 +77,8 @@ import static org.mockito.Mockito.when;
  */
 public class MessageStoreTest extends QpidTestCase
 {
+    private static final Logger _logger = Logger.getLogger(MessageStoreTest.class);
+
     public static final int DEFAULT_PRIORTY_LEVEL = 5;
     public static final String SELECTOR_VALUE = "Test = 'MST'";
     public static final String LVQ_KEY = "MST-LVQ-KEY";
@@ -180,7 +182,7 @@ public class MessageStoreTest extends Qp
             }
             catch (Exception e)
             {
-                e.printStackTrace();
+                _logger.error("Error closing virtual host", e);
                 fail(e.getMessage());
             }
         }
@@ -191,7 +193,7 @@ public class MessageStoreTest extends Qp
         }
         catch (Exception e)
         {
-            e.printStackTrace();
+            _logger.error("Error creating virtual host", e);
             fail(e.getMessage());
         }
 
@@ -615,61 +617,41 @@ public class MessageStoreTest extends Qp
 
         MessagePublishInfo messageInfo = new TestMessagePublishInfo(exchange, false, false, routingKey);
 
-        final IncomingMessage currentMessage;
-
-
-        currentMessage = new IncomingMessage(messageInfo);
-
-        currentMessage.setExchange(exchange);
-
         ContentHeaderBody headerBody = new ContentHeaderBody(BasicConsumeBodyImpl.CLASS_ID,0,properties,0l);
 
-        try
-        {
-            currentMessage.setContentHeaderBody(headerBody);
-        }
-        catch (AMQException e)
-        {
-            fail(e.getMessage());
-        }
+        MessageMetaData mmd = new MessageMetaData(messageInfo, headerBody, System.currentTimeMillis());
 
-        currentMessage.setExpiration();
+        final StoredMessage<MessageMetaData> storedMessage = getVirtualHost().getMessageStore().addMessage(mmd);
+        storedMessage.flushToStore();
+        final AMQMessage currentMessage = new AMQMessage(storedMessage);
 
-        MessageMetaData mmd = currentMessage.headersReceived(System.currentTimeMillis());
-        currentMessage.setStoredMessage(getVirtualHost().getMessageStore().addMessage(mmd));
-        currentMessage.getStoredMessage().flushToStore();
-        currentMessage.route();
+        final List<? extends BaseQueue> destinationQueues = exchange.route(currentMessage, InstanceProperties.EMPTY);
 
 
-        // check and deliver if header says body length is zero
-        if (currentMessage.allContentReceived())
-        {
-            ServerTransaction trans = new AutoCommitTransaction(getVirtualHost().getMessageStore());
-            final List<? extends BaseQueue> destinationQueues = currentMessage.getDestinationQueues();
-            trans.enqueue(currentMessage.getDestinationQueues(), currentMessage, new ServerTransaction.Action() {
-                public void postCommit()
-                {
-                    try
-                    {
-                        AMQMessage message = new AMQMessage(currentMessage.getStoredMessage());
+        ServerTransaction trans = new AutoCommitTransaction(getVirtualHost().getMessageStore());
 
-                        for(BaseQueue queue : destinationQueues)
-                        {
-                            queue.enqueue(message);
-                        }
-                    }
-                    catch (AMQException e)
+        trans.enqueue(destinationQueues, currentMessage, new ServerTransaction.Action() {
+            public void postCommit()
+            {
+                try
+                {
+                    for(BaseQueue queue : destinationQueues)
                     {
-                        e.printStackTrace();
+                        queue.enqueue(currentMessage);
                     }
                 }
-
-                public void onRollback()
+                catch (AMQException e)
                 {
-                    //To change body of implemented methods use File | Settings | File Templates.
+                    _logger.error("Problem enqueing message", e);
                 }
-            });
-        }
+            }
+
+            public void onRollback()
+            {
+                //To change body of implemented methods use File | Settings | File Templates.
+            }
+        });
+
     }
 
     private void createAllQueues()

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/server/store/StoreOverfullTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/server/store/StoreOverfullTest.java?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/server/store/StoreOverfullTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/server/store/StoreOverfullTest.java Thu Jan 23 11:01:02 2014
@@ -346,7 +346,7 @@ public class StoreOverfullTest extends Q
             }
             catch (AMQException e)
             {
-                e.printStackTrace();
+                _logger.error(e);
                 throw new RuntimeException(e);
             }
 

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/server/util/AveragedRun.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/server/util/AveragedRun.java?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/server/util/AveragedRun.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/server/util/AveragedRun.java Thu Jan 23 11:01:02 2014
@@ -23,8 +23,12 @@ package org.apache.qpid.server.util;
 import java.util.Collection;
 import java.util.concurrent.Callable;
 
+import org.apache.log4j.Logger;
+
 public class AveragedRun implements Callable<RunStats>
 {
+    private static final Logger _logger = Logger.getLogger(AveragedRun.class);
+
     private final RunStats stats = new RunStats();
     private final TimedRun test;
     private final int iterations;
@@ -46,7 +50,7 @@ public class AveragedRun implements Call
 
     public void run() throws Exception
     {
-        System.out.println(test + ": " + call());
+        _logger.info(test + ": " + call());
     }
 
     public String toString()

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java Thu Jan 23 11:01:02 2014
@@ -42,6 +42,7 @@ import org.apache.qpid.server.model.Virt
 import org.apache.qpid.server.store.MessageStoreCreator;
 import org.apache.qpid.test.client.UnroutableMessageTestExceptionListener;
 import org.apache.qpid.test.utils.TestBrokerConfiguration;
+import org.apache.qpid.util.SystemUtils;
 
 public class BrokerRestTest extends QpidRestTestCase
 {
@@ -237,8 +238,7 @@ public class BrokerRestTest extends Qpid
 
         assertEquals("Unexpected value of attribute " + Broker.BUILD_VERSION, QpidProperties.getBuildVersion(),
                 brokerDetails.get(Broker.BUILD_VERSION));
-        assertEquals("Unexpected value of attribute " + Broker.OPERATING_SYSTEM, OS_NAME + " "
-                + System.getProperty("os.version") + " " + System.getProperty("os.arch"),
+        assertEquals("Unexpected value of attribute " + Broker.OPERATING_SYSTEM, SystemUtils.getOSString(),
                 brokerDetails.get(Broker.OPERATING_SYSTEM));
         assertEquals(
                 "Unexpected value of attribute " + Broker.PLATFORM,

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/client/RollbackOrderTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/client/RollbackOrderTest.java?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/client/RollbackOrderTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/client/RollbackOrderTest.java Thu Jan 23 11:01:02 2014
@@ -150,7 +150,7 @@ public class RollbackOrderTest extends Q
                 }
                 catch (JMSException e)
                 {
-                    System.out.println("Error:" + e.getMessage());
+                    _logger.error("Error:" + e.getMessage(), e);
                     exceptions[(int)count.getCount()] = e;
                 }
                 catch (AssertionFailedError cf)
@@ -161,9 +161,7 @@ public class RollbackOrderTest extends Q
                         count.countDown();
                     }
 
-                    System.out.println("Error:" + cf.getMessage());
-                    System.err.println(cf.getMessage());
-                    cf.printStackTrace();
+                    _logger.error("Error:" + cf.getMessage(), cf);
                     failed.set(true);
                 }
             }
@@ -177,8 +175,7 @@ public class RollbackOrderTest extends Q
         {
             if (e != null)
             {
-                System.err.println(e.getMessage());
-                e.printStackTrace();
+                _logger.error("Encountered exception", e);
                 failed.set(true);
             }
         }

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/SelectorTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/SelectorTest.java?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/SelectorTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/SelectorTest.java Thu Jan 23 11:01:02 2014
@@ -126,7 +126,7 @@ public class SelectorTest extends QpidBr
             }
             else
             {
-                System.out.println("SUCCESS!!");
+                _logger.debug("SUCCESS!!");
             }
         }
         catch (InterruptedException e)

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeOnMessageTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeOnMessageTest.java?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeOnMessageTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeOnMessageTest.java Thu Jan 23 11:01:02 2014
@@ -125,7 +125,7 @@ public class AcknowledgeOnMessageTest ex
             Exception cause = _causeOfFailure.get();
             if (cause != null)
             {
-                cause.printStackTrace();
+                _logger.error("Cause of failure is: ", cause);
                 fail(cause.getMessage());
             }
             else
@@ -142,7 +142,7 @@ public class AcknowledgeOnMessageTest ex
         Exception cause = _causeOfFailure.get();
         if (cause != null)
         {
-            cause.printStackTrace();
+            _logger.error("Failed due to following exception", cause);
             fail(cause.getMessage());
         }
 

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java Thu Jan 23 11:01:02 2014
@@ -271,8 +271,8 @@ public class BytesMessageTest extends Qp
             count = Integer.parseInt(argv[1]);
         }
 
-        System.out.println("connectionString = " + connectionString);
-        System.out.println("count = " + count);
+        _logger.info("connectionString = " + connectionString);
+        _logger.info("count = " + count);
 
         BytesMessageTest test = new BytesMessageTest();
         test._connectionString = connectionString;

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java Thu Jan 23 11:01:02 2014
@@ -155,8 +155,8 @@ public class LargeMessageTest extends Qp
         }
         catch (JMSException e)
         {
-            e.printStackTrace();
-            fail("Excpetion occured:" + e.getCause());
+            _logger.error("Exception occured", e);
+            fail("Exception occured:" + e.getCause());
         }
     }
 

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java Thu Jan 23 11:01:02 2014
@@ -197,7 +197,6 @@ public class PropertyValueTest extends Q
         catch (Exception e)
         {
             _logger.error(e.getMessage(), e);
-            e.printStackTrace();
         }
     }
 

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/TextMessageTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/TextMessageTest.java?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/TextMessageTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/TextMessageTest.java Thu Jan 23 11:01:02 2014
@@ -95,7 +95,7 @@ public class TextMessageTest extends Qpi
         }
         catch (Throwable  e)
         {
-            e.printStackTrace();
+            _logger.error("Error creating consumer", e);
         }
         connection.start();
     }

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionStartTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionStartTest.java?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionStartTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionStartTest.java Thu Jan 23 11:01:02 2014
@@ -73,7 +73,7 @@ public class ConnectionStartTest extends
         }
         catch (Exception e)
         {
-            e.printStackTrace();
+            _logger.error("Connection to " + _broker + " should succeed.", e);
             fail("Connection to " + _broker + " should succeed. Reason: " + e);
         }
     }

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java Thu Jan 23 11:01:02 2014
@@ -104,7 +104,7 @@ public class ObjectMessageTest extends Q
         }
         catch (Exception e)
         {
-            e.printStackTrace();
+            _logger.error("This Test should succeed but failed", e);
             fail("This Test should succeed but failed due to: " + e);
         }
     }
@@ -254,7 +254,7 @@ public class ObjectMessageTest extends Q
         }
         catch (JMSException e)
         {
-            e.printStackTrace();
+            _logger.error("Error getting object from message", e);
             items.add(e);
         }
 

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/MessageRequeueTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/MessageRequeueTest.java?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/MessageRequeueTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/MessageRequeueTest.java Thu Jan 23 11:01:02 2014
@@ -312,7 +312,7 @@ public class MessageRequeueTest extends 
             }
             catch (Exception e)
             {
-                e.printStackTrace();
+                _logger.error("Consumer run error",e);
             }
         }
 

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java Thu Jan 23 11:01:02 2014
@@ -284,7 +284,7 @@ public class DurableSubscriptionTest ext
     {
         if(!isBrokerStorePersistent())
         {
-            System.out.println("The broker store is not persistent, skipping this test.");
+            _logger.warn("The broker store is not persistent, skipping this test");
             return;
         }
         
@@ -784,7 +784,7 @@ public class DurableSubscriptionTest ext
         }
         catch (Exception e)
         {
-            e.printStackTrace();
+            _logger.error("Receive error",e);
         }
 
         conn.stop();
@@ -852,7 +852,7 @@ public class DurableSubscriptionTest ext
         }
         catch (Exception e)
         {
-            e.printStackTrace();
+            _logger.error("Receive error",e);
         }
 
         conn.stop();
@@ -914,7 +914,7 @@ public class DurableSubscriptionTest ext
         }
         catch (Exception e)
         {
-            e.printStackTrace();
+            _logger.error("Error creating durable subscriber",e);
         }
     }
 

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java Thu Jan 23 11:01:02 2014
@@ -297,7 +297,7 @@ public class TopicSessionTest extends Qp
         m = (TextMessage) noLocal.receive(1000);
         if (m != null)
         {
-            System.out.println("Message:" + m.getText());
+            _logger.info("Message:" + m.getText());
         }
         assertNull(m);
 

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java Thu Jan 23 11:01:02 2014
@@ -634,7 +634,7 @@ public class CommitRollbackTest extends 
             }
             catch (JMSException e)
             {
-                e.printStackTrace();
+                _logger.error("OnMessage error",e);
             }
         }
     }

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactedTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactedTest.java?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactedTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactedTest.java Thu Jan 23 11:01:02 2014
@@ -108,7 +108,7 @@ public class TransactedTest extends Qpid
         }
         catch (Exception e)
         {
-            e.printStackTrace();
+            _logger.error("setup error",e);
             stopBroker();
             throw e;
         }
@@ -127,7 +127,7 @@ public class TransactedTest extends Qpid
         }
         catch (Exception e)
         {
-            e.printStackTrace();
+            _logger.error("tear down error",e);
         }
         finally
         {

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/AbstractXATestCase.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/AbstractXATestCase.java?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/AbstractXATestCase.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/AbstractXATestCase.java Thu Jan 23 11:01:02 2014
@@ -112,7 +112,7 @@ public abstract  class AbstractXATestCas
             }
             catch (JMSException e)
             {
-                e.printStackTrace();
+                _logger.error("Producer error",e);
                 fail("cannot create message producer: " + e.getMessage());
             }
             // create standard consumer

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/FaultTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/FaultTest.java?rev=1560634&r1=1560633&r2=1560634&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/FaultTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/xa/FaultTest.java Thu Jan 23 11:01:02 2014
@@ -39,7 +39,6 @@ import javax.transaction.xa.Xid;
 
 public class FaultTest extends AbstractXATestCase
 {
-    /* this clas logger */
     private static final Logger _logger = LoggerFactory.getLogger(FaultTest.class);
 
     /**



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message