Author: rajdavies
Date: Mon Aug 13 08:44:57 2007
New Revision: 565383
URL: http://svn.apache.org/viewvc?view=rev&rev=565383
Log:
Applied patch from http://issues.apache.org/activemq/browse/AMQ-1361
Modified:
activemq/trunk/activemq-console/src/test/resources/activemq.xml
activemq/trunk/activemq-console/src/test/resources/log4j.properties
Modified: activemq/trunk/activemq-console/src/test/resources/activemq.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-console/src/test/resources/activemq.xml?view=diff&rev=565383&r1=565382&r2=565383
==============================================================================
--- activemq/trunk/activemq-console/src/test/resources/activemq.xml (original)
+++ activemq/trunk/activemq-console/src/test/resources/activemq.xml Mon Aug 13 08:44:57 2007
@@ -19,15 +19,15 @@
<beans>
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
- <broker useJmx="false" xmlns="http://activemq.org/config/1.0">
-
- <persistenceAdapter>
- <journaledJDBC journalLogFiles="2" dataDirectory="target/foo"/>
- </persistenceAdapter>
+ <broker brokerName="linuxpc3" useJmx="true" xmlns="http://activemq.org/config/1.0" persistent="false"
deleteAllMessagesOnStartup="true">
<transportConnectors>
- <transportConnector uri="tcp://localhost:61616"/>
+ <transportConnector uri="tcp://localhost:61616?trace=true&logWriterName=custom&dynamicManagement=true&startLogging=true&jmxPort=1299"/>
</transportConnectors>
+
+ <persistenceAdapter>
+ <memoryPersistenceAdapter/>
+ </persistenceAdapter>
</broker>
Modified: activemq/trunk/activemq-console/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-console/src/test/resources/log4j.properties?view=diff&rev=565383&r1=565382&r2=565383
==============================================================================
--- activemq/trunk/activemq-console/src/test/resources/log4j.properties (original)
+++ activemq/trunk/activemq-console/src/test/resources/log4j.properties Mon Aug 13 08:44:57
2007
@@ -18,11 +18,27 @@
#
# The logging properties used during tests..
#
-log4j.rootLogger=DEBUG, stdout
+log4j.rootLogger=WARN, B
-log4j.logger.org.apache.activemq.spring=WARN
+log4j.additivity.org.apache.activemq.transport.TransportLogger=false
+log4j.logger.org.apache.activemq.transport.TransportLogger=DEBUG, A
-# CONSOLE appender not used by default
+# CONSOLE appender, not used by default
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
\ No newline at end of file
+log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
+
+# File appender for transport level output
+log4j.appender.A=org.apache.log4j.FileAppender
+log4j.appender.A.File=transportlog
+log4j.appender.A.BufferedIO=false
+log4j.appender.A.layout=org.apache.log4j.PatternLayout
+log4j.appender.A.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
+
+# File appender for normal output
+log4j.appender.B=org.apache.log4j.FileAppender
+log4j.appender.B.File=applog
+log4j.appender.B.BufferedIO=false
+log4j.appender.B.layout=org.apache.log4j.PatternLayout
+log4j.appender.B.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
+
|