Author: dejanb
Date: Mon Apr 19 09:54:19 2010
New Revision: 935501
URL: http://svn.apache.org/viewvc?rev=935501&view=rev
Log:
Some improvements for org.apache.activemq.ra.JmsXARollback2CxTransactionTest
test as it fails in hudson
Modified:
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsTransactionTestSupport.java
activemq/trunk/activemq-ra/src/test/resources/log4j.properties
Modified:
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsTransactionTestSupport.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsTransactionTestSupport.java?rev=935501&r1=935500&r2=935501&view=diff
==============================================================================
---
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsTransactionTestSupport.java
(original)
+++
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsTransactionTestSupport.java
Mon Apr 19 09:54:19 2010
@@ -81,6 +81,7 @@ public abstract class JmsTransactionTest
protected void setUp() throws Exception {
broker = createBroker();
broker.start();
+ broker.waitUntilStarted();
resourceProvider = getJmsResourceProvider();
topic = resourceProvider.isTopic();
@@ -129,6 +130,7 @@ public abstract class JmsTransactionTest
connection.close();
connection = null;
broker.stop();
+ broker.waitUntilStopped();
broker = null;
LOG.info("Connection closed.");
Modified: activemq/trunk/activemq-ra/src/test/resources/log4j.properties
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-ra/src/test/resources/log4j.properties?rev=935501&r1=935500&r2=935501&view=diff
==============================================================================
--- activemq/trunk/activemq-ra/src/test/resources/log4j.properties (original)
+++ activemq/trunk/activemq-ra/src/test/resources/log4j.properties Mon Apr 19
09:54:19 2010
@@ -18,10 +18,10 @@
#
# The logging properties used during tests..
#
-log4j.rootLogger=INFO, out
+log4j.rootLogger=INFO, out, stdout
log4j.logger.org.apache.activemq.spring=WARN
-log4j.logger.org.apache.activemq=INFO
+#log4j.logger.org.apache.activemq.ra=DEBUG
# CONSOLE appender not used by default
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
@@ -32,5 +32,5 @@ log4j.appender.stdout.layout.ConversionP
log4j.appender.out=org.apache.log4j.FileAppender
log4j.appender.out.layout=org.apache.log4j.PatternLayout
log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} -
%m%n
-log4j.appender.out.file=target/test-reports/activemq-test.log
-log4j.appender.out.append=false
+log4j.appender.out.file=target/activemq-test.log
+log4j.appender.out.append=true
