jbertram commented on code in PR #5477:
URL: https://github.com/apache/activemq-artemis/pull/5477#discussion_r1934616483
##########
artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationParserTest.java:
##########
@@ -56,6 +56,66 @@
public class FileConfigurationParserTest extends ServerTestBase {
+ private static String firstPart = """
+ <core xmlns="urn:activemq:core">
+ <name>ActiveMQ.main.config</name>
+
<log-delegate-factory-class-name>org.apache.activemq.artemis.integration.logging.Log4jLogDelegateFactory</log-delegate-factory-class-name>
+
<bindings-directory>${jboss.server.data.dir}/activemq/bindings</bindings-directory>
+
<journal-directory>${jboss.server.data.dir}/activemq/journal</journal-directory>
+ <journal-min-files>10</journal-min-files>
+
<large-messages-directory>${jboss.server.data.dir}/activemq/largemessages</large-messages-directory>
+
<paging-directory>${jboss.server.data.dir}/activemq/paging</paging-directory>
+ <connectors>
+ <connector name="netty">tcp://localhost:61616</connector>
+ <connector name="netty-throughput">tcp://localhost:5545</connector>
+ <connector name="in-vm">vm://0</connector>
+ </connectors>
+ <acceptors>
+ <acceptor name="netty">tcp://localhost:5545</acceptor>
+ <acceptor name="netty-throughput">tcp://localhost:5545</acceptor>
+ <acceptor name="in-vm">vm://0</acceptor>
+ </acceptors>
+ <security-settings>
+ <security-setting match="#">
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
+ <permission type="createDurableQueue" roles="guest"/>
+ <permission type="deleteDurableQueue" roles="guest"/>
+ <permission type="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
+ <address-settings>
+ <address-setting match="#">
+ <dead-letter-address>DLQ</dead-letter-address>
+ <expiry-address>ExpiryQueue</expiry-address>
+ <redelivery-delay>0</redelivery-delay>
+ <max-size-bytes>10485760</max-size-bytes>
+
<message-counter-history-day-limit>10</message-counter-history-day-limit>
+ <address-full-policy>BLOCK</address-full-policy>
+ </address-setting>
+ </address-settings>
+ """;
+
+ private static String lastPart = "</core>";
+
+ private static String bridgePart = """
Review Comment:
Fixed.
##########
tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/MirrorInfiniteRetryReplicaTest.java:
##########
@@ -153,18 +153,18 @@ private static void createMirroredServer(String
serverName,
private static void replaceLogs(File serverLocation) throws Exception {
File log4j = new File(serverLocation, "/etc/log4j2.properties");
- assertTrue(FileUtil.findReplace(log4j, "logger.artemis_utils.level=INFO",
- "logger.artemis_utils.level=INFO\n" +
"\n" +
-
"logger.endpoint.name=org.apache.activemq.artemis.core.replication.ReplicationEndpoint\n"
+
- "logger.endpoint.level=DEBUG\n" +
-
"logger.ackmanager.name=org.apache.activemq.artemis.protocol.amqp.connect.mirror.AckManager\n"
+
- "logger.ackmanager.level=INFO\n" +
-
-
"logger.mirrorTarget.name=org.apache.activemq.artemis.protocol.amqp.connect.mirror.AMQPMirrorControllerTarget\n"
+
- "logger.mirrorTarget.level=INFO\n" +
-
- "appender.console.filter.threshold.type
= ThresholdFilter\n" +
- "appender.console.filter.threshold.level
= trace"));
+ assertTrue(FileUtil.findReplace(log4j,
"logger.artemis_utils.level=INFO", """
+ logger.artemis_utils.level=INFO
+
+
logger.endpoint.name=org.apache.activemq.artemis.core.replication.ReplicationEndpoint
+ logger.endpoint.level=DEBUG
+
logger.ackmanager.name=org.apache.activemq.artemis.protocol.amqp.connect.mirror.AckManager
+ logger.ackmanager.level=INFO
+
logger.mirrorTarget.name=org.apache.activemq.artemis.protocol.amqp.connect.mirror.AMQPMirrorControllerTarget
+ logger.mirrorTarget.level=INFO
+ appender.console.filter.threshold.type = ThresholdFilter
+ appender.console.filter.threshold.level = trace\
+ """));
Review Comment:
Fixed.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: gitbox-unsubscr...@activemq.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: gitbox-unsubscr...@activemq.apache.org
For additional commands, e-mail: gitbox-h...@activemq.apache.org
For further information, visit: https://activemq.apache.org/contact
