This is an automated email from the ASF dual-hosted git repository.
robbie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-jms.git
commit 1cd565a54b8a0928e61a8ca40432f07ffd1c873b
Author: Robbie Gemmell <rob...@apache.org>
AuthorDate: Fri May 15 16:45:13 2020 +0100
QPIDJMS-503: update to latest version, fix duplicate log entries, simplify
config, remove superfluous file appender
Closes #36 in concert with 2f547a288ead1f9ce32481a8a4e07aacceae2c11
---
pom.xml | 2 +-
.../src/test/resources/log4j2-test.properties | 32 +++++---
.../src/test/resources/log4j2.properties | 79 ------------------
.../src/main/resources/log4j2.properties | 9 +-
.../src/test/resources/log4j2-test.properties | 40 ++++++---
.../src/test/resources/log4j2.properties | 96 ----------------------
6 files changed, 54 insertions(+), 204 deletions(-)
diff --git a/pom.xml b/pom.xml
index 80cce27..bc6ff5a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,7 @@
<proton-version>0.33.4</proton-version>
<netty-version>4.1.49.Final</netty-version>
<slf4j-version>1.7.30</slf4j-version>
- <log4j-slf4j-version>2.13.2</log4j-slf4j-version>
+ <log4j-slf4j-version>2.13.3</log4j-slf4j-version>
<geronimo.jms.2.spec.version>1.0-alpha-2</geronimo.jms.2.spec.version>
<!-- 'Provided'/Test Dependency Versions for this Project -->
diff --git a/qpid-jms-examples/src/main/resources/log4j2.properties
b/qpid-jms-client/src/test/resources/log4j2-test.properties
similarity index 59%
copy from qpid-jms-examples/src/main/resources/log4j2.properties
copy to qpid-jms-client/src/test/resources/log4j2-test.properties
index c33a737..d597c51 100644
--- a/qpid-jms-examples/src/main/resources/log4j2.properties
+++ b/qpid-jms-client/src/test/resources/log4j2-test.properties
@@ -17,19 +17,29 @@
# under the License.
#
-name=ExamplesPropertiesConfig
+name=ClientModuleTestPropertiesConfig
status=warn
-appender.console.type = Console
-appender.console.name = STDOUT
-appender.console.layout.type = PatternLayout
-appender.console.layout.pattern=%d [%-15.15t] - %-5p %-30.30c{1} - %m%n
+appender.console.type=Console
+appender.console.name=STDOUT
+appender.console.layout.type=PatternLayout
+appender.console.layout.pattern=%d [%-15.15t] - %-5p %-30.30c{1} - %m%n
-rootLogger.level = info
-rootLogger.appenderRef.stdout.ref = STDOUT
+rootLogger.level=trace
+rootLogger.appenderRef.console.ref=STDOUT
-logger.examples.name = org.apache.qpid.jms
-logger.examples.level = WARN
-logger.examples.additivity = false
-logger.examples.appenderRef.console.ref = STDOUT
+logger.jms.name=org.apache.qpid.jms
+logger.jms.level=debug
+logger.provider.name=org.apache.qpid.jms.provider
+logger.provider.level=trace
+
+logger.testpeer.name=org.apache.qpid.jms.test.testpeer
+logger.testpeer.level=trace
+
+# Calm down MiniKdc OpenDirectory
+logger.directory.name=org.apache.directory
+logger.directory.level=warn
+
+logger.jdbm.name=jdbm
+logger.jdbm.level=warn
diff --git a/qpid-jms-client/src/test/resources/log4j2.properties
b/qpid-jms-client/src/test/resources/log4j2.properties
deleted file mode 100644
index cc3deac..0000000
--- a/qpid-jms-client/src/test/resources/log4j2.properties
+++ /dev/null
@@ -1,79 +0,0 @@
-## ---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements. See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License. You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---------------------------------------------------------------------------
-
-#
-# The logging properties used during tests..
-#
-
-name=TestPropertiesConfig
-status=warn
-
-filter.threshold.type=ThresholdFilter
-filter.threshold.level=trace
-
-appenders=console,file
-
-appender.console.type=Console
-appender.console.name=STDOUT
-appender.console.layout.type=PatternLayout
-appender.console.layout.pattern=%d [%-15.15t] - %-5p %-30.30c{1} - %m%n
-appender.console.filter.threshold.type=ThresholdFilter
-appender.console.filter.threshold.level=trace
-
-appender.file.type=File
-appender.file.name=FILE
-appender.file.fileName=target/activemq-test.log
-appender.file.layout.type=PatternLayout
-appender.file.layout.pattern=%d [%-15.15t] - %-5p %-30.30c{1} - %m%n
-
-loggers=jms,provider,directory,jdbm,testpeer
-
-logger.jms.name=org.apache.qpid.jms
-logger.jms.level=debug
-logger.jms.additivity=false
-logger.jms.appenderRefs=console,file
-logger.jms.appenderRef.file.ref=FILE
-logger.jms.appenderRef.console.ref=STDOUT
-
-logger.provider.name=org.apache.qpid.jms.provider
-logger.provider.level=trace
-logger.provider.appenderRefs=console,file
-logger.provider.appenderRef.file.ref=FILE
-logger.provider.appenderRef.console.ref=STDOUT
-
-logger.directory.name=org.apache.directory
-logger.directory.level=warn
-logger.directory.appenderRefs=console,file
-logger.directory.appenderRef.file.ref=FILE
-logger.directory.appenderRef.console.ref=STDOUT
-
-logger.jdbm.name=jdbm
-logger.jdbm.level=warn
-logger.jdbm.appenderRefs=console,file
-logger.jdbm.appenderRef.file.ref=FILE
-logger.jdbm.appenderRef.console.ref=STDOUT
-
-logger.testpeer.name=org.apache.qpid.jms.test.testpeer
-logger.testpeer.level=trace
-logger.testpeer.appenderRefs=console,file
-logger.testpeer.appenderRef.file.ref=FILE
-logger.testpeer.appenderRef.console.ref=STDOUT
-
-rootLogger.level=trace
-rootLogger.appenderRefs=console,file
-rootLogger.appenderRef.console.ref=STDOUT
-rootLogger.appenderRef.file.ref=FILE
diff --git a/qpid-jms-examples/src/main/resources/log4j2.properties
b/qpid-jms-examples/src/main/resources/log4j2.properties
index c33a737..252d11f 100644
--- a/qpid-jms-examples/src/main/resources/log4j2.properties
+++ b/qpid-jms-examples/src/main/resources/log4j2.properties
@@ -26,10 +26,7 @@ appender.console.layout.type = PatternLayout
appender.console.layout.pattern=%d [%-15.15t] - %-5p %-30.30c{1} - %m%n
rootLogger.level = info
-rootLogger.appenderRef.stdout.ref = STDOUT
-
-logger.examples.name = org.apache.qpid.jms
-logger.examples.level = WARN
-logger.examples.additivity = false
-logger.examples.appenderRef.console.ref = STDOUT
+rootLogger.appenderRef.console.ref = STDOUT
+logger.qpid.name = org.apache.qpid.jms
+logger.qpid.level = WARN
diff --git a/qpid-jms-examples/src/main/resources/log4j2.properties
b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/resources/log4j2-test.properties
similarity index 51%
copy from qpid-jms-examples/src/main/resources/log4j2.properties
copy to
qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/resources/log4j2-test.properties
index c33a737..1812985 100644
--- a/qpid-jms-examples/src/main/resources/log4j2.properties
+++
b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/resources/log4j2-test.properties
@@ -17,19 +17,37 @@
# under the License.
#
-name=ExamplesPropertiesConfig
+name=ActiveMQInteropModuleTestPropertiesConfig
status=warn
-appender.console.type = Console
-appender.console.name = STDOUT
-appender.console.layout.type = PatternLayout
-appender.console.layout.pattern=%d [%-15.15t] - %-5p %-30.30c{1} - %m%n
+appender.console.type=Console
+appender.console.name=STDOUT
+appender.console.layout.type=PatternLayout
+appender.console.layout.pattern=%d [%-15.15t] - %-5p %-30.30c{1} - %m%n
-rootLogger.level = info
-rootLogger.appenderRef.stdout.ref = STDOUT
+rootLogger.level=info
+rootLogger.appenderRef.console.ref=STDOUT
-logger.examples.name = org.apache.qpid.jms
-logger.examples.level = WARN
-logger.examples.additivity = false
-logger.examples.appenderRef.console.ref = STDOUT
+logger.jms.name=org.apache.qpid.jms
+logger.jms.level=debug
+logger.provider.name=org.apache.qpid.jms.provider
+logger.provider.level=trace
+
+logger.jmsframes.name=org.apache.qpid.jms.provider.amqp.FRAMES
+logger.jmsframes.level=info
+
+logger.activemq.name=org.apache.activemq
+logger.activemq.level=info
+
+logger.broker.name=org.apache.activemq.broker
+logger.broker.level=info
+
+logger.ws.name=org.apache.activemq.transport.ws
+logger.ws.level=debug
+
+logger.amqp.name=org.apache.activemq.transport.amqp
+logger.amqp.level=debug
+
+logger.frames.name=org.apache.activemq.transport.amqp.FRAMES
+logger.frames.level=info
diff --git
a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/resources/log4j2.properties
b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/resources/log4j2.properties
deleted file mode 100644
index f065359..0000000
---
a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/resources/log4j2.properties
+++ /dev/null
@@ -1,96 +0,0 @@
-## ---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements. See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License. You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---------------------------------------------------------------------------
-
-#
-# The logging properties used during tests..
-#
-name=IntegrationTestPropertiesConfig
-status=warn
-
-appenders=console,file
-
-appender.console.type=Console
-appender.console.name=STDOUT
-appender.console.layout.type=PatternLayout
-appender.console.layout.pattern=%d [%-15.15t] - %-5p %-30.30c{1} - %m%n
-
-appender.file.type=File
-appender.file.name=FILE
-appender.file.fileName=target/activemq-test.log
-appender.file.layout.type=PatternLayout
-appender.file.layout.pattern=%d [%-15.15t] - %-5p %-30.30c{1} - %m%n
-
-loggers=jms,provider,jmsamqp,jmsframes,activemq,broker,ws,amqp,frames
-
-logger.jms.name=org.apache.qpid.jms
-logger.jms.level=trace
-logger.jms.appenderRefs=console,file
-logger.jms.appenderRef.file.ref=FILE
-logger.jms.appenderRef.console.ref=STDOUT
-
-logger.provider.name=org.apache.qpid.jms.provider
-logger.provider.level=trace
-logger.provider.appenderRefs=console,file
-logger.provider.appenderRef.file.ref=FILE
-logger.provider.appenderRef.console.ref=STDOUT
-
-logger.jmsamqp.name=org.apache.qpid.jms.provider.amqp
-logger.jmsamqp.level=trace
-logger.jmsamqp.appenderRefs=console,file
-logger.jmsamqp.appenderRef.file.ref=FILE
-logger.jmsamqp.appenderRef.console.ref=STDOUT
-
-logger.jmsframes.name=org.apache.qpid.jms.provider.amqp.FRAMES
-logger.jmsframes.level=trace
-logger.jmsframes.appenderRefs=console,file
-logger.jmsframes.appenderRef.file.ref=FILE
-logger.jmsframes.appenderRef.console.ref=STDOUT
-
-logger.activemq.name=org.apache.activemq
-logger.activemq.level=info
-logger.activemq.appenderRefs=console,file
-logger.activemq.appenderRef.file.ref=FILE
-logger.activemq.appenderRef.console.ref=STDOUT
-
-logger.broker.name=org.apache.activemq.broker
-logger.broker.level=info
-logger.broker.appenderRefs=console,file
-logger.broker.appenderRef.file.ref=FILE
-logger.broker.appenderRef.console.ref=STDOUT
-
-logger.ws.name=org.apache.activemq.transport.ws
-logger.ws.level=debug
-logger.ws.appenderRefs=console,file
-logger.ws.appenderRef.file.ref=FILE
-logger.ws.appenderRef.console.ref=STDOUT
-
-logger.amqp.name=org.apache.activemq.transport.amqp
-logger.amqp.level=debug
-logger.amqp.appenderRefs=console,file
-logger.amqp.appenderRef.file.ref=FILE
-logger.amqp.appenderRef.console.ref=STDOUT
-
-logger.frames.name=org.apache.activemq.transport.amqp.FRAMES
-logger.frames.level=info
-logger.frames.appenderRefs=console,file
-logger.frames.appenderRef.file.ref=FILE
-logger.frames.appenderRef.console.ref=STDOUT
-
-rootLogger.level=info
-rootLogger.appenderRefs=console,file
-rootLogger.appenderRef.console.ref=STDOUT
-rootLogger.appenderRef.file.ref=FILE
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
