summaryrefslogtreecommitdiff
path: root/qpid/java/broker-core
diff options
context:
space:
mode:
authorRobert Gemmell <robbie@apache.org>2014-01-22 16:04:13 +0000
committerRobert Gemmell <robbie@apache.org>2014-01-22 16:04:13 +0000
commit1c7a129ba58a45726a7d14377fb8ebe447457319 (patch)
treea547fa1721135dd59607ff55609795bb84dc1627 /qpid/java/broker-core
parent51a25d7f950fd2220542727593fa48d24961a1a1 (diff)
downloadqpid-python-1c7a129ba58a45726a7d14377fb8ebe447457319.tar.gz
QPID-5048: logging and build output cleanup
Patch Supplied by Andrew MacBean <andymacbean@gmail.com>. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1560398 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker-core')
-rw-r--r--qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/plugins/AbstractConfigurationTest.java5
-rw-r--r--qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java1
-rw-r--r--qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java5
3 files changed, 8 insertions, 3 deletions
diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/plugins/AbstractConfigurationTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/plugins/AbstractConfigurationTest.java
index 674abbfeb7..0e57b60a6f 100644
--- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/plugins/AbstractConfigurationTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/plugins/AbstractConfigurationTest.java
@@ -24,6 +24,7 @@ import org.apache.commons.configuration.CompositeConfiguration;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.XMLConfiguration;
+import org.apache.log4j.Logger;
import org.apache.qpid.test.utils.QpidTestCase;
import java.util.List;
@@ -34,6 +35,8 @@ import java.util.List;
*/
public class AbstractConfigurationTest extends QpidTestCase
{
+ private static final Logger _logger = Logger.getLogger(AbstractConfigurationTest.class);
+
private static final double DOUBLE = 3.14;
private static final long POSITIVE_LONG = 1000;
private static final long NEGATIVE_LONG = -1000;
@@ -101,7 +104,7 @@ public class AbstractConfigurationTest extends QpidTestCase
}
catch (ConfigurationException e)
{
- e.printStackTrace();
+ _logger.error("Error setting up plugin configuration", e);
fail(e.toString());
}
diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java
index 54826b8c88..8b67db2de9 100644
--- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java
@@ -382,7 +382,6 @@ public class PortFactoryTest extends QpidTestCase
}
catch(IllegalConfigurationException e)
{
- e.printStackTrace();
// pass
}
}
diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java
index 4058eac99d..a7dcaf6d49 100644
--- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java
@@ -30,6 +30,8 @@ import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.when;
import java.util.Map;
+
+import org.apache.log4j.Logger;
import org.apache.qpid.AMQException;
import org.apache.qpid.AMQInternalException;
import org.apache.qpid.AMQSecurityException;
@@ -55,6 +57,7 @@ import java.util.concurrent.TimeUnit;
public class SimpleAMQQueueTest extends QpidTestCase
{
+ private static final Logger _logger = Logger.getLogger(SimpleAMQQueueTest.class);
private SimpleAMQQueue _queue;
private VirtualHost _virtualHost;
@@ -1146,7 +1149,7 @@ public class SimpleAMQQueueTest extends QpidTestCase
}
catch (InterruptedException e)
{
- e.printStackTrace();
+ _logger.error("Thread interrupted", e);
}
}