You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2022/02/27 12:24:03 UTC
[activemq] branch main updated (094dbc8 -> e597017)
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/activemq.git.
from 094dbc8 [AMQ-8515] FailoverTransport should handle MaxFrameSizeExceededException (#785)
new 472dcf8 [AMQ-7426] Upgrade to log4j2
new e597017 Merge pull request #662 from jbonofre/AMQ-7426
The 11045 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
activemq-all/pom.xml | 21 +--
.../{log4j.properties => log4j2.properties} | 45 ++++--
activemq-amqp/pom.xml | 4 +-
activemq-amqp/src/test/resources/log4j.properties | 45 ------
.../src/test/resources/log4j2-test.properties | 74 +++++++++
activemq-broker/pom.xml | 10 +-
.../apache/activemq/util/DefaultTestAppender.java | 49 +++---
.../src/test/resources/log4j.properties | 42 -----
.../src/test/resources/log4j2-test.properties | 57 +++++++
activemq-client/pom.xml | 4 +-
.../src/test/resources/log4j.properties | 42 -----
.../src/test/resources/log4j2-test.properties | 55 +++++++
activemq-console/pom.xml | 12 +-
.../java/org/apache/activemq/console/Main.java | 2 +-
.../src/test/resources/log4j.properties | 66 --------
.../src/test/resources/log4j2-test.properties | 52 ++++++
activemq-http/pom.xml | 4 +-
activemq-http/src/test/resources/log4j.properties | 47 ------
.../src/test/resources/log4j2-test.properties | 67 ++++++++
activemq-itests-spring31/pom.xml | 8 +-
activemq-jaas/pom.xml | 14 +-
activemq-jaas/src/test/resources/log4j.properties | 36 -----
.../src/test/resources/log4j2-test.properties | 48 ++++++
activemq-jdbc-store/pom.xml | 8 +-
...lesTest.java => CommitsTheTransactionTest.java} | 101 +++---------
.../store/jdbc/adapter/JDBCTablesExistsTest.java | 127 +++++++++++++++
.../jdbc/adapter/TriesToCreateTablesTest.java | 128 +++++++++++++++
.../src/test/resources/log4j2-test.properties | 58 +++++++
activemq-jms-pool/pom.xml | 8 +-
.../PooledConnectionFactoryMaximumActiveTest.java | 7 +-
.../jms/pool/PooledConnectionFactoryTest.java | 7 +-
.../PooledSessionExhaustionBlockTimeoutTest.java | 5 +-
.../jms/pool/PooledSessionExhaustionTest.java | 5 +-
.../src/test/resources/log4j.properties | 38 -----
.../src/test/resources/log4j2-test.properties | 54 +++++++
activemq-kahadb-store/pom.xml | 9 +-
.../JournalCorruptionEofIndexRecoveryTest.java | 31 ++--
.../store/kahadb/disk/page/PageFileTest.java | 42 ++---
.../src/test/resources/log4j.properties | 42 -----
.../src/test/resources/log4j2-test.properties | 58 +++++++
activemq-karaf/pom.xml | 14 +-
activemq-log4j-appender/pom.xml | 33 +++-
.../activemq/util/JmsLogAppenderSupport.java | 32 ++--
.../apache/activemq/util/JndiJmsLogAppender.java | 10 +-
.../apache/activemq/util/JmsLogAppenderTest.java | 114 --------------
activemq-mqtt/pom.xml | 8 +-
activemq-mqtt/src/test/resources/log4j.properties | 36 -----
.../src/test/resources/log4j2-test.properties | 46 ++++++
activemq-partition/pom.xml | 29 +---
activemq-pool/pom.xml | 8 +-
activemq-ra/pom.xml | 4 +-
.../test/java/org/apache/activemq/ra/MDBTest.java | 83 +++-------
activemq-ra/src/test/resources/log4j.properties | 36 -----
.../src/test/resources/log4j2-test.properties | 48 ++++++
activemq-rar/pom.xml | 8 +-
activemq-rar/src/main/rar/log4j.properties | 35 -----
.../src/main/rar/log4j2.properties | 21 ++-
activemq-runtime-config/pom.xml | 8 +-
.../src/test/resources/log4j.properties | 36 -----
.../src/test/resources/log4j2-test.properties | 48 ++++++
activemq-shiro/pom.xml | 23 ++-
activemq-spring/pom.xml | 18 +--
.../src/test/resources/log4j.properties | 36 -----
.../src/test/resources/log4j2-test.properties | 48 ++++++
activemq-stomp/pom.xml | 8 +-
.../stomp/StompNIOSSLLargeMessageTest.java | 11 +-
activemq-stomp/src/test/resources/log4j.properties | 42 -----
.../src/test/resources/log4j2-test.properties | 47 ++++++
.../src/main/resources/log4j.properties | 29 ----
.../src/main/resources/log4j2.properties | 20 +--
activemq-unit-tests/pom.xml | 6 +
activemq-web-console/pom.xml | 12 +-
.../src/main/resources/log4j.properties | 38 -----
.../src/main/resources/log4j2.properties | 23 ++-
activemq-web-demo/pom.xml | 14 +-
.../src/main/resources/log4j.properties | 36 -----
.../src/main/resources/log4j2.properties | 48 ++++++
.../src/test/resources/log4j.properties | 36 -----
.../src/test/resources/log4j2-test.properties | 48 ++++++
activemq-web/pom.xml | 8 +-
assembly/pom.xml | 49 ++----
assembly/src/main/descriptors/common-bin.xml | 10 +-
assembly/src/release/conf/activemq.xml | 6 -
assembly/src/release/conf/log4j.properties | 89 -----------
assembly/src/release/conf/log4j2.properties | 113 +++++++++++++
.../conf/{log4j.properties => log4j2.properties} | 41 +++--
.../{log4j.properties => log4j2.properties} | 21 ++-
.../{log4j.properties => log4j2.properties} | 21 ++-
assembly/src/test/resources/log4j.properties | 33 ----
.../src/test/resources/log4j2-test.properties | 16 +-
pom.xml | 175 +++++++++++++++------
91 files changed, 1818 insertions(+), 1496 deletions(-)
rename activemq-all/src/main/resources/{log4j.properties => log4j2.properties} (58%)
delete mode 100644 activemq-amqp/src/test/resources/log4j.properties
create mode 100644 activemq-amqp/src/test/resources/log4j2-test.properties
delete mode 100644 activemq-broker/src/test/resources/log4j.properties
create mode 100644 activemq-broker/src/test/resources/log4j2-test.properties
delete mode 100644 activemq-client/src/test/resources/log4j.properties
create mode 100644 activemq-client/src/test/resources/log4j2-test.properties
delete mode 100644 activemq-console/src/test/resources/log4j.properties
create mode 100644 activemq-console/src/test/resources/log4j2-test.properties
delete mode 100644 activemq-http/src/test/resources/log4j.properties
create mode 100644 activemq-http/src/test/resources/log4j2-test.properties
delete mode 100644 activemq-jaas/src/test/resources/log4j.properties
create mode 100644 activemq-jaas/src/test/resources/log4j2-test.properties
rename activemq-jdbc-store/src/test/java/org/apache/activemq/store/jdbc/adapter/{DefaultJDBCAdapterDoCreateTablesTest.java => CommitsTheTransactionTest.java} (52%)
create mode 100644 activemq-jdbc-store/src/test/java/org/apache/activemq/store/jdbc/adapter/JDBCTablesExistsTest.java
create mode 100644 activemq-jdbc-store/src/test/java/org/apache/activemq/store/jdbc/adapter/TriesToCreateTablesTest.java
create mode 100644 activemq-jdbc-store/src/test/resources/log4j2-test.properties
delete mode 100644 activemq-jms-pool/src/test/resources/log4j.properties
create mode 100644 activemq-jms-pool/src/test/resources/log4j2-test.properties
delete mode 100644 activemq-kahadb-store/src/test/resources/log4j.properties
create mode 100644 activemq-kahadb-store/src/test/resources/log4j2-test.properties
delete mode 100644 activemq-log4j-appender/src/test/java/org/apache/activemq/util/JmsLogAppenderTest.java
delete mode 100644 activemq-mqtt/src/test/resources/log4j.properties
create mode 100644 activemq-mqtt/src/test/resources/log4j2-test.properties
delete mode 100644 activemq-ra/src/test/resources/log4j.properties
create mode 100644 activemq-ra/src/test/resources/log4j2-test.properties
delete mode 100644 activemq-rar/src/main/rar/log4j.properties
rename activemq-log4j-appender/src/test/resources/org/apache/activemq/util/test-log4j.properties => activemq-rar/src/main/rar/log4j2.properties (66%)
delete mode 100644 activemq-runtime-config/src/test/resources/log4j.properties
create mode 100644 activemq-runtime-config/src/test/resources/log4j2-test.properties
delete mode 100644 activemq-spring/src/test/resources/log4j.properties
create mode 100644 activemq-spring/src/test/resources/log4j2-test.properties
delete mode 100644 activemq-stomp/src/test/resources/log4j.properties
create mode 100644 activemq-stomp/src/test/resources/log4j2-test.properties
delete mode 100644 activemq-tooling/activemq-perf-maven-plugin/src/main/resources/log4j.properties
copy activemq-unit-tests/src/test/resources/ssl-domain-JaasDualAuthenticationNetworkBridge.properties => activemq-tooling/activemq-perf-maven-plugin/src/main/resources/log4j2.properties (64%)
delete mode 100644 activemq-web-console/src/main/resources/log4j.properties
copy assembly/src/release/conf/logging.properties => activemq-web-console/src/main/resources/log4j2.properties (64%)
delete mode 100644 activemq-web-demo/src/main/resources/log4j.properties
create mode 100644 activemq-web-demo/src/main/resources/log4j2.properties
delete mode 100644 activemq-web-demo/src/test/resources/log4j.properties
create mode 100644 activemq-web-demo/src/test/resources/log4j2-test.properties
delete mode 100644 assembly/src/release/conf/log4j.properties
create mode 100644 assembly/src/release/conf/log4j2.properties
rename assembly/src/release/examples/conf/{log4j.properties => log4j2.properties} (53%)
rename assembly/src/release/examples/openwire/advanced-scenarios/jms-example-queue/src/main/resources/{log4j.properties => log4j2.properties} (67%)
rename assembly/src/release/examples/openwire/advanced-scenarios/jms-example-topic/src/main/resources/{log4j.properties => log4j2.properties} (67%)
delete mode 100644 assembly/src/test/resources/log4j.properties
rename activemq-log4j-appender/src/test/resources/jndi.properties => assembly/src/test/resources/log4j2-test.properties (75%)