You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ro...@apache.org on 2022/07/06 15:16:37 UTC

[activemq-artemis] 01/01: squashed logging changes from Clebert + me, rebased onto main at 1c0a6d4091796362ff5c3ded15866bfdf7e57272

This is an automated email from the ASF dual-hosted git repository.

robbie pushed a commit to branch new-logging
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git

commit 2b1db131f371a9398c5f63897c26ce21024af395
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Mon Jun 27 12:55:13 2022 +0100

    squashed logging changes from Clebert + me, rebased onto main at 1c0a6d4091796362ff5c3ded15866bfdf7e57272
---
 .github/workflows/build.yml                        |    2 +
 .travis.yml                                        |   33 -
 artemis-cdi-client/pom.xml                         |   26 +-
 .../client/cdi/logger/ActiveMQCDILogger.java       |   26 +-
 artemis-cli/pom.xml                                |   19 +-
 .../artemis/cli/commands/Configurable.java         |    9 +-
 .../cli/commands/tools/xml/XMLMessageImporter.java |    5 +-
 .../cli/commands/tools/xml/XmlDataExporter.java    |   21 +-
 .../cli/commands/tools/xml/XmlDataImporter.java    |    7 +-
 .../bootstrap/ActiveMQBootstrapLogger.java         |   49 +-
 .../org/apache/activemq/cli/test/ArtemisTest.java  |   41 +-
 .../org/apache/activemq/cli/test/HashUtilTest.java |    7 +-
 artemis-commons/pom.xml                            |   33 +-
 .../core/server/ActiveMQScheduledComponent.java    |    7 +-
 .../artemis/core/server/NetworkHealthCheck.java    |    7 +-
 .../activemq/artemis/logs/ActiveMQUtilBundle.java  |   22 +-
 .../activemq/artemis/logs/ActiveMQUtilLogger.java  |  106 +-
 .../artemis/logs/AssertionLoggerHandler.java       |  138 +-
 .../apache/activemq/artemis/logs/AuditLogger.java  | 1837 ++++++++------------
 .../logs/JBossLoggingApacheLoggerBridge.java       |  134 --
 .../apache/activemq/artemis/utils/ByteUtil.java    |    2 +-
 .../activemq/artemis/utils/ClassloadingUtil.java   |    7 +-
 .../artemis/utils/DefaultSensitiveStringCodec.java |    5 +-
 .../activemq/artemis/utils/SizeAwareMetric.java    |    5 +-
 .../activemq/artemis/utils/SpawnedVMSupport.java   |    5 +-
 .../activemq/artemis/utils/ThreadDumpUtil.java     |    6 +-
 .../apache/activemq/artemis/utils/UTF8Util.java    |   13 +-
 .../activemq/artemis/utils/UUIDGenerator.java      |   13 +-
 .../artemis/utils/actors/OrderedExecutor.java      |    5 +-
 .../artemis/utils/actors/ProcessorBase.java        |    5 +-
 .../artemis/utils/actors/ThresholdActor.java       |    5 +-
 .../utils/collections/ConcurrentLongHashSet.java   |    5 +-
 .../utils/critical/CriticalAnalyzerImpl.java       |    5 +-
 .../artemis/utils/critical/CriticalMeasure.java    |    5 +-
 .../FluentPropertyBeanIntrospectorWithIgnores.java |    5 +-
 .../activemq/artemis/utils/ByteUtilTest.java       |    5 +-
 .../utils/DefaultSensitiveStringCodecTest.java     |    5 +-
 .../utils/actors/OrderedExecutorSanityTest.java    |    5 +-
 .../critical/MultiThreadCriticalMeasureTest.java   |    5 +-
 artemis-core-client-osgi/pom.xml                   |   31 +-
 artemis-core-client/pom.xml                        |   32 +-
 .../api/config/ActiveMQDefaultConfiguration.java   |    7 +-
 .../api/core/ChannelBroadcastEndpointFactory.java  |    5 +-
 .../artemis/api/core/JGroupsBroadcastEndpoint.java |    5 +-
 .../artemis/api/core/jgroups/JChannelManager.java  |    5 +-
 .../artemis/api/core/jgroups/JChannelWrapper.java  |    5 +-
 .../artemis/api/core/jgroups/JGroupsReceiver.java  |    5 +-
 .../artemis/core/client/ActiveMQClientLogger.java  |  456 ++---
 .../core/client/ActiveMQClientMessageBundle.java   |   52 +-
 .../core/client/impl/ClientConsumerImpl.java       |    5 +-
 .../core/client/impl/ClientProducerImpl.java       |    9 +-
 .../core/client/impl/ClientSessionFactoryImpl.java |    7 +-
 .../core/client/impl/ClientSessionImpl.java        |    7 +-
 .../core/client/impl/ServerLocatorImpl.java        |    5 +-
 .../artemis/core/client/impl/Topology.java         |    9 +-
 .../artemis/core/cluster/DiscoveryGroup.java       |    7 +-
 .../artemis/core/message/impl/CoreMessage.java     |    5 +-
 .../message/openmbean/MessageOpenTypeFactory.java  |    5 +-
 .../core/impl/ActiveMQClientProtocolManager.java   |    5 +-
 .../protocol/core/impl/ActiveMQSessionContext.java |   13 +-
 .../core/protocol/core/impl/ChannelImpl.java       |    5 +-
 .../protocol/core/impl/RemotingConnectionImpl.java |    5 +-
 .../artemis/core/remoting/CertificateUtil.java     |    5 +-
 .../remoting/impl/netty/CheckDependencies.java     |    5 +-
 .../core/remoting/impl/netty/NettyConnection.java  |    5 +-
 .../core/remoting/impl/netty/NettyConnector.java   |   17 +-
 .../remoting/impl/netty/TransportConstants.java    |    7 +-
 .../impl/ssl/DefaultOpenSSLContextFactory.java     |    4 +-
 .../impl/ssl/DefaultSSLContextFactory.java         |    2 +-
 .../core/protocol/AbstractRemotingConnection.java  |    5 +-
 .../core/remoting/ssl/OpenSSLContextFactory.java   |    5 +-
 .../spi/core/remoting/ssl/SSLContextFactory.java   |    5 +-
 .../activemq/artemis/utils/AutoCreateUtil.java     |    7 +-
 .../org/apache/activemq/artemis/utils/XMLUtil.java |    5 +-
 ...nnectorTransportConfigurationParserURITest.java |    5 +-
 artemis-features/src/main/resources/features.xml   |    4 +-
 artemis-jakarta-client/pom.xml                     |   21 +-
 artemis-jakarta-ra/pom.xml                         |   22 +-
 artemis-jakarta-server/pom.xml                     |   20 +-
 artemis-jakarta-service-extensions/pom.xml         |   28 +-
 artemis-jdbc-store/pom.xml                         |   21 +-
 .../jdbc/store/drivers/AbstractJDBCDriver.java     |   35 +-
 .../jdbc/store/drivers/JDBCConnectionProvider.java |   14 +-
 .../artemis/jdbc/store/drivers/JDBCUtils.java      |   11 +-
 .../jdbc/store/file/JDBCSequentialFile.java        |    5 +-
 .../jdbc/store/file/JDBCSequentialFileFactory.java |    8 +-
 .../file/JDBCSequentialFileFactoryDriver.java      |    7 +-
 .../jdbc/store/journal/JDBCJournalImpl.java        |    7 +-
 .../jdbc/store/journal/JDBCJournalRecord.java      |    7 +-
 .../jdbc/store/logging/LoggingConnection.java      |  112 +-
 .../store/logging/LoggingPreparedStatement.java    |  118 +-
 .../jdbc/store/logging/LoggingResultSet.java       |  395 +++--
 .../jdbc/store/logging/LoggingStatement.java       |  108 +-
 .../jdbc/store/sql/PropertySQLProvider.java        |   11 +-
 artemis-jms-client-osgi/pom.xml                    |   31 +-
 artemis-jms-client/pom.xml                         |   22 +-
 .../artemis/api/jms/ActiveMQJMSClient.java         |    7 +-
 .../jms/client/ActiveMQJMSClientBundle.java        |   23 +-
 .../jms/client/ActiveMQJMSClientLogger.java        |   43 +-
 .../jms/client/ActiveMQMessageProducer.java        |    5 +-
 .../org/apache/activemq/artemis/uri/TCPSchema.java |    7 +-
 .../artemis/uri/ConnectionFactoryURITest.java      |    7 +-
 artemis-jms-server/pom.xml                         |   18 +-
 .../jms/bridge/ActiveMQJMSBridgeLogger.java        |   81 +-
 .../artemis/jms/bridge/impl/JMSBridgeImpl.java     |  318 ++--
 .../jms/server/ActiveMQJMSServerBundle.java        |   24 +-
 .../jms/server/ActiveMQJMSServerLogger.java        |   88 +-
 artemis-journal/pom.xml                            |   36 +-
 .../artemis/core/io/AbstractSequentialFile.java    |    7 +-
 .../core/io/AbstractSequentialFileFactory.java     |    5 +-
 .../activemq/artemis/core/io/RunnableCallback.java |    5 +-
 .../artemis/core/io/aio/AIOSequentialFile.java     |   10 +-
 .../core/io/aio/AIOSequentialFileFactory.java      |   19 +-
 .../artemis/core/io/buffer/TimedBuffer.java        |    7 +-
 .../artemis/core/io/mapped/MappedFile.java         |    5 +-
 .../artemis/core/io/nio/NIOSequentialFile.java     |    9 +-
 .../activemq/artemis/core/io/util/FileIOUtil.java  |    5 +-
 .../core/journal/impl/JournalCompactor.java        |    5 +-
 .../artemis/core/journal/impl/JournalFileImpl.java |    5 +-
 .../core/journal/impl/JournalFilesRepository.java  |   13 +-
 .../artemis/core/journal/impl/JournalImpl.java     |   13 +-
 .../core/journal/impl/JournalTransaction.java      |    5 +-
 .../artemis/core/journal/impl/Reclaimer.java       |   15 +-
 .../artemis/journal/ActiveMQJournalBundle.java     |   14 +-
 .../artemis/journal/ActiveMQJournalLogger.java     |  218 +--
 .../apache/activemq/artemis/core/TestDeleteme.java |   29 +-
 artemis-junit/pom.xml                              |   14 +-
 artemis-log-facade/pom.xml                         |   78 +
 .../activemq/artemis/logprocessor/CodeFactory.java |   69 +
 {artemis-journal => artemis-log-processor}/pom.xml |   78 +-
 .../artemis/logprocessor/LogProcessor.java         |  402 +++++
 .../artemis/logprocessor/annotation/Cause.java     |   28 +-
 .../artemis/logprocessor/annotation/GetLogger.java |   28 +-
 .../artemis/logprocessor/annotation/LogBundle.java |   30 +-
 .../logprocessor/annotation/LogMessage.java        |   45 +-
 .../artemis/logprocessor/annotation/Message.java   |   32 +-
 .../services/javax.annotation.processing.Processor |    1 +
 .../activemq/artemis/logprocessor/MyException.java |   30 +-
 .../activemq/artemis/logprocessor/MyObject.java    |   31 +-
 .../artemis/logprocessor/SimpleBundle.java         |   63 +
 .../artemis/logprocessor/SimpleBundleTest.java     |   90 +
 artemis-protocols/artemis-amqp-protocol/pom.xml    |   33 +-
 .../amqp/broker/AMQPConnectionCallback.java        |    5 +-
 .../amqp/broker/AMQPLargeMessagePersister.java     |    2 -
 .../artemis/protocol/amqp/broker/AMQPMessage.java  |    5 +-
 .../protocol/amqp/broker/AMQPSessionCallback.java  |    5 +-
 .../amqp/broker/ProtonProtocolManager.java         |    7 +-
 .../amqp/client/ProtonClientConnectionManager.java |   17 +-
 .../amqp/connect/AMQPBrokerConnection.java         |   11 +-
 .../amqp/connect/AMQPBrokerConnectionManager.java  |    5 +-
 .../connect/mirror/AMQPMirrorControllerSource.java |    5 +-
 .../connect/mirror/AMQPMirrorControllerTarget.java |   11 +-
 .../amqp/connect/mirror/MirrorTransaction.java     |    7 +-
 .../protocol/amqp/converter/CoreAmqpConverter.java |    3 -
 .../converter/coreWrapper/CoreMessageWrapper.java  |    7 +-
 .../amqp/logger/ActiveMQAMQPProtocolLogger.java    |   45 +-
 .../logger/ActiveMQAMQPProtocolMessageBundle.java  |   50 +-
 .../amqp/proton/AMQPConnectionContext.java         |    5 +-
 .../protocol/amqp/proton/AMQPSessionContext.java   |    5 +-
 .../amqp/proton/ProtonServerReceiverContext.java   |    9 +-
 .../amqp/proton/ProtonServerSenderContext.java     |   11 +-
 .../amqp/proton/handler/ProtonHandler.java         |   19 +-
 .../transaction/ProtonTransactionHandler.java      |    5 +-
 .../amqp/sasl/ExternalServerSASLFactory.java       |    5 +-
 .../protocol/amqp/sasl/GSSAPIServerSASL.java       |    7 +-
 .../amqp/sasl/GSSAPIServerSASLFactory.java         |    5 +-
 .../amqp/sasl/scram/SCRAMServerSASLFactory.java    |    5 +-
 .../protocol/amqp/converter/TestConversions.java   |    5 +-
 artemis-protocols/artemis-mqtt-protocol/pom.xml    |   18 +-
 .../core/protocol/mqtt/MQTTConnectionManager.java  |    3 -
 .../artemis/core/protocol/mqtt/MQTTLogger.java     |   44 +-
 .../core/protocol/mqtt/MQTTProtocolHandler.java    |    9 +-
 .../core/protocol/mqtt/MQTTProtocolManager.java    |   16 +-
 .../core/protocol/mqtt/MQTTPublishManager.java     |   13 +-
 .../protocol/mqtt/MQTTRetainMessageManager.java    |    2 -
 .../artemis/core/protocol/mqtt/MQTTSession.java    |    9 +-
 .../core/protocol/mqtt/MQTTSessionCallback.java    |    3 -
 .../core/protocol/mqtt/MQTTSessionState.java       |    7 +-
 .../protocol/mqtt/MQTTSubscriptionManager.java     |    3 -
 .../artemis/core/protocol/mqtt/MQTTUtil.java       |    5 +-
 .../mqtt/MQTTRetainMessageManagerTest.java         |   19 +-
 .../core/protocol/mqtt/MqttClientService.java      |   15 +-
 .../artemis-openwire-protocol/pom.xml              |   12 +-
 .../core/protocol/openwire/OpenWireConnection.java |   44 +-
 .../protocol/openwire/OpenWireProtocolManager.java |    7 +-
 .../core/protocol/openwire/amq/AMQConsumer.java    |    7 +-
 .../core/protocol/openwire/amq/AMQSession.java     |   16 +-
 artemis-protocols/artemis-stomp-protocol/pom.xml   |   18 +-
 .../stomp/ActiveMQStompProtocolLogger.java         |   28 +-
 .../stomp/ActiveMQStompProtocolMessageBundle.java  |   52 +-
 .../core/protocol/stomp/StompConnection.java       |    7 +-
 .../core/protocol/stomp/StompProtocolManager.java  |    5 +-
 .../artemis/core/protocol/stomp/StompSession.java  |    9 +-
 .../protocol/stomp/v11/StompFrameHandlerV11.java   |    9 +-
 artemis-quorum-ri/pom.xml                          |   27 +-
 artemis-ra/pom.xml                                 |   33 +-
 .../activemq/artemis/ra/ActiveMQRABundle.java      |   18 +-
 .../artemis/ra/ActiveMQRABytesMessage.java         |  117 +-
 .../ra/ActiveMQRAConnectionFactoryImpl.java        |  120 +-
 .../artemis/ra/ActiveMQRAConnectionManager.java    |   17 +-
 .../artemis/ra/ActiveMQRAConnectionMetaData.java   |   37 +-
 .../ra/ActiveMQRAConnectionRequestInfo.java        |   61 +-
 .../activemq/artemis/ra/ActiveMQRACredential.java  |   45 +-
 .../artemis/ra/ActiveMQRALocalTransaction.java     |   21 +-
 .../activemq/artemis/ra/ActiveMQRALogger.java      |  112 +-
 .../artemis/ra/ActiveMQRAMCFProperties.java        |   33 +-
 .../artemis/ra/ActiveMQRAManagedConnection.java    |   67 +-
 .../ra/ActiveMQRAManagedConnectionFactory.java     |  100 +-
 .../activemq/artemis/ra/ActiveMQRAMapMessage.java  |  109 +-
 .../activemq/artemis/ra/ActiveMQRAMessage.java     |  217 +--
 .../artemis/ra/ActiveMQRAMessageConsumer.java      |   61 +-
 .../artemis/ra/ActiveMQRAMessageListener.java      |   14 +-
 .../artemis/ra/ActiveMQRAMessageProducer.java      |  113 +-
 .../activemq/artemis/ra/ActiveMQRAMetaData.java    |   25 +-
 .../artemis/ra/ActiveMQRAObjectMessage.java        |   17 +-
 .../activemq/artemis/ra/ActiveMQRAProperties.java  |   32 +-
 .../artemis/ra/ActiveMQRAQueueReceiver.java        |   13 +-
 .../activemq/artemis/ra/ActiveMQRAQueueSender.java |   29 +-
 .../activemq/artemis/ra/ActiveMQRASession.java     |  352 ++--
 .../artemis/ra/ActiveMQRASessionFactoryImpl.java   |  151 +-
 .../artemis/ra/ActiveMQRAStreamMessage.java        |  105 +-
 .../activemq/artemis/ra/ActiveMQRATextMessage.java |   17 +-
 .../artemis/ra/ActiveMQRATopicPublisher.java       |   45 +-
 .../artemis/ra/ActiveMQRATopicSubscriber.java      |   17 +-
 .../activemq/artemis/ra/ActiveMQRAXAResource.java  |   48 +-
 .../activemq/artemis/ra/ActiveMQRaUtils.java       |    5 +-
 .../artemis/ra/ActiveMQResourceAdapter.java        |   37 +-
 .../artemis/ra/ConnectionFactoryProperties.java    |  260 +--
 .../artemis/ra/inflow/ActiveMQActivation.java      |   11 +-
 .../artemis/ra/inflow/ActiveMQActivationSpec.java  |    5 +-
 .../artemis/ra/inflow/ActiveMQMessageHandler.java  |    7 +-
 .../artemis/ra/recovery/RecoveryManager.java       |   11 +-
 artemis-rest/pom.xml                               |   25 +-
 .../activemq/artemis/rest/ActiveMQRestLogger.java  |   62 +-
 .../artemis/rest/MessageServiceManager.java        |    8 +-
 .../rest/queue/AcknowledgedQueueConsumer.java      |    9 +-
 .../artemis/rest/queue/ConsumedMessage.java        |    7 +-
 .../artemis/rest/queue/ConsumersResource.java      |   12 +-
 .../activemq/artemis/rest/queue/PostMessage.java   |   11 +-
 .../artemis/rest/queue/PostMessageDupsOk.java      |    9 +-
 .../artemis/rest/queue/PostMessageNoDups.java      |    7 +-
 .../activemq/artemis/rest/queue/QueueConsumer.java |   16 +-
 .../rest/queue/QueueDestinationsResource.java      |    7 +-
 .../activemq/artemis/rest/queue/QueueResource.java |   11 +-
 .../queue/push/PushConsumerMessageHandler.java     |   12 +-
 .../rest/queue/push/PushConsumerResource.java      |   11 +-
 .../artemis/rest/queue/push/UriStrategy.java       |   16 +-
 .../rest/topic/PushSubscriptionsResource.java      |   11 +-
 .../artemis/rest/topic/SubscriptionsResource.java  |   18 +-
 .../rest/topic/TopicDestinationsResource.java      |    7 +-
 .../activemq/artemis/rest/topic/TopicResource.java |   11 +-
 .../artemis/rest/util/HttpMessageHelper.java       |   12 +-
 .../activemq/artemis/rest/util/TimeoutTask.java    |    9 +-
 artemis-selector/pom.xml                           |    5 -
 .../artemis/selector/SelectorParserTest.java       |    5 +-
 artemis-server-osgi/pom.xml                        |   30 +-
 .../activemq/artemis/osgi/ActiveMQOsgiLogger.java  |   48 +-
 artemis-server/pom.xml                             |   26 +-
 .../core/config/impl/ConfigurationImpl.java        |    5 +-
 .../core/config/impl/LegacyJMSConfiguration.java   |    5 +-
 .../deployers/impl/FileConfigurationParser.java    |    7 +-
 .../artemis/core/filter/impl/FilterImpl.java       |   11 +-
 .../management/impl/ActiveMQServerControlImpl.java |    5 +-
 .../core/management/impl/AddressControlImpl.java   |   20 +-
 .../core/management/impl/QueueControlImpl.java     |    5 +-
 .../core/paging/cursor/PagedReferenceImpl.java     |    5 +-
 .../paging/cursor/impl/PageCursorProviderImpl.java |   28 +-
 .../cursor/impl/PageSubscriptionCounterImpl.java   |    5 +-
 .../paging/cursor/impl/PageSubscriptionImpl.java   |   43 +-
 .../activemq/artemis/core/paging/impl/Page.java    |   10 +-
 .../artemis/core/paging/impl/PageCache.java        |    5 +-
 .../artemis/core/paging/impl/PageReadWriter.java   |   11 +-
 .../core/paging/impl/PageTransactionInfoImpl.java  |    5 +-
 .../core/paging/impl/PagingManagerImpl.java        |    9 +-
 .../artemis/core/paging/impl/PagingStoreImpl.java  |   25 +-
 .../journal/AbstractJournalStorageManager.java     |    9 +-
 .../impl/journal/BatchingIDGenerator.java          |    5 +-
 .../persistence/impl/journal/DescribeJournal.java  |    5 +-
 .../impl/journal/JournalStorageManager.java        |    5 +-
 .../core/persistence/impl/journal/LargeBody.java   |    7 +-
 .../impl/journal/LargeServerMessageImpl.java       |    5 +-
 .../impl/journal/LargeServerMessageInSync.java     |    5 +-
 .../artemis/core/postoffice/impl/BindingsImpl.java |   13 +-
 .../postoffice/impl/InMemoryDuplicateIDCache.java  |   43 +-
 .../core/postoffice/impl/LocalQueueBinding.java    |    5 +-
 .../impl/PersistentDuplicateIDCache.java           |   51 +-
 .../core/postoffice/impl/PostOfficeImpl.java       |   25 +-
 .../core/postoffice/impl/SimpleAddressManager.java |    5 +-
 .../protocol/core/ServerSessionPacketHandler.java  |    5 +-
 .../protocol/core/impl/ActiveMQPacketHandler.java  |    5 +-
 .../protocol/core/impl/CoreProtocolManager.java    |    5 +-
 .../core/remoting/impl/invm/InVMAcceptor.java      |    5 +-
 .../core/remoting/impl/invm/InVMConnection.java    |    5 +-
 .../core/remoting/impl/invm/InVMConnector.java     |   10 +-
 .../core/remoting/impl/netty/NettyAcceptor.java    |   13 +-
 .../remoting/server/impl/RemotingServiceImpl.java  |   11 +-
 .../core/replication/ReplicatedJournal.java        |    5 +-
 .../core/replication/ReplicationEndpoint.java      |    5 +-
 .../core/replication/ReplicationManager.java       |   13 +-
 .../core/security/impl/SecurityStoreImpl.java      |    5 +-
 .../artemis/core/server/ActiveMQMessageBundle.java |  232 ++-
 .../artemis/core/server/ActiveMQServerLogger.java  | 1670 ++++++------------
 .../server/LoggingConfigurationFileReloader.java   |   89 -
 .../core/server/LoggingConfigurationUpdater.java   |  447 -----
 .../artemis/core/server/MemoryManager.java         |    9 +-
 .../activemq/artemis/core/server/NodeManager.java  |    5 +-
 .../artemis/core/server/cluster/BackupManager.java |    7 +-
 .../core/server/cluster/ClusterController.java     |    7 +-
 .../core/server/cluster/ClusterManager.java        |    7 +-
 .../core/server/cluster/impl/BridgeImpl.java       |    9 +-
 .../server/cluster/impl/BroadcastGroupImpl.java    |    5 +-
 .../cluster/impl/ClusterConnectionBridge.java      |    5 +-
 .../server/cluster/impl/ClusterConnectionImpl.java |    9 +-
 .../cluster/impl/RemoteQueueBindingImpl.java       |    5 +-
 .../cluster/qourum/SharedNothingBackupQuorum.java  |   15 +-
 .../federation/AbstractFederationStream.java       |    5 +-
 .../core/server/federation/FederatedAbstract.java  |    5 +-
 .../federation/FederatedQueueConsumerImpl.java     |    5 +-
 .../server/federation/FederationDownstream.java    |    5 +-
 .../server/federation/queue/FederatedQueue.java    |    5 +-
 .../artemis/core/server/files/FileMoveManager.java |   21 +-
 .../core/server/files/FileStoreMonitor.java        |    5 +-
 .../server/group/impl/LocalGroupingHandler.java    |    7 +-
 .../core/server/impl/ActiveMQServerImpl.java       |   25 +-
 .../artemis/core/server/impl/AddressInfo.java      |    6 +-
 .../impl/AnyLiveNodeLocatorForScaleDown.java       |    5 +-
 .../artemis/core/server/impl/DivertImpl.java       |    5 +-
 .../core/server/impl/FileBasedNodeManager.java     |    5 +-
 .../core/server/impl/FileLockNodeManager.java      |   14 +-
 .../artemis/core/server/impl/LastValueQueue.java   |    5 +-
 .../impl/LegacyLDAPSecuritySettingPlugin.java      |    9 +-
 .../core/server/impl/LiveOnlyActivation.java       |    5 +-
 .../impl/NamedLiveNodeLocatorForScaleDown.java     |    5 +-
 .../core/server/impl/PostOfficeJournalLoader.java  |   15 +-
 .../artemis/core/server/impl/QueueImpl.java        |   17 +-
 .../artemis/core/server/impl/QueueManagerImpl.java |    7 +-
 .../core/server/impl/QueueMessageMetrics.java      |    9 +-
 .../artemis/core/server/impl/RefsOperation.java    |    5 +-
 .../server/impl/ReplicationBackupActivation.java   |   21 +-
 .../artemis/core/server/impl/ReplicationError.java |    5 +-
 .../core/server/impl/ReplicationObserver.java      |    9 +-
 .../server/impl/ReplicationPrimaryActivation.java  |   17 +-
 .../core/server/impl/RoutingContextImpl.java       |    5 +-
 .../artemis/core/server/impl/ScaleDownHandler.java |    7 +-
 .../server/impl/ScheduledDeliveryHandlerImpl.java  |    5 +-
 .../core/server/impl/ServerConsumerImpl.java       |    9 +-
 .../core/server/impl/ServerSessionImpl.java        |    5 +-
 .../server/impl/SharedNothingBackupActivation.java |    5 +-
 .../server/impl/SharedNothingLiveActivation.java   |    9 +-
 .../server/impl/SharedStoreBackupActivation.java   |    5 +-
 .../server/impl/SharedStoreLiveActivation.java     |    5 +-
 .../server/impl/TransientQueueManagerImpl.java     |    5 +-
 .../impl/jdbc/ActiveMQScheduledLeaseLock.java      |   15 +-
 .../core/server/impl/jdbc/JdbcLeaseLock.java       |   39 +-
 .../core/server/impl/jdbc/JdbcNodeManager.java     |   97 +-
 .../server/impl/jdbc/JdbcSharedStateManager.java   |    9 +-
 .../quorum/ActivationSequenceStateMachine.java     |   30 +-
 .../server/management/ArtemisMBeanServerGuard.java |    9 +-
 .../server/management/ManagementConnector.java     |   13 +-
 .../management/impl/HawtioSecurityControlImpl.java |    8 +-
 .../management/impl/ManagementServiceImpl.java     |    5 +-
 .../core/server/metrics/MetricsManager.java        |    5 +-
 .../impl/BrokerMessageAuthorizationPlugin.java     |    5 +-
 .../plugin/impl/LoggingActiveMQServerPlugin.java   |  167 +-
 .../impl/LoggingActiveMQServerPluginLogger.java    |  154 +-
 .../impl/NotificationActiveMQServerPlugin.java     |    5 +-
 .../core/server/reload/ReloadManagerImpl.java      |    5 +-
 .../artemis/core/server/replay/ReplayManager.java  |    5 +-
 .../core/server/routing/ConnectionRouter.java      |    5 +-
 .../server/routing/ConnectionRouterManager.java    |    9 +-
 .../artemis/core/server/routing/KeyResolver.java   |   25 +-
 .../core/server/routing/caches/LocalCache.java     |    5 +-
 .../routing/policies/LeastConnectionsPolicy.java   |    5 +-
 .../core/server/routing/pools/AbstractPool.java    |    7 +-
 .../server/routing/targets/ActiveMQTarget.java     |    5 +-
 .../core/server/routing/targets/TargetMonitor.java |    5 +-
 .../impl/HierarchicalObjectRepository.java         |    5 +-
 .../core/transaction/impl/TransactionImpl.java     |    5 +-
 .../spi/core/protocol/EmbedMessageUtil.java        |    7 +-
 .../spi/core/protocol/MessagePersister.java        |    5 +-
 .../security/ActiveMQBasicSecurityManager.java     |    5 +-
 .../core/security/ActiveMQJAASSecurityManager.java |    5 +-
 .../core/security/ActiveMQSecurityManagerImpl.java |    5 +-
 .../jaas/AbstractPrincipalLoginModule.java         |    5 +-
 .../core/security/jaas/CertificateLoginModule.java |    5 +-
 .../jaas/ExternalCertificateLoginModule.java       |    5 +-
 .../spi/core/security/jaas/GuestLoginModule.java   |    5 +-
 .../spi/core/security/jaas/InVMLoginModule.java    |    5 +-
 .../spi/core/security/jaas/LDAPLoginModule.java    |    5 +-
 .../jaas/PrincipalConversionLoginModule.java       |    5 +-
 .../spi/core/security/jaas/PropertiesLoader.java   |    5 +-
 .../core/security/jaas/PropertiesLoginModule.java  |    5 +-
 .../core/security/jaas/ReloadableProperties.java   |    9 +-
 .../core/config/impl/ConfigurationImplTest.java    |    5 +-
 .../LoggingConfigurationFileReloaderTest.java      |  128 --
 .../core/security/jaas/GuestLoginModuleTest.java   |    5 +-
 .../security/jaas/JAASSecurityManagerTest.java     |    5 +-
 .../security/jaas/PropertiesLoginModuleTest.java   |    5 +-
 .../jaas/TextFileCertificateLoginModuleTest.java   |   10 +-
 .../core/server/files/FileStoreMonitorTest.java    |    5 +-
 .../server/impl/ScheduledDeliveryHandlerTest.java  |    5 +-
 .../core/transaction/impl/TransactionImplTest.java |    5 +-
 .../core/security/jaas/LDAPLoginModuleTest.java    |    5 +-
 .../artemis/tests/util/ActiveMQTestBase.java       |   19 +-
 .../activemq/artemis/tests/util/NoFilesBehind.java |    5 +-
 .../artemis/tests/util/NoProcessFilesBehind.java   |    5 +-
 .../activemq/artemis/uri/AcceptorParserTest.java   |   11 +-
 .../src/test/resources/reload-logging-1.properties |   21 -
 .../src/test/resources/reload-logging-2.properties |   21 -
 artemis-service-extensions/pom.xml                 |   42 +-
 .../extensions/ActiveMQServiceExtensionLogger.java |   28 +-
 .../xa/recovery/ActiveMQXARecoveryLogger.java      |   87 +-
 .../xa/recovery/ActiveMQXAResourceRecovery.java    |   23 +-
 .../xa/recovery/ActiveMQXAResourceWrapper.java     |   78 +-
 artemis-unit-test-support/pom.xml                  |    4 +-
 .../artemis/utils/CleanupSystemPropertiesRule.java |    5 +-
 .../apache/activemq/artemis/utils/RetryRule.java   |    5 +-
 .../artemis/utils/ThreadLeakCheckRule.java         |    5 +-
 .../org/apache/activemq/artemis/utils/Wait.java    |    5 +-
 artemis-web/pom.xml                                |   31 +-
 .../apache/activemq/artemis/ActiveMQWebLogger.java |   48 +-
 .../artemis/component/WebServerComponent.java      |    5 +-
 .../activemq/artemis/component/WebTmpCleaner.java  |    7 +-
 pom.xml                                            |   76 +-
 tests/activemq5-unit-tests/pom.xml                 |   16 -
 tests/artemis-test-support/pom.xml                 |    5 -
 .../apache/activemq/artemis/tests/util/Jmx.java    |    8 +-
 .../apache/activemq/artemis/utils/ExecuteUtil.java |    5 +-
 tests/compatibility-tests/pom.xml                  |   30 +-
 .../e2e/brokerConnection/ChainedMirrorTest.java    |    3 -
 .../DualMirrorFailoverWithContainerTest.java       |    5 +-
 .../e2e/brokerConnection/QpidDispatchPeerTest.java |    9 +-
 .../e2e/brokerConnection/SplitMirrorTest.java      |    3 -
 tests/extra-tests/pom.xml                          |   28 +-
 .../artemis/tests/extras/jms/xa/XATest.java        |   10 +-
 tests/integration-tests/pom.xml                    |   30 +-
 .../integration/MultiThreadedAuditLoggingTest.java |   12 +-
 .../integration/amqp/AmqpIngressTimestampTest.java |    2 +-
 .../client/ExpireTestOnRestartTest.java            |    2 +-
 .../failover/MultipleServerFailoverTestBase.java   |    6 +-
 .../tests/integration/jms/client/MessageTest.java  |   12 +-
 .../jms/client/MoveMessageDuplicateIDTest.java     |    4 +-
 .../jms/client/NewQueueRequestorTest.java          |    2 +-
 .../integration/management/QueueControlTest.java   |    2 +-
 .../tests/integration/mqtt5/MQTT5TestSupport.java  |    4 +-
 .../integration/openwire/SimpleOpenWireTest.java   |    2 +-
 .../integration/paging/AddressFullLoggingTest.java |   13 +-
 .../integration/server/NetworkHealthCheckTest.java |   13 +-
 .../integration/server/SimpleStartStopTest.java    |    5 +-
 .../integration/stomp/v11/ExtraStompTest.java      |    4 +-
 .../tests/integration/stomp/v11/StompV11Test.java  |    2 +-
 .../tests/integration/stomp/v12/StompV12Test.java  |   12 +-
 tests/jms-tests/pom.xml                            |   26 +-
 .../artemis/jms/tests/AcknowledgementTest.java     |  114 +-
 .../artemis/jms/tests/ActiveMQServerTestCase.java  |   12 +-
 .../jms/tests/AutoAckMessageListenerTest.java      |   20 +-
 .../artemis/jms/tests/ConnectionClosedTest.java    |    8 +-
 .../artemis/jms/tests/ConnectionFactoryTest.java   |   12 +-
 .../activemq/artemis/jms/tests/ConnectionTest.java |    8 +-
 .../artemis/jms/tests/ConsumerClosedTest.java      |    8 +-
 .../apache/activemq/artemis/jms/tests/JMSTest.java |    6 +-
 .../artemis/jms/tests/MessageConsumerTest.java     |  104 +-
 .../artemis/jms/tests/MessageProducerTest.java     |   10 +-
 .../artemis/jms/tests/PersistenceTest.java         |    6 +-
 .../jms/tests/TemporaryDestinationTest.java        |    6 +-
 .../artemis/jms/tests/TransactedSessionTest.java   |   20 +-
 .../jms/tests/message/JMSExpirationHeaderTest.java |   23 +-
 .../artemis/jms/tests/message/MessageBodyTest.java |   11 +-
 .../jms/tests/message/MessageHeaderTest.java       |   21 +-
 .../artemis/jms/tests/message/MessageTestBase.java |    8 +-
 .../message/foreign/ForeignBytesMessageTest.java   |    6 +-
 .../message/foreign/ForeignMapMessageTest.java     |    6 +-
 .../tests/message/foreign/ForeignMessageTest.java  |    6 +-
 .../message/foreign/ForeignObjectMessageTest.java  |    6 +-
 .../message/foreign/ForeignStreamMessageTest.java  |    6 +-
 .../artemis/jms/tests/selector/SelectorTest.java   |   26 +-
 .../artemis/jms/tests/tools/ServerManagement.java  |   17 +-
 .../jms/tests/tools/container/InVMContext.java     |   10 +-
 .../InVMInitialContextFactoryBuilder.java          |   11 +-
 .../jms/tests/tools/container/LocalTestServer.java |    7 +-
 .../artemis/jms/tests/util/JNDIUtilTest.java       |    5 +-
 .../artemis/jms/tests/util/ProxyAssertSupport.java |   73 +-
 tests/joram-tests/pom.xml                          |   21 +-
 .../artemis/common/testjndi/TestContext.java       |    7 +-
 tests/karaf-client-integration-tests/pom.xml       |   10 +-
 tests/performance-tests/pom.xml                    |   14 +-
 tests/smoke-tests/pom.xml                          |   20 +-
 .../bridgeTransfer/BridgeTransferingTest.java      |   11 +-
 .../DualMirrorNoContainerTest.java                 |    3 -
 .../brokerConnection/PagedMirrorSmokeTest.java     |    3 -
 .../tests/smoke/dnsswitch/DNSSwitchTest.java       |    5 +-
 .../infinite/InfiniteRedeliverySmokeTest.java      |    9 +-
 .../artemis/tests/smoke/jms/ManifestTest.java      |    2 -
 .../ReplicatedMultipleFailbackTest.java            |   27 +-
 .../tests/smoke/mmfactory/MMSFactoryTest.java      |   25 +-
 .../smoke/paging/FloodServerWithAsyncSendTest.java |   11 +-
 .../quorum/PluggableQuorumSinglePairTest.java      |   41 +-
 .../quorum/ZookeeperPluggableQuorumPeerTest.java   |   13 +-
 .../ZookeeperPluggableQuorumSinglePairTest.java    |    7 +-
 .../smoke/replicationflow/SoakPagingTest.java      |   17 +-
 .../core/journal/impl/JournalImplTestUnit.java     |    7 +-
 .../core/server/impl/QueueConcurrentTest.java      |    9 +-
 .../timing/jms/bridge/impl/JMSBridgeImplTest.java  |    9 +-
 tests/unit-tests/pom.xml                           |   29 +-
 .../artemis/tests/unit/AllClassesTest.java         |   15 +-
 .../asyncio/MultiThreadAsynchronousFileTest.java   |    5 +-
 .../core/journal/impl/AlignedJournalImplTest.java  |    9 +-
 .../journal/impl/JournaHistorylBackupTest.java     |    2 +-
 .../core/journal/impl/JournalImplTestBase.java     |    5 +-
 .../core/journal/impl/JournalImplTestUnit.java     |    7 +-
 .../unit/core/journal/impl/TimedBufferTest.java    |    9 +-
 .../unit/core/message/impl/MessageImplTest.java    |    7 +-
 .../unit/core/paging/impl/PagingStoreImplTest.java |   17 +-
 .../impl/WildcardAddressManagerUnitTest.java       |    7 +-
 .../tests/unit/core/server/impl/QueueImplTest.java |    7 +-
 .../unit/core/util/RandomUtilDistributionTest.java |    9 +-
 .../tests/unit/logging/AssertionLoggerTest.java    |    7 +-
 .../unit/ra/ActiveMQResourceAdapterConfigTest.java |    7 +-
 .../artemis/tests/unit/util/InVMContext.java       |    7 +-
 .../artemis/tests/unit/util/InVMNamingContext.java |    7 +-
 .../artemis/tests/unit/util/MemorySizeTest.java    |    5 +-
 .../artemis/tests/unit/util/ReusableLatchTest.java |    9 +-
 522 files changed, 7140 insertions(+), 8963 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 40b35843f0..3255c23d16 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -4,6 +4,7 @@ on: [push, pull_request, workflow_dispatch]
 
 jobs:
   test:
+    if: github.repository != 'apache/activemq-artemis' || github.event_name == 'workflow_dispatch' || github.event_name == 'pull_request'
     name: Test (${{ matrix.java }})
     runs-on: ubuntu-20.04
     strategy:
@@ -43,6 +44,7 @@ jobs:
           if [ -d ~/.m2/repository/org/apache/activemq ]; then find ~/.m2/repository/org/apache/activemq -name "*-SNAPSHOT" -type d -prune -exec rm -r '{}' \; ; fi
 
   checks:
+    if: github.repository != 'apache/activemq-artemis' || github.event_name == 'workflow_dispatch' || github.event_name == 'pull_request'
     name: Checks (${{ matrix.java }})
     runs-on: ubuntu-20.04
     strategy:
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index b0ea79e8be..0000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-language: java
-install: true
-matrix:
-  include:
-    - os: linux
-      jdk: openjdk11
-      env:
-        - EXAMPLES_PROFILE="release"
-    - os: linux
-      jdk: openjdk17
-      env:
-        - EXAMPLES_PROFILE="examples,noRun"
-
-# clean out Artemis artifacts from the cache
-before_install:
-- rm -rf $HOME/.m2/repository/org/apache/activemq/artemis-*
-
-# use 'install' so smoke-tests will work
-# use '-Pextra-tests' to ensure extra-tests compiles even though they won't actually run
-# By setting anything to org.apache.activemq.artemis.core.io.aio.AIOSequentialFileFactory.DISABLED we are disabling libaio loading on the testsuite
-script: 
-- set -e
-- mvn -s .github/maven-settings.xml -ntp -Dorg.apache.activemq.artemis.core.io.aio.AIOSequentialFileFactory.DISABLED=AnythingNotNull -Dmaven.test.redirectTestOutputToFile=true -Derrorprone -Pdev -Pfast-tests -Pextra-tests -Ptests-CI -Pjmh -B install
-- cd examples
-- mvn -s ../.github/maven-settings.xml verify -P${EXAMPLES_PROFILE} -B -q
-
-cache:
-  directories:
-  - $HOME/.m2
-before_cache:
-  - rm -rf $HOME/.m2/repository/org/apache/activemq/artemis-*
-  - rm -rf $HOME/.m2/repository/org/apache/activemq/*-artemis
-  - rm -rf $HOME/.m2/repository/org/apache/activemq/examples
diff --git a/artemis-cdi-client/pom.xml b/artemis-cdi-client/pom.xml
index 39ca575853..d7a71d12cd 100644
--- a/artemis-cdi-client/pom.xml
+++ b/artemis-cdi-client/pom.xml
@@ -35,29 +35,21 @@
    <name>ActiveMQ Artemis CDI Integration</name>
 
    <dependencies>
+      <!-- logging -->
       <dependency>
-         <groupId>org.jboss.logging</groupId>
-         <artifactId>jboss-logging-processor</artifactId>
-         <scope>provided</scope>
-         <optional>true</optional>
-      </dependency>
-      <dependency>
-         <groupId>org.jboss.logging</groupId>
-         <artifactId>jboss-logging-annotations</artifactId>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>artemis-log-processor</artifactId>
+         <version>${project.version}</version>
          <scope>provided</scope>
-         <optional>true</optional>
-      </dependency>
-      <dependency>
-         <groupId>org.jboss.logging</groupId>
-         <artifactId>jboss-logging</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.jboss.logmanager</groupId>
-         <artifactId>jboss-logmanager</artifactId>
+         <groupId>org.slf4j</groupId>
+         <artifactId>slf4j-api</artifactId>
       </dependency>
       <dependency>
-          <groupId>org.wildfly.common</groupId>
-          <artifactId>wildfly-common</artifactId>
+         <groupId>org.apache.logging.log4j</groupId>
+         <artifactId>log4j-slf4j-impl</artifactId>
+         <scope>test</scope>
       </dependency>
       <dependency>
          <groupId>org.apache.activemq</groupId>
diff --git a/artemis-cdi-client/src/main/java/org/apache/artemis/client/cdi/logger/ActiveMQCDILogger.java b/artemis-cdi-client/src/main/java/org/apache/artemis/client/cdi/logger/ActiveMQCDILogger.java
index f02d51b95b..4f75c76eeb 100644
--- a/artemis-cdi-client/src/main/java/org/apache/artemis/client/cdi/logger/ActiveMQCDILogger.java
+++ b/artemis-cdi-client/src/main/java/org/apache/artemis/client/cdi/logger/ActiveMQCDILogger.java
@@ -21,11 +21,9 @@ package org.apache.artemis.client.cdi.logger;
 
 import javax.enterprise.inject.spi.ProcessBean;
 
-import org.jboss.logging.BasicLogger;
-import org.jboss.logging.Logger;
-import org.jboss.logging.annotations.LogMessage;
-import org.jboss.logging.annotations.Message;
-import org.jboss.logging.annotations.MessageLogger;
+import org.apache.activemq.artemis.logprocessor.CodeFactory;
+import org.apache.activemq.artemis.logprocessor.annotation.LogBundle;
+import org.apache.activemq.artemis.logprocessor.annotation.LogMessage;
 
 /**
  * Logger code 57
@@ -41,24 +39,20 @@ import org.jboss.logging.annotations.MessageLogger;
  *
  * so an INFO message would be 571000 to 571999
  */
-@MessageLogger(projectCode = "AMQ")
-public interface ActiveMQCDILogger extends BasicLogger {
+@LogBundle(projectCode = "AMQ")
+public interface ActiveMQCDILogger {
 
-   ActiveMQCDILogger LOGGER = Logger.getMessageLogger(ActiveMQCDILogger.class, ActiveMQCDILogger.class.getPackage().getName());
+   ActiveMQCDILogger LOGGER = CodeFactory.getCodeClass(ActiveMQCDILogger.class, ActiveMQCDILogger.class.getPackage().getName());
 
-   @LogMessage
-   @Message(id = 571000, value = "Discovered configuration class {0}", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 571000, value = "Discovered configuration class {}", level = LogMessage.Level.INFO)
    void discoveredConfiguration(ProcessBean<?> pb);
 
-   @LogMessage
-   @Message(id = 571001, value = "Discovered client configuration class {0}", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 571001, value = "Discovered client configuration class {}", level = LogMessage.Level.INFO)
    void discoveredClientConfiguration(ProcessBean<?> pb);
 
-   @LogMessage(level = Logger.Level.DEBUG)
-   @Message(id = 573000, value = "Configuration found, not using built in configuration")
+   @LogMessage(id = 573000, value = "Configuration found, not using built in configuration", level = LogMessage.Level.DEBUG)
    void notUsingDefaultConfiguration();
 
-   @LogMessage(level = Logger.Level.DEBUG)
-   @Message(id = 573001, value = "Configuration found, not using built in configuration")
+   @LogMessage(id = 573001, value = "Configuration found, not using built in configuration", level = LogMessage.Level.DEBUG)
    void notUsingDefaultClientConfiguration();
 }
diff --git a/artemis-cli/pom.xml b/artemis-cli/pom.xml
index 85c360403d..7790de8818 100644
--- a/artemis-cli/pom.xml
+++ b/artemis-cli/pom.xml
@@ -82,22 +82,23 @@
          <groupId>org.apache.qpid</groupId>
          <artifactId>qpid-jms-client</artifactId>
       </dependency>
+      <!-- logging -->
       <dependency>
-         <groupId>org.jboss.logging</groupId>
-         <artifactId>jboss-logging-annotations</artifactId>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>artemis-log-processor</artifactId>
+         <version>${project.version}</version>
          <scope>provided</scope>
-         <optional>true</optional>
       </dependency>
       <dependency>
-         <groupId>org.jboss.logging</groupId>
-         <artifactId>jboss-logging-processor</artifactId>
-         <scope>provided</scope>
-         <optional>true</optional>
+         <groupId>org.slf4j</groupId>
+         <artifactId>slf4j-api</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.jboss.logging</groupId>
-         <artifactId>jboss-logging</artifactId>
+         <groupId>org.apache.logging.log4j</groupId>
+         <artifactId>log4j-slf4j-impl</artifactId>
+         <scope>runtime</scope> <!-- TODO: decide whether to only supply via assembly or here -->
       </dependency>
+
       <dependency>
          <groupId>io.airlift</groupId>
          <artifactId>airline</artifactId>
diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Configurable.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Configurable.java
index 686f042248..5767d57b75 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Configurable.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Configurable.java
@@ -33,14 +33,17 @@ import org.apache.activemq.artemis.core.config.FileDeploymentManager;
 import org.apache.activemq.artemis.core.config.impl.FileConfiguration;
 import org.apache.activemq.artemis.dto.BrokerDTO;
 import org.apache.activemq.artemis.dto.ManagementContextDTO;
-import org.apache.activemq.artemis.integration.bootstrap.ActiveMQBootstrapLogger;
 import org.apache.activemq.artemis.jms.server.config.impl.FileJMSConfiguration;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Abstract class where we can replace the configuration in various places *
  */
 public abstract class Configurable extends ActionAbstract {
 
+   private static final Logger logger = LoggerFactory.getLogger(Configurable.class);
+
    @Arguments(description = "Broker Configuration URI, default 'xml:${ARTEMIS_INSTANCE}/etc/bootstrap.xml'")
    String configuration;
 
@@ -55,7 +58,7 @@ public abstract class Configurable extends ActionAbstract {
    private FileConfiguration fileConfiguration;
 
    protected void treatError(Exception e, String group, String command) {
-      ActiveMQBootstrapLogger.LOGGER.debug(e.getMessage(), e);
+      logger.debug(e.getMessage(), e);
       System.err.println();
       System.err.println("Error:" + e.getMessage());
       System.err.println();
@@ -142,7 +145,7 @@ public abstract class Configurable extends ActionAbstract {
          // To support Windows paths as explained above.
          configuration = configuration.replace("\\", "/");
 
-         ActiveMQBootstrapLogger.LOGGER.usingBrokerConfig(configuration);
+         logger.debug("Using broker configuration: {}", configuration);
       }
 
       return configuration;
diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XMLMessageImporter.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XMLMessageImporter.java
index 78ae5ecb1d..c9383b9b6a 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XMLMessageImporter.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XMLMessageImporter.java
@@ -40,12 +40,13 @@ import org.apache.activemq.artemis.api.core.client.ClientMessage;
 import org.apache.activemq.artemis.api.core.client.ClientSession;
 import org.apache.activemq.artemis.utils.Base64;
 import org.apache.activemq.artemis.utils.UUIDGenerator;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /** This is an Utility class that will import the outputs in XML format. */
 public class XMLMessageImporter {
 
-   private static final Logger logger = Logger.getLogger(XMLMessageImporter.class);
+   private static final Logger logger = LoggerFactory.getLogger(XMLMessageImporter.class);
 
    private XMLStreamReader reader;
 
diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XmlDataExporter.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XmlDataExporter.java
index 117408224c..7a64dc06f4 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XmlDataExporter.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XmlDataExporter.java
@@ -62,13 +62,16 @@ import org.apache.activemq.artemis.core.persistence.impl.journal.codec.CursorAck
 import org.apache.activemq.artemis.core.persistence.impl.journal.codec.PageUpdateTXEncoding;
 import org.apache.activemq.artemis.core.persistence.impl.journal.codec.PersistentAddressBindingEncoding;
 import org.apache.activemq.artemis.core.persistence.impl.journal.codec.PersistentQueueBindingEncoding;
-import org.apache.activemq.artemis.core.server.ActiveMQServerLogger;
 import org.apache.activemq.artemis.core.server.JournalType;
 import org.apache.activemq.artemis.utils.collections.LinkedListIterator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 @Command(name = "exp", description = "Export all message-data using an XML that could be interpreted by any system.")
 public final class XmlDataExporter extends DBOption {
 
+   private static final Logger logger = LoggerFactory.getLogger(XmlDataExporter.class);
+
    private XMLStreamWriter xmlWriter;
 
    // an inner map of message refs hashed by the queue ID to which they belong and then hashed by their record ID
@@ -149,8 +152,8 @@ public final class XmlDataExporter extends DBOption {
       getBindings();
       processMessageJournal();
       printDataAsXML();
-      ActiveMQServerLogger.LOGGER.debug("\n\nProcessing took: " + (System.currentTimeMillis() - start) + "ms");
-      ActiveMQServerLogger.LOGGER.debug("Output " + messagesPrinted + " messages and " + bindingsPrinted + " bindings.");
+      logger.debug("\n\nProcessing took: {}ms", (System.currentTimeMillis() - start));
+      logger.debug("Output {} messages and {} bindings.", messagesPrinted, bindingsPrinted);
    }
 
    /**
@@ -169,7 +172,7 @@ public final class XmlDataExporter extends DBOption {
 
       Journal messageJournal = storageManager.getMessageJournal();
 
-      ActiveMQServerLogger.LOGGER.debug("Reading journal from " + config.getJournalDirectory());
+      logger.debug("Reading journal from {}", config.getJournalDirectory());
 
       messageJournal.start();
 
@@ -201,7 +204,7 @@ public final class XmlDataExporter extends DBOption {
                }
             }
 
-            ActiveMQServerLogger.LOGGER.debug(message.toString());
+            logger.debug(message.toString());
          }
       };
 
@@ -299,7 +302,7 @@ public final class XmlDataExporter extends DBOption {
 
       bindingsJournal.start();
 
-      ActiveMQServerLogger.LOGGER.debug("Reading bindings journal from " + config.getBindingsDirectory());
+      logger.debug("Reading bindings journal from {}", config.getBindingsDirectory());
 
       bindingsJournal.load(records, null, null);
 
@@ -396,11 +399,11 @@ public final class XmlDataExporter extends DBOption {
 
             if (pageStore != null) {
                File folder = pageStore.getFolder();
-               ActiveMQServerLogger.LOGGER.debug("Reading page store " + store + " folder = " + folder);
+               logger.debug("Reading page store {} folder = {}", store, folder);
 
                long pageId = pageStore.getFirstPage();
                for (long i = 0; i < pageStore.getNumberOfPages(); i++) {
-                  ActiveMQServerLogger.LOGGER.debug("Reading page " + pageId);
+                  logger.debug("Reading page {}", pageId);
                   Page page = pageStore.newPageObject(pageId);
                   page.open(false);
                   org.apache.activemq.artemis.utils.collections.LinkedList<PagedMessage> messages = page.read(storageManager);
@@ -445,7 +448,7 @@ public final class XmlDataExporter extends DBOption {
                   }
                }
             } else {
-               ActiveMQServerLogger.LOGGER.debug("Page store was null");
+               logger.debug("Page store was null");
             }
          }
       } catch (Exception e) {
diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XmlDataImporter.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XmlDataImporter.java
index 027db44cb3..f8baad2032 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XmlDataImporter.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XmlDataImporter.java
@@ -63,7 +63,8 @@ import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants;
 import org.apache.activemq.artemis.core.server.ActiveMQServerLogger;
 import org.apache.activemq.artemis.utils.ClassloadingUtil;
 import org.apache.activemq.artemis.utils.ListUtil;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Read XML output from <code>org.apache.activemq.artemis.core.persistence.impl.journal.XmlDataExporter</code>, create a core session, and
@@ -73,7 +74,7 @@ import org.jboss.logging.Logger;
 @Command(name = "imp", description = "Import all message-data using an XML that could be interpreted by any system.")
 public final class XmlDataImporter extends ActionAbstract {
 
-   private static final Logger logger = Logger.getLogger(XmlDataImporter.class);
+   private static final Logger logger = LoggerFactory.getLogger(XmlDataImporter.class);
 
    private XMLStreamReader reader;
 
@@ -329,7 +330,7 @@ public final class XmlDataImporter extends ActionAbstract {
 
       logMessage.delete(logMessage.length() - 2, logMessage.length()); // take off the trailing comma
       if (logger.isDebugEnabled()) {
-         logger.debug(logMessage);
+         logger.debug(logMessage.toString()); //TODO: this potentially expensive logMessage StringBuilder is still prepared even if debug isnt enabled
       }
 
       message.putBytesProperty(Message.HDR_ROUTE_TO_IDS, buffer.array());
diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/integration/bootstrap/ActiveMQBootstrapLogger.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/integration/bootstrap/ActiveMQBootstrapLogger.java
index fcadb24c32..f0c1904f95 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/integration/bootstrap/ActiveMQBootstrapLogger.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/integration/bootstrap/ActiveMQBootstrapLogger.java
@@ -16,12 +16,9 @@
  */
 package org.apache.activemq.artemis.integration.bootstrap;
 
-import org.jboss.logging.BasicLogger;
-import org.jboss.logging.Logger;
-import org.jboss.logging.annotations.Cause;
-import org.jboss.logging.annotations.LogMessage;
-import org.jboss.logging.annotations.Message;
-import org.jboss.logging.annotations.MessageLogger;
+import org.apache.activemq.artemis.logprocessor.CodeFactory;
+import org.apache.activemq.artemis.logprocessor.annotation.LogBundle;
+import org.apache.activemq.artemis.logprocessor.annotation.LogMessage;
 
 /**
  * Logger Code 10
@@ -37,47 +34,23 @@ import org.jboss.logging.annotations.MessageLogger;
  *
  * so an INFO message would be 101000 to 101999
  */
-@MessageLogger(projectCode = "AMQ")
-public interface ActiveMQBootstrapLogger extends BasicLogger {
+@LogBundle(projectCode = "AMQ")
+public interface ActiveMQBootstrapLogger {
 
-   /**
-    * The default logger.
-    */
-   ActiveMQBootstrapLogger LOGGER = Logger.getMessageLogger(ActiveMQBootstrapLogger.class, ActiveMQBootstrapLogger.class.getPackage().getName());
+   ActiveMQBootstrapLogger LOGGER = CodeFactory.getCodeClass(ActiveMQBootstrapLogger.class, ActiveMQBootstrapLogger.class.getPackage().getName());
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 101000, value = "Starting ActiveMQ Artemis Server", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 101000, value = "Starting ActiveMQ Artemis Server", level = LogMessage.Level.INFO)
    void serverStarting();
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 101001, value = "Stopping ActiveMQ Artemis Server", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 101001, value = "Stopping ActiveMQ Artemis Server", level = LogMessage.Level.INFO)
    void serverStopping();
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 101002, value = "Starting Naming server on {0}:{1,number,#} (rmi {2}:{3,number,#})", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 101002, value = "Starting Naming server on {}:{} (rmi {}:{})", level = LogMessage.Level.INFO)
    void startedNamingService(String bindAddress, int port, String rmiBindAddress, int rmiPort);
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 101003, value = "Halting ActiveMQ Artemis Server after user request", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 101003, value = "Halting ActiveMQ Artemis Server after user request", level = LogMessage.Level.INFO)
    void serverKilled();
 
-   @LogMessage(level = Logger.Level.DEBUG)
-   @Message(id = 101005, value = "Using broker configuration: {0}", format = Message.Format.MESSAGE_FORMAT)
-   void usingBrokerConfig(String location);
-
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 102000, value = "Error during undeployment: {0}", format = Message.Format.MESSAGE_FORMAT)
-   void errorDuringUndeployment(@Cause Throwable t, String name);
-
-   @LogMessage(level = Logger.Level.ERROR)
-   @Message(id = 104000, value = "Failed to delete file {0}", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 104000, value = "Failed to delete file {}", level = LogMessage.Level.ERROR)
    void errorDeletingFile(String name);
-
-   @LogMessage(level = Logger.Level.ERROR)
-   @Message(id = 104001, value = "Failed to start server", format = Message.Format.MESSAGE_FORMAT)
-   void errorStartingServer(@Cause Exception e);
-
-   @LogMessage(level = Logger.Level.ERROR)
-   @Message(id = 104002, value = "The print data operation failed: {0}", format = Message.Format.MESSAGE_FORMAT)
-   void printDataFailed(String exceptionMessage);
 }
diff --git a/artemis-cli/src/test/java/org/apache/activemq/cli/test/ArtemisTest.java b/artemis-cli/src/test/java/org/apache/activemq/cli/test/ArtemisTest.java
index 745dce07d6..ca8c354178 100644
--- a/artemis-cli/src/test/java/org/apache/activemq/cli/test/ArtemisTest.java
+++ b/artemis-cli/src/test/java/org/apache/activemq/cli/test/ArtemisTest.java
@@ -96,11 +96,12 @@ import org.apache.activemq.artemis.utils.Wait;
 import org.apache.commons.configuration2.PropertiesConfiguration;
 import org.apache.commons.configuration2.builder.FileBasedConfigurationBuilder;
 import org.apache.commons.configuration2.builder.fluent.Configurations;
-import org.jboss.logging.Logger;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -116,7 +117,7 @@ import static org.junit.Assert.fail;
  * Test to validate that the CLI doesn't throw improper exceptions when invoked.
  */
 public class ArtemisTest extends CliTestBase {
-   private static final Logger log = Logger.getLogger(ArtemisTest.class);
+   private static final Logger log = LoggerFactory.getLogger(ArtemisTest.class);
 
    // some tests will set this, as some security methods will need to know the server the CLI started
    private ActiveMQServer server;
@@ -167,9 +168,9 @@ public class ArtemisTest extends CliTestBase {
       int writes = 2;
       int tries = 5;
       long totalAvg = SyncCalculation.syncTest(temporaryFolder.getRoot(), 4096, writes, tries, true, true, true, "file.tmp", 1, JournalType.NIO);
-      log.debug("TotalAvg = " + totalAvg);
+      log.debug("TotalAvg = {}", totalAvg);
       long nanoTime = SyncCalculation.toNanos(totalAvg, writes, false);
-      log.debug("nanoTime avg = " + nanoTime);
+      log.debug("nanoTime avg = {}", nanoTime);
       assertEquals(0, LibaioContext.getTotalMaxIO());
 
    }
@@ -300,7 +301,7 @@ public class ArtemisTest extends CliTestBase {
 
       byte[] contents = Files.readAllBytes(bootstrapFile.toPath());
       String cfgText = new String(contents);
-      log.debug("confg: " + cfgText);
+      log.debug("confg: {}", cfgText);
 
       config = parseXml(bootstrapFile);
       webElem = (Element) config.getElementsByTagName("web").item(0);
@@ -446,7 +447,7 @@ public class ArtemisTest extends CliTestBase {
          listCmd.execute(context);
 
          String result = context.getStdout();
-         log.debug("output1:\n" + result);
+         log.debug("output1:\n{}", result);
 
          //default only one user admin with role amq
          assertTrue(result.contains("\"admin\"(amq)"));
@@ -465,7 +466,7 @@ public class ArtemisTest extends CliTestBase {
          context = new TestActionContext();
          listCmd.execute(context);
          result = context.getStdout();
-         log.debug("output2:\n" + result);
+         log.debug("output2:\n{}", result);
 
          assertTrue(result.contains("\"admin\"(amq)"));
          assertTrue(result.contains("\"guest\"(admin)"));
@@ -486,7 +487,7 @@ public class ArtemisTest extends CliTestBase {
          context = new TestActionContext();
          listCmd.execute(context);
          result = context.getStdout();
-         log.debug("output3:\n" + result);
+         log.debug("output3:\n{}", result);
 
          assertTrue(result.contains("\"admin\"(amq)"));
          assertTrue(result.contains("\"guest\"(admin)"));
@@ -511,7 +512,7 @@ public class ArtemisTest extends CliTestBase {
          context = new TestActionContext();
          listCmd.execute(context);
          result = context.getStdout();
-         log.debug("output4:\n" + result);
+         log.debug("output4:\n{}", result);
 
          assertTrue(result.contains("\"admin\"(amq)"));
          assertTrue(result.contains("\"guest\"(admin)"));
@@ -528,7 +529,7 @@ public class ArtemisTest extends CliTestBase {
          context = new TestActionContext();
          listCmd.execute(context);
          result = context.getStdout();
-         log.debug("output5:\n" + result);
+         log.debug("output5:\n{}", result);
 
          assertTrue(result.contains("\"admin\"(amq)"));
          assertFalse(result.contains("\"guest\"(admin)"));
@@ -546,7 +547,7 @@ public class ArtemisTest extends CliTestBase {
          context = new TestActionContext();
          listCmd.execute(context);
          result = context.getStdout();
-         log.debug("output6:\n" + result);
+         log.debug("output6:\n{}", result);
 
          assertTrue(result.contains("\"admin\"(amq)"));
          assertFalse(result.contains("\"guest\"(admin)"));
@@ -567,7 +568,7 @@ public class ArtemisTest extends CliTestBase {
          context = new TestActionContext();
          listCmd.execute(context);
          result = context.getStdout();
-         log.debug("output7:\n" + result);
+         log.debug("output7:\n{}", result);
          assertTrue(result.contains("\"admin\"(amq)"));
          assertTrue(result.contains("Total: 1"));
 
@@ -582,7 +583,7 @@ public class ArtemisTest extends CliTestBase {
          context = new TestActionContext();
          listCmd.execute(context);
          result = context.getStdout();
-         log.debug("output8:\n" + result);
+         log.debug("output8:\n{}", result);
 
          assertTrue(result.contains("Total: 0"));
       } finally {
@@ -876,7 +877,7 @@ public class ArtemisTest extends CliTestBase {
          listCmd.execute(context);
 
          String result = context.getStdout();
-         log.debug("output1:\n" + result);
+         log.debug("output1:\n{}", result);
 
          //default only one user admin with role amq
          assertTrue(result.contains("\"admin\"(amq)"));
@@ -892,7 +893,7 @@ public class ArtemisTest extends CliTestBase {
          context = new TestActionContext();
          listCmd.execute(context);
          result = context.getStdout();
-         log.debug("output8:\n" + result);
+         log.debug("output8:\n{}", result);
 
          assertTrue(result.contains("Total: 0"));
 
@@ -925,7 +926,7 @@ public class ArtemisTest extends CliTestBase {
          context = new TestActionContext();
          listCmd.execute(context);
          result = context.getStdout();
-         log.debug("output2:\n" + result);
+         log.debug("output2:\n{}", result);
 
          assertTrue(result.contains("Total: 4"));
          assertTrue(result.contains("\"guest\"(admin)"));
@@ -1006,7 +1007,7 @@ public class ArtemisTest extends CliTestBase {
          listCmd.execute(context);
 
          String result = context.getStdout();
-         log.debug("output1:\n" + result);
+         log.debug("output1:\n{}", result);
 
          assertTrue(result.contains("Total: 1"));
          assertTrue(result.contains("\"admin\"(amq)"));
@@ -1036,7 +1037,7 @@ public class ArtemisTest extends CliTestBase {
          listCmd.execute(context);
 
          result = context.getStdout();
-         log.debug("output2:\n" + result);
+         log.debug("output2:\n{}", result);
 
          // make sure the admin user is still in tact (i.e. that the file wasn't corrupted via concurrent access)
          assertTrue(result.contains("\"admin\"(amq)"));
@@ -1109,7 +1110,7 @@ public class ArtemisTest extends CliTestBase {
          listCmd.execute(context);
 
          String result = context.getStdout();
-         log.debug("output1:\n" + result);
+         log.debug("output1:\n{}", result);
 
          assertTrue(result.contains("\"admin\"(" + roleWithSpaces + ")"));
 
@@ -2131,7 +2132,7 @@ public class ArtemisTest extends CliTestBase {
          for (String r : roles) {
             String storedUsers = (String) roleConfig.getProperty(r);
 
-            log.debug("users in role: " + r + " ; " + storedUsers);
+            log.debug("users in role: {} ; {}", r, storedUsers);
             List<String> userList = StringUtil.splitStringList(storedUsers, ",");
             assertTrue(userList.contains(user));
          }
diff --git a/artemis-cli/src/test/java/org/apache/activemq/cli/test/HashUtilTest.java b/artemis-cli/src/test/java/org/apache/activemq/cli/test/HashUtilTest.java
index 6394d72c22..7d7c26cd53 100644
--- a/artemis-cli/src/test/java/org/apache/activemq/cli/test/HashUtilTest.java
+++ b/artemis-cli/src/test/java/org/apache/activemq/cli/test/HashUtilTest.java
@@ -18,21 +18,22 @@ package org.apache.activemq.cli.test;
 
 import org.apache.activemq.artemis.cli.commands.util.HashUtil;
 import org.apache.activemq.artemis.utils.PasswordMaskingUtil;
-import org.jboss.logging.Logger;
 import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 public class HashUtilTest {
-   private static final Logger log = Logger.getLogger(HashUtilTest.class);
+   private static final Logger log = LoggerFactory.getLogger(HashUtilTest.class);
 
    @Test
    public void testDefaultHashFormat() throws Exception {
       final String password = "helloworld";
       String hash = HashUtil.tryHash(new TestActionContext(), password);
       String hashStr = PasswordMaskingUtil.unwrap(hash);
-      log.debug("hashString: " + hashStr);
+      log.debug("hashString: {}", hashStr);
       String[] parts = hashStr.split(":");
       assertEquals(3, parts.length);
       //first part should be able to convert to an int
diff --git a/artemis-commons/pom.xml b/artemis-commons/pom.xml
index 929156c99b..0a9affe1f2 100644
--- a/artemis-commons/pom.xml
+++ b/artemis-commons/pom.xml
@@ -51,34 +51,31 @@
       </dependency>
       <!-- ^^ these dependencies are shaded on this JAR -->
 
+      <!-- logging -->
       <dependency>
-         <groupId>org.jboss.logging</groupId>
-         <artifactId>jboss-logging-processor</artifactId>
-         <scope>provided</scope>
-         <optional>true</optional>
-      </dependency>
-      <dependency>
-         <groupId>org.jboss.logging</groupId>
-         <artifactId>jboss-logging-annotations</artifactId>
-         <scope>provided</scope>
-         <optional>true</optional>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>artemis-log-facade</artifactId>
+         <version>${project.version}</version>
       </dependency>
       <dependency>
-         <groupId>org.jboss.logmanager</groupId>
-         <artifactId>jboss-logmanager</artifactId>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>artemis-log-processor</artifactId>
+         <version>${project.version}</version>
          <scope>provided</scope>
+         <!-- Superfluous, except for osgi manifest handling -->
          <optional>true</optional>
       </dependency>
       <dependency>
-          <groupId>org.wildfly.common</groupId>
-          <artifactId>wildfly-common</artifactId>
-         <scope>provided</scope>
-         <optional>true</optional>
+         <groupId>org.slf4j</groupId>
+         <artifactId>slf4j-api</artifactId>
+         <!-- License: MIT -->
       </dependency>
       <dependency>
-         <groupId>org.jboss.logging</groupId>
-         <artifactId>jboss-logging</artifactId>
+         <groupId>org.apache.logging.log4j</groupId>
+         <artifactId>log4j-slf4j-impl</artifactId>
+         <scope>test</scope>
       </dependency>
+
       <dependency>
          <groupId>io.netty</groupId>
          <artifactId>netty-buffer</artifactId>
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQScheduledComponent.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQScheduledComponent.java
index 6783f7a672..09226f1410 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQScheduledComponent.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQScheduledComponent.java
@@ -28,14 +28,15 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.apache.activemq.artemis.utils.ActiveMQThreadFactory;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This is for components with a scheduled at a fixed rate.
  */
 public abstract class ActiveMQScheduledComponent implements ActiveMQComponent, Runnable {
 
-   private static final Logger logger = Logger.getLogger(ActiveMQScheduledComponent.class);
+   private static final Logger logger = LoggerFactory.getLogger(ActiveMQScheduledComponent.class);
    protected ScheduledExecutorService scheduledExecutorService;
    private boolean startedOwnScheduler;
 
@@ -165,7 +166,7 @@ public abstract class ActiveMQScheduledComponent implements ActiveMQComponent, R
          final AtomicBoolean booked = this.bookedForRunning;
          future = scheduledExecutorService.scheduleWithFixedDelay(() -> runForScheduler(booked), initialDelay >= 0 ? initialDelay : period, period, timeUnit);
       } else {
-         logger.tracef("did not start scheduled executor on %s because period was configured as %d", this, period);
+         logger.trace("did not start scheduled executor on {} because period was configured as {}", this, period);
       }
    }
 
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/core/server/NetworkHealthCheck.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/core/server/NetworkHealthCheck.java
index 022ee8ea30..5916eb9b96 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/core/server/NetworkHealthCheck.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/core/server/NetworkHealthCheck.java
@@ -35,7 +35,8 @@ import org.apache.activemq.artemis.logs.ActiveMQUtilLogger;
 import org.apache.activemq.artemis.utils.ActiveMQThreadFactory;
 import org.apache.activemq.artemis.utils.Env;
 import org.apache.activemq.artemis.utils.collections.ConcurrentHashSet;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This will use {@link InetAddress#isReachable(int)} to determine if the network is alive.
@@ -43,7 +44,7 @@ import org.jboss.logging.Logger;
  */
 public class NetworkHealthCheck extends ActiveMQScheduledComponent {
 
-   private static final Logger logger = Logger.getLogger(NetworkHealthCheck.class);
+   private static final Logger logger = LoggerFactory.getLogger(NetworkHealthCheck.class);
 
    private final Set<ActiveMQComponent> componentList = new ConcurrentHashSet<>();
    private final Set<String> addresses = new ConcurrentHashSet<>();
@@ -358,7 +359,7 @@ public class NetworkHealthCheck extends ActiveMQScheduledComponent {
    public boolean check(InetAddress address) throws IOException, InterruptedException {
       if (!hasCustomPingCommand() && isReachable(address)) {
          if (logger.isTraceEnabled()) {
-            logger.tracef(address + " OK");
+            logger.trace(address + " OK");
          }
          return true;
       } else {
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/ActiveMQUtilBundle.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/ActiveMQUtilBundle.java
index c32bc67c8e..bce2df7d1b 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/ActiveMQUtilBundle.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/ActiveMQUtilBundle.java
@@ -17,10 +17,10 @@
 package org.apache.activemq.artemis.logs;
 
 import org.apache.activemq.artemis.api.core.ActiveMQIllegalStateException;
-import org.jboss.logging.Messages;
-import org.jboss.logging.annotations.Cause;
-import org.jboss.logging.annotations.Message;
-import org.jboss.logging.annotations.MessageBundle;
+import org.apache.activemq.artemis.logprocessor.CodeFactory;
+import org.apache.activemq.artemis.logprocessor.annotation.Cause;
+import org.apache.activemq.artemis.logprocessor.annotation.LogBundle;
+import org.apache.activemq.artemis.logprocessor.annotation.Message;
 
 /**
  * Logger Code 20
@@ -29,23 +29,23 @@ import org.jboss.logging.annotations.MessageBundle;
  *
  * so 209000 to 209999
  */
-@MessageBundle(projectCode = "AMQ")
+@LogBundle(projectCode = "AMQ")
 public interface ActiveMQUtilBundle {
 
-   ActiveMQUtilBundle BUNDLE = Messages.getBundle(ActiveMQUtilBundle.class);
+   ActiveMQUtilBundle BUNDLE = CodeFactory.getCodeClass(ActiveMQUtilBundle.class);
 
-   @Message(id = 209000, value = "invalid property: {0}", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 209000, value = "invalid property: {}")
    ActiveMQIllegalStateException invalidProperty(String part);
 
-   @Message(id = 209001, value = "Invalid type: {0}", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 209001, value = "Invalid type: {}")
    IllegalStateException invalidType(Byte type);
 
-   @Message(id = 209002, value = "the specified string is too long ({0})", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 209002, value = "the specified string is too long ({})")
    IllegalStateException stringTooLong(Integer length);
 
-   @Message(id = 209003, value = "Error instantiating codec {0}", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 209003, value = "Error instantiating codec {}")
    IllegalArgumentException errorCreatingCodec(@Cause Exception e, String codecClassName);
 
-   @Message(id = 209004, value = "Failed to parse long value from {0}", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 209004, value = "Failed to parse long value from {}")
    IllegalArgumentException failedToParseLong(String value);
 }
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/ActiveMQUtilLogger.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/ActiveMQUtilLogger.java
index 502daffdbd..7fa668976f 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/ActiveMQUtilLogger.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/ActiveMQUtilLogger.java
@@ -16,127 +16,73 @@
  */
 package org.apache.activemq.artemis.logs;
 
-import org.jboss.logging.BasicLogger;
-import org.jboss.logging.Logger;
-import org.jboss.logging.annotations.Cause;
-import org.jboss.logging.annotations.LogMessage;
-import org.jboss.logging.annotations.Message;
-import org.jboss.logging.annotations.MessageLogger;
+import org.apache.activemq.artemis.logprocessor.CodeFactory;
+import org.apache.activemq.artemis.logprocessor.annotation.Cause;
+import org.apache.activemq.artemis.logprocessor.annotation.LogBundle;
+import org.apache.activemq.artemis.logprocessor.annotation.LogMessage;
 
 /**
  * Logger Code 20
- *
- * each message id must be 6 digits long starting with 20, the 3rd digit donates the level so
- *
- * INF0  1
- * WARN  2
- * DEBUG 3
- * ERROR 4
- * TRACE 5
- * FATAL 6
- *
- * so an INFO message would be 201000 to 201999
  */
-@MessageLogger(projectCode = "AMQ")
-public interface ActiveMQUtilLogger extends BasicLogger {
+@LogBundle(projectCode = "AMQ")
+public interface ActiveMQUtilLogger {
 
-   /**
-    * The default logger.
-    */
-   ActiveMQUtilLogger LOGGER = Logger.getMessageLogger(ActiveMQUtilLogger.class, ActiveMQUtilLogger.class.getPackage().getName());
+   ActiveMQUtilLogger LOGGER = CodeFactory.getCodeClass(ActiveMQUtilLogger.class, ActiveMQUtilLogger.class.getPackage().getName());
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 201000, value = "Network is healthy, starting service {0}",
-      format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 201000, value = "Network is healthy, starting service {}", level = LogMessage.Level.INFO)
    void startingService(String component);
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 201001, value = "Network is unhealthy, stopping service {0}",
-      format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 201001, value = "Network is unhealthy, stopping service {}", level = LogMessage.Level.WARN)
    void stoppingService(String component);
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 202000, value = "Missing privileges to set Thread Context Class Loader on Thread Factory. Using current Thread Context Class Loader",
-      format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 202000, value = "Missing privileges to set Thread Context Class Loader on Thread Factory. Using current Thread Context Class Loader", level = LogMessage.Level.WARN)
    void missingPrivsForClassloader();
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 202001, value = "{0} is a loopback address and will be discarded.",
-      format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 202001, value = "{} is a loopback address and will be discarded.", level = LogMessage.Level.WARN)
    void addressloopback(String address);
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 202002, value = "Ping Address {0} wasn't reacheable.",
-      format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 202002, value = "Ping Address {} wasn't reacheable.", level = LogMessage.Level.WARN)
    void addressWasntReacheable(String address);
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 202003, value = "Ping Url {0} wasn't reacheable.",
-      format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 202003, value = "Ping Url {} wasn't reacheable.", level = LogMessage.Level.WARN)
    void urlWasntReacheable(String url);
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 202004, value = "Error starting component {0} ",
-      format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 202004, value = "Error starting component {} ", level = LogMessage.Level.WARN)
    void errorStartingComponent(@Cause Exception e, String component);
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 202005, value = "Error stopping component {0} ",
-      format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 202005, value = "Error stopping component {} ", level = LogMessage.Level.WARN)
    void errorStoppingComponent(@Cause Exception e, String component);
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 202006, value = "Failed to check Url {0}.",
-      format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 202006, value = "Failed to check Url {}.", level = LogMessage.Level.WARN)
    void failedToCheckURL(@Cause Exception e, String url);
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 202007, value = "Failed to check Address {0}.",
-      format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 202007, value = "Failed to check Address {}.", level = LogMessage.Level.WARN)
    void failedToCheckAddress(@Cause Exception e, String address);
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 202008, value = "Failed to check Address list {0}.",
-      format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 202008, value = "Failed to check Address list {}.", level = LogMessage.Level.WARN)
    void failedToParseAddressList(@Cause Exception e, String addressList);
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 202009, value = "Failed to check Url list {0}.",
-      format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 202009, value = "Failed to check Url list {}.", level = LogMessage.Level.WARN)
    void failedToParseUrlList(@Cause Exception e, String urlList);
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 202010, value = "Failed to set NIC {0}.",
-      format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 202010, value = "Failed to set NIC {}.", level = LogMessage.Level.WARN)
    void failedToSetNIC(@Cause Exception e, String nic);
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 202011, value = "Failed to read from stream {0}.",
-      format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 202011, value = "Failed to read from stream {}.", level = LogMessage.Level.WARN)
    void failedToReadFromStream(String stream);
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 202012, value = "Object cannot be serialized.",
-      format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 202012, value = "Object cannot be serialized.", level = LogMessage.Level.WARN)
    void failedToSerializeObject(@Cause Exception e);
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 202013, value = "Unable to deserialize object.",
-      format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 202013, value = "Unable to deserialize object.", level = LogMessage.Level.WARN)
    void failedToDeserializeObject(@Cause Exception e);
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 202014, value = "Unable to encode byte array into Base64 notation.",
-      format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 202014, value = "Unable to encode byte array into Base64 notation.", level = LogMessage.Level.WARN)
    void failedToEncodeByteArrayToBase64Notation(@Cause Exception e);
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 202015, value = "Failed to clean up file {0}",
-      format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 202015, value = "Failed to clean up file {}", level = LogMessage.Level.WARN)
    void failedToCleanupFile(String file);
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 202016, value = "Could not list files to clean up in {0}",
-      format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 202016, value = "Could not list files to clean up in {}", level = LogMessage.Level.WARN)
    void failedListFilesToCleanup(String path);
 }
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/AssertionLoggerHandler.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/AssertionLoggerHandler.java
index 5379b4b68c..ca41f1bf37 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/AssertionLoggerHandler.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/AssertionLoggerHandler.java
@@ -16,80 +16,20 @@
  */
 package org.apache.activemq.artemis.logs;
 
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
-import java.util.regex.Pattern;
 
-import org.jboss.logmanager.ExtHandler;
-import org.jboss.logmanager.ExtLogRecord;
 
-/**
- * This class contains a tool where programs could intercept for LogMessage given an interval of time between {@link #startCapture()}
- * and {@link #stopCapture()}
- *
- * Be careful with this use as this is intended for testing only (such as testcases)
- */
-public class AssertionLoggerHandler extends ExtHandler {
-
-   private static final Map<String, ExtLogRecord> messages = new ConcurrentHashMap<>();
-   private static List<String> traceMessages;
-   private static boolean capture = false;
-
-   /**
-    * {@inheritDoc}
-    */
-   @Override
-   public void flush() {
-   }
+public class AssertionLoggerHandler {
 
-   /**
-    * {@inheritDoc}
-    */
-   @Override
    public void close() throws SecurityException {
    }
 
-   @Override
-   protected void doPublish(final ExtLogRecord record) {
-      if (capture) {
-         messages.put(record.getFormattedMessage(), record);
-         if (traceMessages != null) {
-            traceMessages.add(record.getFormattedMessage());
-         }
-      }
-   }
-
-   /**
-    * is there any record matching Level?
-    *
-    * @param level
-    * @return
-    */
    public static boolean hasLevel(Level level) {
-      for (ExtLogRecord record : messages.values()) {
-         if (record.getLevel().equals(level)) {
-            return true;
-         }
-      }
-
       return false;
    }
 
    public static boolean findText(long mstimeout, String... text) {
-
-      long timeMax = System.currentTimeMillis() + mstimeout;
-      do {
-         if (findText(text)) {
-            return true;
-         }
-      }
-      while (timeMax > System.currentTimeMillis());
-
       return false;
-
    }
 
    /**
@@ -99,87 +39,21 @@ public class AssertionLoggerHandler extends ExtHandler {
     * @return
     */
    public static boolean findText(final String... text) {
-      for (Map.Entry<String, ExtLogRecord> entry : messages.entrySet()) {
-         String key = entry.getKey();
-         boolean found = true;
-
-         for (String txtCheck : text) {
-            found = key.contains(txtCheck);
-            if (!found) {
-               // If the main log message doesn't contain what we're looking for let's look in the message from the exception (if there is one).
-               Throwable throwable = entry.getValue().getThrown();
-               if (throwable != null && throwable.getMessage() != null) {
-                  found = throwable.getMessage().contains(txtCheck);
-                  if (!found) {
-                     break;
-                  }
-               } else {
-                  break;
-               }
-            }
-         }
-
-         if (found) {
-            return true;
-         }
-      }
-
       return false;
    }
 
    public static int countText(final String... text) {
-      int found = 0;
-      if (traceMessages != null) {
-         for (String str : traceMessages) {
-            for (String txtCheck : text) {
-               if (str.contains(txtCheck)) {
-                  found++;
-               }
-            }
-         }
-      } else {
-         for (Map.Entry<String, ExtLogRecord> entry : messages.entrySet()) {
-            String key = entry.getKey();
-
-            for (String txtCheck : text) {
-               if (key.contains(txtCheck)) {
-                  found++;
-               }
-            }
-         }
-      }
-
-      return found;
+      return 0;
    }
 
    public static boolean matchText(final String pattern) {
-      Pattern r = Pattern.compile(pattern);
-
-      for (Map.Entry<String, ExtLogRecord> entry : messages.entrySet()) {
-         if (r.matcher(entry.getKey()).matches()) {
-            return true;
-         } else {
-            Throwable throwable = entry.getValue().getThrown();
-            if (throwable != null && throwable.getMessage() != null) {
-               if (r.matcher(throwable.getMessage()).matches()) {
-                  return true;
-               }
-            }
-         }
-      }
-
       return false;
    }
 
    public static final void clear() {
-      messages.clear();
-      if (traceMessages != null) {
-         traceMessages.clear();
-      }
    }
 
    public static final void startCapture() {
-      startCapture(false);
    }
 
    /**
@@ -187,16 +61,8 @@ public class AssertionLoggerHandler extends ExtHandler {
     * @param individualMessages enables counting individual messages.
     */
    public static final void startCapture(boolean individualMessages) {
-      clear();
-      if (individualMessages) {
-         traceMessages = new LinkedList<>();
-      }
-      capture = true;
    }
 
    public static final void stopCapture() {
-      capture = false;
-      clear();
-      traceMessages = null;
    }
 }
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/AuditLogger.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/AuditLogger.java
index d654e9f813..8b146f602d 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/AuditLogger.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/AuditLogger.java
@@ -16,12 +16,12 @@
  */
 package org.apache.activemq.artemis.logs;
 
-import org.jboss.logging.BasicLogger;
-import org.jboss.logging.Logger;
-import org.jboss.logging.annotations.Cause;
-import org.jboss.logging.annotations.LogMessage;
-import org.jboss.logging.annotations.Message;
-import org.jboss.logging.annotations.MessageLogger;
+import org.apache.activemq.artemis.logprocessor.CodeFactory;
+import org.apache.activemq.artemis.logprocessor.annotation.LogBundle;
+import org.apache.activemq.artemis.logprocessor.annotation.Cause;
+import org.apache.activemq.artemis.logprocessor.annotation.GetLogger;
+import org.apache.activemq.artemis.logprocessor.annotation.LogMessage;
+import org.slf4j.Logger;
 
 import javax.management.ObjectName;
 import javax.security.auth.Subject;
@@ -32,24 +32,13 @@ import java.util.Set;
 
 /**
  * Logger Code 60
- *
- * each message id must be 6 digits long starting with 60, the 3rd digit donates the level so
- *
- * INF0  1
- * WARN  2
- * DEBUG 3
- * ERROR 4
- * TRACE 5
- * FATAL 6
- *
- * so an INFO message would be 601000 to 601999
  */
-@MessageLogger(projectCode = "AMQ")
-public interface AuditLogger extends BasicLogger {
+@LogBundle(projectCode = "AMQ")
+public interface AuditLogger {
 
-   AuditLogger BASE_LOGGER = Logger.getMessageLogger(AuditLogger.class, "org.apache.activemq.audit.base");
-   AuditLogger RESOURCE_LOGGER = Logger.getMessageLogger(AuditLogger.class, "org.apache.activemq.audit.resource");
-   AuditLogger MESSAGE_LOGGER = Logger.getMessageLogger(AuditLogger.class, "org.apache.activemq.audit.message");
+   AuditLogger BASE_LOGGER = CodeFactory.getCodeClass(AuditLogger.class, "org.apache.activemq.audit.base");
+   AuditLogger RESOURCE_LOGGER = CodeFactory.getCodeClass(AuditLogger.class, "org.apache.activemq.audit.resource");
+   AuditLogger MESSAGE_LOGGER = CodeFactory.getCodeClass(AuditLogger.class, "org.apache.activemq.audit.message");
 
    ThreadLocal<String> remoteAddress = new ThreadLocal<>();
 
@@ -59,16 +48,19 @@ public interface AuditLogger extends BasicLogger {
       return isBaseLoggingEnabled() || isMessageLoggingEnabled() || isResourceLoggingEnabled();
    }
 
+   @GetLogger
+   Logger getLogger();
+
    static boolean isBaseLoggingEnabled() {
-      return BASE_LOGGER.isEnabled(Logger.Level.INFO);
+      return BASE_LOGGER.getLogger().isInfoEnabled();
    }
 
    static boolean isResourceLoggingEnabled() {
-      return RESOURCE_LOGGER.isEnabled(Logger.Level.INFO);
+      return RESOURCE_LOGGER.getLogger().isInfoEnabled();
    }
 
    static boolean isMessageLoggingEnabled() {
-      return MESSAGE_LOGGER.isEnabled(Logger.Level.INFO);
+      return MESSAGE_LOGGER.getLogger().isInfoEnabled();
    }
 
    /**
@@ -126,7 +118,7 @@ public interface AuditLogger extends BasicLogger {
       return remoteAddress.get();
    }
 
-   static String arrayToString(Object value) {
+   static String parametersList(Object value) {
       if (value == null) return "";
 
       final String prefix = "with parameters: ";
@@ -158,2262 +150,1980 @@ public interface AuditLogger extends BasicLogger {
       BASE_LOGGER.getRoutingTypes(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601000, value = "User {0} is getting routing type property on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getRoutingTypes(String user, Object source, Object... args);
+   @LogMessage(id = 601000, value = "User {} is getting routing type property on target resource: {}", level = LogMessage.Level.INFO)
+   void getRoutingTypes(String user, Object source);
 
    static void getRoutingTypesAsJSON(Object source) {
       BASE_LOGGER.getRoutingTypesAsJSON(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601001, value = "User {0} is getting routing type property as json on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getRoutingTypesAsJSON(String user, Object source, Object... args);
+   @LogMessage(id = 601001, value = "User {} is getting routing type property as json on target resource: {}", level = LogMessage.Level.INFO)
+   void getRoutingTypesAsJSON(String user, Object source);
 
    static void getQueueNames(Object source, Object... args) {
-      BASE_LOGGER.getQueueNames(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.getQueueNames(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601002, value = "User {0} is getting queue names on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getQueueNames(String user, Object source, Object... args);
+   @LogMessage(id = 601002, value = "User {} is getting queue names on target resource: {} {}", level = LogMessage.Level.INFO)
+   void getQueueNames(String user, Object source, String parameters);
 
    static void getBindingNames(Object source) {
       BASE_LOGGER.getBindingNames(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601003, value = "User {0} is getting binding names on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getBindingNames(String user, Object source, Object... args);
+   @LogMessage(id = 601003, value = "User {} is getting binding names on target resource: {}", level = LogMessage.Level.INFO)
+   void getBindingNames(String user, Object source);
 
    static void getRoles(Object source, Object... args) {
-      BASE_LOGGER.getRoles(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.getRoles(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601004, value = "User {0} is getting roles on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getRoles(String user, Object source, Object... args);
+   @LogMessage(id = 601004, value = "User {} is getting roles on target resource: {} {}", level = LogMessage.Level.INFO)
+   void getRoles(String user, Object source, String parameters);
 
    static void getRolesAsJSON(Object source, Object... args) {
-      BASE_LOGGER.getRolesAsJSON(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.getRolesAsJSON(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601005, value = "User {0} is getting roles as json on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getRolesAsJSON(String user, Object source, Object... args);
+   @LogMessage(id = 601005, value = "User {} is getting roles as json on target resource: {} {}", level = LogMessage.Level.INFO)
+   void getRolesAsJSON(String user, Object source, String parameters);
 
    static void getNumberOfBytesPerPage(Object source) {
       BASE_LOGGER.getNumberOfBytesPerPage(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601006, value = "User {0} is getting number of bytes per page on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getNumberOfBytesPerPage(String user, Object source, Object... args);
+   @LogMessage(id = 601006, value = "User {} is getting number of bytes per page on target resource: {}", level = LogMessage.Level.INFO)
+   void getNumberOfBytesPerPage(String user, Object source);
 
    static void getAddressSize(Object source) {
       BASE_LOGGER.getAddressSize(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601007, value = "User {0} is getting address size on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getAddressSize(String user, Object source, Object... args);
+   @LogMessage(id = 601007, value = "User {} is getting address size on target resource: {}", level = LogMessage.Level.INFO)
+   void getAddressSize(String user, Object source);
 
    static void getNumberOfMessages(Object source) {
       BASE_LOGGER.getNumberOfMessages(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601008, value = "User {0} is getting number of messages on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getNumberOfMessages(String user, Object source, Object... args);
+   @LogMessage(id = 601008, value = "User {} is getting number of messages on target resource: {}", level = LogMessage.Level.INFO)
+   void getNumberOfMessages(String user, Object source);
 
    static void isPaging(Object source) {
       BASE_LOGGER.isPaging(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601009, value = "User {0} is getting isPaging on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void isPaging(String user, Object source, Object... args);
+   @LogMessage(id = 601009, value = "User {} is getting isPaging on target resource: {}", level = LogMessage.Level.INFO)
+   void isPaging(String user, Object source);
 
    static void getNumberOfPages(Object source) {
       BASE_LOGGER.getNumberOfPages(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601010, value = "User {0} is getting number of pages on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getNumberOfPages(String user, Object source, Object... args);
+   @LogMessage(id = 601010, value = "User {} is getting number of pages on target resource: {}", level = LogMessage.Level.INFO)
+   void getNumberOfPages(String user, Object source);
 
    static void getRoutedMessageCount(Object source) {
       BASE_LOGGER.getRoutedMessageCount(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601011, value = "User {0} is getting routed message count on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getRoutedMessageCount(String user, Object source, Object... args);
+   @LogMessage(id = 601011, value = "User {} is getting routed message count on target resource: {}", level = LogMessage.Level.INFO)
+   void getRoutedMessageCount(String user, Object source);
 
    static void getUnRoutedMessageCount(Object source) {
       BASE_LOGGER.getUnRoutedMessageCount(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601012, value = "User {0} is getting unrouted message count on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getUnRoutedMessageCount(String user, Object source, Object... args);
+   @LogMessage(id = 601012, value = "User {} is getting unrouted message count on target resource: {}", level = LogMessage.Level.INFO)
+   void getUnRoutedMessageCount(String user, Object source);
 
    static void sendMessageThroughManagement(Object source, Object... args) {
-      BASE_LOGGER.sendMessageThroughManagement(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.sendMessageThroughManagement(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601013, value = "User {0} is sending a message on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void sendMessageThroughManagement(String user, Object source, Object... args);
+   @LogMessage(id = 601013, value = "User {} is sending a message on target resource: {} {}", level = LogMessage.Level.INFO)
+   void sendMessageThroughManagement(String user, Object source, String parameters);
 
    static void getName(Object source) {
       BASE_LOGGER.getName(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601014, value = "User {0} is getting name on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getName(String user, Object source, Object... args);
+   @LogMessage(id = 601014, value = "User {} is getting name on target resource: {}", level = LogMessage.Level.INFO)
+   void getName(String user, Object source);
 
    static void getAddress(Object source) {
       BASE_LOGGER.getAddress(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601015, value = "User {0} is getting address on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getAddress(String user, Object source, Object... args);
+   @LogMessage(id = 601015, value = "User {} is getting address on target resource: {}", level = LogMessage.Level.INFO)
+   void getAddress(String user, Object source);
 
    static void getFilter(Object source) {
       BASE_LOGGER.getFilter(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601016, value = "User {0} is getting filter on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getFilter(String user, Object source, Object... args);
+   @LogMessage(id = 601016, value = "User {} is getting filter on target resource: {}", level = LogMessage.Level.INFO)
+   void getFilter(String user, Object source);
 
    static void isDurable(Object source) {
       BASE_LOGGER.isDurable(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601017, value = "User {0} is getting durable property on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void isDurable(String user, Object source, Object... args);
+   @LogMessage(id = 601017, value = "User {} is getting durable property on target resource: {}", level = LogMessage.Level.INFO)
+   void isDurable(String user, Object source);
 
    static void getMessageCount(Object source) {
       BASE_LOGGER.getMessageCount(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601018, value = "User {0} is getting message count on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getMessageCount(String user, Object source, Object... args);
+   @LogMessage(id = 601018, value = "User {} is getting message count on target resource: {}", level = LogMessage.Level.INFO)
+   void getMessageCount(String user, Object source);
 
    static void getMBeanInfo(Object source) {
       BASE_LOGGER.getMBeanInfo(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601019, value = "User {0} is getting mbean info on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getMBeanInfo(String user, Object source, Object... args);
+   @LogMessage(id = 601019, value = "User {} is getting mbean info on target resource: {}", level = LogMessage.Level.INFO)
+   void getMBeanInfo(String user, Object source);
 
    static void getFactoryClassName(Object source) {
       BASE_LOGGER.getFactoryClassName(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601020, value = "User {0} is getting factory class name on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getFactoryClassName(String user, Object source, Object... args);
+   @LogMessage(id = 601020, value = "User {} is getting factory class name on target resource: {}", level = LogMessage.Level.INFO)
+   void getFactoryClassName(String user, Object source);
 
    static void getParameters(Object source) {
       BASE_LOGGER.getParameters(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601021, value = "User {0} is getting parameters on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getParameters(String user, Object source, Object... args);
+   @LogMessage(id = 601021, value = "User {} is getting parameters on target resource: {}", level = LogMessage.Level.INFO)
+   void getParameters(String user, Object source);
 
    static void reload(Object source) {
       BASE_LOGGER.reload(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601022, value = "User {0} is doing reload on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void reload(String user, Object source, Object... args);
+   @LogMessage(id = 601022, value = "User {} is doing reload on target resource: {}", level = LogMessage.Level.INFO)
+   void reload(String user, Object source);
 
    static void isStarted(Object source) {
       BASE_LOGGER.isStarted(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601023, value = "User {0} is querying isStarted on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void isStarted(String user, Object source, Object... args);
+   @LogMessage(id = 601023, value = "User {} is querying isStarted on target resource: {}", level = LogMessage.Level.INFO)
+   void isStarted(String user, Object source);
 
    static void startAcceptor(Object source) {
       BASE_LOGGER.startAcceptor(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601024, value = "User {0} is starting an acceptor on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void startAcceptor(String user, Object source, Object... args);
+   @LogMessage(id = 601024, value = "User {} is starting an acceptor on target resource: {}", level = LogMessage.Level.INFO)
+   void startAcceptor(String user, Object source);
 
    static void stopAcceptor(Object source) {
       BASE_LOGGER.stopAcceptor(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601025, value = "User {0} is stopping an acceptor on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void stopAcceptor(String user, Object source, Object... args);
+   @LogMessage(id = 601025, value = "User {} is stopping an acceptor on target resource: {}", level = LogMessage.Level.INFO)
+   void stopAcceptor(String user, Object source);
 
    static void getVersion(Object source) {
       BASE_LOGGER.getVersion(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601026, value = "User {0} is getting version on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getVersion(String user, Object source, Object... args);
+   @LogMessage(id = 601026, value = "User {} is getting version on target resource: {}", level = LogMessage.Level.INFO)
+   void getVersion(String user, Object source);
 
    static void isBackup(Object source) {
       BASE_LOGGER.isBackup(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601027, value = "User {0} is querying isBackup on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void isBackup(String user, Object source, Object... args);
+   @LogMessage(id = 601027, value = "User {} is querying isBackup on target resource: {}", level = LogMessage.Level.INFO)
+   void isBackup(String user, Object source);
 
    static void isSharedStore(Object source) {
       BASE_LOGGER.isSharedStore(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601028, value = "User {0} is querying isSharedStore on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void isSharedStore(String user, Object source, Object... args);
+   @LogMessage(id = 601028, value = "User {} is querying isSharedStore on target resource: {}", level = LogMessage.Level.INFO)
+   void isSharedStore(String user, Object source);
 
    static void getBindingsDirectory(Object source) {
       BASE_LOGGER.getBindingsDirectory(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601029, value = "User {0} is getting bindings directory on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getBindingsDirectory(String user, Object source, Object... args);
+   @LogMessage(id = 601029, value = "User {} is getting bindings directory on target resource: {}", level = LogMessage.Level.INFO)
+   void getBindingsDirectory(String user, Object source);
 
    static void getIncomingInterceptorClassNames(Object source) {
       BASE_LOGGER.getIncomingInterceptorClassNames(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601030, value = "User {0} is getting incoming interceptor class names on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getIncomingInterceptorClassNames(String user, Object source, Object... args);
+   @LogMessage(id = 601030, value = "User {} is getting incoming interceptor class names on target resource: {}", level = LogMessage.Level.INFO)
+   void getIncomingInterceptorClassNames(String user, Object source);
 
    static void getOutgoingInterceptorClassNames(Object source) {
       BASE_LOGGER.getOutgoingInterceptorClassNames(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601031, value = "User {0} is getting outgoing interceptor class names on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getOutgoingInterceptorClassNames(String user, Object source, Object... args);
+   @LogMessage(id = 601031, value = "User {} is getting outgoing interceptor class names on target resource: {}", level = LogMessage.Level.INFO)
+   void getOutgoingInterceptorClassNames(String user, Object source);
 
    static void getJournalBufferSize(Object source) {
       BASE_LOGGER.getJournalBufferSize(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601032, value = "User {0} is getting journal buffer size on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getJournalBufferSize(String user, Object source, Object... args);
+   @LogMessage(id = 601032, value = "User {} is getting journal buffer size on target resource: {}", level = LogMessage.Level.INFO)
+   void getJournalBufferSize(String user, Object source);
 
    static void getJournalBufferTimeout(Object source) {
       BASE_LOGGER.getJournalBufferTimeout(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601033, value = "User {0} is getting journal buffer timeout on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getJournalBufferTimeout(String user, Object source, Object... args);
+   @LogMessage(id = 601033, value = "User {} is getting journal buffer timeout on target resource: {}", level = LogMessage.Level.INFO)
+   void getJournalBufferTimeout(String user, Object source);
 
    static void setFailoverOnServerShutdown(Object source, Object... args) {
-      BASE_LOGGER.setFailoverOnServerShutdown(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.setFailoverOnServerShutdown(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601034, value = "User {0} is setting failover on server shutdown on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void setFailoverOnServerShutdown(String user, Object source, Object... args);
+   @LogMessage(id = 601034, value = "User {} is setting failover on server shutdown on target resource: {} {}", level = LogMessage.Level.INFO)
+   void setFailoverOnServerShutdown(String user, Object source, String parameters);
 
    static void isFailoverOnServerShutdown(Object source) {
       BASE_LOGGER.isFailoverOnServerShutdown(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601035, value = "User {0} is querying is-failover-on-server-shutdown on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void isFailoverOnServerShutdown(String user, Object source, Object... args);
+   @LogMessage(id = 601035, value = "User {} is querying is-failover-on-server-shutdown on target resource: {}", level = LogMessage.Level.INFO)
+   void isFailoverOnServerShutdown(String user, Object source);
 
    static void getJournalMaxIO(Object source) {
       BASE_LOGGER.getJournalMaxIO(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601036, value = "User {0} is getting journal's max io on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getJournalMaxIO(String user, Object source, Object... args);
+   @LogMessage(id = 601036, value = "User {} is getting journal's max io on target resource: {}", level = LogMessage.Level.INFO)
+   void getJournalMaxIO(String user, Object source);
 
    static void getJournalDirectory(Object source) {
       BASE_LOGGER.getJournalDirectory(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601037, value = "User {0} is getting journal directory on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getJournalDirectory(String user, Object source, Object... args);
+   @LogMessage(id = 601037, value = "User {} is getting journal directory on target resource: {}", level = LogMessage.Level.INFO)
+   void getJournalDirectory(String user, Object source);
 
    static void getJournalFileSize(Object source) {
       BASE_LOGGER.getJournalFileSize(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601038, value = "User {0} is getting journal file size on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getJournalFileSize(String user, Object source, Object... args);
+   @LogMessage(id = 601038, value = "User {} is getting journal file size on target resource: {}", level = LogMessage.Level.INFO)
+   void getJournalFileSize(String user, Object source);
 
    static void getJournalMinFiles(Object source) {
       BASE_LOGGER.getJournalMinFiles(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601039, value = "User {0} is getting journal min files on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getJournalMinFiles(String user, Object source, Object... args);
+   @LogMessage(id = 601039, value = "User {} is getting journal min files on target resource: {}", level = LogMessage.Level.INFO)
+   void getJournalMinFiles(String user, Object source);
 
    static void getJournalCompactMinFiles(Object source) {
       BASE_LOGGER.getJournalCompactMinFiles(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601040, value = "User {0} is getting journal compact min files on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getJournalCompactMinFiles(String user, Object source, Object... args);
+   @LogMessage(id = 601040, value = "User {} is getting journal compact min files on target resource: {}", level = LogMessage.Level.INFO)
+   void getJournalCompactMinFiles(String user, Object source);
 
    static void getJournalCompactPercentage(Object source) {
       BASE_LOGGER.getJournalCompactPercentage(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601041, value = "User {0} is getting journal compact percentage on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getJournalCompactPercentage(String user, Object source, Object... args);
+   @LogMessage(id = 601041, value = "User {} is getting journal compact percentage on target resource: {}", level = LogMessage.Level.INFO)
+   void getJournalCompactPercentage(String user, Object source);
 
    static void isPersistenceEnabled(Object source) {
       BASE_LOGGER.isPersistenceEnabled(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601042, value = "User {0} is querying persistence enabled on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void isPersistenceEnabled(String user, Object source, Object... args);
+   @LogMessage(id = 601042, value = "User {} is querying persistence enabled on target resource: {}", level = LogMessage.Level.INFO)
+   void isPersistenceEnabled(String user, Object source);
 
    static void getJournalType(Object source) {
       BASE_LOGGER.getJournalType(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601043, value = "User {0} is getting journal type on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getJournalType(String user, Object source, Object... args);
+   @LogMessage(id = 601043, value = "User {} is getting journal type on target resource: {}", level = LogMessage.Level.INFO)
+   void getJournalType(String user, Object source);
 
    static void getPagingDirectory(Object source) {
       BASE_LOGGER.getPagingDirectory(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601044, value = "User {0} is getting paging directory on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getPagingDirectory(String user, Object source, Object... args);
+   @LogMessage(id = 601044, value = "User {} is getting paging directory on target resource: {}", level = LogMessage.Level.INFO)
+   void getPagingDirectory(String user, Object source);
 
    static void getScheduledThreadPoolMaxSize(Object source) {
       BASE_LOGGER.getScheduledThreadPoolMaxSize(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601045, value = "User {0} is getting scheduled threadpool max size on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getScheduledThreadPoolMaxSize(String user, Object source, Object... args);
+   @LogMessage(id = 601045, value = "User {} is getting scheduled threadpool max size on target resource: {}", level = LogMessage.Level.INFO)
+   void getScheduledThreadPoolMaxSize(String user, Object source);
 
    static void getThreadPoolMaxSize(Object source) {
       BASE_LOGGER.getThreadPoolMaxSize(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601046, value = "User {0} is getting threadpool max size on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getThreadPoolMaxSize(String user, Object source, Object... args);
+   @LogMessage(id = 601046, value = "User {} is getting threadpool max size on target resource: {}", level = LogMessage.Level.INFO)
+   void getThreadPoolMaxSize(String user, Object source);
 
    static void getSecurityInvalidationInterval(Object source) {
       BASE_LOGGER.getSecurityInvalidationInterval(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601047, value = "User {0} is getting security invalidation interval on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getSecurityInvalidationInterval(String user, Object source, Object... args);
+   @LogMessage(id = 601047, value = "User {} is getting security invalidation interval on target resource: {}", level = LogMessage.Level.INFO)
+   void getSecurityInvalidationInterval(String user, Object source);
 
    static void isClustered(Object source) {
       BASE_LOGGER.isClustered(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601048, value = "User {0} is querying is-clustered on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void isClustered(String user, Object source, Object... args);
+   @LogMessage(id = 601048, value = "User {} is querying is-clustered on target resource: {}", level = LogMessage.Level.INFO)
+   void isClustered(String user, Object source);
 
    static void isCreateBindingsDir(Object source) {
       BASE_LOGGER.isCreateBindingsDir(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601049, value = "User {0} is querying is-create-bindings-dir on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void isCreateBindingsDir(String user, Object source, Object... args);
+   @LogMessage(id = 601049, value = "User {} is querying is-create-bindings-dir on target resource: {}", level = LogMessage.Level.INFO)
+   void isCreateBindingsDir(String user, Object source);
 
    static void isCreateJournalDir(Object source) {
       BASE_LOGGER.isCreateJournalDir(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601050, value = "User {0} is querying is-create-journal-dir on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void isCreateJournalDir(String user, Object source, Object... args);
+   @LogMessage(id = 601050, value = "User {} is querying is-create-journal-dir on target resource: {}", level = LogMessage.Level.INFO)
+   void isCreateJournalDir(String user, Object source);
 
    static void isJournalSyncNonTransactional(Object source) {
       BASE_LOGGER.isJournalSyncNonTransactional(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601051, value = "User {0} is querying is-journal-sync-non-transactional on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void isJournalSyncNonTransactional(String user, Object source, Object... args);
+   @LogMessage(id = 601051, value = "User {} is querying is-journal-sync-non-transactional on target resource: {}", level = LogMessage.Level.INFO)
+   void isJournalSyncNonTransactional(String user, Object source);
 
    static void isJournalSyncTransactional(Object source) {
       BASE_LOGGER.isJournalSyncTransactional(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601052, value = "User {0} is querying is-journal-sync-transactional on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void isJournalSyncTransactional(String user, Object source, Object... args);
+   @LogMessage(id = 601052, value = "User {} is querying is-journal-sync-transactional on target resource: {}", level = LogMessage.Level.INFO)
+   void isJournalSyncTransactional(String user, Object source);
 
    static void isSecurityEnabled(Object source) {
       BASE_LOGGER.isSecurityEnabled(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601053, value = "User {0} is querying is-security-enabled on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void isSecurityEnabled(String user, Object source, Object... args);
+   @LogMessage(id = 601053, value = "User {} is querying is-security-enabled on target resource: {}", level = LogMessage.Level.INFO)
+   void isSecurityEnabled(String user, Object source);
 
    static void isAsyncConnectionExecutionEnabled(Object source) {
       BASE_LOGGER.isAsyncConnectionExecutionEnabled(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601054, value = "User {0} is query is-async-connection-execution-enabled on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void isAsyncConnectionExecutionEnabled(String user, Object source, Object... args);
+   @LogMessage(id = 601054, value = "User {} is query is-async-connection-execution-enabled on target resource: {}", level = LogMessage.Level.INFO)
+   void isAsyncConnectionExecutionEnabled(String user, Object source);
 
    static void getDiskScanPeriod(Object source) {
       BASE_LOGGER.getDiskScanPeriod(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601055, value = "User {0} is getting disk scan period on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getDiskScanPeriod(String user, Object source, Object... args);
+   @LogMessage(id = 601055, value = "User {} is getting disk scan period on target resource: {}", level = LogMessage.Level.INFO)
+   void getDiskScanPeriod(String user, Object source);
 
    static void getMaxDiskUsage(Object source) {
       BASE_LOGGER.getMaxDiskUsage(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601056, value = "User {0} is getting max disk usage on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getMaxDiskUsage(String user, Object source, Object... args);
+   @LogMessage(id = 601056, value = "User {} is getting max disk usage on target resource: {}", level = LogMessage.Level.INFO)
+   void getMaxDiskUsage(String user, Object source);
 
    static void getGlobalMaxSize(Object source) {
       BASE_LOGGER.getGlobalMaxSize(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601057, value = "User {0} is getting global max size on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getGlobalMaxSize(String user, Object source, Object... args);
+   @LogMessage(id = 601057, value = "User {} is getting global max size on target resource: {}", level = LogMessage.Level.INFO)
+   void getGlobalMaxSize(String user, Object source);
 
    static void getAddressMemoryUsage(Object source) {
       BASE_LOGGER.getAddressMemoryUsage(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601058, value = "User {0} is getting address memory usage on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getAddressMemoryUsage(String user, Object source, Object... args);
+   @LogMessage(id = 601058, value = "User {} is getting address memory usage on target resource: {}", level = LogMessage.Level.INFO)
+   void getAddressMemoryUsage(String user, Object source);
 
    static void getAddressMemoryUsagePercentage(Object source) {
       BASE_LOGGER.getAddressMemoryUsagePercentage(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601059, value = "User {0} is getting address memory usage percentage on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getAddressMemoryUsagePercentage(String user, Object source, Object... args);
+   @LogMessage(id = 601059, value = "User {} is getting address memory usage percentage on target resource: {}", level = LogMessage.Level.INFO)
+   void getAddressMemoryUsagePercentage(String user, Object source);
 
    static void freezeReplication(Object source) {
       BASE_LOGGER.freezeReplication(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601060, value = "User {0} is freezing replication on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void freezeReplication(String user, Object source, Object... args);
+   @LogMessage(id = 601060, value = "User {} is freezing replication on target resource: {}", level = LogMessage.Level.INFO)
+   void freezeReplication(String user, Object source);
 
    static void createAddress(Object source, Object... args) {
-      BASE_LOGGER.createAddress(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.createAddress(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601061, value = "User {0} is creating an address on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void createAddress(String user, Object source, Object... args);
+   @LogMessage(id = 601061, value = "User {} is creating an address on target resource: {} {}", level = LogMessage.Level.INFO)
+   void createAddress(String user, Object source, String args);
 
    static void updateAddress(Object source, Object... args) {
-      BASE_LOGGER.updateAddress(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.updateAddress(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601062, value = "User {0} is updating an address on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void updateAddress(String user, Object source, Object... args);
+   @LogMessage(id = 601062, value = "User {} is updating an address on target resource: {} {}", level = LogMessage.Level.INFO)
+   void updateAddress(String user, Object source, String args);
 
    static void deleteAddress(Object source, Object... args) {
-      BASE_LOGGER.deleteAddress(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.deleteAddress(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601063, value = "User {0} is deleting an address on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void deleteAddress(String user, Object source, Object... args);
+   @LogMessage(id = 601063, value = "User {} is deleting an address on target resource: {} {}", level = LogMessage.Level.INFO)
+   void deleteAddress(String user, Object source, String args);
 
    static void deployQueue(Object source, Object... args) {
-      BASE_LOGGER.deployQueue(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.deployQueue(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601064, value = "User {0} is creating a queue on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void deployQueue(String user, Object source, Object... args);
+   @LogMessage(id = 601064, value = "User {} is creating a queue on target resource: {} {}", level = LogMessage.Level.INFO)
+   void deployQueue(String user, Object source, String args);
 
    static void createQueue(Object source, Subject user, String remoteAddress, Object... args) {
-      RESOURCE_LOGGER.createQueue(getCaller(user, remoteAddress), source, arrayToString(args));
+      RESOURCE_LOGGER.createQueue(getCaller(user, remoteAddress), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601065, value = "User {0} is creating a queue on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void createQueue(String user, Object source, Object... args);
+   @LogMessage(id = 601065, value = "User {} is creating a queue on target resource: {} {}", level = LogMessage.Level.INFO)
+   void createQueue(String user, Object source, String args);
 
    static void updateQueue(Object source, Object... args) {
-      BASE_LOGGER.updateQueue(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.updateQueue(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601066, value = "User {0} is updating a queue on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void updateQueue(String user, Object source, Object... args);
+   @LogMessage(id = 601066, value = "User {} is updating a queue on target resource: {} {}", level = LogMessage.Level.INFO)
+   void updateQueue(String user, Object source, String args);
 
    static void getClusterConnectionNames(Object source) {
       BASE_LOGGER.getClusterConnectionNames(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601067, value = "User {0} is getting cluster connection names on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getClusterConnectionNames(String user, Object source, Object... args);
+   @LogMessage(id = 601067, value = "User {} is getting cluster connection names on target resource: {}", level = LogMessage.Level.INFO)
+   void getClusterConnectionNames(String user, Object source);
 
    static void getUptime(Object source) {
       BASE_LOGGER.getUptime(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601068, value = "User {0} is getting uptime on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getUptime(String user, Object source, Object... args);
+   @LogMessage(id = 601068, value = "User {} is getting uptime on target resource: {}", level = LogMessage.Level.INFO)
+   void getUptime(String user, Object source);
 
    static void getUptimeMillis(Object source) {
       BASE_LOGGER.getUptimeMillis(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601069, value = "User {0} is getting uptime in milliseconds on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getUptimeMillis(String user, Object source, Object... args);
+   @LogMessage(id = 601069, value = "User {} is getting uptime in milliseconds on target resource: {}", level = LogMessage.Level.INFO)
+   void getUptimeMillis(String user, Object source);
 
    static void isReplicaSync(Object source) {
       BASE_LOGGER.isReplicaSync(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601070, value = "User {0} is querying is-replica-sync on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void isReplicaSync(String user, Object source, Object... args);
+   @LogMessage(id = 601070, value = "User {} is querying is-replica-sync on target resource: {}", level = LogMessage.Level.INFO)
+   void isReplicaSync(String user, Object source);
 
    static void getAddressNames(Object source) {
       BASE_LOGGER.getAddressNames(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601071, value = "User {0} is getting address names on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getAddressNames(String user, Object source, Object... args);
+   @LogMessage(id = 601071, value = "User {} is getting address names on target resource: {}", level = LogMessage.Level.INFO)
+   void getAddressNames(String user, Object source);
 
    static void destroyQueue(Object source, Subject user, String remoteAddress, Object... args) {
-      BASE_LOGGER.destroyQueue(getCaller(user, remoteAddress), source, arrayToString(args));
+      BASE_LOGGER.destroyQueue(getCaller(user, remoteAddress), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601072, value = "User {0} is deleting a queue on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void destroyQueue(String user, Object source, Object... args);
+   @LogMessage(id = 601072, value = "User {} is deleting a queue on target resource: {} {}", level = LogMessage.Level.INFO)
+   void destroyQueue(String user, Object source, String args);
 
    static void getAddressInfo(Object source, Object... args) {
-      BASE_LOGGER.getAddressInfo(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.getAddressInfo(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601073, value = "User {0} is getting address info on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getAddressInfo(String user, Object source, Object... args);
+   @LogMessage(id = 601073, value = "User {} is getting address info on target resource: {} {}", level = LogMessage.Level.INFO)
+   void getAddressInfo(String user, Object source, String args);
 
    static void listBindingsForAddress(Object source, Object... args) {
-      BASE_LOGGER.listBindingsForAddress(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.listBindingsForAddress(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601074, value = "User {0} is listing bindings for address on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void listBindingsForAddress(String user, Object source, Object... args);
+   @LogMessage(id = 601074, value = "User {} is listing bindings for address on target resource: {} {}", level = LogMessage.Level.INFO)
+   void listBindingsForAddress(String user, Object source, String args);
 
    static void listAddresses(Object source, Object... args) {
-      BASE_LOGGER.listAddresses(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.listAddresses(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601075, value = "User {0} is listing addresses on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void listAddresses(String user, Object source, Object... args);
+   @LogMessage(id = 601075, value = "User {} is listing addresses on target resource: {} {}", level = LogMessage.Level.INFO)
+   void listAddresses(String user, Object source, String args);
 
    static void getConnectionCount(Object source, Object... args) {
-      BASE_LOGGER.getConnectionCount(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.getConnectionCount(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601076, value = "User {0} is getting connection count on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getConnectionCount(String user, Object source, Object... args);
+   @LogMessage(id = 601076, value = "User {} is getting connection count on target resource: {} {}", level = LogMessage.Level.INFO)
+   void getConnectionCount(String user, Object source, String args);
 
    static void getTotalConnectionCount(Object source) {
       BASE_LOGGER.getTotalConnectionCount(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601077, value = "User {0} is getting total connection count on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getTotalConnectionCount(String user, Object source, Object... args);
+   @LogMessage(id = 601077, value = "User {} is getting total connection count on target resource: {}", level = LogMessage.Level.INFO)
+   void getTotalConnectionCount(String user, Object source);
 
    static void getTotalMessageCount(Object source) {
       BASE_LOGGER.getTotalMessageCount(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601078, value = "User {0} is getting total message count on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getTotalMessageCount(String user, Object source, Object... args);
+   @LogMessage(id = 601078, value = "User {} is getting total message count on target resource: {}", level = LogMessage.Level.INFO)
+   void getTotalMessageCount(String user, Object source);
 
    static void getTotalMessagesAdded(Object source) {
       BASE_LOGGER.getTotalMessagesAdded(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601079, value = "User {0} is getting total messages added on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getTotalMessagesAdded(String user, Object source, Object... args);
+   @LogMessage(id = 601079, value = "User {} is getting total messages added on target resource: {}", level = LogMessage.Level.INFO)
+   void getTotalMessagesAdded(String user, Object source);
 
    static void getTotalMessagesAcknowledged(Object source) {
       BASE_LOGGER.getTotalMessagesAcknowledged(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601080, value = "User {0} is getting total messages acknowledged on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getTotalMessagesAcknowledged(String user, Object source, Object... args);
+   @LogMessage(id = 601080, value = "User {} is getting total messages acknowledged on target resource: {}", level = LogMessage.Level.INFO)
+   void getTotalMessagesAcknowledged(String user, Object source);
 
    static void getTotalConsumerCount(Object source) {
       BASE_LOGGER.getTotalConsumerCount(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601081, value = "User {0} is getting total consumer count on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getTotalConsumerCount(String user, Object source, Object... args);
+   @LogMessage(id = 601081, value = "User {} is getting total consumer count on target resource: {}", level = LogMessage.Level.INFO)
+   void getTotalConsumerCount(String user, Object source);
 
    static void enableMessageCounters(Object source) {
       BASE_LOGGER.enableMessageCounters(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601082, value = "User {0} is enabling message counters on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void enableMessageCounters(String user, Object source, Object... args);
+   @LogMessage(id = 601082, value = "User {} is enabling message counters on target resource: {}", level = LogMessage.Level.INFO)
+   void enableMessageCounters(String user, Object source);
 
    static void disableMessageCounters(Object source) {
       BASE_LOGGER.disableMessageCounters(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601083, value = "User {0} is disabling message counters on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void disableMessageCounters(String user, Object source, Object... args);
+   @LogMessage(id = 601083, value = "User {} is disabling message counters on target resource: {}", level = LogMessage.Level.INFO)
+   void disableMessageCounters(String user, Object source);
 
    static void resetAllMessageCounters(Object source) {
       BASE_LOGGER.resetAllMessageCounters(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601084, value = "User {0} is resetting all message counters on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void resetAllMessageCounters(String user, Object source, Object... args);
+   @LogMessage(id = 601084, value = "User {} is resetting all message counters on target resource: {}", level = LogMessage.Level.INFO)
+   void resetAllMessageCounters(String user, Object source);
 
    static void resetAllMessageCounterHistories(Object source) {
       BASE_LOGGER.resetAllMessageCounterHistories(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601085, value = "User {0} is resetting all message counter histories on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void resetAllMessageCounterHistories(String user, Object source, Object... args);
+   @LogMessage(id = 601085, value = "User {} is resetting all message counter histories on target resource: {}", level = LogMessage.Level.INFO)
+   void resetAllMessageCounterHistories(String user, Object source);
 
    static void isMessageCounterEnabled(Object source) {
       BASE_LOGGER.isMessageCounterEnabled(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601086, value = "User {0} is querying is-message-counter-enabled on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void isMessageCounterEnabled(String user, Object source, Object... args);
+   @LogMessage(id = 601086, value = "User {} is querying is-message-counter-enabled on target resource: {}", level = LogMessage.Level.INFO)
+   void isMessageCounterEnabled(String user, Object source);
 
    static void getMessageCounterSamplePeriod(Object source) {
       BASE_LOGGER.getMessageCounterSamplePeriod(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601087, value = "User {0} is getting message counter sample period on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getMessageCounterSamplePeriod(String user, Object source, Object... args);
+   @LogMessage(id = 601087, value = "User {} is getting message counter sample period on target resource: {}", level = LogMessage.Level.INFO)
+   void getMessageCounterSamplePeriod(String user, Object source);
 
    static void setMessageCounterSamplePeriod(Object source, Object... args) {
-      BASE_LOGGER.setMessageCounterSamplePeriod(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.setMessageCounterSamplePeriod(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601088, value = "User {0} is setting message counter sample period on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void setMessageCounterSamplePeriod(String user, Object source, Object... args);
+   @LogMessage(id = 601088, value = "User {} is setting message counter sample period on target resource: {} {}", level = LogMessage.Level.INFO)
+   void setMessageCounterSamplePeriod(String user, Object source, String args);
 
    static void getMessageCounterMaxDayCount(Object source) {
       BASE_LOGGER.getMessageCounterMaxDayCount(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601089, value = "User {0} is getting message counter max day count on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getMessageCounterMaxDayCount(String user, Object source, Object... args);
+   @LogMessage(id = 601089, value = "User {} is getting message counter max day count on target resource: {}", level = LogMessage.Level.INFO)
+   void getMessageCounterMaxDayCount(String user, Object source);
 
    static void setMessageCounterMaxDayCount(Object source, Object... args) {
-      BASE_LOGGER.setMessageCounterMaxDayCount(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.setMessageCounterMaxDayCount(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601090, value = "User {0} is setting message counter max day count on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void setMessageCounterMaxDayCount(String user, Object source, Object... args);
+   @LogMessage(id = 601090, value = "User {} is setting message counter max day count on target resource: {} {}", level = LogMessage.Level.INFO)
+   void setMessageCounterMaxDayCount(String user, Object source, String args);
 
    static void listPreparedTransactions(Object source) {
       BASE_LOGGER.listPreparedTransactions(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601091, value = "User {0} is listing prepared transactions on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void listPreparedTransactions(String user, Object source, Object... args);
+   @LogMessage(id = 601091, value = "User {} is listing prepared transactions on target resource: {}", level = LogMessage.Level.INFO)
+   void listPreparedTransactions(String user, Object source);
 
    static void listPreparedTransactionDetailsAsJSON(Object source) {
       BASE_LOGGER.listPreparedTransactionDetailsAsJSON(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601092, value = "User {0} is listing prepared transaction details as json on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void listPreparedTransactionDetailsAsJSON(String user, Object source, Object... args);
+   @LogMessage(id = 601092, value = "User {} is listing prepared transaction details as json on target resource: {}", level = LogMessage.Level.INFO)
+   void listPreparedTransactionDetailsAsJSON(String user, Object source);
 
    static void listPreparedTransactionDetailsAsHTML(Object source, Object... args) {
-      BASE_LOGGER.listPreparedTransactionDetailsAsHTML(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.listPreparedTransactionDetailsAsHTML(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601093, value = "User {0} is listing prepared transaction details as HTML on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void listPreparedTransactionDetailsAsHTML(String user, Object source, Object... args);
+   @LogMessage(id = 601093, value = "User {} is listing prepared transaction details as HTML on target resource: {} {}", level = LogMessage.Level.INFO)
+   void listPreparedTransactionDetailsAsHTML(String user, Object source, String args);
 
    static void listHeuristicCommittedTransactions(Object source) {
       BASE_LOGGER.listHeuristicCommittedTransactions(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601094, value = "User {0} is listing heuristic committed transactions on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void listHeuristicCommittedTransactions(String user, Object source, Object... args);
+   @LogMessage(id = 601094, value = "User {} is listing heuristic committed transactions on target resource: {}", level = LogMessage.Level.INFO)
+   void listHeuristicCommittedTransactions(String user, Object source);
 
    static void listHeuristicRolledBackTransactions(Object source) {
       BASE_LOGGER.listHeuristicRolledBackTransactions(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601095, value = "User {0} is listing heuristic rolled back transactions on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void listHeuristicRolledBackTransactions(String user, Object source, Object... args);
+   @LogMessage(id = 601095, value = "User {} is listing heuristic rolled back transactions on target resource: {}", level = LogMessage.Level.INFO)
+   void listHeuristicRolledBackTransactions(String user, Object source);
 
    static void commitPreparedTransaction(Object source, Object... args) {
-      BASE_LOGGER.commitPreparedTransaction(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.commitPreparedTransaction(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601096, value = "User {0} is commiting prepared transaction on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void commitPreparedTransaction(String user, Object source, Object... args);
+   @LogMessage(id = 601096, value = "User {} is commiting prepared transaction on target resource: {} {}", level = LogMessage.Level.INFO)
+   void commitPreparedTransaction(String user, Object source, String args);
 
    static void rollbackPreparedTransaction(Object source, Object... args) {
-      BASE_LOGGER.rollbackPreparedTransaction(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.rollbackPreparedTransaction(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601097, value = "User {0} is rolling back prepared transaction on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void rollbackPreparedTransaction(String user, Object source, Object... args);
+   @LogMessage(id = 601097, value = "User {} is rolling back prepared transaction on target resource: {} {}", level = LogMessage.Level.INFO)
+   void rollbackPreparedTransaction(String user, Object source, String args);
 
    static void listRemoteAddresses(Object source, Object... args) {
-      BASE_LOGGER.listRemoteAddresses(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.listRemoteAddresses(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601098, value = "User {0} is listing remote addresses on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void listRemoteAddresses(String user, Object source, Object... args);
+   @LogMessage(id = 601098, value = "User {} is listing remote addresses on target resource: {} {}", level = LogMessage.Level.INFO)
+   void listRemoteAddresses(String user, Object source, String args);
 
    static void closeConnectionsForAddress(Object source, Object... args) {
-      BASE_LOGGER.closeConnectionsForAddress(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.closeConnectionsForAddress(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601099, value = "User {0} is closing connections for address on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void closeConnectionsForAddress(String user, Object source, Object... args);
+   @LogMessage(id = 601099, value = "User {} is closing connections for address on target resource: {} {}", level = LogMessage.Level.INFO)
+   void closeConnectionsForAddress(String user, Object source, String args);
 
    static void closeConsumerConnectionsForAddress(Object source, Object... args) {
-      BASE_LOGGER.closeConsumerConnectionsForAddress(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.closeConsumerConnectionsForAddress(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601100, value = "User {0} is closing consumer connections for address on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void closeConsumerConnectionsForAddress(String user, Object source, Object... args);
+   @LogMessage(id = 601100, value = "User {} is closing consumer connections for address on target resource: {} {}", level = LogMessage.Level.INFO)
+   void closeConsumerConnectionsForAddress(String user, Object source, String args);
 
    static void closeConnectionsForUser(Object source, Object... args) {
-      BASE_LOGGER.closeConnectionsForUser(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.closeConnectionsForUser(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601101, value = "User {0} is closing connections for user on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void closeConnectionsForUser(String user, Object source, Object... args);
+   @LogMessage(id = 601101, value = "User {} is closing connections for user on target resource: {} {}", level = LogMessage.Level.INFO)
+   void closeConnectionsForUser(String user, Object source, String args);
 
    static void closeConnectionWithID(Object source, Object... args) {
-      BASE_LOGGER.closeConnectionWithID(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.closeConnectionWithID(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601102, value = "User {0} is closing a connection by ID on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void closeConnectionWithID(String user, Object source, Object... args);
+   @LogMessage(id = 601102, value = "User {} is closing a connection by ID on target resource: {} {}", level = LogMessage.Level.INFO)
+   void closeConnectionWithID(String user, Object source, String args);
 
    static void closeSessionWithID(Object source, Object... args) {
-      BASE_LOGGER.closeSessionWithID(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.closeSessionWithID(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601103, value = "User {0} is closing session with id on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void closeSessionWithID(String user, Object source, Object... args);
+   @LogMessage(id = 601103, value = "User {} is closing session with id on target resource: {} {}", level = LogMessage.Level.INFO)
+   void closeSessionWithID(String user, Object source, String args);
 
    static void closeConsumerWithID(Object source, Object... args) {
-      BASE_LOGGER.closeConsumerWithID(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.closeConsumerWithID(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601104, value = "User {0} is closing consumer with id on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void closeConsumerWithID(String user, Object source, Object... args);
+   @LogMessage(id = 601104, value = "User {} is closing consumer with id on target resource: {} {}", level = LogMessage.Level.INFO)
+   void closeConsumerWithID(String user, Object source, String args);
 
    static void listConnectionIDs(Object source) {
       BASE_LOGGER.listConnectionIDs(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601105, value = "User {0} is listing connection IDs on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void listConnectionIDs(String user, Object source, Object... args);
+   @LogMessage(id = 601105, value = "User {} is listing connection IDs on target resource: {}", level = LogMessage.Level.INFO)
+   void listConnectionIDs(String user, Object source);
 
    static void listSessions(Object source, Object... args) {
-      BASE_LOGGER.listSessions(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.listSessions(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601106, value = "User {0} is listing sessions on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void listSessions(String user, Object source, Object... args);
+   @LogMessage(id = 601106, value = "User {} is listing sessions on target resource: {} {}", level = LogMessage.Level.INFO)
+   void listSessions(String user, Object source, String args);
 
    static void listProducersInfoAsJSON(Object source) {
       BASE_LOGGER.listProducersInfoAsJSON(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601107, value = "User {0} is listing producers info as json on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void listProducersInfoAsJSON(String user, Object source, Object... args);
+   @LogMessage(id = 601107, value = "User {} is listing producers info as json on target resource: {}", level = LogMessage.Level.INFO)
+   void listProducersInfoAsJSON(String user, Object source);
 
    static void listConnections(Object source, Object... args) {
-      BASE_LOGGER.listConnections(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.listConnections(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601108, value = "User {0} is listing connections on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void listConnections(String user, Object source, Object... args);
+   @LogMessage(id = 601108, value = "User {} is listing connections on target resource: {} {}", level = LogMessage.Level.INFO)
+   void listConnections(String user, Object source, String args);
 
    static void listConsumers(Object source, Object... args) {
-      BASE_LOGGER.listConsumers(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.listConsumers(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601109, value = "User {0} is listing consumers on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void listConsumers(String user, Object source, Object... args);
+   @LogMessage(id = 601109, value = "User {} is listing consumers on target resource: {} {}", level = LogMessage.Level.INFO)
+   void listConsumers(String user, Object source, String args);
 
    static void listQueues(Object source, Object... args) {
-      BASE_LOGGER.listQueues(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.listQueues(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601110, value = "User {0} is listing queues on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void listQueues(String user, Object source, Object... args);
+   @LogMessage(id = 601110, value = "User {} is listing queues on target resource: {} {}", level = LogMessage.Level.INFO)
+   void listQueues(String user, Object source, String arg);
 
    static void listProducers(Object source, Object... args) {
-      BASE_LOGGER.listProducers(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.listProducers(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601111, value = "User {0} is listing producers on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void listProducers(String user, Object source, Object... args);
+   @LogMessage(id = 601111, value = "User {} is listing producers on target resource: {} {}", level = LogMessage.Level.INFO)
+   void listProducers(String user, Object source, String args);
 
    static void listConnectionsAsJSON(Object source) {
       BASE_LOGGER.listConnectionsAsJSON(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601112, value = "User {0} is listing connections as json on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void listConnectionsAsJSON(String user, Object source, Object... args);
+   @LogMessage(id = 601112, value = "User {} is listing connections as json on target resource: {}", level = LogMessage.Level.INFO)
+   void listConnectionsAsJSON(String user, Object source);
 
    static void listSessionsAsJSON(Object source, Object... args) {
-      BASE_LOGGER.listSessionsAsJSON(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.listSessionsAsJSON(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601113, value = "User {0} is listing sessions as json on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void listSessionsAsJSON(String user, Object source, Object... args);
+   @LogMessage(id = 601113, value = "User {} is listing sessions as json on target resource: {} {}", level = LogMessage.Level.INFO)
+   void listSessionsAsJSON(String user, Object source, String args);
 
    static void listAllSessionsAsJSON(Object source) {
       BASE_LOGGER.listAllSessionsAsJSON(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601114, value = "User {0} is listing all sessions as json on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void listAllSessionsAsJSON(String user, Object source, Object... args);
+   @LogMessage(id = 601114, value = "User {} is listing all sessions as json on target resource: {}", level = LogMessage.Level.INFO)
+   void listAllSessionsAsJSON(String user, Object source);
 
    static void listConsumersAsJSON(Object source, Object... args) {
-      BASE_LOGGER.listConsumersAsJSON(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.listConsumersAsJSON(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601115, value = "User {0} is listing consumers as json on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void listConsumersAsJSON(String user, Object source, Object... args);
+   @LogMessage(id = 601115, value = "User {} is listing consumers as json on target resource: {} {}", level = LogMessage.Level.INFO)
+   void listConsumersAsJSON(String user, Object source, String args);
 
    static void listAllConsumersAsJSON(Object source) {
       BASE_LOGGER.listAllConsumersAsJSON(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601116, value = "User {0} is listing all consumers as json on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void listAllConsumersAsJSON(String user, Object source, Object... args);
+   @LogMessage(id = 601116, value = "User {} is listing all consumers as json on target resource: {}", level = LogMessage.Level.INFO)
+   void listAllConsumersAsJSON(String user, Object source);
 
    static void getConnectors(Object source) {
       BASE_LOGGER.getConnectors(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601117, value = "User {0} is getting connectors on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getConnectors(String user, Object source, Object... args);
+   @LogMessage(id = 601117, value = "User {} is getting connectors on target resource: {}", level = LogMessage.Level.INFO)
+   void getConnectors(String user, Object source);
 
    static void getConnectorsAsJSON(Object source) {
       BASE_LOGGER.getConnectorsAsJSON(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601118, value = "User {0} is getting connectors as json on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getConnectorsAsJSON(String user, Object source, Object... args);
+   @LogMessage(id = 601118, value = "User {} is getting connectors as json on target resource: {}", level = LogMessage.Level.INFO)
+   void getConnectorsAsJSON(String user, Object source);
 
    static void addSecuritySettings(Object source, Object... args) {
-      BASE_LOGGER.addSecuritySettings(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.addSecuritySettings(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601119, value = "User {0} is adding security settings on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void addSecuritySettings(String user, Object source, Object... args);
+   @LogMessage(id = 601119, value = "User {} is adding security settings on target resource: {} {}", level = LogMessage.Level.INFO)
+   void addSecuritySettings(String user, Object source, String args);
 
    static void removeSecuritySettings(Object source, Object... args) {
-      BASE_LOGGER.removeSecuritySettings(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.removeSecuritySettings(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601120, value = "User {0} is removing security settings on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void removeSecuritySettings(String user, Object source, Object... args);
+   @LogMessage(id = 601120, value = "User {} is removing security settings on target resource: {} {}", level = LogMessage.Level.INFO)
+   void removeSecuritySettings(String user, Object source, String args);
 
    static void getAddressSettingsAsJSON(Object source, Object... args) {
-      BASE_LOGGER.getAddressSettingsAsJSON(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.getAddressSettingsAsJSON(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601121, value = "User {0} is getting address settings as json on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getAddressSettingsAsJSON(String user, Object source, Object... args);
+   @LogMessage(id = 601121, value = "User {} is getting address settings as json on target resource: {} {}", level = LogMessage.Level.INFO)
+   void getAddressSettingsAsJSON(String user, Object source, String args);
 
    static void addAddressSettings(Object source, Object... args) {
-      BASE_LOGGER.addAddressSettings(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.addAddressSettings(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601122, value = "User {0} is adding addressSettings on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void addAddressSettings(String user, Object source, Object... args);
+   @LogMessage(id = 601122, value = "User {} is adding addressSettings on target resource: {} {}", level = LogMessage.Level.INFO)
+   void addAddressSettings(String user, Object source, String args);
 
    static void removeAddressSettings(Object source, Object... args) {
-      BASE_LOGGER.removeAddressSettings(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.removeAddressSettings(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601123, value = "User {0} is removing address settings on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void removeAddressSettings(String user, Object source, Object... args);
+   @LogMessage(id = 601123, value = "User {} is removing address settings on target resource: {} {}", level = LogMessage.Level.INFO)
+   void removeAddressSettings(String user, Object source, String args);
 
    static void getDivertNames(Object source) {
       BASE_LOGGER.getDivertNames(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601124, value = "User {0} is getting divert names on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getDivertNames(String user, Object source, Object... args);
+   @LogMessage(id = 601124, value = "User {} is getting divert names on target resource: {}", level = LogMessage.Level.INFO)
+   void getDivertNames(String user, Object source);
 
    static void createDivert(Object source, Object... args) {
-      BASE_LOGGER.createDivert(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.createDivert(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601125, value = "User {0} is creating a divert on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void createDivert(String user, Object source, Object... args);
+   @LogMessage(id = 601125, value = "User {} is creating a divert on target resource: {} {}", level = LogMessage.Level.INFO)
+   void createDivert(String user, Object source, String args);
 
    static void destroyDivert(Object source, Object... args) {
-      BASE_LOGGER.destroyDivert(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.destroyDivert(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601126, value = "User {0} is destroying a divert on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void destroyDivert(String user, Object source, Object... args);
+   @LogMessage(id = 601126, value = "User {} is destroying a divert on target resource: {} {}", level = LogMessage.Level.INFO)
+   void destroyDivert(String user, Object source, String args);
 
    static void getBridgeNames(Object source) {
       BASE_LOGGER.getBridgeNames(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601127, value = "User {0} is getting bridge names on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getBridgeNames(String user, Object source, Object... args);
+   @LogMessage(id = 601127, value = "User {} is getting bridge names on target resource: {}", level = LogMessage.Level.INFO)
+   void getBridgeNames(String user, Object source);
 
    static void createBridge(Object source, Object... args) {
-      BASE_LOGGER.createBridge(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.createBridge(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601128, value = "User {0} is creating a bridge on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void createBridge(String user, Object source, Object... args);
+   @LogMessage(id = 601128, value = "User {} is creating a bridge on target resource: {} {}", level = LogMessage.Level.INFO)
+   void createBridge(String user, Object source, String args);
 
    static void destroyBridge(Object source, Object... args) {
-      BASE_LOGGER.destroyBridge(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.destroyBridge(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601129, value = "User {0} is destroying a bridge on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void destroyBridge(String user, Object source, Object... args);
+   @LogMessage(id = 601129, value = "User {} is destroying a bridge on target resource: {} {}", level = LogMessage.Level.INFO)
+   void destroyBridge(String user, Object source, String args);
 
    static void createConnectorService(Object source, Object... args) {
-      BASE_LOGGER.createConnectorService(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.createConnectorService(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601130, value = "User {0} is creating connector service on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void createConnectorService(String user, Object source, Object... args);
+   @LogMessage(id = 601130, value = "User {} is creating connector service on target resource: {} {}", level = LogMessage.Level.INFO)
+   void createConnectorService(String user, Object source, String args);
 
    static void destroyConnectorService(Object source, Object... args) {
-      BASE_LOGGER.destroyConnectorService(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.destroyConnectorService(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601131, value = "User {0} is destroying connector service on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void destroyConnectorService(String user, Object source, Object... args);
+   @LogMessage(id = 601131, value = "User {} is destroying connector service on target resource: {} {}", level = LogMessage.Level.INFO)
+   void destroyConnectorService(String user, Object source, String args);
 
    static void getConnectorServices(Object source, Object... args) {
-      BASE_LOGGER.getConnectorServices(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.getConnectorServices(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601132, value = "User {0} is getting connector services on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getConnectorServices(String user, Object source, Object... args);
+   @LogMessage(id = 601132, value = "User {} is getting connector services on target resource: {} {}", level = LogMessage.Level.INFO)
+   void getConnectorServices(String user, Object source, String args);
 
    static void forceFailover(Object source) {
       BASE_LOGGER.forceFailover(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601133, value = "User {0} is forceing a failover on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void forceFailover(String user, Object source, Object... args);
+   @LogMessage(id = 601133, value = "User {} is forceing a failover on target resource: {}", level = LogMessage.Level.INFO)
+   void forceFailover(String user, Object source);
 
    static void scaleDown(Object source, Object... args) {
-      BASE_LOGGER.scaleDown(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.scaleDown(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601134, value = "User {0} is performing scale down on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void scaleDown(String user, Object source, Object... args);
+   @LogMessage(id = 601134, value = "User {} is performing scale down on target resource: {} {}", level = LogMessage.Level.INFO)
+   void scaleDown(String user, Object source, String args);
 
    static void listNetworkTopology(Object source) {
       BASE_LOGGER.listNetworkTopology(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601135, value = "User {0} is listing network topology on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void listNetworkTopology(String user, Object source, Object... args);
+   @LogMessage(id = 601135, value = "User {} is listing network topology on target resource: {}", level = LogMessage.Level.INFO)
+   void listNetworkTopology(String user, Object source);
 
    static void removeNotificationListener(Object source, Object... args) {
-      BASE_LOGGER.removeNotificationListener(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.removeNotificationListener(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601136, value = "User {0} is removing notification listener on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void removeNotificationListener(String user, Object source, Object... args);
+   @LogMessage(id = 601136, value = "User {} is removing notification listener on target resource: {} {}", level = LogMessage.Level.INFO)
+   void removeNotificationListener(String user, Object source, String args);
 
    static void addNotificationListener(Object source, Object... args) {
-      BASE_LOGGER.addNotificationListener(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.addNotificationListener(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601137, value = "User {0} is adding notification listener on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void addNotificationListener(String user, Object source, Object... args);
+   @LogMessage(id = 601137, value = "User {} is adding notification listener on target resource: {} {}", level = LogMessage.Level.INFO)
+   void addNotificationListener(String user, Object source, String args);
 
    static void getNotificationInfo(Object source) {
       BASE_LOGGER.getNotificationInfo(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601138, value = "User {0} is getting notification info on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getNotificationInfo(String user, Object source, Object... args);
+   @LogMessage(id = 601138, value = "User {} is getting notification info on target resource: {}", level = LogMessage.Level.INFO)
+   void getNotificationInfo(String user, Object source);
 
    static void getConnectionTTLOverride(Object source) {
       BASE_LOGGER.getConnectionTTLOverride(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601139, value = "User {0} is getting connection ttl override on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getConnectionTTLOverride(String user, Object source, Object... args);
+   @LogMessage(id = 601139, value = "User {} is getting connection ttl override on target resource: {}", level = LogMessage.Level.INFO)
+   void getConnectionTTLOverride(String user, Object source);
 
    static void getIDCacheSize(Object source) {
       BASE_LOGGER.getIDCacheSize(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601140, value = "User {0} is getting ID cache size on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getIDCacheSize(String user, Object source, Object... args);
+   @LogMessage(id = 601140, value = "User {} is getting ID cache size on target resource: {}", level = LogMessage.Level.INFO)
+   void getIDCacheSize(String user, Object source);
 
    static void getLargeMessagesDirectory(Object source) {
       BASE_LOGGER.getLargeMessagesDirectory(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601141, value = "User {0} is getting large message directory on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getLargeMessagesDirectory(String user, Object source, Object... args);
+   @LogMessage(id = 601141, value = "User {} is getting large message directory on target resource: {}", level = LogMessage.Level.INFO)
+   void getLargeMessagesDirectory(String user, Object source);
 
    static void getManagementAddress(Object source) {
       BASE_LOGGER.getManagementAddress(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601142, value = "User {0} is getting management address on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getManagementAddress(String user, Object source, Object... args);
+   @LogMessage(id = 601142, value = "User {} is getting management address on target resource: {}", level = LogMessage.Level.INFO)
+   void getManagementAddress(String user, Object source);
 
    static void getNodeID(Object source) {
       BASE_LOGGER.getNodeID(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601143, value = "User {0} is getting node ID on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getNodeID(String user, Object source, Object... args);
+   @LogMessage(id = 601143, value = "User {} is getting node ID on target resource: {}", level = LogMessage.Level.INFO)
+   void getNodeID(String user, Object source);
 
    static void getManagementNotificationAddress(Object source) {
       BASE_LOGGER.getManagementNotificationAddress(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601144, value = "User {0} is getting management notification address on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getManagementNotificationAddress(String user, Object source, Object... args);
+   @LogMessage(id = 601144, value = "User {} is getting management notification address on target resource: {}", level = LogMessage.Level.INFO)
+   void getManagementNotificationAddress(String user, Object source);
 
    static void getMessageExpiryScanPeriod(Object source) {
       BASE_LOGGER.getMessageExpiryScanPeriod(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601145, value = "User {0} is getting message expiry scan period on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getMessageExpiryScanPeriod(String user, Object source, Object... args);
+   @LogMessage(id = 601145, value = "User {} is getting message expiry scan period on target resource: {}", level = LogMessage.Level.INFO)
+   void getMessageExpiryScanPeriod(String user, Object source);
 
    static void getMessageExpiryThreadPriority(Object source) {
       BASE_LOGGER.getMessageExpiryThreadPriority(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601146, value = "User {0} is getting message expiry thread priority on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getMessageExpiryThreadPriority(String user, Object source, Object... args);
+   @LogMessage(id = 601146, value = "User {} is getting message expiry thread priority on target resource: {}", level = LogMessage.Level.INFO)
+   void getMessageExpiryThreadPriority(String user, Object source);
 
    static void getTransactionTimeout(Object source) {
       BASE_LOGGER.getTransactionTimeout(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601147, value = "User {0} is getting transaction timeout on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getTransactionTimeout(String user, Object source, Object... args);
+   @LogMessage(id = 601147, value = "User {} is getting transaction timeout on target resource: {}", level = LogMessage.Level.INFO)
+   void getTransactionTimeout(String user, Object source);
 
    static void getTransactionTimeoutScanPeriod(Object source) {
       BASE_LOGGER.getTransactionTimeoutScanPeriod(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601148, value = "User {0} is getting transaction timeout scan period on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getTransactionTimeoutScanPeriod(String user, Object source, Object... args);
+   @LogMessage(id = 601148, value = "User {} is getting transaction timeout scan period on target resource: {}", level = LogMessage.Level.INFO)
+   void getTransactionTimeoutScanPeriod(String user, Object source);
 
    static void isPersistDeliveryCountBeforeDelivery(Object source) {
       BASE_LOGGER.isPersistDeliveryCountBeforeDelivery(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601149, value = "User {0} is querying is-persist-delivery-before-delivery on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void isPersistDeliveryCountBeforeDelivery(String user, Object source, Object... args);
+   @LogMessage(id = 601149, value = "User {} is querying is-persist-delivery-before-delivery on target resource: {}", level = LogMessage.Level.INFO)
+   void isPersistDeliveryCountBeforeDelivery(String user, Object source);
 
    static void isPersistIDCache(Object source) {
       BASE_LOGGER.isPersistIDCache(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601150, value = "User {0} is querying is-persist-id-cache on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void isPersistIDCache(String user, Object source, Object... args);
+   @LogMessage(id = 601150, value = "User {} is querying is-persist-id-cache on target resource: {}", level = LogMessage.Level.INFO)
+   void isPersistIDCache(String user, Object source);
 
    static void isWildcardRoutingEnabled(Object source) {
       BASE_LOGGER.isWildcardRoutingEnabled(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601151, value = "User {0} is querying is-wildcard-routing-enabled on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void isWildcardRoutingEnabled(String user, Object source, Object... args);
+   @LogMessage(id = 601151, value = "User {} is querying is-wildcard-routing-enabled on target resource: {}", level = LogMessage.Level.INFO)
+   void isWildcardRoutingEnabled(String user, Object source);
 
    static void addUser(Object source, Object... args) {
-      BASE_LOGGER.addUser(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.addUser(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601152, value = "User {0} is adding a user on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void addUser(String user, Object source, Object... args);
+   @LogMessage(id = 601152, value = "User {} is adding a user on target resource: {} {}", level = LogMessage.Level.INFO)
+   void addUser(String user, Object source, String args);
 
    static void listUser(Object source, Object... args) {
-      BASE_LOGGER.listUser(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.listUser(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601153, value = "User {0} is listing a user on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void listUser(String user, Object source, Object... args);
+   @LogMessage(id = 601153, value = "User {} is listing a user on target resource: {} {}", level = LogMessage.Level.INFO)
+   void listUser(String user, Object source, String args);
 
    static void removeUser(Object source, Object... args) {
-      BASE_LOGGER.removeUser(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.removeUser(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601154, value = "User {0} is removing a user on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void removeUser(String user, Object source, Object... args);
+   @LogMessage(id = 601154, value = "User {} is removing a user on target resource: {} {}", level = LogMessage.Level.INFO)
+   void removeUser(String user, Object source, String args);
 
    static void resetUser(Object source, Object... args) {
-      BASE_LOGGER.resetUser(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.resetUser(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601155, value = "User {0} is resetting a user on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void resetUser(String user, Object source, Object... args);
+   @LogMessage(id = 601155, value = "User {} is resetting a user on target resource: {} {}", level = LogMessage.Level.INFO)
+   void resetUser(String user, Object source, String args);
 
    static void getUser(Object source) {
       BASE_LOGGER.getUser(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601156, value = "User {0} is getting user property on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getUser(String user, Object source, Object... args);
+   @LogMessage(id = 601156, value = "User {} is getting user property on target resource: {}", level = LogMessage.Level.INFO)
+   void getUser(String user, Object source);
 
    static void getRoutingType(Object source) {
       BASE_LOGGER.getRoutingType(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601157, value = "User {0} is getting routing type property on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getRoutingType(String user, Object source, Object... args);
+   @LogMessage(id = 601157, value = "User {} is getting routing type property on target resource: {}", level = LogMessage.Level.INFO)
+   void getRoutingType(String user, Object source);
 
    static void isTemporary(Object source) {
       BASE_LOGGER.isTemporary(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601158, value = "User {0} is getting temporary property on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void isTemporary(String user, Object source, Object... args);
+   @LogMessage(id = 601158, value = "User {} is getting temporary property on target resource: {}", level = LogMessage.Level.INFO)
+   void isTemporary(String user, Object source);
 
    static void getPersistentSize(Object source) {
       BASE_LOGGER.getPersistentSize(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601159, value = "User {0} is getting persistent size on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getPersistentSize(String user, Object source, Object... args);
+   @LogMessage(id = 601159, value = "User {} is getting persistent size on target resource: {}", level = LogMessage.Level.INFO)
+   void getPersistentSize(String user, Object source);
 
    static void getDurableMessageCount(Object source) {
       BASE_LOGGER.getDurableMessageCount(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601160, value = "User {0} is getting durable message count on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getDurableMessageCount(String user, Object source, Object... args);
+   @LogMessage(id = 601160, value = "User {} is getting durable message count on target resource: {}", level = LogMessage.Level.INFO)
+   void getDurableMessageCount(String user, Object source);
 
    static void getDurablePersistSize(Object source) {
       BASE_LOGGER.getDurablePersistSize(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601161, value = "User {0} is getting durable persist size on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getDurablePersistSize(String user, Object source, Object... args);
+   @LogMessage(id = 601161, value = "User {} is getting durable persist size on target resource: {}", level = LogMessage.Level.INFO)
+   void getDurablePersistSize(String user, Object source);
 
    static void getConsumerCount(Object source) {
       BASE_LOGGER.getConsumerCount(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601162, value = "User {0} is getting consumer count on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getConsumerCount(String user, Object source, Object... args);
+   @LogMessage(id = 601162, value = "User {} is getting consumer count on target resource: {}", level = LogMessage.Level.INFO)
+   void getConsumerCount(String user, Object source);
 
    static void getDeliveringCount(Object source) {
       BASE_LOGGER.getDeliveringCount(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601163, value = "User {0} is getting delivering count on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getDeliveringCount(String user, Object source, Object... args);
+   @LogMessage(id = 601163, value = "User {} is getting delivering count on target resource: {}", level = LogMessage.Level.INFO)
+   void getDeliveringCount(String user, Object source);
 
    static void getDeliveringSize(Object source) {
       BASE_LOGGER.getDeliveringSize(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601164, value = "User {0} is getting delivering size on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getDeliveringSize(String user, Object source, Object... args);
+   @LogMessage(id = 601164, value = "User {} is getting delivering size on target resource: {}", level = LogMessage.Level.INFO)
+   void getDeliveringSize(String user, Object source);
 
    static void getDurableDeliveringCount(Object source) {
       BASE_LOGGER.getDurableDeliveringCount(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601165, value = "User {0} is getting durable delivering count on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getDurableDeliveringCount(String user, Object source, Object... args);
+   @LogMessage(id = 601165, value = "User {} is getting durable delivering count on target resource: {}", level = LogMessage.Level.INFO)
+   void getDurableDeliveringCount(String user, Object source);
 
    static void getDurableDeliveringSize(Object source) {
       BASE_LOGGER.getDurableDeliveringSize(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601166, value = "User {0} is getting durable delivering size on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getDurableDeliveringSize(String user, Object source, Object... args);
+   @LogMessage(id = 601166, value = "User {} is getting durable delivering size on target resource: {}", level = LogMessage.Level.INFO)
+   void getDurableDeliveringSize(String user, Object source);
 
    static void getMessagesAdded(Object source) {
       BASE_LOGGER.getMessagesAdded(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601167, value = "User {0} is getting messages added on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getMessagesAdded(String user, Object source, Object... args);
+   @LogMessage(id = 601167, value = "User {} is getting messages added on target resource: {}", level = LogMessage.Level.INFO)
+   void getMessagesAdded(String user, Object source);
 
    static void getMessagesAcknowledged(Object source) {
       BASE_LOGGER.getMessagesAcknowledged(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601168, value = "User {0} is getting messages acknowledged on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getMessagesAcknowledged(String user, Object source, Object... args);
+   @LogMessage(id = 601168, value = "User {} is getting messages acknowledged on target resource: {}", level = LogMessage.Level.INFO)
+   void getMessagesAcknowledged(String user, Object source);
 
    static void getMessagesExpired(Object source) {
       BASE_LOGGER.getMessagesExpired(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601169, value = "User {0} is getting messages expired on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getMessagesExpired(String user, Object source, Object... args);
+   @LogMessage(id = 601169, value = "User {} is getting messages expired on target resource: {}", level = LogMessage.Level.INFO)
+   void getMessagesExpired(String user, Object source);
 
    static void getMessagesKilled(Object source) {
       BASE_LOGGER.getMessagesKilled(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601170, value = "User {0} is getting messages killed on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getMessagesKilled(String user, Object source, Object... args);
+   @LogMessage(id = 601170, value = "User {} is getting messages killed on target resource: {}", level = LogMessage.Level.INFO)
+   void getMessagesKilled(String user, Object source);
 
    static void getID(Object source) {
       BASE_LOGGER.getID(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601171, value = "User {0} is getting ID on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getID(String user, Object source, Object... args);
+   @LogMessage(id = 601171, value = "User {} is getting ID on target resource: {}", level = LogMessage.Level.INFO)
+   void getID(String user, Object source);
 
    static void getScheduledCount(Object source) {
       BASE_LOGGER.getScheduledCount(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601172, value = "User {0} is getting scheduled count on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getScheduledCount(String user, Object source, Object... args);
+   @LogMessage(id = 601172, value = "User {} is getting scheduled count on target resource: {}", level = LogMessage.Level.INFO)
+   void getScheduledCount(String user, Object source);
 
    static void getScheduledSize(Object source) {
       BASE_LOGGER.getScheduledSize(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601173, value = "User {0} is getting scheduled size on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getScheduledSize(String user, Object source, Object... args);
+   @LogMessage(id = 601173, value = "User {} is getting scheduled size on target resource: {}", level = LogMessage.Level.INFO)
+   void getScheduledSize(String user, Object source);
 
    static void getDurableScheduledCount(Object source) {
       BASE_LOGGER.getDurableScheduledCount(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601174, value = "User {0} is getting durable scheduled count on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getDurableScheduledCount(String user, Object source, Object... args);
+   @LogMessage(id = 601174, value = "User {} is getting durable scheduled count on target resource: {}", level = LogMessage.Level.INFO)
+   void getDurableScheduledCount(String user, Object source);
 
    static void getDurableScheduledSize(Object source) {
       BASE_LOGGER.getDurableScheduledSize(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601175, value = "User {0} is getting durable scheduled size on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getDurableScheduledSize(String user, Object source, Object... args);
+   @LogMessage(id = 601175, value = "User {} is getting durable scheduled size on target resource: {}", level = LogMessage.Level.INFO)
+   void getDurableScheduledSize(String user, Object source);
 
    static void getDeadLetterAddress(Object source) {
       BASE_LOGGER.getDeadLetterAddress(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601176, value = "User {0} is getting dead letter address on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getDeadLetterAddress(String user, Object source, Object... args);
+   @LogMessage(id = 601176, value = "User {} is getting dead letter address on target resource: {}", level = LogMessage.Level.INFO)
+   void getDeadLetterAddress(String user, Object source);
 
    static void getExpiryAddress(Object source) {
       BASE_LOGGER.getExpiryAddress(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601177, value = "User {0} is getting expiry address on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getExpiryAddress(String user, Object source, Object... args);
+   @LogMessage(id = 601177, value = "User {} is getting expiry address on target resource: {}", level = LogMessage.Level.INFO)
+   void getExpiryAddress(String user, Object source);
 
    static void getMaxConsumers(Object source) {
       BASE_LOGGER.getMaxConsumers(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601178, value = "User {0} is getting max consumers on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getMaxConsumers(String user, Object source, Object... args);
+   @LogMessage(id = 601178, value = "User {} is getting max consumers on target resource: {}", level = LogMessage.Level.INFO)
+   void getMaxConsumers(String user, Object source);
 
    static void isPurgeOnNoConsumers(Object source) {
       BASE_LOGGER.isPurgeOnNoConsumers(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601179, value = "User {0} is getting purge-on-consumers property on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void isPurgeOnNoConsumers(String user, Object source, Object... args);
+   @LogMessage(id = 601179, value = "User {} is getting purge-on-consumers property on target resource: {}", level = LogMessage.Level.INFO)
+   void isPurgeOnNoConsumers(String user, Object source);
 
    static void isConfigurationManaged(Object source) {
       BASE_LOGGER.isConfigurationManaged(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601180, value = "User {0} is getting configuration-managed property on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void isConfigurationManaged(String user, Object source, Object... args);
+   @LogMessage(id = 601180, value = "User {} is getting configuration-managed property on target resource: {}", level = LogMessage.Level.INFO)
+   void isConfigurationManaged(String user, Object source);
 
    static void isExclusive(Object source) {
       BASE_LOGGER.isExclusive(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601181, value = "User {0} is getting exclusive property on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void isExclusive(String user, Object source, Object... args);
+   @LogMessage(id = 601181, value = "User {} is getting exclusive property on target resource: {}", level = LogMessage.Level.INFO)
+   void isExclusive(String user, Object source);
 
    static void isLastValue(Object source) {
       BASE_LOGGER.isLastValue(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601182, value = "User {0} is getting last-value property on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void isLastValue(String user, Object source, Object... args);
+   @LogMessage(id = 601182, value = "User {} is getting last-value property on target resource: {}", level = LogMessage.Level.INFO)
+   void isLastValue(String user, Object source);
 
    static void listScheduledMessages(Object source) {
       BASE_LOGGER.listScheduledMessages(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601183, value = "User {0} is listing scheduled messages on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void listScheduledMessages(String user, Object source, Object... args);
+   @LogMessage(id = 601183, value = "User {} is listing scheduled messages on target resource: {}", level = LogMessage.Level.INFO)
+   void listScheduledMessages(String user, Object source);
 
    static void listScheduledMessagesAsJSON(Object source) {
       BASE_LOGGER.listScheduledMessagesAsJSON(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601184, value = "User {0} is listing scheduled messages as json on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void listScheduledMessagesAsJSON(String user, Object source, Object... args);
+   @LogMessage(id = 601184, value = "User {} is listing scheduled messages as json on target resource: {}", level = LogMessage.Level.INFO)
+   void listScheduledMessagesAsJSON(String user, Object source);
 
    static void listDeliveringMessages(Object source) {
       BASE_LOGGER.listDeliveringMessages(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601185, value = "User {0} is listing delivering messages on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void listDeliveringMessages(String user, Object source, Object... args);
+   @LogMessage(id = 601185, value = "User {} is listing delivering messages on target resource: {}", level = LogMessage.Level.INFO)
+   void listDeliveringMessages(String user, Object source);
 
    static void listDeliveringMessagesAsJSON(Object source) {
       BASE_LOGGER.listDeliveringMessagesAsJSON(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601186, value = "User {0} is listing delivering messages as json on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void listDeliveringMessagesAsJSON(String user, Object source, Object... args);
+   @LogMessage(id = 601186, value = "User {} is listing delivering messages as json on target resource: {}", level = LogMessage.Level.INFO)
+   void listDeliveringMessagesAsJSON(String user, Object source);
 
    static void listMessages(Object source, Object... args) {
-      BASE_LOGGER.listMessages(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.listMessages(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601187, value = "User {0} is listing messages on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void listMessages(String user, Object source, Object... args);
+   @LogMessage(id = 601187, value = "User {} is listing messages on target resource: {} {}", level = LogMessage.Level.INFO)
+   void listMessages(String user, Object source, String args);
 
    static void listMessagesAsJSON(Object source) {
       BASE_LOGGER.listMessagesAsJSON(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601188, value = "User {0} is listing messages as json on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void listMessagesAsJSON(String user, Object source, Object... args);
+   @LogMessage(id = 601188, value = "User {} is listing messages as json on target resource: {}", level = LogMessage.Level.INFO)
+   void listMessagesAsJSON(String user, Object source);
 
    static void getFirstMessage(Object source) {
       BASE_LOGGER.getFirstMessage(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601189, value = "User {0} is getting first message on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getFirstMessage(String user, Object source, Object... args);
+   @LogMessage(id = 601189, value = "User {} is getting first message on target resource: {}", level = LogMessage.Level.INFO)
+   void getFirstMessage(String user, Object source);
 
    static void getFirstMessageAsJSON(Object source) {
       BASE_LOGGER.getFirstMessageAsJSON(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601190, value = "User {0} is getting first message as json on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getFirstMessageAsJSON(String user, Object source, Object... args);
+   @LogMessage(id = 601190, value = "User {} is getting first message as json on target resource: {}", level = LogMessage.Level.INFO)
+   void getFirstMessageAsJSON(String user, Object source);
 
    static void getFirstMessageTimestamp(Object source) {
       BASE_LOGGER.getFirstMessageTimestamp(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601191, value = "User {0} is getting first message's timestamp on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getFirstMessageTimestamp(String user, Object source, Object... args);
+   @LogMessage(id = 601191, value = "User {} is getting first message's timestamp on target resource: {}", level = LogMessage.Level.INFO)
+   void getFirstMessageTimestamp(String user, Object source);
 
    static void getFirstMessageAge(Object source) {
       BASE_LOGGER.getFirstMessageAge(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601192, value = "User {0} is getting first message's age on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getFirstMessageAge(String user, Object source, Object... args);
+   @LogMessage(id = 601192, value = "User {} is getting first message's age on target resource: {}", level = LogMessage.Level.INFO)
+   void getFirstMessageAge(String user, Object source);
 
    static void countMessages(Object source, Object... args) {
-      BASE_LOGGER.countMessages(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.countMessages(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601193, value = "User {0} is counting messages on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void countMessages(String user, Object source, Object... args);
+   @LogMessage(id = 601193, value = "User {} is counting messages on target resource: {} {}", level = LogMessage.Level.INFO)
+   void countMessages(String user, Object source, String args);
 
    static void countDeliveringMessages(Object source, Object... args) {
-      BASE_LOGGER.countDeliveringMessages(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.countDeliveringMessages(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601194, value = "User {0} is counting delivery messages on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void countDeliveringMessages(String user, Object source, Object... args);
+   @LogMessage(id = 601194, value = "User {} is counting delivery messages on target resource: {} {}", level = LogMessage.Level.INFO)
+   void countDeliveringMessages(String user, Object source, String args);
 
    static void removeMessage(Object source, Object... args) {
-      BASE_LOGGER.removeMessage(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.removeMessage(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601195, value = "User {0} is removing a message on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void removeMessage(String user, Object source, Object... args);
+   @LogMessage(id = 601195, value = "User {} is removing a message on target resource: {} {}", level = LogMessage.Level.INFO)
+   void removeMessage(String user, Object source, String args);
 
    static void removeMessages(Object source, Object... args) {
-      BASE_LOGGER.removeMessages(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.removeMessages(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601196, value = "User {0} is removing messages on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void removeMessages(String user, Object source, Object... args);
+   @LogMessage(id = 601196, value = "User {} is removing messages on target resource: {} {}", level = LogMessage.Level.INFO)
+   void removeMessages(String user, Object source, String args);
 
    static void expireMessage(Object source, Object... args) {
-      BASE_LOGGER.expireMessage(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.expireMessage(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601197, value = "User {0} is expiring messages on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void expireMessage(String user, Object source, Object... args);
+   @LogMessage(id = 601197, value = "User {} is expiring messages on target resource: {} {}", level = LogMessage.Level.INFO)
+   void expireMessage(String user, Object source, String args);
 
    static void expireMessages(Object source, Object... args) {
-      BASE_LOGGER.expireMessages(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.expireMessages(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601198, value = "User {0} is expiring messages on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void expireMessages(String user, Object source, Object... args);
+   @LogMessage(id = 601198, value = "User {} is expiring messages on target resource: {} {}", level = LogMessage.Level.INFO)
+   void expireMessages(String user, Object source, String args);
 
    static void retryMessage(Object source, Object... args) {
-      BASE_LOGGER.retryMessage(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.retryMessage(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601199, value = "User {0} is retry sending message on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void retryMessage(String user, Object source, Object... args);
+   @LogMessage(id = 601199, value = "User {} is retry sending message on target resource: {} {}", level = LogMessage.Level.INFO)
+   void retryMessage(String user, Object source, String args);
 
    static void retryMessages(Object source) {
       BASE_LOGGER.retryMessages(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601200, value = "User {0} is retry sending messages on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void retryMessages(String user, Object source, Object... args);
+   @LogMessage(id = 601200, value = "User {} is retry sending messages on target resource: {}", level = LogMessage.Level.INFO)
+   void retryMessages(String user, Object source);
 
    static void moveMessage(Object source, Object... args) {
-      BASE_LOGGER.moveMessage(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.moveMessage(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601201, value = "User {0} is moving a message to another queue on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void moveMessage(String user, Object source, Object... args);
+   @LogMessage(id = 601201, value = "User {} is moving a message to another queue on target resource: {} {}", level = LogMessage.Level.INFO)
+   void moveMessage(String user, Object source, String args);
 
    static void moveMessages(Object source, Object... args) {
-      BASE_LOGGER.moveMessages(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.moveMessages(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601202, value = "User {0} is moving messages to another queue on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void moveMessages(String user, Object source, Object... args);
+   @LogMessage(id = 601202, value = "User {} is moving messages to another queue on target resource: {} {}", level = LogMessage.Level.INFO)
+   void moveMessages(String user, Object source, String args);
 
    static void sendMessagesToDeadLetterAddress(Object source, Object... args) {
-      BASE_LOGGER.sendMessagesToDeadLetterAddress(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.sendMessagesToDeadLetterAddress(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601203, value = "User {0} is sending messages to dead letter address on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void sendMessagesToDeadLetterAddress(String user, Object source, Object... args);
+   @LogMessage(id = 601203, value = "User {} is sending messages to dead letter address on target resource: {} {}", level = LogMessage.Level.INFO)
+   void sendMessagesToDeadLetterAddress(String user, Object source, String args);
 
    static void sendMessageToDeadLetterAddress(Object source, Object... args) {
-      BASE_LOGGER.sendMessageToDeadLetterAddress(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.sendMessageToDeadLetterAddress(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601204, value = "User {0} is sending messages to dead letter address on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void sendMessageToDeadLetterAddress(String user, Object source, Object... args);
+   @LogMessage(id = 601204, value = "User {} is sending messages to dead letter address on target resource: {} {}", level = LogMessage.Level.INFO)
+   void sendMessageToDeadLetterAddress(String user, Object source, String args);
 
    static void changeMessagesPriority(Object source, Object... args) {
-      BASE_LOGGER.changeMessagesPriority(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.changeMessagesPriority(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601205, value = "User {0} is changing message's priority on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void changeMessagesPriority(String user, Object source, Object... args);
+   @LogMessage(id = 601205, value = "User {} is changing message's priority on target resource: {} {}", level = LogMessage.Level.INFO)
+   void changeMessagesPriority(String user, Object source, String args);
 
    static void changeMessagePriority(Object source, Object... args) {
-      BASE_LOGGER.changeMessagePriority(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.changeMessagePriority(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601206, value = "User {0} is changing a message's priority on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void changeMessagePriority(String user, Object source, Object... args);
+   @LogMessage(id = 601206, value = "User {} is changing a message's priority on target resource: {} {}", level = LogMessage.Level.INFO)
+   void changeMessagePriority(String user, Object source, String args);
 
    static void listMessageCounter(Object source) {
       BASE_LOGGER.listMessageCounter(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601207, value = "User {0} is listing message counter on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void listMessageCounter(String user, Object source, Object... args);
+   @LogMessage(id = 601207, value = "User {} is listing message counter on target resource: {}", level = LogMessage.Level.INFO)
+   void listMessageCounter(String user, Object source);
 
    static void resetMessageCounter(Object source) {
       BASE_LOGGER.resetMessageCounter(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601208, value = "User {0} is resetting message counter on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void resetMessageCounter(String user, Object source, Object... args);
+   @LogMessage(id = 601208, value = "User {} is resetting message counter on target resource: {}", level = LogMessage.Level.INFO)
+   void resetMessageCounter(String user, Object source);
 
    static void listMessageCounterAsHTML(Object source) {
       BASE_LOGGER.listMessageCounterAsHTML(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601209, value = "User {0} is listing message counter as HTML on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void listMessageCounterAsHTML(String user, Object source, Object... args);
+   @LogMessage(id = 601209, value = "User {} is listing message counter as HTML on target resource: {}", level = LogMessage.Level.INFO)
+   void listMessageCounterAsHTML(String user, Object source);
 
    static void listMessageCounterHistory(Object source) {
       BASE_LOGGER.listMessageCounterHistory(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601210, value = "User {0} is listing message counter history on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void listMessageCounterHistory(String user, Object source, Object... args);
+   @LogMessage(id = 601210, value = "User {} is listing message counter history on target resource: {}", level = LogMessage.Level.INFO)
+   void listMessageCounterHistory(String user, Object source);
 
    static void listMessageCounterHistoryAsHTML(Object source) {
       BASE_LOGGER.listMessageCounterHistoryAsHTML(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601211, value = "User {0} is listing message counter history as HTML on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void listMessageCounterHistoryAsHTML(String user, Object source, Object... args);
+   @LogMessage(id = 601211, value = "User {} is listing message counter history as HTML on target resource: {}", level = LogMessage.Level.INFO)
+   void listMessageCounterHistoryAsHTML(String user, Object source);
 
    static void pause(Object source, Object... args) {
-      BASE_LOGGER.pause(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.pause(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601212, value = "User {0} is pausing on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void pause(String user, Object source, Object... args);
+   @LogMessage(id = 601212, value = "User {} is pausing on target resource: {} {}", level = LogMessage.Level.INFO)
+   void pause(String user, Object source, String args);
 
    static void resume(Object source) {
       BASE_LOGGER.resume(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601213, value = "User {0} is resuming on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void resume(String user, Object source, Object... args);
+   @LogMessage(id = 601213, value = "User {} is resuming on target resource: {}", level = LogMessage.Level.INFO)
+   void resume(String user, Object source);
 
    static void isPaused(Object source) {
       BASE_LOGGER.isPaused(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601214, value = "User {0} is getting paused property on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void isPaused(String user, Object source, Object... args);
+   @LogMessage(id = 601214, value = "User {} is getting paused property on target resource: {}", level = LogMessage.Level.INFO)
+   void isPaused(String user, Object source);
 
    static void browse(Object source, Object... args) {
-      BASE_LOGGER.browse(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.browse(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601215, value = "User {0} is browsing a queue on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void browse(String user, Object source, Object... args);
+   @LogMessage(id = 601215, value = "User {} is browsing a queue on target resource: {} {}", level = LogMessage.Level.INFO)
+   void browse(String user, Object source, String args);
 
    static void flushExecutor(Object source) {
       BASE_LOGGER.flushExecutor(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601216, value = "User {0} is flushing executor on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void flushExecutor(String user, Object source, Object... args);
+   @LogMessage(id = 601216, value = "User {} is flushing executor on target resource: {}", level = LogMessage.Level.INFO)
+   void flushExecutor(String user, Object source);
 
    static void resetAllGroups(Object source) {
       BASE_LOGGER.resetAllGroups(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601217, value = "User {0} is resetting all groups on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void resetAllGroups(String user, Object source, Object... args);
+   @LogMessage(id = 601217, value = "User {} is resetting all groups on target resource: {}", level = LogMessage.Level.INFO)
+   void resetAllGroups(String user, Object source);
 
    static void resetGroup(Object source, Object... args) {
-      BASE_LOGGER.resetGroup(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.resetGroup(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601218, value = "User {0} is resetting group on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void resetGroup(String user, Object source, Object... args);
+   @LogMessage(id = 601218, value = "User {} is resetting group on target resource: {} {}", level = LogMessage.Level.INFO)
+   void resetGroup(String user, Object source, String arg);
 
    static void getGroupCount(Object source, Object... args) {
-      BASE_LOGGER.getGroupCount(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.getGroupCount(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601219, value = "User {0} is getting group count on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getGroupCount(String user, Object source, Object... args);
+   @LogMessage(id = 601219, value = "User {} is getting group count on target resource: {} {}", level = LogMessage.Level.INFO)
+   void getGroupCount(String user, Object source, String args);
 
    static void listGroupsAsJSON(Object source) {
       BASE_LOGGER.listGroupsAsJSON(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601220, value = "User {0} is listing groups as json on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void listGroupsAsJSON(String user, Object source, Object... args);
+   @LogMessage(id = 601220, value = "User {} is listing groups as json on target resource: {}", level = LogMessage.Level.INFO)
+   void listGroupsAsJSON(String user, Object source);
 
    static void resetMessagesAdded(Object source) {
       BASE_LOGGER.resetMessagesAdded(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601221, value = "User {0} is resetting added messages on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void resetMessagesAdded(String user, Object source, Object... args);
+   @LogMessage(id = 601221, value = "User {} is resetting added messages on target resource: {}", level = LogMessage.Level.INFO)
+   void resetMessagesAdded(String user, Object source);
 
    static void resetMessagesAcknowledged(Object source) {
       BASE_LOGGER.resetMessagesAcknowledged(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601222, value = "User {0} is resetting acknowledged messages on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void resetMessagesAcknowledged(String user, Object source, Object... args);
+   @LogMessage(id = 601222, value = "User {} is resetting acknowledged messages on target resource: {}", level = LogMessage.Level.INFO)
+   void resetMessagesAcknowledged(String user, Object source);
 
    static void resetMessagesExpired(Object source) {
       BASE_LOGGER.resetMessagesExpired(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601223, value = "User {0} is resetting expired messages on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void resetMessagesExpired(String user, Object source, Object... args);
+   @LogMessage(id = 601223, value = "User {} is resetting expired messages on target resource: {}", level = LogMessage.Level.INFO)
+   void resetMessagesExpired(String user, Object source);
 
    static void resetMessagesKilled(Object source) {
       BASE_LOGGER.resetMessagesKilled(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601224, value = "User {0} is resetting killed messages on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void resetMessagesKilled(String user, Object source, Object... args);
+   @LogMessage(id = 601224, value = "User {} is resetting killed messages on target resource: {}", level = LogMessage.Level.INFO)
+   void resetMessagesKilled(String user, Object source);
 
    static void getStaticConnectors(Object source) {
       BASE_LOGGER.getStaticConnectors(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601225, value = "User {0} is getting static connectors on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getStaticConnectors(String user, Object source, Object... args);
+   @LogMessage(id = 601225, value = "User {} is getting static connectors on target resource: {}", level = LogMessage.Level.INFO)
+   void getStaticConnectors(String user, Object source);
 
    static void getForwardingAddress(Object source) {
       BASE_LOGGER.getForwardingAddress(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601226, value = "User {0} is getting forwarding address on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getForwardingAddress(String user, Object source, Object... args);
+   @LogMessage(id = 601226, value = "User {} is getting forwarding address on target resource: {}", level = LogMessage.Level.INFO)
+   void getForwardingAddress(String user, Object source);
 
    static void getQueueName(Object source) {
       BASE_LOGGER.getQueueName(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601227, value = "User {0} is getting the queue name on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getQueueName(String user, Object source, Object... args);
+   @LogMessage(id = 601227, value = "User {} is getting the queue name on target resource: {}", level = LogMessage.Level.INFO)
+   void getQueueName(String user, Object source);
 
    static void getDiscoveryGroupName(Object source) {
       BASE_LOGGER.getDiscoveryGroupName(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601228, value = "User {0} is getting discovery group name on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getDiscoveryGroupName(String user, Object source, Object... args);
+   @LogMessage(id = 601228, value = "User {} is getting discovery group name on target resource: {}", level = LogMessage.Level.INFO)
+   void getDiscoveryGroupName(String user, Object source);
 
    static void getFilterString(Object source) {
       BASE_LOGGER.getFilterString(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601229, value = "User {0} is getting filter string on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getFilterString(String user, Object source, Object... args);
+   @LogMessage(id = 601229, value = "User {} is getting filter string on target resource: {}", level = LogMessage.Level.INFO)
+   void getFilterString(String user, Object source);
 
    static void getReconnectAttempts(Object source) {
       BASE_LOGGER.getReconnectAttempts(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601230, value = "User {0} is getting reconnect attempts on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getReconnectAttempts(String user, Object source, Object... args);
+   @LogMessage(id = 601230, value = "User {} is getting reconnect attempts on target resource: {}", level = LogMessage.Level.INFO)
+   void getReconnectAttempts(String user, Object source);
 
    static void getRetryInterval(Object source) {
       BASE_LOGGER.getRetryInterval(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601231, value = "User {0} is getting retry interval on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getRetryInterval(String user, Object source, Object... args);
+   @LogMessage(id = 601231, value = "User {} is getting retry interval on target resource: {}", level = LogMessage.Level.INFO)
+   void getRetryInterval(String user, Object source);
 
    static void getRetryIntervalMultiplier(Object source) {
       BASE_LOGGER.getRetryIntervalMultiplier(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601232, value = "User {0} is getting retry interval multiplier on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getRetryIntervalMultiplier(String user, Object source, Object... args);
+   @LogMessage(id = 601232, value = "User {} is getting retry interval multiplier on target resource: {}", level = LogMessage.Level.INFO)
+   void getRetryIntervalMultiplier(String user, Object source);
 
    static void getTransformerClassName(Object source) {
       BASE_LOGGER.getTransformerClassName(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601233, value = "User {0} is getting transformer class name on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getTransformerClassName(String user, Object source, Object... args);
+   @LogMessage(id = 601233, value = "User {} is getting transformer class name on target resource: {}", level = LogMessage.Level.INFO)
+   void getTransformerClassName(String user, Object source);
 
    static void getTransformerPropertiesAsJSON(Object source) {
       BASE_LOGGER.getTransformerPropertiesAsJSON(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601234, value = "User {0} is getting transformer properties as json on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getTransformerPropertiesAsJSON(String user, Object source, Object... args);
+   @LogMessage(id = 601234, value = "User {} is getting transformer properties as json on target resource: {}", level = LogMessage.Level.INFO)
+   void getTransformerPropertiesAsJSON(String user, Object source);
 
    static void getTransformerProperties(Object source) {
       BASE_LOGGER.getTransformerProperties(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601235, value = "User {0} is getting transformer properties on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getTransformerProperties(String user, Object source, Object... args);
+   @LogMessage(id = 601235, value = "User {} is getting transformer properties on target resource: {}", level = LogMessage.Level.INFO)
+   void getTransformerProperties(String user, Object source);
 
    static void isStartedBridge(Object source) {
       BASE_LOGGER.isStartedBridge(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601236, value = "User {0} is checking if bridge started on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void isStartedBridge(String user, Object source, Object... args);
+   @LogMessage(id = 601236, value = "User {} is checking if bridge started on target resource: {}", level = LogMessage.Level.INFO)
+   void isStartedBridge(String user, Object source);
 
    static void isUseDuplicateDetection(Object source) {
       BASE_LOGGER.isUseDuplicateDetection(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601237, value = "User {0} is querying use duplicate detection on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void isUseDuplicateDetection(String user, Object source, Object... args);
+   @LogMessage(id = 601237, value = "User {} is querying use duplicate detection on target resource: {}", level = LogMessage.Level.INFO)
+   void isUseDuplicateDetection(String user, Object source);
 
    static void isHA(Object source) {
       BASE_LOGGER.isHA(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601238, value = "User {0} is querying isHA on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void isHA(String user, Object source, Object... args);
+   @LogMessage(id = 601238, value = "User {} is querying isHA on target resource: {}", level = LogMessage.Level.INFO)
+   void isHA(String user, Object source);
 
    static void startBridge(Object source) {
       BASE_LOGGER.startBridge(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601239, value = "User {0} is starting a bridge on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void startBridge(String user, Object source, Object... args);
+   @LogMessage(id = 601239, value = "User {} is starting a bridge on target resource: {}", level = LogMessage.Level.INFO)
+   void startBridge(String user, Object source);
 
    static void stopBridge(Object source) {
       BASE_LOGGER.stopBridge(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601240, value = "User {0} is stopping a bridge on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void stopBridge(String user, Object source, Object... args);
+   @LogMessage(id = 601240, value = "User {} is stopping a bridge on target resource: {}", level = LogMessage.Level.INFO)
+   void stopBridge(String user, Object source);
 
    static void getMessagesPendingAcknowledgement(Object source) {
       BASE_LOGGER.getMessagesPendingAcknowledgement(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601241, value = "User {0} is getting messages pending acknowledgement on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getMessagesPendingAcknowledgement(String user, Object source, Object... args);
+   @LogMessage(id = 601241, value = "User {} is getting messages pending acknowledgement on target resource: {}", level = LogMessage.Level.INFO)
+   void getMessagesPendingAcknowledgement(String user, Object source);
 
    static void getMetrics(Object source) {
       BASE_LOGGER.getMetrics(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601242, value = "User {0} is getting metrics on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getMetrics(String user, Object source, Object... args);
+   @LogMessage(id = 601242, value = "User {} is getting metrics on target resource: {}", level = LogMessage.Level.INFO)
+   void getMetrics(String user, Object source);
 
    static void getBroadcastPeriod(Object source) {
       BASE_LOGGER.getBroadcastPeriod(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601243, value = "User {0} is getting broadcast period on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getBroadcastPeriod(String user, Object source, Object... args);
+   @LogMessage(id = 601243, value = "User {} is getting broadcast period on target resource: {}", level = LogMessage.Level.INFO)
+   void getBroadcastPeriod(String user, Object source);
 
    static void getConnectorPairs(Object source) {
       BASE_LOGGER.getConnectorPairs(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601244, value = "User {0} is getting connector pairs on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getConnectorPairs(String user, Object source, Object... args);
+   @LogMessage(id = 601244, value = "User {} is getting connector pairs on target resource: {}", level = LogMessage.Level.INFO)
+   void getConnectorPairs(String user, Object source);
 
    static void getConnectorPairsAsJSON(Object source) {
       BASE_LOGGER.getConnectorPairsAsJSON(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601245, value = "User {0} is getting connector pairs as json on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getConnectorPairsAsJSON(String user, Object source, Object... args);
+   @LogMessage(id = 601245, value = "User {} is getting connector pairs as json on target resource: {}", level = LogMessage.Level.INFO)
+   void getConnectorPairsAsJSON(String user, Object source);
 
    static void getGroupAddress(Object source) {
       BASE_LOGGER.getGroupAddress(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601246, value = "User {0} is getting group address on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getGroupAddress(String user, Object source, Object... args);
+   @LogMessage(id = 601246, value = "User {} is getting group address on target resource: {}", level = LogMessage.Level.INFO)
+   void getGroupAddress(String user, Object source);
 
    static void getGroupPort(Object source) {
       BASE_LOGGER.getGroupPort(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601247, value = "User {0} is getting group port on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getGroupPort(String user, Object source, Object... args);
+   @LogMessage(id = 601247, value = "User {} is getting group port on target resource: {}", level = LogMessage.Level.INFO)
+   void getGroupPort(String user, Object source);
 
    static void getLocalBindPort(Object source) {
       BASE_LOGGER.getLocalBindPort(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601248, value = "User {0} is getting local binding port on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getLocalBindPort(String user, Object source, Object... args);
+   @LogMessage(id = 601248, value = "User {} is getting local binding port on target resource: {}", level = LogMessage.Level.INFO)
+   void getLocalBindPort(String user, Object source);
 
    static void startBroadcastGroup(Object source) {
       BASE_LOGGER.startBroadcastGroup(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601249, value = "User {0} is starting broadcasting group on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void startBroadcastGroup(String user, Object source, Object... args);
+   @LogMessage(id = 601249, value = "User {} is starting broadcasting group on target resource: {}", level = LogMessage.Level.INFO)
+   void startBroadcastGroup(String user, Object source);
 
    static void stopBroadcastGroup(Object source) {
       BASE_LOGGER.stopBroadcastGroup(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601250, value = "User {0} is stopping broadcasting group on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void stopBroadcastGroup(String user, Object source, Object... args);
+   @LogMessage(id = 601250, value = "User {} is stopping broadcasting group on target resource: {}", level = LogMessage.Level.INFO)
+   void stopBroadcastGroup(String user, Object source);
 
    static void getMaxHops(Object source) {
       BASE_LOGGER.getMaxHops(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601251, value = "User {0} is getting max hops on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getMaxHops(String user, Object source, Object... args);
+   @LogMessage(id = 601251, value = "User {} is getting max hops on target resource: {}", level = LogMessage.Level.INFO)
+   void getMaxHops(String user, Object source);
 
    static void getStaticConnectorsAsJSON(Object source) {
       BASE_LOGGER.getStaticConnectorsAsJSON(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601252, value = "User {0} is geting static connectors as json on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getStaticConnectorsAsJSON(String user, Object source, Object... args);
+   @LogMessage(id = 601252, value = "User {} is geting static connectors as json on target resource: {}", level = LogMessage.Level.INFO)
+   void getStaticConnectorsAsJSON(String user, Object source);
 
    static void isDuplicateDetection(Object source) {
       BASE_LOGGER.isDuplicateDetection(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601253, value = "User {0} is querying use duplicate detection on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void isDuplicateDetection(String user, Object source, Object... args);
+   @LogMessage(id = 601253, value = "User {} is querying use duplicate detection on target resource: {}", level = LogMessage.Level.INFO)
+   void isDuplicateDetection(String user, Object source);
 
    static void getMessageLoadBalancingType(Object source) {
       BASE_LOGGER.getMessageLoadBalancingType(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601254, value = "User {0} is getting message loadbalancing type on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getMessageLoadBalancingType(String user, Object source, Object... args);
+   @LogMessage(id = 601254, value = "User {} is getting message loadbalancing type on target resource: {}", level = LogMessage.Level.INFO)
+   void getMessageLoadBalancingType(String user, Object source);
 
    static void getTopology(Object source) {
       BASE_LOGGER.getTopology(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601255, value = "User {0} is getting topology on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getTopology(String user, Object source, Object... args);
+   @LogMessage(id = 601255, value = "User {} is getting topology on target resource: {}", level = LogMessage.Level.INFO)
+   void getTopology(String user, Object source);
 
    static void getNodes(Object source) {
       BASE_LOGGER.getNodes(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601256, value = "User {0} is getting nodes on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getNodes(String user, Object source, Object... args);
+   @LogMessage(id = 601256, value = "User {} is getting nodes on target resource: {}", level = LogMessage.Level.INFO)
+   void getNodes(String user, Object source);
 
    static void startClusterConnection(Object source) {
       BASE_LOGGER.startClusterConnection(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601257, value = "User {0} is start cluster connection on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void startClusterConnection(String user, Object source, Object... args);
+   @LogMessage(id = 601257, value = "User {} is start cluster connection on target resource: {}", level = LogMessage.Level.INFO)
+   void startClusterConnection(String user, Object source);
 
    static void stopClusterConnection(Object source) {
       BASE_LOGGER.stopClusterConnection(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601258, value = "User {0} is stop cluster connection on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void stopClusterConnection(String user, Object source, Object... args);
+   @LogMessage(id = 601258, value = "User {} is stop cluster connection on target resource: {}", level = LogMessage.Level.INFO)
+   void stopClusterConnection(String user, Object source);
 
    static void getBridgeMetrics(Object source, Object... args) {
-      BASE_LOGGER.getBridgeMetrics(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.getBridgeMetrics(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601259, value = "User {0} is getting bridge metrics on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getBridgeMetrics(String user, Object source, Object... args);
+   @LogMessage(id = 601259, value = "User {} is getting bridge metrics on target resource: {} {}", level = LogMessage.Level.INFO)
+   void getBridgeMetrics(String user, Object source, String args);
 
    static void getRoutingName(Object source) {
       BASE_LOGGER.getRoutingName(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601260, value = "User {0} is getting routing name on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getRoutingName(String user, Object source, Object... args);
+   @LogMessage(id = 601260, value = "User {} is getting routing name on target resource: {}", level = LogMessage.Level.INFO)
+   void getRoutingName(String user, Object source);
 
    static void getUniqueName(Object source) {
       BASE_LOGGER.getUniqueName(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601261, value = "User {0} is getting unique name on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getUniqueName(String user, Object source, Object... args);
+   @LogMessage(id = 601261, value = "User {} is getting unique name on target resource: {}", level = LogMessage.Level.INFO)
+   void getUniqueName(String user, Object source);
 
    static void serverSessionCreateAddress(Object source, Subject user, String remoteAddress, Object... args) {
-      BASE_LOGGER.serverSessionCreateAddress2(getCaller(user, remoteAddress), source, arrayToString(args));
+      BASE_LOGGER.serverSessionCreateAddress2(getCaller(user, remoteAddress), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601262, value = "User {0} is creating address on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void serverSessionCreateAddress2(String user, Object source, Object... args);
+   @LogMessage(id = 601262, value = "User {} is creating address on target resource: {} {}", level = LogMessage.Level.INFO)
+   void serverSessionCreateAddress2(String user, Object source, String args);
 
    static void handleManagementMessage(Object source, Subject user, String remoteAddress, Object... args) {
-      BASE_LOGGER.handleManagementMessage2(getCaller(user, remoteAddress), source, arrayToString(args));
+      BASE_LOGGER.handleManagementMessage2(getCaller(user, remoteAddress), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601263, value = "User {0} is handling a management message on target resource {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void handleManagementMessage2(String user, Object source, Object... args);
+   @LogMessage(id = 601263, value = "User {} is handling a management message on target resource {} {}", level = LogMessage.Level.INFO)
+   void handleManagementMessage2(String user, Object source, String args);
 
 
    static void securityFailure(Exception cause) {
       BASE_LOGGER.securityFailure(getCaller(), cause);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601264, value = "User {0} gets security check failure", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 601264, value = "User {} gets security check failure", level = LogMessage.Level.INFO)
    void securityFailure(String user, @Cause Throwable cause);
 
 
    static void createCoreConsumer(Object source, Subject user, String remoteAddress, Object... args) {
-      BASE_LOGGER.createCoreConsumer(getCaller(user, remoteAddress), source, arrayToString(args));
+      BASE_LOGGER.createCoreConsumer(getCaller(user, remoteAddress), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601265, value = "User {0} is creating a core consumer on target resource {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void createCoreConsumer(String user, Object source, Object... args);
+   @LogMessage(id = 601265, value = "User {} is creating a core consumer on target resource {} {}", level = LogMessage.Level.INFO)
+   void createCoreConsumer(String user, Object source, String args);
 
    static void createSharedQueue(Object source, Subject user, String remoteAddress, Object... args) {
-      BASE_LOGGER.createSharedQueue(getCaller(user, remoteAddress), source, arrayToString(args));
+      BASE_LOGGER.createSharedQueue(getCaller(user, remoteAddress), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601266, value = "User {0} is creating a shared queue on target resource {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void createSharedQueue(String user, Object source, Object... args);
+   @LogMessage(id = 601266, value = "User {} is creating a shared queue on target resource {} {}", level = LogMessage.Level.INFO)
+   void createSharedQueue(String user, Object source, String args);
 
    static void createCoreSession(Object source, Subject user, String remoteAddress, Object... args) {
-      BASE_LOGGER.createCoreSession(getCaller(user, remoteAddress), source, arrayToString(args));
+      BASE_LOGGER.createCoreSession(getCaller(user, remoteAddress), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601267, value = "User {0} is creating a core session on target resource {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void createCoreSession(String user, Object source, Object... args);
+   @LogMessage(id = 601267, value = "User {} is creating a core session on target resource {} {}", level = LogMessage.Level.INFO)
+   void createCoreSession(String user, Object source, String args);
 
    static void getAcknowledgeAttempts(Object source) {
       BASE_LOGGER.getMessagesAcknowledged(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601269, value = "User {0} is getting messages acknowledged attempts on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getAcknowledgeAttempts(String user, Object source, Object... args);
+   @LogMessage(id = 601269, value = "User {} is getting messages acknowledged attempts on target resource: {} {}", level = LogMessage.Level.INFO)
+   void getAcknowledgeAttempts(String user, Object source, String args);
 
    static void getRingSize(Object source, Object... args) {
-      BASE_LOGGER.getRingSize(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.getRingSize(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601270, value = "User {0} is getting ring size on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getRingSize(String user, Object source, Object... args);
+   @LogMessage(id = 601270, value = "User {} is getting ring size on target resource: {} {}", level = LogMessage.Level.INFO)
+   void getRingSize(String user, Object source, String args);
 
 
    static void isRetroactiveResource(Object source) {
       BASE_LOGGER.isRetroactiveResource(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601271, value = "User {0} is getting retroactiveResource property on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void isRetroactiveResource(String user, Object source, Object... args);
+   @LogMessage(id = 601271, value = "User {} is getting retroactiveResource property on target resource: {}", level = LogMessage.Level.INFO)
+   void isRetroactiveResource(String user, Object source);
 
    static void getDiskStoreUsage(Object source) {
       BASE_LOGGER.getDiskStoreUsage(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601272, value = "User {0} is getting disk store usage on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getDiskStoreUsage(String user, Object source, Object... args);
+   @LogMessage(id = 601272, value = "User {} is getting disk store usage on target resource: {}", level = LogMessage.Level.INFO)
+   void getDiskStoreUsage(String user, Object source);
 
    static void getDiskStoreUsagePercentage(Object source) {
       BASE_LOGGER.getDiskStoreUsagePercentage(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601273, value = "User {0} is getting disk store usage percentage on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getDiskStoreUsagePercentage(String user, Object source, Object... args);
+   @LogMessage(id = 601273, value = "User {} is getting disk store usage percentage on target resource: {}", level = LogMessage.Level.INFO)
+   void getDiskStoreUsagePercentage(String user, Object source);
 
    static void isGroupRebalance(Object source) {
       BASE_LOGGER.isGroupRebalance(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601274, value = "User {0} is getting group rebalance property on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void isGroupRebalance(String user, Object source, Object... args);
+   @LogMessage(id = 601274, value = "User {} is getting group rebalance property on target resource: {}", level = LogMessage.Level.INFO)
+   void isGroupRebalance(String user, Object source);
 
    static void getGroupBuckets(Object source) {
       BASE_LOGGER.getGroupBuckets(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601275, value = "User {0} is getting group buckets on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getGroupBuckets(String user, Object source, Object... args);
+   @LogMessage(id = 601275, value = "User {} is getting group buckets on target resource: {}", level = LogMessage.Level.INFO)
+   void getGroupBuckets(String user, Object source);
 
    static void getGroupFirstKey(Object source) {
       BASE_LOGGER.getGroupFirstKey(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601276, value = "User {0} is getting group first key on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getGroupFirstKey(String user, Object source, Object... args);
+   @LogMessage(id = 601276, value = "User {} is getting group first key on target resource: {}", level = LogMessage.Level.INFO)
+   void getGroupFirstKey(String user, Object source);
 
    static void getCurrentDuplicateIdCacheSize(Object source) {
       BASE_LOGGER.getCurrentDuplicateIdCacheSize(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601509, value = "User {0} is getting currentDuplicateIdCacheSize property on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getCurrentDuplicateIdCacheSize(String user, Object source, Object... args);
+   @LogMessage(id = 601509, value = "User {} is getting currentDuplicateIdCacheSize property on target resource: {}", level = LogMessage.Level.INFO)
+   void getCurrentDuplicateIdCacheSize(String user, Object source);
 
 
    static void clearDuplicateIdCache(Object source) {
       BASE_LOGGER.clearDuplicateIdCache(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601510, value = "User {0} is clearing duplicate ID cache on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void clearDuplicateIdCache(String user, Object source, Object... args);
+   @LogMessage(id = 601510, value = "User {} is clearing duplicate ID cache on target resource: {}", level = LogMessage.Level.INFO)
+   void clearDuplicateIdCache(String user, Object source);
 
 
    static void getChannelName(Object source) {
       BASE_LOGGER.getChannelName(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601511, value = "User {0} is getting channelName property on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getChannelName(String user, Object source, Object... args);
+   @LogMessage(id = 601511, value = "User {} is getting channelName property on target resource: {}", level = LogMessage.Level.INFO)
+   void getChannelName(String user, Object source);
 
    static void getFileContents(Object source) {
       BASE_LOGGER.getFileContents(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601512, value = "User {0} is getting fileContents property on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getFileContents(String user, Object source, Object... args);
+   @LogMessage(id = 601512, value = "User {} is getting fileContents property on target resource: {}", level = LogMessage.Level.INFO)
+   void getFileContents(String user, Object source);
 
    static void getFile(Object source) {
       BASE_LOGGER.getFile(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601513, value = "User {0} is getting file property on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getFile(String user, Object source, Object... args);
+   @LogMessage(id = 601513, value = "User {} is getting file property on target resource: {}", level = LogMessage.Level.INFO)
+   void getFile(String user, Object source);
 
    static void getPreparedTransactionMessageCount(Object source) {
       BASE_LOGGER.getPreparedTransactionMessageCount(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601514, value = "User {0} is getting preparedTransactionMessageCount property on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getPreparedTransactionMessageCount(String user, Object source, Object... args);
+   @LogMessage(id = 601514, value = "User {} is getting preparedTransactionMessageCount property on target resource: {}", level = LogMessage.Level.INFO)
+   void getPreparedTransactionMessageCount(String user, Object source);
 
    /*
     * This logger is for message production and consumption and is on the hot path so enabled independently
@@ -2424,8 +2134,7 @@ public interface AuditLogger extends BasicLogger {
       MESSAGE_LOGGER.logCoreSendMessage(getCaller(user, remoteAddress), messageToString, context);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601500, value = "User {0} is sending a message {1}, with Context: {2}", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 601500, value = "User {} is sending a message {}, with Context: {}", level = LogMessage.Level.INFO)
    void logCoreSendMessage(String user, String messageToString, Object context);
 
    //hot path log using a different logger
@@ -2433,8 +2142,7 @@ public interface AuditLogger extends BasicLogger {
       MESSAGE_LOGGER.consumeMessage(getCaller(user, remoteAddress), queue, message);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601501, value = "User {0} is consuming a message from {1}: {2}", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 601501, value = "User {} is consuming a message from {}: {}", level = LogMessage.Level.INFO)
    void consumeMessage(String user, String address, String message);
 
    //hot path log using a different logger
@@ -2442,8 +2150,7 @@ public interface AuditLogger extends BasicLogger {
       MESSAGE_LOGGER.acknowledgeMessage(getCaller(user, remoteAddress), queue, message);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601502, value = "User {0} is acknowledging a message from {1}: {2}", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 601502, value = "User {} is acknowledging a message from {}: {}", level = LogMessage.Level.INFO)
    void acknowledgeMessage(String user, String queue, String message);
 
    /*
@@ -2454,40 +2161,35 @@ public interface AuditLogger extends BasicLogger {
       RESOURCE_LOGGER.createAddressSuccess(getCaller(), name, routingTypes);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601701, value = "User {0} successfully created Address: {1} with routing types {2}", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 601701, value = "User {} successfully created Address: {} with routing types {}", level = LogMessage.Level.INFO)
    void createAddressSuccess(String user, String name, String routingTypes);
 
    static void createAddressFailure(String name, String routingTypes) {
       RESOURCE_LOGGER.createAddressFailure(getCaller(), name, routingTypes);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601702, value = "User {0} failed to created Address: {1} with routing types {2}", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 601702, value = "User {} failed to created Address: {} with routing types {}", level = LogMessage.Level.INFO)
    void createAddressFailure(String user, String name, String routingTypes);
 
    static void updateAddressSuccess(String name, String routingTypes) {
       RESOURCE_LOGGER.updateAddressSuccess(getCaller(), name, routingTypes);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601703, value = "User {0} successfully updated Address: {1} with routing types {2}", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 601703, value = "User {} successfully updated Address: {} with routing types {}", level = LogMessage.Level.INFO)
    void updateAddressSuccess(String user, String name, String routingTypes);
 
    static void updateAddressFailure(String name, String routingTypes) {
       RESOURCE_LOGGER.updateAddressFailure(getCaller(), name, routingTypes);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601704, value = "User {0} successfully updated Address: {1} with routing types {2}", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 601704, value = "User {} successfully updated Address: {} with routing types {}", level = LogMessage.Level.INFO)
    void updateAddressFailure(String user, String name, String routingTypes);
 
    static void deleteAddressSuccess(String name) {
       RESOURCE_LOGGER.deleteAddressSuccess(getCaller(), name);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601705, value = "User {0} successfully deleted Address: {1}", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 601705, value = "User {} successfully deleted Address: {}", level = LogMessage.Level.INFO)
    void deleteAddressSuccess(String user, String name);
 
 
@@ -2495,40 +2197,35 @@ public interface AuditLogger extends BasicLogger {
       RESOURCE_LOGGER.deleteAddressFailure(getCaller(), name);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601706, value = "User {0} failed to deleted Address: {1}", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 601706, value = "User {} failed to deleted Address: {}", level = LogMessage.Level.INFO)
    void deleteAddressFailure(String user, String name);
 
    static void createQueueSuccess(String name, String address, String routingType) {
       RESOURCE_LOGGER.createQueueSuccess(getCaller(), name, address, routingType);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601707, value = "User {0} successfully created Queue: {1} on Address: {2} with routing type {3}", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 601707, value = "User {} successfully created Queue: {} on Address: {} with routing type {}", level = LogMessage.Level.INFO)
    void createQueueSuccess(String user, String name, String address, String routingType);
 
    static void createQueueFailure(String name, String address, String routingType) {
       RESOURCE_LOGGER.createQueueFailure(getCaller(), name, address, routingType);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601708, value = "User {0} failed to create Queue: {1} on Address: {2} with routing type {3}", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 601708, value = "User {} failed to create Queue: {} on Address: {} with routing type {}", level = LogMessage.Level.INFO)
    void createQueueFailure(String user, String name, String address, String routingType);
 
    static void updateQueueSuccess(String name, String routingType) {
       RESOURCE_LOGGER.updateQueueSuccess(getCaller(), name, routingType);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601709, value = "User {0} successfully updated Queue: {1} with routing type {2}", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 601709, value = "User {} successfully updated Queue: {} with routing type {}", level = LogMessage.Level.INFO)
    void updateQueueSuccess(String user, String name, String routingType);
 
    static void updateQueueFailure(String name, String routingType) {
       RESOURCE_LOGGER.updateQueueFailure(getCaller(), name, routingType);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601710, value = "User {0} failed to update Queue: {1} with routing type {2}", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 601710, value = "User {} failed to update Queue: {} with routing type {}", level = LogMessage.Level.INFO)
    void updateQueueFailure(String user, String name, String routingType);
 
 
@@ -2536,32 +2233,28 @@ public interface AuditLogger extends BasicLogger {
       RESOURCE_LOGGER.destroyQueueSuccess(getCaller(), name);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601711, value = "User {0} successfully deleted Queue: {1}", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 601711, value = "User {} successfully deleted Queue: {}", level = LogMessage.Level.INFO)
    void destroyQueueSuccess(String user, String name);
 
    static void destroyQueueFailure(String name) {
       RESOURCE_LOGGER.destroyQueueFailure(getCaller(), name);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601712, value = "User {0} failed to delete Queue: {1}", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 601712, value = "User {} failed to delete Queue: {}", level = LogMessage.Level.INFO)
    void destroyQueueFailure(String user, String name);
 
    static void removeMessagesSuccess(int removed, String queue) {
       RESOURCE_LOGGER.removeMessagesSuccess(getCaller(), removed, queue);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601713, value = "User {0} has removed {1} messages from Queue: {2}", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 601713, value = "User {} has removed {} messages from Queue: {}", level = LogMessage.Level.INFO)
    void removeMessagesSuccess(String user, int removed, String queue);
 
    static void removeMessagesFailure(String queue) {
       RESOURCE_LOGGER.removeMessagesFailure(getCaller(), queue);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601714, value = "User {0} failed to remove messages from Queue: {1}", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 601714, value = "User {} failed to remove messages from Queue: {}", level = LogMessage.Level.INFO)
    void removeMessagesFailure(String user, String queue);
 
    static void userSuccesfullyAuthenticatedInAudit(Subject subject, String remoteAddress) {
@@ -2572,8 +2265,7 @@ public interface AuditLogger extends BasicLogger {
       userSuccesfullyAuthenticatedInAudit(subject, null);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601715, value = "User {0} successfully authenticated", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 601715, value = "User {} successfully authenticated", level = LogMessage.Level.INFO)
    void userSuccesfullyAuthenticated(String caller);
 
 
@@ -2585,16 +2277,14 @@ public interface AuditLogger extends BasicLogger {
       RESOURCE_LOGGER.userFailedAuthentication(getCaller(subject, null), reason);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601716, value = "User {0} failed authentication, reason: {1}", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 601716, value = "User {} failed authentication, reason: {}", level = LogMessage.Level.INFO)
    void userFailedAuthentication(String user, String reason);
 
    static void objectInvokedSuccessfully(ObjectName objectName, String operationName) {
       RESOURCE_LOGGER.objectInvokedSuccessfully(getCaller(), objectName, operationName);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601717, value = "User {0} accessed {2} on management object {1}", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 601717, value = "User {} accessed {} on management object {}", level = LogMessage.Level.INFO)
    void objectInvokedSuccessfully(String caller, ObjectName objectName, String operationName);
 
 
@@ -2602,16 +2292,14 @@ public interface AuditLogger extends BasicLogger {
       RESOURCE_LOGGER.objectInvokedFailure(getCaller(), objectName, operationName);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601718, value = "User {0} does not have correct role to access {2} on management object {1}", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 601718, value = "User {} does not have correct role to access {} on management object {}", level = LogMessage.Level.INFO)
    void objectInvokedFailure(String caller, ObjectName objectName, String operationName);
 
    static void pauseQueueSuccess(String queueName) {
       RESOURCE_LOGGER.pauseQueueSuccess(getCaller(), queueName);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601719, value = "User {0} has paused queue {1}", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 601719, value = "User {} has paused queue {}", level = LogMessage.Level.INFO)
    void pauseQueueSuccess(String user, String queueName);
 
 
@@ -2619,8 +2307,7 @@ public interface AuditLogger extends BasicLogger {
       RESOURCE_LOGGER.pauseQueueFailure(getCaller(), queueName);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601720, value = "User {0} failed to pause queue {1}", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 601720, value = "User {} failed to pause queue {}", level = LogMessage.Level.INFO)
    void pauseQueueFailure(String user, String queueName);
 
 
@@ -2628,8 +2315,7 @@ public interface AuditLogger extends BasicLogger {
       RESOURCE_LOGGER.resumeQueueSuccess(getCaller(), queueName);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601721, value = "User {0} has resumed queue {1}", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 601721, value = "User {} has resumed queue {}", level = LogMessage.Level.INFO)
    void resumeQueueSuccess(String user, String queueName);
 
 
@@ -2637,80 +2323,70 @@ public interface AuditLogger extends BasicLogger {
       RESOURCE_LOGGER.pauseQueueFailure(getCaller(), queueName);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601722, value = "User {0} failed to resume queue {1}", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 601722, value = "User {} failed to resume queue {}", level = LogMessage.Level.INFO)
    void resumeQueueFailure(String user, String queueName);
 
    static void sendMessageSuccess(String queueName, String user) {
       RESOURCE_LOGGER.sendMessageSuccess(getCaller(), queueName, user);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601723, value = "User {0} sent message to {1} as user {2}", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 601723, value = "User {} sent message to {} as user {}", level = LogMessage.Level.INFO)
    void sendMessageSuccess(String user, String queueName, String sendUser);
 
    static void sendMessageFailure(String queueName, String user) {
       RESOURCE_LOGGER.sendMessageFailure(getCaller(), queueName, user);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601724, value = "User {0} failed to send message to {1} as user {2}", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 601724, value = "User {} failed to send message to {} as user {}", level = LogMessage.Level.INFO)
    void sendMessageFailure(String user, String queueName, String sendUser);
 
    static void browseMessagesSuccess(String queueName, int numMessages) {
       RESOURCE_LOGGER.browseMessagesSuccess(getCaller(), queueName, numMessages);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601725, value = "User {0} browsed {2} messages from queue {1}", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 601725, value = "User {} browsed {} messages from queue {}", level = LogMessage.Level.INFO)
    void browseMessagesSuccess(String user, String queueName, int numMessages);
 
    static void browseMessagesFailure(String queueName) {
       RESOURCE_LOGGER.browseMessagesFailure(getCaller(), queueName);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601726, value = "User {0} failed to browse messages from queue {1}", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 601726, value = "User {} failed to browse messages from queue {}", level = LogMessage.Level.INFO)
    void browseMessagesFailure(String user, String queueName);
 
    static void updateDivert(Object source, Object... args) {
-      BASE_LOGGER.updateDivert(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.updateDivert(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601727, value = "User {0} is updating a divert on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void updateDivert(String user, Object source, Object... args);
+   @LogMessage(id = 601727, value = "User {} is updating a divert on target resource: {} {}", level = LogMessage.Level.INFO)
+   void updateDivert(String user, Object source, String arg);
 
    static void isEnabled(Object source) {
       BASE_LOGGER.isEnabled(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601728, value = "User {0} is getting enabled property on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void isEnabled(String user, Object source, Object... args);
+   @LogMessage(id = 601728, value = "User {} is getting enabled property on target resource: {}", level = LogMessage.Level.INFO)
+   void isEnabled(String user, Object source);
 
    static void disable(Object source, Object... args) {
-      BASE_LOGGER.disable(getCaller(), source, arrayToString(args));
+      BASE_LOGGER.disable(getCaller(), source, parametersList(args));
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601729, value = "User {0} is disabling on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void disable(String user, Object source, Object... args);
+   @LogMessage(id = 601729, value = "User {} is disabling on target resource: {} {}", level = LogMessage.Level.INFO)
+   void disable(String user, Object source, String arg);
 
    static void enable(Object source) {
       BASE_LOGGER.resume(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601730, value = "User {0} is enabling on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void enable(String user, Object source, Object... args);
+   @LogMessage(id = 601730, value = "User {} is enabling on target resource: {}", level = LogMessage.Level.INFO)
+   void enable(String user, Object source);
 
    static void pauseAddressSuccess(String queueName) {
       RESOURCE_LOGGER.pauseAddressSuccess(getCaller(), queueName);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601731, value = "User {0} has paused address {1}", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 601731, value = "User {} has paused address {}", level = LogMessage.Level.INFO)
    void pauseAddressSuccess(String user, String queueName);
 
 
@@ -2718,8 +2394,7 @@ public interface AuditLogger extends BasicLogger {
       RESOURCE_LOGGER.pauseAddressFailure(getCaller(), queueName);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601732, value = "User {0} failed to pause address {1}", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 601732, value = "User {} failed to pause address {}", level = LogMessage.Level.INFO)
    void pauseAddressFailure(String user, String queueName);
 
 
@@ -2727,8 +2402,7 @@ public interface AuditLogger extends BasicLogger {
       RESOURCE_LOGGER.resumeAddressSuccess(getCaller(), queueName);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601733, value = "User {0} has resumed address {1}", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 601733, value = "User {} has resumed address {}", level = LogMessage.Level.INFO)
    void resumeAddressSuccess(String user, String queueName);
 
 
@@ -2736,145 +2410,127 @@ public interface AuditLogger extends BasicLogger {
       RESOURCE_LOGGER.resumeAddressFailure(getCaller(), queueName);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601734, value = "User {0} failed to resume address {1}", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 601734, value = "User {} failed to resume address {}", level = LogMessage.Level.INFO)
    void resumeAddressFailure(String user, String queueName);
 
    static void isGroupRebalancePauseDispatch(Object source) {
       BASE_LOGGER.isGroupRebalancePauseDispatch(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601735, value = "User {0} is getting group rebalance pause dispatch property on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void isGroupRebalancePauseDispatch(String user, Object source, Object... args);
+   @LogMessage(id = 601735, value = "User {} is getting group rebalance pause dispatch property on target resource: {}", level = LogMessage.Level.INFO)
+   void isGroupRebalancePauseDispatch(String user, Object source);
 
    static void getAuthenticationCacheSize(Object source) {
       BASE_LOGGER.getAuthenticationCacheSize(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601736, value = "User {0} is getting authentication cache size on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getAuthenticationCacheSize(String user, Object source, Object... args);
+   @LogMessage(id = 601736, value = "User {} is getting authentication cache size on target resource: {}", level = LogMessage.Level.INFO)
+   void getAuthenticationCacheSize(String user, Object source);
 
    static void getAuthorizationCacheSize(Object source) {
       BASE_LOGGER.getAuthorizationCacheSize(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601737, value = "User {0} is getting authorization cache size on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getAuthorizationCacheSize(String user, Object source, Object... args);
+   @LogMessage(id = 601737, value = "User {} is getting authorization cache size on target resource: {}", level = LogMessage.Level.INFO)
+   void getAuthorizationCacheSize(String user, Object source);
 
    static void listBrokerConnections() {
       BASE_LOGGER.listBrokerConnections(getCaller());
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601738, value = "User {0} is requesting a list of broker connections", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 601738, value = "User {} is requesting a list of broker connections", level = LogMessage.Level.INFO)
    void listBrokerConnections(String user);
 
    static void stopBrokerConnection(String name) {
       BASE_LOGGER.stopBrokerConnection(getCaller(), name);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601739, value = "User {0} is requesting to stop broker connection {1}", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 601739, value = "User {} is requesting to stop broker connection {}", level = LogMessage.Level.INFO)
    void stopBrokerConnection(String user, String name);
 
    static void startBrokerConnection(String name) {
       BASE_LOGGER.startBrokerConnection(getCaller(), name);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601740, value = "User {0} is requesting to start broker connection {1}", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 601740, value = "User {} is requesting to start broker connection {}", level = LogMessage.Level.INFO)
    void startBrokerConnection(String user, String name);
 
    static void getAddressCount(Object source) {
       BASE_LOGGER.getAddressCount(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601741, value = "User {0} is getting address count on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getAddressCount(String user, Object source, Object... args);
+   @LogMessage(id = 601741, value = "User {} is getting address count on target resource: {}", level = LogMessage.Level.INFO)
+   void getAddressCount(String user, Object source);
 
    static void getQueueCount(Object source) {
       BASE_LOGGER.getQueueCount(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601742, value = "User {0} is getting the queue count on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getQueueCount(String user, Object source, Object... args);
+   @LogMessage(id = 601742, value = "User {} is getting the queue count on target resource: {}", level = LogMessage.Level.INFO)
+   void getQueueCount(String user, Object source);
 
    static void lastValueKey(Object source) {
       BASE_LOGGER.lastValueKey(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601743, value = "User {0} is getting last-value-key property on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void lastValueKey(String user, Object source, Object... args);
+   @LogMessage(id = 601743, value = "User {} is getting last-value-key property on target resource: {}", level = LogMessage.Level.INFO)
+   void lastValueKey(String user, Object source);
 
    static void consumersBeforeDispatch(Object source) {
       BASE_LOGGER.consumersBeforeDispatch(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601744, value = "User {0} is getting consumers-before-dispatch property on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void consumersBeforeDispatch(String user, Object source, Object... args);
+   @LogMessage(id = 601744, value = "User {} is getting consumers-before-dispatch property on target resource: {}", level = LogMessage.Level.INFO)
+   void consumersBeforeDispatch(String user, Object source);
 
    static void delayBeforeDispatch(Object source) {
       BASE_LOGGER.delayBeforeDispatch(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601745, value = "User {0} is getting delay-before-dispatch property on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void delayBeforeDispatch(String user, Object source, Object... args);
+   @LogMessage(id = 601745, value = "User {} is getting delay-before-dispatch property on target resource: {}", level = LogMessage.Level.INFO)
+   void delayBeforeDispatch(String user, Object source);
 
    static void isInternal(Object source) {
       BASE_LOGGER.isInternal(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601746, value = "User {0} is getting internal property on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void isInternal(String user, Object source, Object... args);
+   @LogMessage(id = 601746, value = "User {} is getting internal property on target resource: {}", level = LogMessage.Level.INFO)
+   void isInternal(String user, Object source);
 
    static void isAutoCreated(Object source) {
       BASE_LOGGER.isAutoCreated(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601747, value = "User {0} is getting auto-created property on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void isAutoCreated(String user, Object source, Object... args);
+   @LogMessage(id = 601747, value = "User {} is getting auto-created property on target resource: {}", level = LogMessage.Level.INFO)
+   void isAutoCreated(String user, Object source);
 
    static void getMaxRetryInterval(Object source) {
       BASE_LOGGER.getMaxRetryInterval(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601748, value = "User {0} is getting max retry interval on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getMaxRetryInterval(String user, Object source, Object... args);
+   @LogMessage(id = 601748, value = "User {} is getting max retry interval on target resource: {}", level = LogMessage.Level.INFO)
+   void getMaxRetryInterval(String user, Object source);
 
    static void getActivationSequence(Object source) {
       BASE_LOGGER.getActivationSequence(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601749, value = "User {0} is getting activation sequence on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getActivationSequence(String user, Object source, Object... args);
+   @LogMessage(id = 601749, value = "User {} is getting activation sequence on target resource: {}", level = LogMessage.Level.INFO)
+   void getActivationSequence(String user, Object source);
 
    static void purge(Object source) {
       RESOURCE_LOGGER.purge(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601750, value = "User {0} is purging target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void purge(String user, Object source, Object... args);
+   @LogMessage(id = 601750, value = "User {} is purging target resource: {}", level = LogMessage.Level.INFO)
+   void purge(String user, Object source);
 
 
    static void purgeAddressSuccess(String queueName) {
       RESOURCE_LOGGER.purgeAddressSuccess(getCaller(), queueName);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601751, value = "User {0} has purged address {1}", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 601751, value = "User {} has purged address {}", level = LogMessage.Level.INFO)
    void purgeAddressSuccess(String user, String queueName);
 
 
@@ -2882,55 +2538,48 @@ public interface AuditLogger extends BasicLogger {
       RESOURCE_LOGGER.purgeAddressFailure(getCaller(), queueName);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601752, value = "User {0} failed to purge address {1}", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 601752, value = "User {} failed to purge address {}", level = LogMessage.Level.INFO)
    void purgeAddressFailure(String user, String queueName);
 
    static void getAddressLimitPercent(Object source) {
       BASE_LOGGER.getAddressLimitPercent(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601753, value = "User {0} is getting address limit %  on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getAddressLimitPercent(String user, Object source, Object... args);
+   @LogMessage(id = 601753, value = "User {} is getting address limit %  on target resource: {}", level = LogMessage.Level.INFO)
+   void getAddressLimitPercent(String user, Object source);
 
    static void block(Object source) {
       BASE_LOGGER.block(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601754, value = "User {0} is blocking target resource: {1}", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 601754, value = "User {} is blocking target resource: {}", level = LogMessage.Level.INFO)
    void block(String user, Object source);
 
    static void unBlock(Object source) {
       BASE_LOGGER.unBlock(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601755, value = "User {0} is unblocking target resource: {1}", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 601755, value = "User {} is unblocking target resource: {}", level = LogMessage.Level.INFO)
    void unBlock(String user, Object source);
 
    static void getAcceptors(Object source) {
       BASE_LOGGER.getAcceptors(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601756, value = "User {0} is getting acceptors on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getAcceptors(String user, Object source, Object... args);
+   @LogMessage(id = 601756, value = "User {} is getting acceptors on target resource: {}", level = LogMessage.Level.INFO)
+   void getAcceptors(String user, Object source);
 
    static void getAcceptorsAsJSON(Object source) {
       BASE_LOGGER.getAcceptorsAsJSON(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601757, value = "User {0} is getting acceptors as json on target resource: {1} {2}", format = Message.Format.MESSAGE_FORMAT)
-   void getAcceptorsAsJSON(String user, Object source, Object... args);
+   @LogMessage(id = 601757, value = "User {} is getting acceptors as json on target resource: {}", level = LogMessage.Level.INFO)
+   void getAcceptorsAsJSON(String user, Object source);
 
    static void schedulePageCleanup(Object source) {
       BASE_LOGGER.schedulePageCleanup(getCaller(), source);
    }
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 601758, value = "User {0} is calling schedulePageCleanup on address: {1}", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 601758, value = "User {} is calling schedulePageCleanup on address: {}", level = LogMessage.Level.INFO)
    void schedulePageCleanup(String user, Object address);
 }
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/JBossLoggingApacheLoggerBridge.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/JBossLoggingApacheLoggerBridge.java
deleted file mode 100644
index 78242a2572..0000000000
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/logs/JBossLoggingApacheLoggerBridge.java
+++ /dev/null
@@ -1,134 +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.
- */
-
-package org.apache.activemq.artemis.logs;
-
-import org.apache.commons.logging.Log;
-import org.jboss.logging.Logger;
-
-/**
- * There is an issue on the Testsuite, as it's not possible
- * to bring JBossLogging on the booting classLoader.
- * As a result classes like BeanUtils will be using apache logging,
- * which will not have the bootstrapping necessary.
- *
- * As a result BeanUtils is keeping showing log.debug into the test output and test console.
- *
- * This class will give an opportunity to the CI and our applications to use proper logging even on the testsuite.
- * */
-public class JBossLoggingApacheLoggerBridge implements Log {
-
-   final Logger bridgeLog;
-
-   public JBossLoggingApacheLoggerBridge(Class clazz) {
-      bridgeLog = Logger.getLogger(clazz);
-   }
-
-   public JBossLoggingApacheLoggerBridge(String name) {
-      bridgeLog = Logger.getLogger(name);
-   }
-
-   @Override
-   public void debug(Object message) {
-      bridgeLog.debug(message);
-   }
-
-   @Override
-   public void debug(Object message, Throwable t) {
-      bridgeLog.debug(message, t);
-   }
-
-   @Override
-   public void error(Object message) {
-      bridgeLog.error(message);
-   }
-
-   @Override
-   public void error(Object message, Throwable t) {
-      bridgeLog.error(message, t);
-   }
-
-   @Override
-   public void fatal(Object message) {
-      bridgeLog.fatal(message);
-   }
-
-   @Override
-   public void fatal(Object message, Throwable t) {
-      bridgeLog.fatal(message, t);
-   }
-
-   @Override
-   public void info(Object message) {
-      bridgeLog.info(message);
-   }
-
-   @Override
-   public void info(Object message, Throwable t) {
-      bridgeLog.info(message, t);
-   }
-
-   @Override
-   public boolean isDebugEnabled() {
-      return bridgeLog.isDebugEnabled();
-   }
-
-   @Override
-   public boolean isErrorEnabled() {
-      return bridgeLog.isEnabled(Logger.Level.ERROR);
-   }
-
-   @Override
-   public boolean isFatalEnabled() {
-      return bridgeLog.isEnabled(Logger.Level.FATAL);
-   }
-
-   @Override
-   public boolean isInfoEnabled() {
-      return bridgeLog.isInfoEnabled();
-   }
-
-   @Override
-   public boolean isTraceEnabled() {
-      return bridgeLog.isTraceEnabled();
-   }
-
-   @Override
-   public boolean isWarnEnabled() {
-      return bridgeLog.isEnabled(Logger.Level.WARN);
-   }
-
-   @Override
-   public void trace(Object message) {
-      bridgeLog.trace(message);
-   }
-
-   @Override
-   public void trace(Object message, Throwable t) {
-      bridgeLog.trace(message, t);
-   }
-
-   @Override
-   public void warn(Object message) {
-      bridgeLog.warn(message);
-   }
-
-   @Override
-   public void warn(Object message, Throwable t) {
-      bridgeLog.warn(message, t);
-   }
-}
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ByteUtil.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ByteUtil.java
index 8c5fec9e6d..10a301699f 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ByteUtil.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ByteUtil.java
@@ -29,7 +29,7 @@ import io.netty.util.internal.PlatformDependent;
 import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
 import org.apache.activemq.artemis.api.core.SimpleString;
 import org.apache.activemq.artemis.logs.ActiveMQUtilBundle;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
 
 public class ByteUtil {
 
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ClassloadingUtil.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ClassloadingUtil.java
index b56e3a09b8..b848ed7a38 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ClassloadingUtil.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ClassloadingUtil.java
@@ -19,7 +19,8 @@ package org.apache.activemq.artemis.utils;
 import java.net.URL;
 import java.util.Properties;
 
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This class will be used to perform generic class-loader operations,
@@ -30,7 +31,7 @@ import org.jboss.logging.Logger;
 
 public final class ClassloadingUtil {
 
-   private static final Logger logger = Logger.getLogger(ClassloadingUtil.class);
+   private static final Logger logger = LoggerFactory.getLogger(ClassloadingUtil.class);
 
    private static final String INSTANTIATION_EXCEPTION_MESSAGE = "Your class must have a constructor without arguments. If it is an inner class, it must be static!";
 
@@ -135,7 +136,7 @@ public final class ClassloadingUtil {
             properties.load(url.openStream());
          }
       } catch (Throwable ignored) {
-         logger.warn(ignored);
+         logger.warn(ignored.getMessage(), ignored);
       }
       return properties;
    }
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/DefaultSensitiveStringCodec.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/DefaultSensitiveStringCodec.java
index 6f07a7b80b..6e36488e69 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/DefaultSensitiveStringCodec.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/DefaultSensitiveStringCodec.java
@@ -31,7 +31,8 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.Properties;
 
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A DefaultSensitiveDataCodec
@@ -47,7 +48,7 @@ import org.jboss.logging.Logger;
  */
 public class DefaultSensitiveStringCodec implements SensitiveDataCodec<String> {
 
-   private static final Logger logger = Logger.getLogger(DefaultSensitiveStringCodec.class);
+   private static final Logger logger = LoggerFactory.getLogger(DefaultSensitiveStringCodec.class);
 
    public static final String ALGORITHM = "algorithm";
    public static final String BLOWFISH_KEY = "key";
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/SizeAwareMetric.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/SizeAwareMetric.java
index 9d33ef0858..f98ef35c6d 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/SizeAwareMetric.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/SizeAwareMetric.java
@@ -20,7 +20,8 @@ package org.apache.activemq.artemis.utils;
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class SizeAwareMetric {
 
@@ -28,7 +29,7 @@ public class SizeAwareMetric {
       void add(int delta, boolean sizeOnly);
    }
 
-   private static final Logger logger = Logger.getLogger(SizeAwareMetric.class);
+   private static final Logger logger = LoggerFactory.getLogger(SizeAwareMetric.class);
 
    private static final int PENDING_FREE = 0, FREE = 1, PENDING_OVER_SIZE = 2, OVER_SIZE = 3, PENDING_OVER_ELEMENTS = 4, OVER_ELEMENTS = 5, NOT_USED = -1;
 
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/SpawnedVMSupport.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/SpawnedVMSupport.java
index e71c57ffcb..87548fc150 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/SpawnedVMSupport.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/SpawnedVMSupport.java
@@ -27,13 +27,14 @@ import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
 
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class SpawnedVMSupport {
 
    static ConcurrentHashMap<Process, String> startedProcesses = null;
 
-   private static final Logger log = Logger.getLogger(SpawnedVMSupport.class);
+   private static final Logger log = LoggerFactory.getLogger(SpawnedVMSupport.class);
 
    public static Process spawnVM(final String className, final String... args) throws Exception {
       return SpawnedVMSupport.spawnVM(className, new String[0], true, args);
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ThreadDumpUtil.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ThreadDumpUtil.java
index 2d942615c3..69d762bcc4 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ThreadDumpUtil.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ThreadDumpUtil.java
@@ -19,7 +19,8 @@
 
 package org.apache.activemq.artemis.utils;
 
-import org.apache.activemq.artemis.logs.ActiveMQUtilLogger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -31,6 +32,7 @@ import java.lang.management.ThreadInfo;
 import java.lang.management.ThreadMXBean;
 
 public final class ThreadDumpUtil {
+   private static final Logger logger = LoggerFactory.getLogger(ThreadDumpUtil.class);
 
    public static String threadDump(final String msg) {
 
@@ -66,7 +68,7 @@ public final class ThreadDumpUtil {
          return str.toString();
 
       } catch (IOException e) {
-         ActiveMQUtilLogger.LOGGER.error("Exception thrown during generating of thread dump.", e);
+         logger.error("Exception thrown during generating of thread dump.", e);
       }
 
       return "Generating of thread dump failed " + msg;
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UTF8Util.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UTF8Util.java
index 66f3ec01ab..f57fff54ca 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UTF8Util.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UTF8Util.java
@@ -23,7 +23,8 @@ import io.netty.util.internal.PlatformDependent;
 import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
 import org.apache.activemq.artemis.api.core.SimpleString;
 import org.apache.activemq.artemis.logs.ActiveMQUtilBundle;
-import org.apache.activemq.artemis.logs.ActiveMQUtilLogger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A UTF8Util
@@ -32,6 +33,8 @@ import org.apache.activemq.artemis.logs.ActiveMQUtilLogger;
  */
 public final class UTF8Util {
 
+   private static final Logger logger = LoggerFactory.getLogger(UTF8Util.class);
+
    private static final ThreadLocal<SoftReference<StringUtilBuffer>> currentBuffer = new ThreadLocal<>();
 
    private UTF8Util() {
@@ -85,9 +88,9 @@ public final class UTF8Util {
 
       final int stringLength = str.length();
 
-      if (ActiveMQUtilLogger.LOGGER.isTraceEnabled()) {
+      if (logger.isTraceEnabled()) {
          // This message is too verbose for debug, that's why we are using trace here
-         ActiveMQUtilLogger.LOGGER.trace("Saving string with utfSize=" + len + " stringSize=" + stringLength);
+         logger.trace("Saving string with utfSize=" + len + " stringSize=" + stringLength);
       }
 
       if (out.hasArray()) {
@@ -183,9 +186,9 @@ public final class UTF8Util {
 
       final int size = input.readUnsignedShort();
 
-      if (ActiveMQUtilLogger.LOGGER.isTraceEnabled()) {
+      if (logger.isTraceEnabled()) {
          // This message is too verbose for debug, that's why we are using trace here
-         ActiveMQUtilLogger.LOGGER.trace("Reading string with utfSize=" + size);
+         logger.trace("Reading string with utfSize=" + size);
       }
       if (PlatformDependent.hasUnsafe() && input.byteBuf() != null && input.byteBuf().hasMemoryAddress()) {
          final ByteBuf byteBuf = input.byteBuf();
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUIDGenerator.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUIDGenerator.java
index c59ca1c83d..fcbafe5d5a 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUIDGenerator.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUIDGenerator.java
@@ -32,10 +32,13 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
 import org.apache.activemq.artemis.api.core.SimpleString;
-import org.apache.activemq.artemis.logs.ActiveMQUtilLogger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public final class UUIDGenerator {
 
+   private static final Logger logger = LoggerFactory.getLogger(UUIDGenerator.class);
+
    private static final UUIDGenerator sSingleton = new UUIDGenerator();
 
    // Windows has some fake adapters that will return the same HARDWARE ADDRESS on any computer. We need to ignore those
@@ -122,8 +125,8 @@ public final class UUIDGenerator {
        */
       dummy[0] |= (byte) 0x01;
 
-      if (ActiveMQUtilLogger.LOGGER.isDebugEnabled()) {
-         ActiveMQUtilLogger.LOGGER.debug("using dummy address " + UUIDGenerator.asString(dummy));
+      if (logger.isDebugEnabled()) {
+         logger.debug("using dummy address " + UUIDGenerator.asString(dummy));
       }
       return dummy;
    }
@@ -153,8 +156,8 @@ public final class UUIDGenerator {
 
          byte[] address = findFirstMatchingHardwareAddress(ifaces);
          if (address != null) {
-            if (ActiveMQUtilLogger.LOGGER.isDebugEnabled()) {
-               ActiveMQUtilLogger.LOGGER.debug("using hardware address " + UUIDGenerator.asString(address));
+            if (logger.isDebugEnabled()) {
+               logger.debug("using hardware address " + UUIDGenerator.asString(address));
             }
             return address;
          }
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/actors/OrderedExecutor.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/actors/OrderedExecutor.java
index 8a02497b00..b941f59d20 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/actors/OrderedExecutor.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/actors/OrderedExecutor.java
@@ -20,7 +20,8 @@ package org.apache.activemq.artemis.utils.actors;
 import java.util.concurrent.Executor;
 
 import org.apache.activemq.artemis.api.core.ActiveMQInterruptedException;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * An executor that always runs all tasks in order, using a delegate executor to run the tasks.
@@ -34,7 +35,7 @@ public class OrderedExecutor extends ProcessorBase<Runnable> implements ArtemisE
       super(delegate);
    }
 
-   private static final Logger logger = Logger.getLogger(OrderedExecutor.class);
+   private static final Logger logger = LoggerFactory.getLogger(OrderedExecutor.class);
 
    @Override
    protected final void doTask(Runnable task) {
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/actors/ProcessorBase.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/actors/ProcessorBase.java
index 67dcb5cdb3..850330a971 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/actors/ProcessorBase.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/actors/ProcessorBase.java
@@ -24,11 +24,12 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.function.Consumer;
 
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public abstract class ProcessorBase<T> extends HandlerBase {
 
-   private static final Logger logger = Logger.getLogger(ProcessorBase.class);
+   private static final Logger logger = LoggerFactory.getLogger(ProcessorBase.class);
    public static final int STATE_NOT_RUNNING = 0;
    public static final int STATE_RUNNING = 1;
    public static final int STATE_FORCED_SHUTDOWN = 2;
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/actors/ThresholdActor.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/actors/ThresholdActor.java
index 6b00b87179..21e1e33b94 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/actors/ThresholdActor.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/actors/ThresholdActor.java
@@ -21,11 +21,12 @@ import java.util.concurrent.Executor;
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.function.ToIntFunction;
 
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ThresholdActor<T> extends ProcessorBase<Object> {
 
-   private static final Logger logger = Logger.getLogger(ThresholdActor.class);
+   private static final Logger logger = LoggerFactory.getLogger(ThresholdActor.class);
 
    private static final AtomicIntegerFieldUpdater<ThresholdActor> SIZE_UPDATER = AtomicIntegerFieldUpdater.newUpdater(ThresholdActor.class, "size");
    private volatile int size = 0;
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/ConcurrentLongHashSet.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/ConcurrentLongHashSet.java
index 4188524cf4..cf1fb60edb 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/ConcurrentLongHashSet.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/ConcurrentLongHashSet.java
@@ -26,7 +26,8 @@ import java.util.Set;
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.locks.StampedLock;
 
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import static org.apache.activemq.artemis.utils.Preconditions.checkArgument;
 
@@ -40,7 +41,7 @@ import static org.apache.activemq.artemis.utils.Preconditions.checkArgument;
  */
 public class ConcurrentLongHashSet {
 
-   private static final Logger logger = Logger.getLogger(ConcurrentLongHashSet.class);
+   private static final Logger logger = LoggerFactory.getLogger(ConcurrentLongHashSet.class);
 
    private static final long EmptyItem = -1L;
    private static final long DeletedItem = -2L;
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/critical/CriticalAnalyzerImpl.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/critical/CriticalAnalyzerImpl.java
index 528d15f488..e7363bd771 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/critical/CriticalAnalyzerImpl.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/critical/CriticalAnalyzerImpl.java
@@ -24,11 +24,12 @@ import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.apache.activemq.artemis.core.server.ActiveMQScheduledComponent;
 import org.apache.activemq.artemis.utils.collections.ConcurrentHashSet;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class CriticalAnalyzerImpl implements CriticalAnalyzer {
 
-   private final Logger logger = Logger.getLogger(CriticalAnalyzer.class);
+   private final Logger logger = LoggerFactory.getLogger(CriticalAnalyzer.class);
 
    private volatile long timeoutNanoSeconds;
 
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/critical/CriticalMeasure.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/critical/CriticalMeasure.java
index 16fa099dc5..292808db1d 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/critical/CriticalMeasure.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/critical/CriticalMeasure.java
@@ -20,7 +20,8 @@ package org.apache.activemq.artemis.utils.critical;
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 
 import org.apache.activemq.artemis.utils.ArtemisCloseable;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class CriticalMeasure {
 
@@ -28,7 +29,7 @@ public class CriticalMeasure {
       return closeable == dummyCloseable;
    }
 
-   private static final Logger logger = Logger.getLogger(CriticalMeasure.class);
+   private static final Logger logger = LoggerFactory.getLogger(CriticalMeasure.class);
 
    // this is used on enterCritical, if the logger is in trace mode
    private volatile Exception traceEnter;
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/uri/FluentPropertyBeanIntrospectorWithIgnores.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/uri/FluentPropertyBeanIntrospectorWithIgnores.java
index ad56353eef..cd88b7aa26 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/uri/FluentPropertyBeanIntrospectorWithIgnores.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/uri/FluentPropertyBeanIntrospectorWithIgnores.java
@@ -26,11 +26,12 @@ import org.apache.activemq.artemis.api.core.Pair;
 import org.apache.activemq.artemis.utils.collections.ConcurrentHashSet;
 import org.apache.commons.beanutils.FluentPropertyBeanIntrospector;
 import org.apache.commons.beanutils.IntrospectionContext;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class FluentPropertyBeanIntrospectorWithIgnores extends FluentPropertyBeanIntrospector {
 
-   static Logger logger = Logger.getLogger(FluentPropertyBeanIntrospectorWithIgnores.class);
+   static Logger logger = LoggerFactory.getLogger(FluentPropertyBeanIntrospectorWithIgnores.class);
 
    private static ConcurrentHashSet<Pair<String, String>> ignores = new ConcurrentHashSet<>();
 
diff --git a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/ByteUtilTest.java b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/ByteUtilTest.java
index b4eea724ed..efa686c174 100644
--- a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/ByteUtilTest.java
+++ b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/ByteUtilTest.java
@@ -27,7 +27,8 @@ import java.util.Map;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.util.internal.PlatformDependent;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.junit.Assert;
 import org.junit.Assume;
 import org.junit.Test;
@@ -39,7 +40,7 @@ import static org.junit.Assert.fail;
 
 public class ByteUtilTest {
 
-   private static final Logger log = Logger.getLogger(ByteUtilTest.class);
+   private static final Logger log = LoggerFactory.getLogger(ByteUtilTest.class);
 
    @Test
    public void testBytesToString() {
diff --git a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/DefaultSensitiveStringCodecTest.java b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/DefaultSensitiveStringCodecTest.java
index c670345fa0..e9993c15f2 100644
--- a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/DefaultSensitiveStringCodecTest.java
+++ b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/DefaultSensitiveStringCodecTest.java
@@ -16,7 +16,8 @@
  */
 package org.apache.activemq.artemis.utils;
 
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.junit.Test;
 
 import java.util.HashMap;
@@ -29,7 +30,7 @@ import static org.junit.Assert.fail;
 
 public class DefaultSensitiveStringCodecTest {
 
-   private static final Logger log = Logger.getLogger(DefaultSensitiveStringCodecTest.class);
+   private static final Logger log = LoggerFactory.getLogger(DefaultSensitiveStringCodecTest.class);
 
    @Test
    public void testDefaultAlgorithm() throws Exception {
diff --git a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/actors/OrderedExecutorSanityTest.java b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/actors/OrderedExecutorSanityTest.java
index 86cdf81a31..8223efc979 100644
--- a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/actors/OrderedExecutorSanityTest.java
+++ b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/actors/OrderedExecutorSanityTest.java
@@ -26,12 +26,13 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.junit.Assert;
 import org.junit.Test;
 
 public class OrderedExecutorSanityTest {
-   private static final Logger log = Logger.getLogger(OrderedExecutorSanityTest.class);
+   private static final Logger log = LoggerFactory.getLogger(OrderedExecutorSanityTest.class);
 
    @Test
    public void shouldExecuteTasksInOrder() throws InterruptedException {
diff --git a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/critical/MultiThreadCriticalMeasureTest.java b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/critical/MultiThreadCriticalMeasureTest.java
index 61fccf8160..591afd494f 100644
--- a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/critical/MultiThreadCriticalMeasureTest.java
+++ b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/critical/MultiThreadCriticalMeasureTest.java
@@ -27,13 +27,14 @@ import java.util.concurrent.locks.LockSupport;
 
 import org.apache.activemq.artemis.utils.ReusableLatch;
 import org.apache.activemq.artemis.utils.Wait;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.junit.Assert;
 import org.junit.Test;
 
 public class MultiThreadCriticalMeasureTest {
 
-   private static final Logger logger = Logger.getLogger(MultiThreadCriticalMeasureTest.class);
+   private static final Logger logger = LoggerFactory.getLogger(MultiThreadCriticalMeasureTest.class);
 
    @Test
    public void testMultiThread() throws Throwable {
diff --git a/artemis-core-client-osgi/pom.xml b/artemis-core-client-osgi/pom.xml
index 7e1b59d28d..abd6f0f682 100644
--- a/artemis-core-client-osgi/pom.xml
+++ b/artemis-core-client-osgi/pom.xml
@@ -41,33 +41,15 @@
          <artifactId>artemis-core-client</artifactId>
          <version>${project.version}</version>
       </dependency>
+      <!-- logging -->
       <dependency>
-         <groupId>org.jboss.logmanager</groupId>
-         <artifactId>jboss-logmanager</artifactId>
-         <optional>true</optional>
-         <scope>provided</scope>
-      </dependency>
-      <dependency>
-          <groupId>org.wildfly.common</groupId>
-          <artifactId>wildfly-common</artifactId>
-         <scope>provided</scope>
-         <optional>true</optional>
-      </dependency>
-      <dependency>
-         <groupId>org.jboss.logging</groupId>
-         <artifactId>jboss-logging-processor</artifactId>
-         <scope>provided</scope>
-         <optional>true</optional>
-      </dependency>
-      <dependency>
-         <groupId>org.jboss.logging</groupId>
-         <artifactId>jboss-logging-annotations</artifactId>
-         <scope>provided</scope>
-         <optional>true</optional>
+         <groupId>org.slf4j</groupId>
+         <artifactId>slf4j-api</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.jboss.logging</groupId>
-         <artifactId>jboss-logging</artifactId>
+         <groupId>org.apache.logging.log4j</groupId>
+         <artifactId>log4j-slf4j-impl</artifactId>
+         <scope>test</scope>
       </dependency>
       <dependency>
          <groupId>xalan</groupId>
@@ -100,6 +82,7 @@
                   <Import-Package>
                      org.glassfish.json*;resolution:=optional,
                      io.netty.buffer;io.netty.*;version="[4.1,5)",
+                     org.apache.activemq.artemis.logprocessor.*;resolution:=optional,
                      *
                   </Import-Package>
                   <_exportcontents>org.apache.activemq.artemis.*;-noimport:=true</_exportcontents>
diff --git a/artemis-core-client/pom.xml b/artemis-core-client/pom.xml
index 1538f0cd38..fe8d158a23 100644
--- a/artemis-core-client/pom.xml
+++ b/artemis-core-client/pom.xml
@@ -32,35 +32,23 @@
    </properties>
 
    <dependencies>
+      <!-- logging -->
       <dependency>
-         <groupId>org.jboss.logging</groupId>
-         <artifactId>jboss-logging-processor</artifactId>
-         <scope>provided</scope>
-         <optional>true</optional>
-      </dependency>
-      <dependency>
-         <groupId>org.jboss.logging</groupId>
-         <artifactId>jboss-logging-annotations</artifactId>
-         <scope>provided</scope>
-         <optional>true</optional>
-      </dependency>
-      <dependency>
-         <groupId>org.jboss.logging</groupId>
-         <artifactId>jboss-logging</artifactId>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>artemis-log-processor</artifactId>
+         <version>${project.version}</version>
          <scope>provided</scope>
+         <!-- Superfluous, except for osgi manifest handling -->
          <optional>true</optional>
       </dependency>
       <dependency>
-         <groupId>org.jboss.logmanager</groupId>
-         <artifactId>jboss-logmanager</artifactId>
-         <scope>provided</scope>
-         <optional>true</optional>
+         <groupId>org.slf4j</groupId>
+         <artifactId>slf4j-api</artifactId>
       </dependency>
       <dependency>
-          <groupId>org.wildfly.common</groupId>
-          <artifactId>wildfly-common</artifactId>
-         <scope>provided</scope>
-         <optional>true</optional>
+         <groupId>org.apache.logging.log4j</groupId>
+         <artifactId>log4j-slf4j-impl</artifactId>
+         <scope>test</scope>
       </dependency>
       <dependency>
          <groupId>org.jgroups</groupId>
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
index 734d58261b..ef3d870854 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
@@ -23,14 +23,15 @@ import org.apache.activemq.artemis.api.core.RoutingType;
 import org.apache.activemq.artemis.api.core.SimpleString;
 import org.apache.activemq.artemis.core.server.ComponentConfigurationRoutingType;
 import org.apache.activemq.artemis.utils.critical.CriticalAnalyzerPolicy;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Default values of ActiveMQ Artemis configuration parameters.
  */
 public final class ActiveMQDefaultConfiguration {
 
-   private static final Logger logger = Logger.getLogger(ActiveMQDefaultConfiguration.class);
+   private static final Logger logger = LoggerFactory.getLogger(ActiveMQDefaultConfiguration.class);
 
    /*
     * <p> In order to avoid compile time in-lining of constants, all access is done through methods
@@ -509,7 +510,7 @@ public final class ActiveMQDefaultConfiguration {
          maxDisk = Integer.parseInt(System.getProperty(ActiveMQDefaultConfiguration.getDefaultSystemPropertyPrefix() + "maxDiskUsage", "90"));
       } catch (Throwable e) {
          // This is not really supposed to happen, so just logging it, just in case
-         logger.warn(e);
+         logger.warn(e.getMessage(), e);
          maxDisk = 90;
       }
       DEFAULT_MAX_DISK_USAGE = maxDisk;
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/ChannelBroadcastEndpointFactory.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/ChannelBroadcastEndpointFactory.java
index 66b61d3153..15acbcee55 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/ChannelBroadcastEndpointFactory.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/ChannelBroadcastEndpointFactory.java
@@ -17,7 +17,8 @@
 package org.apache.activemq.artemis.api.core;
 
 import org.apache.activemq.artemis.api.core.jgroups.JChannelManager;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.jgroups.JChannel;
 
 /**
@@ -27,7 +28,7 @@ import org.jgroups.JChannel;
  */
 public class ChannelBroadcastEndpointFactory implements BroadcastEndpointFactory {
 
-   private static final Logger logger = Logger.getLogger(ChannelBroadcastEndpointFactory.class);
+   private static final Logger logger = LoggerFactory.getLogger(ChannelBroadcastEndpointFactory.class);
 
    private final JChannel channel;
 
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsBroadcastEndpoint.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsBroadcastEndpoint.java
index a02ff28751..68b549c41f 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsBroadcastEndpoint.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsBroadcastEndpoint.java
@@ -21,7 +21,8 @@ import java.util.concurrent.TimeUnit;
 import org.apache.activemq.artemis.api.core.jgroups.JChannelManager;
 import org.apache.activemq.artemis.api.core.jgroups.JChannelWrapper;
 import org.apache.activemq.artemis.api.core.jgroups.JGroupsReceiver;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.jgroups.JChannel;
 
 /**
@@ -29,7 +30,7 @@ import org.jgroups.JChannel;
  */
 public abstract class JGroupsBroadcastEndpoint implements BroadcastEndpoint {
 
-   private static final Logger logger = Logger.getLogger(JGroupsBroadcastEndpoint.class);
+   private static final Logger logger = LoggerFactory.getLogger(JGroupsBroadcastEndpoint.class);
 
    private final String channelName;
 
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/jgroups/JChannelManager.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/jgroups/JChannelManager.java
index 682bf7645e..4e72dda303 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/jgroups/JChannelManager.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/jgroups/JChannelManager.java
@@ -21,7 +21,8 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.activemq.artemis.api.core.JGroupsBroadcastEndpoint;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This class maintain a global Map of JChannels wrapped in JChannelWrapper for
@@ -54,7 +55,7 @@ public class JChannelManager {
    // this is useful for testcases using a single channel.
    private boolean loopbackMessages = false;
 
-   private final Logger logger = Logger.getLogger(JChannelManager.class);
+   private final Logger logger = LoggerFactory.getLogger(JChannelManager.class);
 
    private static final Map<String, JChannelWrapper> channels = new HashMap<>();
 
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/jgroups/JChannelWrapper.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/jgroups/JChannelWrapper.java
index cc2d8f93d8..d57bfd306f 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/jgroups/JChannelWrapper.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/jgroups/JChannelWrapper.java
@@ -20,10 +20,11 @@ package org.apache.activemq.artemis.api.core.jgroups;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jboss.logging.Logger;
 import org.jgroups.JChannel;
 import org.jgroups.Message;
 import org.jgroups.Receiver;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This class wraps a JChannel with a reference counter. The reference counter
@@ -32,7 +33,7 @@ import org.jgroups.Receiver;
  */
 public class JChannelWrapper {
 
-   private static final Logger logger = Logger.getLogger(JChannelWrapper.class);
+   private static final Logger logger = LoggerFactory.getLogger(JChannelWrapper.class);
 
    private boolean connected = false;
    int refCount = 1;
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/jgroups/JGroupsReceiver.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/jgroups/JGroupsReceiver.java
index f0f3aab07d..5f5d608ce5 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/jgroups/JGroupsReceiver.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/jgroups/JGroupsReceiver.java
@@ -21,7 +21,8 @@ import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingDeque;
 import java.util.concurrent.TimeUnit;
 
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.jgroups.Receiver;
 
 /**
@@ -30,7 +31,7 @@ import org.jgroups.Receiver;
  */
 public class JGroupsReceiver implements Receiver {
 
-   private static final Logger logger = Logger.getLogger(JGroupsReceiver.class);
+   private static final Logger logger = LoggerFactory.getLogger(JGroupsReceiver.class);
 
    private final BlockingQueue<byte[]> dequeue = new LinkedBlockingDeque<>();
 
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientLogger.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientLogger.java
index e476dcb20a..5beb963958 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientLogger.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientLogger.java
@@ -16,565 +16,333 @@
  */
 package org.apache.activemq.artemis.core.client;
 
+import java.net.UnknownHostException;
+
 import org.apache.activemq.artemis.api.core.ActiveMQExceptionType;
 import org.apache.activemq.artemis.api.core.Interceptor;
-import org.apache.activemq.artemis.core.protocol.core.Packet;
-import org.jboss.logging.BasicLogger;
-import org.jboss.logging.Logger;
-import org.jboss.logging.annotations.Cause;
-import org.jboss.logging.annotations.LogMessage;
-import org.jboss.logging.annotations.Message;
-import org.jboss.logging.annotations.MessageLogger;
+import org.apache.activemq.artemis.logprocessor.CodeFactory;
+import org.apache.activemq.artemis.logprocessor.annotation.Cause;
+import org.apache.activemq.artemis.logprocessor.annotation.LogBundle;
+import org.apache.activemq.artemis.logprocessor.annotation.LogMessage;
 import org.w3c.dom.Node;
 
-import java.net.UnknownHostException;
-
 /**
  * Logger Code 21
- * <p>
- * Each message id must be 6 digits long starting with 21, the 3rd digit donates the level so
- *
- * <pre>
- * INF0  1
- * WARN  2
- * DEBUG 3
- * ERROR 4
- * TRACE 5
- * FATAL 6
- * </pre>
- *
- * so an INFO message would be 211000 to 211999.
- * <p>
- * Once released, methods should not be deleted as they may be referenced by knowledge base
- * articles. Unused methods should be marked as deprecated.
  */
-@MessageLogger(projectCode = "AMQ")
-public interface ActiveMQClientLogger extends BasicLogger {
-
-   /**
-    * The default logger.
-    */
-   ActiveMQClientLogger LOGGER = Logger.getMessageLogger(ActiveMQClientLogger.class, ActiveMQClientLogger.class.getPackage().getName());
+@LogBundle(projectCode = "AMQ")
+public interface ActiveMQClientLogger {
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 211000, value = "**** Dumping session creation stacks ****", format = Message.Format.MESSAGE_FORMAT)
-   void dumpingSessionStacks();
+   ActiveMQClientLogger LOGGER = CodeFactory.getCodeClass(ActiveMQClientLogger.class, ActiveMQClientLogger.class.getPackage().getName());
 
-   @LogMessage(level = Logger.Level.INFO)
-   @Message(id = 211001, value = "session created", format = Message.Format.MESSAGE_FORMAT)
-   void dumpingSessionStack(@Cause Exception e);
-
-   @LogMessage(level = Logger.Level.DEBUG)
-   @Message(id = 211002, value = "Started {0} Netty Connector version {1} to {2}:{3,number,#}", format = Message.Format.MESSAGE_FORMAT)
-   void startedNettyConnector(String connectorType, String version, String host, Integer port);
-
-   @LogMessage(level = Logger.Level.DEBUG)
-   @Message(id = 211003, value = "Started InVM Connector", format = Message.Format.MESSAGE_FORMAT)
-   void startedInVMConnector();
-
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212000, value = "{0}", format = Message.Format.MESSAGE_FORMAT)
-   void warn(String message);
-
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212001, value = "Error on clearing messages", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212001, value = "Error on clearing messages", level = LogMessage.Level.WARN)
    void errorClearingMessages(@Cause Throwable e);
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212002, value = "Timed out waiting for handler to complete processing", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212002, value = "Timed out waiting for handler to complete processing", level = LogMessage.Level.WARN)
    void timeOutWaitingForProcessing();
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212003, value = "Unable to close session", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212003, value = "Unable to close session", level = LogMessage.Level.WARN)
    void unableToCloseSession(@Cause Exception e);
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212004, value = "Failed to connect to server.", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212004, value = "Failed to connect to server.", level = LogMessage.Level.WARN)
    void failedToConnectToServer();
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212005, value = "Tried {0} times to connect. Now giving up on reconnecting it.", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212005, value = "Tried {0} times to connect. Now giving up on reconnecting it.", level = LogMessage.Level.WARN)
    void failedToConnectToServer(Integer reconnectAttempts);
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212007,
-      value = "connector.create or connectorFactory.createConnector should never throw an exception, implementation is badly behaved, but we will deal with it anyway.",
-      format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212007, value = "connector.create or connectorFactory.createConnector should never throw an exception, implementation is badly behaved, but we will deal with it anyway.", level = LogMessage.Level.WARN)
    void createConnectorException(@Cause Exception e);
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212008,
-      value = "I am closing a core ClientSessionFactory you left open. Please make sure you close all ClientSessionFactories explicitly " + "before letting them go out of scope! {0}",
-      format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212008, value = "I am closing a core ClientSessionFactory you left open. Please make sure you close all ClientSessionFactories explicitly " + "before letting them go out of scope! {0}", level = LogMessage.Level.WARN)
    void factoryLeftOpen(@Cause Exception e, int i);
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212009, value = "resetting session after failure", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212009, value = "resetting session after failure", level = LogMessage.Level.WARN)
    void resettingSessionAfterFailure();
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212010, value = "Server is starting, retry to create the session {0}", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212010, value = "Server is starting, retry to create the session {0}", level = LogMessage.Level.WARN)
    void retryCreateSessionSeverStarting(String name);
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212011, value = "committing transaction after failover occurred, any non persistent messages may be lost", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212011, value = "committing transaction after failover occurred, any non persistent messages may be lost", level = LogMessage.Level.WARN)
    void commitAfterFailover();
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212012, value = "failure occurred during commit throwing XAException", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212012, value = "failure occurred during commit throwing XAException", level = LogMessage.Level.WARN)
    void failoverDuringCommit();
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212014, value = "failover occurred during prepare rolling back", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212014, value = "failover occurred during prepare rolling back", level = LogMessage.Level.WARN)
    void failoverDuringPrepareRollingBack();
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212015, value = "failover occurred during prepare rolling back", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212015, value = "failover occurred during prepare rolling back", level = LogMessage.Level.WARN)
    void errorDuringPrepare(@Cause Throwable e);
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212016,
-      value = "I am closing a core ClientSession you left open. Please make sure you close all ClientSessions explicitly before letting them go out of scope! {0}",
-      format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212016, value = "I am closing a core ClientSession you left open. Please make sure you close all ClientSessions explicitly before letting them go out of scope! {0}", level = LogMessage.Level.WARN)
    void clientSessionNotClosed(@Cause Exception e, int identity);
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212017, value = "error adding packet", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212017, value = "error adding packet", level = LogMessage.Level.WARN)
    void errorAddingPacket(@Cause Exception e);
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212018, value = "error calling cancel", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212018, value = "error calling cancel", level = LogMessage.Level.WARN)
    void errorCallingCancel(@Cause Exception e);
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212019, value = "error reading index", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212019, value = "error reading index", level = LogMessage.Level.WARN)
    void errorReadingIndex(@Cause Exception e);
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212020, value = "error setting index", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212020, value = "error setting index", level = LogMessage.Level.WARN)
    void errorSettingIndex(@Cause Exception e);
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212021, value = "error resetting index", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212021, value = "error resetting index", level = LogMessage.Level.WARN)
    void errorReSettingIndex(@Cause Exception e);
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212022, value = "error reading LargeMessage file cache", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212022, value = "error reading LargeMessage file cache", level = LogMessage.Level.WARN)
    void errorReadingCache(@Cause Exception e);
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212023, value = "error closing LargeMessage file cache", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212023, value = "error closing LargeMessage file cache", level = LogMessage.Level.WARN)
    void errorClosingCache(@Cause Exception e);
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212024, value = "Exception during finalization for LargeMessage file cache", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212024, value = "Exception during finalization for LargeMessage file cache", level = LogMessage.Level.WARN)
    void errorFinalisingCache(@Cause Exception e);
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212025, value = "did not connect the cluster connection to other nodes", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212025, value = "did not connect the cluster connection to other nodes", level = LogMessage.Level.WARN)
    void errorConnectingToNodes(@Cause Exception e);
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212026, value = "Timed out waiting for pool to terminate", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212026, value = "Timed out waiting for pool to terminate", level = LogMessage.Level.WARN)
    void timedOutWaitingForTermination();
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212027, value = "Timed out waiting for scheduled pool to terminate", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212027, value = "Timed out waiting for scheduled pool to terminate", level = LogMessage.Level.WARN)
    void timedOutWaitingForScheduledPoolTermination();
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212028, value = "error starting server locator", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212028, value = "error starting server locator", level = LogMessage.Level.WARN)
    void errorStartingLocator(@Cause Exception e);
 
-   @LogMessage(level = Logger.Level.DEBUG)
-   @Message(id = 212029,
-      value = "Closing a Server Locator left open. Please make sure you close all Server Locators explicitly before letting them go out of scope! {0}",
-      format = Message.Format.MESSAGE_FORMAT)
-   void serverLocatorNotClosed(@Cause Exception e, int identity);
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212030, value = "error sending topology", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212030, value = "error sending topology", level = LogMessage.Level.WARN)
    void errorSendingTopology(@Cause Throwable e);
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212031, value = "error sending topology", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212031, value = "error sending topology", level = LogMessage.Level.WARN)
    void errorSendingTopologyNodedown(@Cause Throwable e);
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212032, value = "Timed out waiting to stop discovery thread", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212032, value = "Timed out waiting to stop discovery thread", level = LogMessage.Level.WARN)
    void timedOutStoppingDiscovery();
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212033, value = "unable to send notification when discovery group is stopped", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212033, value = "unable to send notification when discovery group is stopped", level = LogMessage.Level.WARN)
    void errorSendingNotifOnDiscoveryStop(@Cause Throwable e);
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212034,
-      value = "There are more than one servers on the network broadcasting the same node id. " + "You will see this message exactly once (per node) if a node is restarted, in which case it can be safely " + "ignored. But if it is logged continuously it means you really do have more than one node on the same network " + "active concurrently with the same node id. This could occur if you have a backup node active at the same time as " + "its live node. nodeID={0}",
-      format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212034, value = "There are more than one servers on the network broadcasting the same node id. " + "You will see this message exactly once (per node) if a node is restarted, in which case it can be safely " + "ignored. But if it is logged continuously it means you really do have more than one node on the same network " + "active concurrently with the same node id. This could occur if you have a backup node active at the same time as " + "its live node. nodeID={0}", le [...]
    void multipleServersBroadcastingSameNode(String nodeId);
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212035, value = "error receiving packet in discovery", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212035, value = "error receiving packet in discovery", level = LogMessage.Level.WARN)
    void errorReceivingPacketInDiscovery(@Cause Throwable e);
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212036,
-      value = "Can not find packet to clear: {0} last received command id first stored command id {1}",
-      format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212036, value = "Can not find packet to clear: {0} last received command id first stored command id {1}", level = LogMessage.Level.WARN)
    void cannotFindPacketToClear(Integer lastReceivedCommandID, Integer firstStoredCommandID);
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212037, value = "Connection failure to {0} has been detected: {1} [code={2}]", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212037, value = "Connection failure to {0} has been detected: {1} [code={2}]", level = LogMessage.Level.WARN)
    void connectionFailureDetected(String remoteAddress, String message, ActiveMQExceptionType type);
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212038, value = "Failure in calling interceptor: {0}", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212038, value = "Failure in calling interceptor: {0}", level = LogMessage.Level.WARN)
    void errorCallingInterceptor(@Cause Throwable e, Interceptor interceptor);
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212040, value = "Timed out waiting for netty ssl close future to complete", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212040, value = "Timed out waiting for netty ssl close future to complete", level = LogMessage.Level.WARN)
    void timeoutClosingSSL();
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212041, value = "Timed out waiting for netty channel to close", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212041, value = "Timed out waiting for netty channel to close", level = LogMessage.Level.WARN)
    void timeoutClosingNettyChannel();
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212042, value = "Timed out waiting for packet to be flushed", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212042, value = "Timed out waiting for packet to be flushed", level = LogMessage.Level.WARN)
    void timeoutFlushingPacket();
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212043, value = "Property {0} must be an Integer, it is {1}", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212043, value = "Property {0} must be an Integer, it is {1}", level = LogMessage.Level.WARN)
    void propertyNotInteger(String propName, String name);
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212044, value = "Property {0} must be a Long, it is {1}", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212044, value = "Property {0} must be a Long, it is {1}", level = LogMessage.Level.WARN)
    void propertyNotLong(String propName, String name);
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212045, value = "Property {0} must be a Boolean, it is {1}", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212045, value = "Property {0} must be a Boolean, it is {1}", level = LogMessage.Level.WARN)
    void propertyNotBoolean(String propName, String name);
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212046, value = "Cannot find activemq-version.properties on classpath: {0}",
-      format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212046, value = "Cannot find activemq-version.properties on classpath: {0}", level = LogMessage.Level.WARN)
    void noVersionOnClasspath(String classpath);
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212047, value = "Warning: JVM allocated more data what would make results invalid {0}:{1}", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212047, value = "Warning: JVM allocated more data what would make results invalid {0}:{1}", level = LogMessage.Level.WARN)
    void jvmAllocatedMoreMemory(Long totalMemory1, Long totalMemory2);
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212048, value = "Random address ({0}) was already in use, trying another time",
-      format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212048, value = "Random address ({0}) was already in use, trying another time", level = LogMessage.Level.WARN)
    void broadcastGroupBindErrorRetry(String hostAndPort, @Cause Throwable t);
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212049,
-      value = "Could not bind to {0} ({1} address); " +
-         "make sure your discovery group-address is of the same type as the IP stack (IPv4 or IPv6)." +
-         "\nIgnoring discovery group-address, but this may lead to cross talking.",
-      format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212049, value = "Could not bind to {0} ({1} address); " + "make sure your discovery group-address is of the same type as the IP stack (IPv4 or IPv6)." + "\nIgnoring discovery group-address, but this may lead to cross talking.", level = LogMessage.Level.WARN)
    void ioDiscoveryError(String hostAddress, String s);
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212050, value = "Compressed large message tried to read {0} bytes from stream {1}",
-      format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212050, value = "Compressed large message tried to read {0} bytes from stream {1}", level = LogMessage.Level.WARN)
    void compressedLargeMessageError(int length, int nReadBytes);
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212051,
-      value = "Invalid concurrent session usage. Sessions are not supposed to be used by more than one thread concurrently.",
-      format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212051, value = "Invalid concurrent session usage. Sessions are not supposed to be used by more than one thread concurrently.", level = LogMessage.Level.WARN)
    void invalidConcurrentSessionUsage(@Cause Throwable t);
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212052,
-      value = "Packet {0} was answered out of sequence due to a previous server timeout and it''s being ignored",
-      format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212052, value = "Packet {0} was answered out of sequence due to a previous server timeout and it''s being ignored", level = LogMessage.Level.WARN)
    void packetOutOfOrder(Object obj, @Cause Throwable t);
 
    /**
     * Warns about usage of {@link org.apache.activemq.artemis.api.core.client.SendAcknowledgementHandler} or JMS's {@code CompletionWindow} with
     * confirmations disabled (confirmationWindowSize=-1).
     */
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212053,
-      value = "CompletionListener/SendAcknowledgementHandler used with confirmationWindowSize=-1. Enable confirmationWindowSize to receive acks from server!",
-      format = Message.Format.MESSAGE_FORMAT)
+
+   @LogMessage(id = 212053, value = "CompletionListener/SendAcknowledgementHandler used with confirmationWindowSize=-1. Enable confirmationWindowSize to receive acks from server!", level = LogMessage.Level.WARN)
    void confirmationWindowDisabledWarning();
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212054,
-      value = "Destination address={0} is blocked. If the system is configured to block make sure you consume messages on this configuration.",
-      format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212054, value = "Destination address={0} is blocked. If the system is configured to block make sure you consume messages on this configuration.", level = LogMessage.Level.WARN)
    void outOfCreditOnFlowControl(String address);
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212055, value = "Unable to close consumer", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212055, value = "Unable to close consumer", level = LogMessage.Level.WARN)
    void unableToCloseConsumer(@Cause Exception e);
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212056, value = "local-bind-address specified for broadcast group but no local-bind-port. Using random port for UDP Broadcast ({0})",
-      format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212056, value = "local-bind-address specified for broadcast group but no local-bind-port. Using random port for UDP Broadcast ({0})", level = LogMessage.Level.WARN)
    void broadcastGroupBindError(String hostAndPort);
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212057, value = "Large Message Streaming is taking too long to flush on back pressure.",
-      format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212057, value = "Large Message Streaming is taking too long to flush on back pressure.", level = LogMessage.Level.WARN)
    void timeoutStreamingLargeMessage();
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212058, value = "Unable to get a message.",
-           format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212058, value = "Unable to get a message.", level = LogMessage.Level.WARN)
    void unableToGetMessage(@Cause Exception e);
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212059, value = "Failed to clean up: {0} ",
-           format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212059, value = "Failed to clean up: {0} ", level = LogMessage.Level.WARN)
    void failedCleaningUp(String target);
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212060, value = "Unexpected null data received from DiscoveryEndpoint ",
-           format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212060, value = "Unexpected null data received from DiscoveryEndpoint ", level = LogMessage.Level.WARN)
    void unexpectedNullDataReceived();
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212061, value = "Failed to perform force close ",
-           format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212061, value = "Failed to perform force close ", level = LogMessage.Level.WARN)
    void failedForceClose(@Cause Throwable e);
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212062, value = "Failed to perform post actions on message processing ",
-           format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212062, value = "Failed to perform post actions on message processing ", level = LogMessage.Level.WARN)
    void failedPerformPostActionsOnMessage(@Cause Exception e);
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212063, value = "Unable to handle connection failure ",
-           format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212063, value = "Unable to handle connection failure ", level = LogMessage.Level.WARN)
    void unableToHandleConnectionFailure(@Cause Throwable e);
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212064, value = "Unable to receive cluster topology ",
-           format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212064, value = "Unable to receive cluster topology ", level = LogMessage.Level.WARN)
    void unableToReceiveClusterTopology(@Cause Throwable e);
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212065, value = "{0} getting exception when receiving broadcasting ",
-           format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212065, value = "{0} getting exception when receiving broadcasting ", level = LogMessage.Level.WARN)
    void unableToReceiveBroadcast(@Cause Exception e, String target);
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212066, value = "failed to parse int property ",
-           format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212066, value = "failed to parse int property ", level = LogMessage.Level.WARN)
    void unableToParseValue(@Cause Throwable e);
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212067, value = "failed to get system property ",
-           format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212067, value = "failed to get system property ", level = LogMessage.Level.WARN)
    void unableToGetProperty(@Cause Throwable e);
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212068, value = "Couldn't finish the client globalThreadPool in less than 10 seconds, interrupting it now ",
-           format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212068, value = "Couldn't finish the client globalThreadPool in less than 10 seconds, interrupting it now ", level = LogMessage.Level.WARN)
    void unableToProcessGlobalThreadPoolIn10Sec();
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212069, value = "Couldn't finish the client scheduled in less than 10 seconds, interrupting it now ",
-           format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212069, value = "Couldn't finish the client scheduled in less than 10 seconds, interrupting it now ", level = LogMessage.Level.WARN)
    void unableToProcessScheduledlIn10Sec();
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212070, value = "Unable to initialize VersionLoader ",
-           format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212070, value = "Unable to initialize VersionLoader ", level = LogMessage.Level.WARN)
    void unableToInitVersionLoader(@Cause Throwable e);
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212071, value = "Unable to check Epoll availability ",
-           format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212071, value = "Unable to check Epoll availability ", level = LogMessage.Level.WARN)
    void unableToCheckEpollAvailability(@Cause Throwable e);
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212072, value = "Failed to change channel state to ReadyForWriting ",
-           format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212072, value = "Failed to change channel state to ReadyForWriting ", level = LogMessage.Level.WARN)
    void failedToSetChannelReadyForWriting(@Cause Throwable e);
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212073, value = "Unable to check KQueue availability ",
-           format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212073, value = "Unable to check KQueue availability ", level = LogMessage.Level.WARN)
    void unableToCheckKQueueAvailability(@Cause Throwable e);
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212074, value = "SendAcknowledgementHandler will not be asynchronous without setting up confirmation window size",
-      format = Message.Format.MESSAGE_FORMAT)
-   void confirmationNotSet();
-
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212075, value = "KQueue is not available, please add to the classpath or configure useKQueue=false to remove this warning",
-           format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212075, value = "KQueue is not available, please add to the classpath or configure useKQueue=false to remove this warning", level = LogMessage.Level.WARN)
    void unableToCheckKQueueAvailabilityNoClass();
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212076, value = "Epoll is not available, please add to the classpath or configure useEpoll=false to remove this warning",
-           format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212076, value = "Epoll is not available, please add to the classpath or configure useEpoll=false to remove this warning", level = LogMessage.Level.WARN)
    void unableToCheckEpollAvailabilitynoClass();
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212077, value = "Timed out waiting to receive initial broadcast from cluster. Retry {0} of {1}",
-           format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212077, value = "Timed out waiting to receive initial broadcast from cluster. Retry {0} of {1}", level = LogMessage.Level.WARN)
    void broadcastTimeout(int retry, int maxretry);
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212079, value = "The upstream connector from the downstream federation will ignore url parameter {0}", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212079, value = "The upstream connector from the downstream federation will ignore url parameter {0}", level = LogMessage.Level.WARN)
    void ignoredParameterForDownstreamFederation(String name);
 
-   @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 212080, value = "Using legacy SSL store provider value: {0}. Please use either ''keyStoreType'' or ''trustStoreType'' instead as appropriate.", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 212080, value = "Using legacy SSL store provider value: {0}. Please use either ''keyStoreType'' or ''trustStoreType'' instead as appropriate.", level = LogMessage.Level.WARN)
    void oldStoreProvider(String value);
 
-   @LogMessage(level = Logger.Level.ERROR)
-   @Message(id = 214000, value = "Failed to call onMessage", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 214000, value = "Failed to call onMessage", level = LogMessage.Level.ERROR)
    void onMessageError(@Cause Throwable e);
 
-   @LogMessage(level = Logger.Level.ERROR)
-   @Message(id = 214001, value = "failed to cleanup session", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 214001, value = "failed to cleanup session", level = LogMessage.Level.ERROR)
    void failedToCleanupSession(@Cause Exception e);
 
-   @LogMessage(level = Logger.Level.ERROR)
-   @Message(id = 214002, value = "Failed to execute failure listener", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 214002, value = "Failed to execute failure listener", level = LogMessage.Level.ERROR)
    void failedToExecuteListener(@Cause Throwable t);
 
-   @LogMessage(level = Logger.Level.ERROR)
-   @Message(id = 214003, value = "Failed to handle failover", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 214003, value = "Failed to handle failover", level = LogMessage.Level.ERROR)
    void failedToHandleFailover(@Cause Throwable t);
 
-   @LogMessage(level = Logger.Level.ERROR)
-   @Message(id = 214004, value = "XA end operation failed ", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 214004, value = "XA end operation failed ", level = LogMessage.Level.ERROR)
    void errorCallingEnd(@Cause Throwable t);
 
-   @LogMessage(level = Logger.Level.ERROR)
-   @Message(id = 214005, value = "XA start operation failed {0} code:{1}", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 214005, value = "XA start operation failed {0} code:{1}", level = LogMessage.Level.ERROR)
    void errorCallingStart(String message, Integer code);
 
-   @LogMessage(level = Logger.Level.ERROR)
-   @Message(id = 214006, value = "Session is not XA", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 214006, value = "Session is not XA", level = LogMessage.Level.ERROR)
    void sessionNotXA();
 
-   @LogMessage(level = Logger.Level.ERROR)
-   @Message(id = 214007, value = "Received exception asynchronously from server", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 214007, value = "Received exception asynchronously from server", level = LogMessage.Level.ERROR)
    void receivedExceptionAsynchronously(@Cause Exception e);
 
-   @LogMessage(level = Logger.Level.ERROR)
-   @Message(id = 214008, value = "Failed to handle packet", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 214008, value = "Failed to handle packet", level = LogMessage.Level.ERROR)
    void failedToHandlePacket(@Cause Exception e);
 
-   @LogMessage(level = Logger.Level.ERROR)
-   @Message(id = 214009, value = "Failed to stop discovery group", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 214009, value = "Failed to stop discovery group", level = LogMessage.Level.ERROR)
    void failedToStopDiscovery(@Cause Throwable e);
 
-   @LogMessage(level = Logger.Level.ERROR)
-   @Message(id = 214010, value = "Failed to receive datagram", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 214010, value = "Failed to receive datagram", level = LogMessage.Level.ERROR)
    void failedToReceiveDatagramInDiscovery(@Cause Throwable e);
 
-   @LogMessage(level = Logger.Level.ERROR)
-   @Message(id = 214011, value = "Failed to call discovery listener", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 214011, value = "Failed to call discovery listener", level = LogMessage.Level.ERROR)
    void failedToCallListenerInDiscovery(@Cause Throwable e);
 
-   @LogMessage(level = Logger.Level.ERROR)
-   @Message(id = 214012, value = "Unexpected error handling packet {0}", format = Message.Format.MESSAGE_FORMAT)
-   void errorHandlingPacket(@Cause Throwable t, Packet packet);
-
-   @LogMessage(level = Logger.Level.ERROR)
-   @Message(id = 214013, value = "Failed to decode packet", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 214013, value = "Failed to decode packet", level = LogMessage.Level.ERROR)
    void errorDecodingPacket(@Cause Throwable e);
 
-   @LogMessage(level = Logger.Level.ERROR)
-   @Message(id = 214014, value = "Failed to execute failure listener", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 214014, value = "Failed to execute failure listener", level = LogMessage.Level.ERROR)
    void errorCallingFailureListener(@Cause Throwable e);
 
-   @LogMessage(level = Logger.Level.ERROR)
-   @Message(id = 214015, value = "Failed to execute connection life cycle listener", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 214015, value = "Failed to execute connection life cycle listener", level = LogMessage.Level.ERROR)
    void errorCallingLifeCycleListener(@Cause Throwable e);
 
-   @LogMessage(level = Logger.Level.ERROR)
-   @Message(id = 214016, value = "Failed to create netty connection", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 214016, value = "Failed to create netty connection", level = LogMessage.Level.ERROR)
    void errorCreatingNettyConnection(@Cause Throwable e);
 
-   @LogMessage(level = Logger.Level.ERROR)
-   @Message(id = 214017, value = "Caught unexpected Throwable", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 214017, value = "Caught unexpected Throwable", level = LogMessage.Level.ERROR)
    void caughtunexpectedThrowable(@Cause Throwable t);
 
-   @Deprecated
-   @LogMessage(level = Logger.Level.ERROR)
-   @Message(id = 214018, value = "Failed to invoke getTextContent() on node {0}", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 214018, value = "Failed to invoke getTextContent() on node {0}", level = LogMessage.Level.ERROR)
    void errorOnXMLTransform(@Cause Throwable t, Node n);
 
-   @LogMessage(level = Logger.Level.ERROR)
-   @Message(id = 214019, value = "Invalid configuration", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 214019, value = "Invalid configuration", level = LogMessage.Level.ERROR)
    void errorOnXMLTransformInvalidConf(@Cause Throwable t);
 
-   @LogMessage(level = Logger.Level.ERROR)
-   @Message(id = 214020, value = "Exception happened while stopping Discovery BroadcastEndpoint {0}", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 214020, value = "Exception happened while stopping Discovery BroadcastEndpoint {0}", level = LogMessage.Level.ERROR)
    void errorStoppingDiscoveryBroadcastEndpoint(Object endpoint, @Cause Throwable t);
 
-   @LogMessage(level = Logger.Level.ERROR)
-   @Message(id = 214021, value = "Invalid cipher suite specified. Supported cipher suites are: {0}", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 214021, value = "Invalid cipher suite specified. Supported cipher suites are: {0}", level = LogMessage.Level.ERROR)
    void invalidCipherSuite(String validSuites);
 
-   @LogMessage(level = Logger.Level.ERROR)
-   @Message(id = 214022, value = "Invalid protocol specified. Supported protocols are: {0}", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 214022, value = "Invalid protocol specified. Supported protocols are: {0}", level = LogMessage.Level.ERROR)
    void invalidProtocol(String validProtocols);
 
-   @LogMessage(level = Logger.Level.DEBUG)
-   @Message(id = 214023, value = "HTTP Handshake failed, received %s")
-   void httpHandshakeFailed(Object msg);
-
-   @LogMessage(level = Logger.Level.ERROR)
-   @Message(id = 214024, value = "HTTP upgrade not supported by remote acceptor")
-   void httpUpgradeNotSupportedByRemoteAcceptor();
-
-   @LogMessage(level = Logger.Level.ERROR)
-   @Message(id = 214025, value = "Invalid type {0}, Using default connection factory at {1}", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 214025, value = "Invalid type {0}, Using default connection factory at {1}", level = LogMessage.Level.ERROR)
    void invalidCFType(String type, String uri);
 
-   @LogMessage(level = Logger.Level.TRACE)
-   @Message(id = 214026,
-      value = "Failure captured on connectionID={0}, performing failover or reconnection now",
-      format = Message.Format.MESSAGE_FORMAT)
-   void failoverOrReconnect(Object connectionID, @Cause Throwable cause);
-
-   @LogMessage(level = Logger.Level.DEBUG)
-   @Message(id = 214027,
-      value = "Replaying commands for channelID={0} with lastCommandID from the server={1}",
-      format = Message.Format.MESSAGE_FORMAT)
-   void replayingCommands(Object connectionID, int lastConfirmedCommandID);
-
-   @LogMessage(level = Logger.Level.DEBUG)
-   @Message(id = 214028,
-      value = "Couldn't reattach session {0}, performing as a failover operation now and recreating objects",
-      format = Message.Format.MESSAGE_FORMAT)
-   void reconnectCreatingNewSession(long id);
-
-   @LogMessage(level = Logger.Level.ERROR)
-   @Message(id = 214029, value = "Unexpected response from HTTP server: %s")
+   @LogMessage(id = 214029, value = "Unexpected response from HTTP server: %s", level = LogMessage.Level.ERROR)
    void unexpectedResponseFromHttpServer(Object response);
 
-   @LogMessage(level = Logger.Level.ERROR)
-   @Message(id = 214030, value = "Failed to bind {0}={1}", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 214030, value = "Failed to bind {0}={1}", level = LogMessage.Level.ERROR)
    void failedToBind(String p1, String p2, @Cause Throwable cause);
 
-   @LogMessage(level = Logger.Level.ERROR)
-   @Message(id = 214031, value = "Failed to decode buffer, disconnect immediately.", format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 214031, value = "Failed to decode buffer, disconnect immediately.", level = LogMessage.Level.ERROR)
    void disconnectOnErrorDecoding(@Cause Throwable cause);
 
-   @LogMessage(level = Logger.Level.ERROR)
-   @Message(id = 214032, value = "Unable to initialize VersionLoader ",
-           format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 214032, value = "Unable to initialize VersionLoader ", level = LogMessage.Level.ERROR)
    void unableToInitVersionLoaderError(@Cause Throwable e);
 
-   @LogMessage(level = Logger.Level.ERROR)
-   @Message(id = 214033, value = "Cannot resolve host ",
-           format = Message.Format.MESSAGE_FORMAT)
+   @LogMessage(id = 214033, value = "Cannot resolve host ", level = LogMessage.Level.ERROR)
    void unableToResolveHost(@Cause UnknownHostException e);
 }
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientMessageBundle.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientMessageBundle.java
index 15194db21a..219c184de4 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientMessageBundle.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/ActiveMQClientMessageBundle.java
@@ -32,11 +32,11 @@ import org.apache.activemq.artemis.api.core.ActiveMQTransactionOutcomeUnknownExc
 import org.apache.activemq.artemis.api.core.ActiveMQTransactionRolledBackException;
 import org.apache.activemq.artemis.api.core.ActiveMQUnBlockedException;
 import org.apache.activemq.artemis.core.cluster.DiscoveryGroup;
+import org.apache.activemq.artemis.logprocessor.CodeFactory;
+import org.apache.activemq.artemis.logprocessor.annotation.Cause;
+import org.apache.activemq.artemis.logprocessor.annotation.LogBundle;
+import org.apache.activemq.artemis.logprocessor.annotation.Message;
 import org.apache.activemq.artemis.spi.core.remoting.Connection;
-import org.jboss.logging.Messages;
-import org.jboss.logging.annotations.Cause;
-import org.jboss.logging.annotations.Message;
-import org.jboss.logging.annotations.MessageBundle;
 import org.w3c.dom.Node;
 
 /**
@@ -46,10 +46,10 @@ import org.w3c.dom.Node;
  *
  * so 219000 to 219999
  */
-@MessageBundle(projectCode = "AMQ")
+@LogBundle(projectCode = "AMQ")
 public interface ActiveMQClientMessageBundle {
 
-   ActiveMQClientMessageBundle BUNDLE = Messages.getBundle(ActiveMQClientMessageBundle.class);
+   ActiveMQClientMessageBundle BUNDLE = CodeFactory.getCodeClass(ActiveMQClientMessageBundle.class);
 
    @Message(id = 219000, value = "ClientSession closed while creating session")
    ActiveMQInternalErrorException clientSessionClosed();
@@ -81,16 +81,16 @@ public interface ActiveMQClientMessageBundle {
    @Message(id = 219010, value = "Connection is destroyed")
    ActiveMQNotConnectedException connectionDestroyed();
 
-   @Message(id = 219011, value = "Did not receive data from server for {0}", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 219011, value = "Did not receive data from server for {0}")
    ActiveMQConnectionTimedOutException connectionTimedOut(Connection transportConnection);
 
    @Message(id = 219012, value = "Timed out waiting to receive initial broadcast from cluster")
    ActiveMQConnectionTimedOutException connectionTimedOutInInitialBroadcast();
 
-   @Message(id = 219013, value = "Timed out waiting to receive cluster topology. Group:{0}", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 219013, value = "Timed out waiting to receive cluster topology. Group:{0}")
    ActiveMQConnectionTimedOutException connectionTimedOutOnReceiveTopology(DiscoveryGroup discoveryGroup);
 
-   @Message(id = 219014, value = "Timed out after waiting {0} ms for response when sending packet {1}", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 219014, value = "Timed out after waiting {0} ms for response when sending packet {1}")
    ActiveMQConnectionTimedOutException timedOutSendingPacket(long timeout, Byte type);
 
    @Message(id = 219015, value = "The connection was disconnected because of server shutdown")
@@ -114,8 +114,7 @@ public interface ActiveMQClientMessageBundle {
    @Message(id = 219021, value = "Cannot set MessageHandler - consumer is in receive(...)")
    ActiveMQIllegalStateException inReceive();
 
-   @Message(id = 219022, value = "Header size ({0}) is too big, use the messageBody for large data, or increase minLargeMessageSize",
-      format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 219022, value = "Header size ({0}) is too big, use the messageBody for large data, or increase minLargeMessageSize")
    ActiveMQIllegalStateException headerSizeTooBig(Integer headerSize);
 
    @Message(id = 219023, value = "The large message lost connection with its session, either because of a rollback or a closed session")
@@ -145,23 +144,22 @@ public interface ActiveMQClientMessageBundle {
    @Message(id = 219031, value = "The transaction was rolled back on failover however commit may have been successful")
    ActiveMQTransactionOutcomeUnknownException txOutcomeUnknown();
 
-   @Message(id = 219032, value = "Invalid type: {0}", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 219032, value = "Invalid type: {0}")
    IllegalArgumentException invalidType(Object type);
 
-   @Message(id = 219033, value = "Invalid type: {0}", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 219033, value = "Invalid type: {0}")
    IllegalArgumentException invalidEncodeType(Object type);
 
-   @Message(id = 219034, value = "Params for management operations must be of the following type: int long double String boolean Map or array thereof but found {0}",
-      format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 219034, value = "Params for management operations must be of the following type: int long double String boolean Map or array thereof but found {0}")
    IllegalArgumentException invalidManagementParam(Object type);
 
-   @Message(id = 219035, value = "Invalid window size {0}", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 219035, value = "Invalid window size {0}")
    IllegalArgumentException invalidWindowSize(Integer size);
 
-   @Message(id = 219037, value = "Invalid last Received Command ID: {0}", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 219037, value = "Invalid last Received Command ID: {0}")
    IllegalArgumentException invalidCommandID(Integer lastReceivedCommandID);
 
-   @Message(id = 219038, value = "Cannot find channel with id {0} to close", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 219038, value = "Cannot find channel with id {0} to close")
    IllegalArgumentException noChannelToClose(Long id);
 
    @Message(id = 219039, value = "Close Listener cannot be null")
@@ -170,7 +168,7 @@ public interface ActiveMQClientMessageBundle {
    @Message(id = 219040, value = "Fail Listener cannot be null")
    IllegalArgumentException failListenerCannotBeNull();
 
-   @Message(id = 219041, value = "Connection already exists with id {0}", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 219041, value = "Connection already exists with id {0}")
    IllegalArgumentException connectionExists(Object id);
 
    @Message(id = 219042, value = "Invalid argument null listener")
@@ -191,7 +189,7 @@ public interface ActiveMQClientMessageBundle {
    @Message(id = 219048, value = "nodes have a different number of attributes")
    IllegalArgumentException nodeHaveDifferentAttNumber();
 
-   @Message(id = 219049, value = "attribute {0}={1} does not match", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 219049, value = "attribute {0}={1} does not match")
    IllegalArgumentException attsDontMatch(String name, String value);
 
    @Message(id = 219050, value = "one node has children and the other does not")
@@ -200,25 +198,25 @@ public interface ActiveMQClientMessageBundle {
    @Message(id = 219051, value = "nodes have a different number of children")
    IllegalArgumentException nodeHasDifferentChildNumber();
 
-   @Message(id = 219052, value = "Element {0} requires a valid Boolean value, but ''{1}'' cannot be parsed as a Boolean", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 219052, value = "Element {0} requires a valid Boolean value, but ''{1}'' cannot be parsed as a Boolean")
    IllegalArgumentException mustBeBoolean(Node elem, String value);
 
-   @Message(id = 219053, value = "Element {0} requires a valid Double value, but ''{1}'' cannot be parsed as a Double", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 219053, value = "Element {0} requires a valid Double value, but ''{1}'' cannot be parsed as a Double")
    IllegalArgumentException mustBeDouble(Node elem, String value);
 
-   @Message(id = 219054, value = "Element {0} requires a valid Integer value, but ''{1}'' cannot be parsed as an Integer", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 219054, value = "Element {0} requires a valid Integer value, but ''{1}'' cannot be parsed as an Integer")
    IllegalArgumentException mustBeInteger(Node elem, String value);
 
-   @Message(id = 219055, value = "Element {0} requires a valid Long value, but ''{1}'' cannot be parsed as a Long", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 219055, value = "Element {0} requires a valid Long value, but ''{1}'' cannot be parsed as a Long")
    IllegalArgumentException mustBeLong(Node element, String value);
 
    @Message(id = 219057, value = "Error decoding password")
    IllegalArgumentException errordecodingPassword(@Cause Exception e);
 
-   @Message(id = 219058, value = "Address \"{0}\" is full. Message encode size = {1}B", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 219058, value = "Address \"{0}\" is full. Message encode size = {1}B")
    ActiveMQAddressFullException addressIsFull(String addressName, int size);
 
-   @Message(id = 219059, value = "Interceptor {0} rejected packet in a blocking call. This call will never complete.", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 219059, value = "Interceptor {0} rejected packet in a blocking call. This call will never complete.")
    ActiveMQInterceptorRejectedPacketException interceptorRejectedPacket(String interceptionResult);
 
    @Message(id = 219060, value = "Large Message Transmission interrupted on consumer shutdown.")
@@ -233,7 +231,7 @@ public interface ActiveMQClientMessageBundle {
    @Message(id = 219063, value = "Cannot send a packet while response cache is full.")
    IllegalStateException cannotSendPacketWhilstResponseCacheFull();
 
-   @Message(id = 219064, value = "Invalide packet: {0}", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 219064, value = "Invalide packet: {0}")
    IllegalStateException invalidPacket(byte type);
 
    @Message(id = 219065, value = "Failed to handle packet.")
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientConsumerImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientConsumerImpl.java
index 9936290ce5..87c8281322 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientConsumerImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientConsumerImpl.java
@@ -45,12 +45,13 @@ import org.apache.activemq.artemis.utils.TokenBucketLimiter;
 import org.apache.activemq.artemis.utils.collections.LinkedListIterator;
 import org.apache.activemq.artemis.utils.collections.PriorityLinkedList;
 import org.apache.activemq.artemis.utils.collections.PriorityLinkedListImpl;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public final class ClientConsumerImpl implements ClientConsumerInternal {
 
 
-   private static final Logger logger = Logger.getLogger(ClientConsumerImpl.class);
+   private static final Logger logger = LoggerFactory.getLogger(ClientConsumerImpl.class);
 
    private static final long CLOSE_TIMEOUT_MILLISECONDS = 10000;
 
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerImpl.java
index 59e29c390c..9d746fc19c 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerImpl.java
@@ -33,14 +33,15 @@ import org.apache.activemq.artemis.utils.ActiveMQBufferInputStream;
 import org.apache.activemq.artemis.utils.DeflaterReader;
 import org.apache.activemq.artemis.utils.TokenBucketLimiter;
 import org.apache.activemq.artemis.utils.UUIDGenerator;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * The client-side Producer.
  */
 public class ClientProducerImpl implements ClientProducerInternal {
 
-   private static final Logger logger = Logger.getLogger(ClientProducerImpl.class);
+   private static final Logger logger = LoggerFactory.getLogger(ClientProducerImpl.class);
 
    private final SimpleString address;
 
@@ -282,7 +283,7 @@ public class ClientProducerImpl implements ClientProducerInternal {
       // Not the continuations, but this is ok since we are only interested in limiting the amount of
       // data in *memory* and continuations go straight to the disk
 
-      logger.tracef("sendRegularMessage::%s, Blocking=%s", msgI, sendBlocking);
+      logger.trace("sendRegularMessage::{}, Blocking={}", msgI, sendBlocking);
 
       int creditSize = sessionContext.getCreditsOnSendingFull(msgI);
 
@@ -308,7 +309,7 @@ public class ClientProducerImpl implements ClientProducerInternal {
                                  final ICoreMessage msgI,
                                  final ClientProducerCredits credits,
                                  SendAcknowledgementHandler handler) throws ActiveMQException {
-      logger.tracef("largeMessageSend::%s, Blocking=%s", msgI, sendBlocking);
+      logger.trace("largeMessageSend::{}, Blocking={}", msgI, sendBlocking);
 
       int headerSize = msgI.getHeadersAndPropertiesEncodeSize();
 
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryImpl.java
index a8c81e5258..b091c039e6 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryImpl.java
@@ -70,11 +70,12 @@ import org.apache.activemq.artemis.utils.ExecutorFactory;
 import org.apache.activemq.artemis.utils.UUIDGenerator;
 import org.apache.activemq.artemis.utils.actors.OrderedExecutorFactory;
 import org.apache.activemq.artemis.utils.collections.ConcurrentHashSet;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, ClientConnectionLifeCycleListener {
 
-   private static final Logger logger = Logger.getLogger(ClientSessionFactoryImpl.class);
+   private static final Logger logger = LoggerFactory.getLogger(ClientSessionFactoryImpl.class);
 
    private final ServerLocatorInternal serverLocator;
 
@@ -555,7 +556,7 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C
    private void failoverOrReconnect(final Object connectionID,
                                     final ActiveMQException me,
                                     String scaleDownTargetNodeID) {
-      ActiveMQClientLogger.LOGGER.failoverOrReconnect(connectionID, me);
+      logger.debug("Failure captured on connectionID={0}, performing failover or reconnection now", connectionID, me);
 
       for (ClientSessionInternal session : sessions) {
          SessionContext context = session.getSessionContext();
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
index fc90c7c9c8..fa65b2e003 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
@@ -58,11 +58,12 @@ import org.apache.activemq.artemis.utils.ConfirmationWindowWarning;
 import org.apache.activemq.artemis.utils.TokenBucketLimiterImpl;
 import org.apache.activemq.artemis.utils.UUIDGenerator;
 import org.apache.activemq.artemis.utils.XidCodecSupport;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public final class ClientSessionImpl implements ClientSessionInternal, FailureListener {
 
-   private static final Logger logger = Logger.getLogger(ClientSessionImpl.class);
+   private static final Logger logger = LoggerFactory.getLogger(ClientSessionImpl.class);
 
    private final Map<String, String> metadata = new HashMap<>();
 
@@ -1526,7 +1527,7 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi
 
    @Override
    public void setAddress(final Message message, final SimpleString address) {
-      logger.tracef("setAddress() Setting default address as %s", address);
+      logger.trace("setAddress() Setting default address as {}", address);
 
       message.setAddress(address);
    }
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java
index 17707780fd..4554357252 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java
@@ -73,7 +73,8 @@ import org.apache.activemq.artemis.utils.UUIDGenerator;
 import org.apache.activemq.artemis.utils.actors.Actor;
 import org.apache.activemq.artemis.utils.actors.OrderedExecutor;
 import org.apache.activemq.artemis.utils.uri.FluentPropertyBeanIntrospectorWithIgnores;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This is the implementation of {@link org.apache.activemq.artemis.api.core.client.ServerLocator} and all
@@ -81,7 +82,7 @@ import org.jboss.logging.Logger;
  */
 public final class ServerLocatorImpl implements ServerLocatorInternal, DiscoveryListener {
 
-   private static final Logger logger = Logger.getLogger(ServerLocatorImpl.class);
+   private static final Logger logger = LoggerFactory.getLogger(ServerLocatorImpl.class);
 
    private enum STATE {
       INITIALIZED, CLOSED, CLOSING
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/Topology.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/Topology.java
index 749f167b98..1255b4b07c 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/Topology.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/Topology.java
@@ -31,11 +31,12 @@ import org.apache.activemq.artemis.api.core.client.ClusterTopologyListener;
 import org.apache.activemq.artemis.core.client.ActiveMQClientLogger;
 import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
 import org.apache.activemq.artemis.spi.core.remoting.Connector;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public final class Topology {
 
-   private static final Logger logger = Logger.getLogger(Topology.class);
+   private static final Logger logger = LoggerFactory.getLogger(Topology.class);
 
    private final Set<ClusterTopologyListener> topologyListeners;
 
@@ -204,7 +205,7 @@ public final class Topology {
       }
 
       if (manager != null && !manager.updateMember(uniqueEventID, nodeId, memberInput)) {
-         logger.debugf("TopologyManager rejected the update towards %s", memberInput);
+         logger.debug("TopologyManager rejected the update towards {}", memberInput);
          return false;
       }
 
@@ -312,7 +313,7 @@ public final class Topology {
 
 
       if (manager != null && !manager.removeMember(uniqueEventID, nodeId)) {
-         logger.debugf("TopologyManager rejected the update towards %s", nodeId);
+         logger.debug("TopologyManager rejected the update towards {}", nodeId);
          return false;
       }
 
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/cluster/DiscoveryGroup.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/cluster/DiscoveryGroup.java
index 45bd213b24..45d3f97b01 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/cluster/DiscoveryGroup.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/cluster/DiscoveryGroup.java
@@ -40,7 +40,8 @@ import org.apache.activemq.artemis.core.server.management.Notification;
 import org.apache.activemq.artemis.core.server.management.NotificationService;
 import org.apache.activemq.artemis.utils.ActiveMQThreadFactory;
 import org.apache.activemq.artemis.utils.collections.TypedProperties;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This class is used to search for members on the cluster through the opaque interface {@link BroadcastEndpoint}.
@@ -52,7 +53,7 @@ import org.jboss.logging.Logger;
  */
 public final class DiscoveryGroup implements ActiveMQComponent {
 
-   private static final Logger logger = Logger.getLogger(DiscoveryGroup.class);
+   private static final Logger logger = LoggerFactory.getLogger(DiscoveryGroup.class);
 
    private final List<DiscoveryListener> listeners = new ArrayList<>();
 
@@ -360,7 +361,7 @@ public final class DiscoveryGroup implements ActiveMQComponent {
                   if (logger.isTraceEnabled()) {
                      logger.trace("Connectors changed on Discovery:");
                      for (DiscoveryEntry connector : connectors.values()) {
-                        logger.trace(connector);
+                        logger.trace("{}", connector);
                      }
                   }
                   if (logger.isDebugEnabled()) {
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/CoreMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/CoreMessage.java
index 4b4a2cff9d..f4b35526fd 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/CoreMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/CoreMessage.java
@@ -58,7 +58,8 @@ import org.apache.activemq.artemis.reader.MessageUtil;
 import org.apache.activemq.artemis.utils.DataConstants;
 import org.apache.activemq.artemis.utils.UUID;
 import org.apache.activemq.artemis.utils.collections.TypedProperties;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import static org.apache.activemq.artemis.utils.ByteUtil.ensureExactWritable;
 
@@ -70,7 +71,7 @@ public class CoreMessage extends RefCountMessage implements ICoreMessage {
 
    protected volatile int memoryEstimate = -1;
 
-   private static final Logger logger = Logger.getLogger(CoreMessage.class);
+   private static final Logger logger = LoggerFactory.getLogger(CoreMessage.class);
 
    // There's an integer with the number of bytes for the body
    public static final int BODY_OFFSET = DataConstants.SIZE_INT;
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/openmbean/MessageOpenTypeFactory.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/openmbean/MessageOpenTypeFactory.java
index ca139be68a..33a9efb17f 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/openmbean/MessageOpenTypeFactory.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/openmbean/MessageOpenTypeFactory.java
@@ -34,11 +34,12 @@ import org.apache.activemq.artemis.api.core.ActiveMQException;
 import org.apache.activemq.artemis.api.core.JsonUtil;
 import org.apache.activemq.artemis.api.core.Message;
 import org.apache.activemq.artemis.api.core.SimpleString;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class MessageOpenTypeFactory<M extends Message> {
 
-   private static final Logger logger = Logger.getLogger(MessageOpenTypeFactory.class);
+   private static final Logger logger = LoggerFactory.getLogger(MessageOpenTypeFactory.class);
 
    public MessageOpenTypeFactory() {
       try {
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQClientProtocolManager.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQClientProtocolManager.java
index 0d0cb0d286..0f503f95b2 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQClientProtocolManager.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQClientProtocolManager.java
@@ -63,7 +63,8 @@ import org.apache.activemq.artemis.spi.core.remoting.Connection;
 import org.apache.activemq.artemis.spi.core.remoting.SessionContext;
 import org.apache.activemq.artemis.spi.core.remoting.TopologyResponseHandler;
 import org.apache.activemq.artemis.utils.VersionLoader;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This class will return specific packets for different types of actions happening on a messaging protocol.
@@ -79,7 +80,7 @@ import org.jboss.logging.Logger;
 
 public class ActiveMQClientProtocolManager implements ClientProtocolManager {
 
-   private static final Logger logger = Logger.getLogger(ActiveMQClientProtocolManager.class);
+   private static final Logger logger = LoggerFactory.getLogger(ActiveMQClientProtocolManager.class);
 
    private static final String handshake = "ARTEMIS";
 
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQSessionContext.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQSessionContext.java
index 6013266ae2..fa20909ab1 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQSessionContext.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQSessionContext.java
@@ -129,11 +129,12 @@ import org.apache.activemq.artemis.spi.core.remoting.Connection;
 import org.apache.activemq.artemis.spi.core.remoting.ReadyListener;
 import org.apache.activemq.artemis.spi.core.remoting.SessionContext;
 import org.apache.activemq.artemis.utils.TokenBucketLimiterImpl;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ActiveMQSessionContext extends SessionContext {
 
-   private static final Logger logger = Logger.getLogger(ActiveMQSessionContext.class);
+   private static final Logger logger = LoggerFactory.getLogger(ActiveMQSessionContext.class);
 
    private final Channel sessionChannel;
    private final int serverVersion;
@@ -846,14 +847,14 @@ public class ActiveMQSessionContext extends SessionContext {
       ReattachSessionResponseMessage response = (ReattachSessionResponseMessage) channel1.sendBlocking(request, PacketImpl.REATTACH_SESSION_RESP);
 
       if (response.isReattached()) {
-         ActiveMQClientLogger.LOGGER.replayingCommands(sessionChannel.getID(), response.getLastConfirmedCommandID());
+         logger.debug("Replaying commands for channelID={} with lastCommandID from the server={}", sessionChannel.getID(), response.getLastConfirmedCommandID());
          // The session was found on the server - we reattached transparently ok
 
          sessionChannel.replayCommands(response.getLastConfirmedCommandID());
 
          return true;
       } else {
-         ActiveMQClientLogger.LOGGER.reconnectCreatingNewSession(sessionChannel.getID());
+         logger.debug("Couldn't reattach session {}, performing as a failover operation now and recreating objects", sessionChannel.getID());
 
          sessionChannel.clearCommands();
 
@@ -1061,8 +1062,8 @@ public class ActiveMQSessionContext extends SessionContext {
             final long elapsedMillis = TimeUnit.NANOSECONDS.toMillis(elapsedFlowControl);
             ActiveMQClientLogger.LOGGER.timeoutStreamingLargeMessage();
             if (logger.isDebugEnabled()) {
-               logger.debugf("try to write %d bytes after blocked %d ms on a not writable connection: [%s]",
-                             chunkPacket.expectedEncodeSize(), elapsedMillis, connection.getID());
+               logger.debug("try to write {} bytes after blocked {} ms on a not writable connection: [{}]",
+                            chunkPacket.expectedEncodeSize(), elapsedMillis, connection.getID());
             }
          }
          if (requiresResponse) {
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ChannelImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ChannelImpl.java
index e0bb33b205..02b7ebc093 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ChannelImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ChannelImpl.java
@@ -42,11 +42,12 @@ import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ActiveMQEx
 import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.PacketsConfirmedMessage;
 import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
 import org.apache.activemq.artemis.utils.ConcurrentUtil;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public final class ChannelImpl implements Channel {
 
-   private static final Logger logger = Logger.getLogger(ChannelImpl.class);
+   private static final Logger logger = LoggerFactory.getLogger(ChannelImpl.class);
 
    public enum CHANNEL_ID {
       /**
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/RemotingConnectionImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/RemotingConnectionImpl.java
index 09607321a0..acb95fa32a 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/RemotingConnectionImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/RemotingConnectionImpl.java
@@ -46,11 +46,12 @@ import org.apache.activemq.artemis.core.security.ActiveMQPrincipal;
 import org.apache.activemq.artemis.spi.core.protocol.AbstractRemotingConnection;
 import org.apache.activemq.artemis.spi.core.remoting.Connection;
 import org.apache.activemq.artemis.utils.SimpleIDGenerator;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class RemotingConnectionImpl extends AbstractRemotingConnection implements CoreRemotingConnection {
 
-   private static final Logger logger = Logger.getLogger(RemotingConnectionImpl.class);
+   private static final Logger logger = LoggerFactory.getLogger(RemotingConnectionImpl.class);
 
    private final PacketDecoder packetDecoder;
 
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/CertificateUtil.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/CertificateUtil.java
index 00fd0fdb41..a066b06658 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/CertificateUtil.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/CertificateUtil.java
@@ -30,11 +30,12 @@ import io.netty.handler.ssl.SslHandler;
 import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnection;
 import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
 import org.apache.activemq.artemis.spi.core.remoting.Connection;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class CertificateUtil {
 
-   private static final Logger logger = Logger.getLogger(CertificateUtil.class);
+   private static final Logger logger = LoggerFactory.getLogger(CertificateUtil.class);
 
    private static final String SSL_HANDLER_NAME = "ssl";
 
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/CheckDependencies.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/CheckDependencies.java
index c29b17c70e..682af3c89b 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/CheckDependencies.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/CheckDependencies.java
@@ -21,7 +21,8 @@ import io.netty.channel.epoll.Epoll;
 import io.netty.channel.kqueue.KQueue;
 import org.apache.activemq.artemis.core.client.ActiveMQClientLogger;
 import org.apache.activemq.artemis.utils.Env;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This class will check for Epoll or KQueue is available, and return false in case of NoClassDefFoundError
@@ -29,7 +30,7 @@ import org.jboss.logging.Logger;
  */
 public class CheckDependencies {
 
-   private static final Logger logger = Logger.getLogger(CheckDependencies.class);
+   private static final Logger logger = LoggerFactory.getLogger(CheckDependencies.class);
 
    public static final boolean isEpollAvailable() {
       try {
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnection.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnection.java
index a0a0476c6d..65ac5bdabd 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnection.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnection.java
@@ -43,13 +43,14 @@ import org.apache.activemq.artemis.spi.core.remoting.Connection;
 import org.apache.activemq.artemis.spi.core.remoting.ReadyListener;
 import org.apache.activemq.artemis.utils.Env;
 import org.apache.activemq.artemis.utils.IPV6Util;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import static org.apache.activemq.artemis.utils.Preconditions.checkNotNull;
 
 public class NettyConnection implements Connection {
 
-   private static final Logger logger = Logger.getLogger(NettyConnection.class);
+   private static final Logger logger = LoggerFactory.getLogger(NettyConnection.class);
 
    private static final int DEFAULT_WAIT_MILLIS = 10_000;
 
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnector.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnector.java
index 0514411fb5..f631231f27 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnector.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnector.java
@@ -123,7 +123,8 @@ import org.apache.activemq.artemis.spi.core.remoting.ssl.SSLContextFactoryProvid
 import org.apache.activemq.artemis.utils.ConfigurationHelper;
 import org.apache.activemq.artemis.utils.FutureLatch;
 import org.apache.activemq.artemis.utils.IPV6Util;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import static org.apache.activemq.artemis.utils.Base64.encodeBytes;
 
@@ -133,7 +134,7 @@ public class NettyConnector extends AbstractConnector {
    public static String EPOLL_CONNECTOR_TYPE = "EPOLL";
    public static String KQUEUE_CONNECTOR_TYPE = "KQUEUE";
 
-   private static final Logger logger = Logger.getLogger(NettyConnector.class);
+   private static final Logger logger = LoggerFactory.getLogger(NettyConnector.class);
 
    public static final String JAVAX_KEYSTORE_PATH_PROP_NAME = "javax.net.ssl.keyStore";
    public static final String JAVAX_KEYSTORE_PASSWORD_PROP_NAME = "javax.net.ssl.keyStorePassword";
@@ -730,7 +731,7 @@ public class NettyConnector extends AbstractConnector {
 
             if (handler != null) {
                pipeline.addLast(new ActiveMQClientChannelHandler(channelGroup, handler, new Listener(), closeExecutor));
-               logger.debugf("Added ActiveMQClientChannelHandler to Channel with id = %s ", channel.id());
+               logger.debug("Added ActiveMQClientChannelHandler to Channel with id = {} ", channel.id());
             }
          }
       });
@@ -740,7 +741,7 @@ public class NettyConnector extends AbstractConnector {
 
          batchFlusherFuture = scheduledThreadPool.scheduleWithFixedDelay(flusher, batchDelay, batchDelay, TimeUnit.MILLISECONDS);
       }
-      ActiveMQClientLogger.LOGGER.startedNettyConnector(connectorType, TransportConstants.NETTY_VERSION, host, port);
+      logger.debug("Started {0} Netty Connector version {1} to {2}:{3,number,#}", connectorType, TransportConstants.NETTY_VERSION, host, port);
    }
 
    private SSLEngine loadJdkSslEngine(final SSLContextConfig sslContextConfig) throws Exception {
@@ -917,7 +918,7 @@ public class NettyConnector extends AbstractConnector {
                request.headers().set(SEC_ACTIVEMQ_REMOTING_KEY, key);
                ch.attr(REMOTING_KEY).set(key);
 
-               logger.debugf("Sending HTTP request %s", request);
+               logger.debug("Sending HTTP request {}", request);
 
                // Send the HTTP request.
                ch.writeAndFlush(request);
@@ -1016,7 +1017,7 @@ public class NettyConnector extends AbstractConnector {
                   handshakeComplete = true;
                } else {
                   // HTTP upgrade failed
-                  ActiveMQClientLogger.LOGGER.httpHandshakeFailed(msg);
+                  logger.debug("HTTP Handshake failed, received {}", msg);
                   ctx.close();
                   latch.countDown();
                }
@@ -1030,7 +1031,7 @@ public class NettyConnector extends AbstractConnector {
             channelHandler.active = true;
          }
          if (!handshakeComplete) {
-            ActiveMQClientLogger.LOGGER.httpHandshakeFailed(msg);
+            logger.debug("HTTP Handshake failed, received {}", msg);
             ctx.close();
          }
          latch.countDown();
@@ -1295,7 +1296,7 @@ public class NettyConnector extends AbstractConnector {
          InetAddress address = InetAddress.getByName(host);
          return address.isLoopbackAddress();
       } catch (UnknownHostException e) {
-         ActiveMQClientLogger.LOGGER.error("Cannot resolve host", e);
+         logger.error("Cannot resolve host", e);
       }
       return false;
    }
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/TransportConstants.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/TransportConstants.java
index de5eaad2a7..db83fed081 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/TransportConstants.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/TransportConstants.java
@@ -23,11 +23,12 @@ import java.util.Set;
 import io.netty.handler.codec.socksx.SocksVersion;
 import io.netty.util.Version;
 import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class TransportConstants {
 
-   private static final Logger logger = Logger.getLogger(TransportConstants.class);
+   private static final Logger logger = LoggerFactory.getLogger(TransportConstants.class);
 
    public static final String SSL_CONTEXT_PROP_NAME = "sslContext";
 
@@ -374,7 +375,7 @@ public class TransportConstants {
             return Integer.parseInt(variable);
          }
       } catch (Throwable ignored) {
-         logger.debug(ignored);
+         logger.debug(ignored.getMessage(), ignored);
       }
 
       return defaultValue;
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/ssl/DefaultOpenSSLContextFactory.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/ssl/DefaultOpenSSLContextFactory.java
index 225a8ca8fd..d5dd76fcb5 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/ssl/DefaultOpenSSLContextFactory.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/ssl/DefaultOpenSSLContextFactory.java
@@ -36,7 +36,7 @@ public class DefaultOpenSSLContextFactory implements OpenSSLContextFactory {
     */
    @Override
    public SslContext getClientSslContext(final SSLContextConfig config, final Map<String, Object> additionalOpts) throws Exception {
-      log.debugf("Creating Client OpenSSL Context with %s", config);
+      log.debug("Creating Client OpenSSL Context with {}", config);
       return new SSLSupport(config)
          .setSslProvider(TransportConstants.OPENSSL_PROVIDER)
          .createNettyClientContext();
@@ -49,7 +49,7 @@ public class DefaultOpenSSLContextFactory implements OpenSSLContextFactory {
     */
    @Override
    public SslContext getServerSslContext(final SSLContextConfig config, final Map<String, Object> additionalOpts) throws Exception {
-      log.debugf("Creating Server OpenSSL Context with %s", config);
+      log.debug("Creating Server OpenSSL Context with {}", config);
       return new SSLSupport(config)
          .setSslProvider(TransportConstants.OPENSSL_PROVIDER)
          .createNettyContext();
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/ssl/DefaultSSLContextFactory.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/ssl/DefaultSSLContextFactory.java
index 462d6d6e8d..ab1a71f91e 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/ssl/DefaultSSLContextFactory.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/ssl/DefaultSSLContextFactory.java
@@ -40,7 +40,7 @@ public class DefaultSSLContextFactory implements SSLContextFactory {
          return SSLContext.getDefault();
       }
 
-      log.debugf("Creating JDK SSLContext with %s", config);
+      log.debug("Creating JDK SSLContext with {}", config);
       return new SSLSupport(config).createContext();
    }
 
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/protocol/AbstractRemotingConnection.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/protocol/AbstractRemotingConnection.java
index cbd235782e..d17362068b 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/protocol/AbstractRemotingConnection.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/protocol/AbstractRemotingConnection.java
@@ -32,13 +32,14 @@ import org.apache.activemq.artemis.core.remoting.CloseListener;
 import org.apache.activemq.artemis.core.remoting.FailureListener;
 import org.apache.activemq.artemis.spi.core.remoting.Connection;
 import org.apache.activemq.artemis.spi.core.remoting.ReadyListener;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.security.auth.Subject;
 
 public abstract class AbstractRemotingConnection implements RemotingConnection {
 
-   private static final Logger logger = Logger.getLogger(AbstractRemotingConnection.class);
+   private static final Logger logger = LoggerFactory.getLogger(AbstractRemotingConnection.class);
 
    protected final List<FailureListener> failureListeners = new CopyOnWriteArrayList<>();
    protected final List<CloseListener> closeListeners = new CopyOnWriteArrayList<>();
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ssl/OpenSSLContextFactory.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ssl/OpenSSLContextFactory.java
index db1025a936..a6bb2e1284 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ssl/OpenSSLContextFactory.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ssl/OpenSSLContextFactory.java
@@ -19,7 +19,8 @@ package org.apache.activemq.artemis.spi.core.remoting.ssl;
 import java.util.Map;
 
 import io.netty.handler.ssl.SslContext;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Service interface to create an {@link SslContext} for a configuration.
@@ -30,7 +31,7 @@ import org.jboss.logging.Logger;
  */
 public interface OpenSSLContextFactory extends Comparable<OpenSSLContextFactory> {
 
-   Logger log = Logger.getLogger(OpenSSLContextFactory.class);
+   Logger log = LoggerFactory.getLogger(OpenSSLContextFactory.class);
 
    /**
     * Release any cached {@link SslContext} instances.
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ssl/SSLContextFactory.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ssl/SSLContextFactory.java
index b8f3a72caf..3334a4fd2c 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ssl/SSLContextFactory.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/ssl/SSLContextFactory.java
@@ -17,7 +17,8 @@ package org.apache.activemq.artemis.spi.core.remoting.ssl;
 
 import java.util.Map;
 import javax.net.ssl.SSLContext;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Service interface to create a SSLContext for a configuration.
@@ -27,7 +28,7 @@ import org.jboss.logging.Logger;
  * in your jar and fill it with the full qualified name of your implementation.
  */
 public interface SSLContextFactory extends Comparable<SSLContextFactory> {
-   Logger log = Logger.getLogger(SSLContextFactory.class);
+   Logger log = LoggerFactory.getLogger(SSLContextFactory.class);
 
    /**
     * @return an {@link SSLContext} for the given configuration.
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/AutoCreateUtil.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/AutoCreateUtil.java
index 7badc9b6c4..d0d8bde191 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/AutoCreateUtil.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/AutoCreateUtil.java
@@ -24,14 +24,17 @@ import org.apache.activemq.artemis.api.core.RoutingType;
 import org.apache.activemq.artemis.api.core.SimpleString;
 import org.apache.activemq.artemis.api.core.client.ClientSession;
 import org.apache.activemq.artemis.api.core.client.ClientSession.AddressQuery;
-import org.apache.activemq.artemis.core.client.ActiveMQClientLogger;
 import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Utility class to create queues 'automatically'.
  */
 public class AutoCreateUtil {
 
+   private static final Logger logger = LoggerFactory.getLogger(AutoCreateUtil.class);
+
    public static  void autoCreateQueue(ClientSession session, SimpleString destAddress, SimpleString selectorString) throws ActiveMQException {
       AddressQuery response = session.addressQuery(destAddress);
       /* The address query will send back exists=true even if the node only has a REMOTE binding for the destination.
@@ -47,7 +50,7 @@ public class AutoCreateUtil {
                      .setAddress(destAddress);
                setRequiredQueueConfigurationIfNotSet(queueConfiguration,response, RoutingType.ANYCAST, selectorString, true);
                session.createQueue(queueConfiguration);
-               ActiveMQClientLogger.LOGGER.debug("The queue " + destAddress + " was created automatically");
+               logger.debug("The queue " + destAddress + " was created automatically");
             } catch (ActiveMQQueueExistsException e) {
                // The queue was created by another client/admin between the query check and send create queue packet
             }
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/XMLUtil.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/XMLUtil.java
index 490d1703b0..e14dced4d6 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/XMLUtil.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/XMLUtil.java
@@ -35,7 +35,8 @@ import java.util.List;
 
 import org.apache.activemq.artemis.core.client.ActiveMQClientLogger;
 import org.apache.activemq.artemis.core.client.ActiveMQClientMessageBundle;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NamedNodeMap;
@@ -46,7 +47,7 @@ import org.xml.sax.SAXException;
 
 public final class XMLUtil {
 
-   private static final Logger logger = Logger.getLogger(XMLUtil.class);
+   private static final Logger logger = LoggerFactory.getLogger(XMLUtil.class);
 
    private XMLUtil() {
       // Utility class
diff --git a/artemis-core-client/src/test/java/org/apache/activemq/artemis/tests/uri/ConnectorTransportConfigurationParserURITest.java b/artemis-core-client/src/test/java/org/apache/activemq/artemis/tests/uri/ConnectorTransportConfigurationParserURITest.java
index 4a1572adb5..991667fa80 100644
--- a/artemis-core-client/src/test/java/org/apache/activemq/artemis/tests/uri/ConnectorTransportConfigurationParserURITest.java
+++ b/artemis-core-client/src/test/java/org/apache/activemq/artemis/tests/uri/ConnectorTransportConfigurationParserURITest.java
@@ -21,13 +21,14 @@ import java.util.List;
 
 import org.apache.activemq.artemis.api.core.TransportConfiguration;
 import org.apache.activemq.artemis.uri.ConnectorTransportConfigurationParser;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.junit.Assert;
 import org.junit.Test;
 
 public class ConnectorTransportConfigurationParserURITest {
 
-   private static final Logger logger = Logger.getLogger(ConnectorTransportConfigurationParserURITest.class);
+   private static final Logger logger = LoggerFactory.getLogger(ConnectorTransportConfigurationParserURITest.class);
 
    @Test
    public void testParse() throws Exception {
diff --git a/artemis-features/src/main/resources/features.xml b/artemis-features/src/main/resources/features.xml
index f26d8d1d2e..7de6fadb58 100644
--- a/artemis-features/src/main/resources/features.xml
+++ b/artemis-features/src/main/resources/features.xml
@@ -53,8 +53,8 @@
 		<bundle dependency="true">mvn:commons-beanutils/commons-beanutils/${commons.beanutils.version}</bundle>
 		<bundle dependency="true">mvn:commons-collections/commons-collections/${commons.collections.version}</bundle>
 
-		<bundle dependency="true">mvn:org.jboss.logging/jboss-logging/${jboss.logging.version}</bundle>
 		<bundle dependency="true">wrap:mvn:org.jgroups/jgroups/${jgroups.version}</bundle>
+		<bundle>wrap:mvn:org.apache.activemq/artemis-log-facade/${pom.version}</bundle>
 	</feature>
 
 	<feature name="artemis-core" version="${pom.version}" description="ActiveMQ Artemis broker libraries">
@@ -147,4 +147,4 @@
 		<bundle>mvn:org.apache.activemq/activemq-client/${activemq5-version}</bundle>
 	</feature>
 
-</features>
\ No newline at end of file
+</features>
diff --git a/artemis-jakarta-client/pom.xml b/artemis-jakarta-client/pom.xml
index 0aa71bb069..8f0346842a 100644
--- a/artemis-jakarta-client/pom.xml
+++ b/artemis-jakarta-client/pom.xml
@@ -33,11 +33,21 @@
    </properties>
 
    <dependencies>
+      <!-- logging -->
       <dependency>
-         <groupId>org.jboss.logging</groupId>
-         <artifactId>jboss-logging-processor</artifactId>
+         <groupId>org.slf4j</groupId>
+         <artifactId>slf4j-api</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.apache.logging.log4j</groupId>
+         <artifactId>log4j-slf4j-impl</artifactId>
+         <scope>test</scope>
+      </dependency>
+      <dependency>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>artemis-log-processor</artifactId>
+         <version>${project.version}</version>
          <scope>provided</scope>
-         <optional>true</optional>
       </dependency>
       <dependency>
          <groupId>org.apache.activemq</groupId>
@@ -64,11 +74,6 @@
          <artifactId>junit</artifactId>
          <scope>test</scope>
       </dependency>
-      <dependency>
-         <groupId>org.jboss.logmanager</groupId>
-         <artifactId>jboss-logmanager</artifactId>
-         <scope>test</scope>
-      </dependency>
    </dependencies>
 
     
diff --git a/artemis-jakarta-ra/pom.xml b/artemis-jakarta-ra/pom.xml
index e58c45dad6..69278a6822 100644
--- a/artemis-jakarta-ra/pom.xml
+++ b/artemis-jakarta-ra/pom.xml
@@ -36,22 +36,23 @@
 
 
    <dependencies>
+      <!-- logging -->
       <dependency>
-         <groupId>org.jboss.logging</groupId>
-         <artifactId>jboss-logging-processor</artifactId>
-         <scope>provided</scope>
-         <optional>true</optional>
+         <groupId>org.slf4j</groupId>
+         <artifactId>slf4j-api</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.jboss.logging</groupId>
-         <artifactId>jboss-logging-annotations</artifactId>
-         <scope>provided</scope>
-         <optional>true</optional>
+         <groupId>org.apache.logging.log4j</groupId>
+         <artifactId>log4j-slf4j-impl</artifactId>
+         <scope>test</scope>
       </dependency>
       <dependency>
-         <groupId>org.jboss.logging</groupId>
-         <artifactId>jboss-logging</artifactId>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>artemis-log-processor</artifactId>
+         <version>${project.version}</version>
+         <scope>provided</scope>
       </dependency>
+
       <dependency>
          <groupId>org.apache.activemq</groupId>
          <artifactId>artemis-core-client</artifactId>
@@ -93,6 +94,7 @@
          <groupId>org.jgroups</groupId>
          <artifactId>jgroups</artifactId>
       </dependency>
+
    </dependencies>
 
    <build>
diff --git a/artemis-jakarta-server/pom.xml b/artemis-jakarta-server/pom.xml
index d68f7bb137..1670290a30 100644
--- a/artemis-jakarta-server/pom.xml
+++ b/artemis-jakarta-server/pom.xml
@@ -35,21 +35,21 @@
     </properties>
 
    <dependencies>
+      <!-- logging -->
       <dependency>
-         <groupId>org.jboss.logging</groupId>
-         <artifactId>jboss-logging-processor</artifactId>
-         <scope>provided</scope>
-         <optional>true</optional>
+         <groupId>org.slf4j</groupId>
+         <artifactId>slf4j-api</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.jboss.logging</groupId>
-         <artifactId>jboss-logging-annotations</artifactId>
-         <scope>provided</scope>
-         <optional>true</optional>
+         <groupId>org.apache.logging.log4j</groupId>
+         <artifactId>log4j-slf4j-impl</artifactId>
+         <scope>runtime</scope> <!-- TODO: decide whether to only supply via assembly or here -->
       </dependency>
       <dependency>
-         <groupId>org.jboss.logging</groupId>
-         <artifactId>jboss-logging</artifactId>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>artemis-log-processor</artifactId>
+         <version>${project.version}</version>
+         <scope>provided</scope>
       </dependency>
       <dependency>
          <groupId>org.apache.activemq</groupId>
diff --git a/artemis-jakarta-service-extensions/pom.xml b/artemis-jakarta-service-extensions/pom.xml
index a2843969c1..6b73313dec 100644
--- a/artemis-jakarta-service-extensions/pom.xml
+++ b/artemis-jakarta-service-extensions/pom.xml
@@ -49,31 +49,21 @@
          <artifactId>artemis-commons</artifactId>
          <version>${project.version}</version>
       </dependency>
+      <!-- logging -->
       <dependency>
-         <groupId>org.jboss.logging</groupId>
-         <artifactId>jboss-logging</artifactId>
+         <groupId>org.slf4j</groupId>
+         <artifactId>slf4j-api</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.jboss.logging</groupId>
-         <artifactId>jboss-logging-processor</artifactId>
-         <scope>provided</scope>
-         <optional>true</optional>
-      </dependency>
-      <dependency>
-         <groupId>org.jboss.logging</groupId>
-         <artifactId>jboss-logging-annotations</artifactId>
-         <scope>provided</scope>
-         <optional>true</optional>
-      </dependency>
-      <dependency>
-         <groupId>org.jboss.logmanager</groupId>
-         <artifactId>jboss-logmanager</artifactId>
+         <groupId>org.apache.logging.log4j</groupId>
+         <artifactId>log4j-slf4j-impl</artifactId>
          <scope>test</scope>
       </dependency>
       <dependency>
-          <groupId>org.wildfly.common</groupId>
-          <artifactId>wildfly-common</artifactId>
-          <scope>test</scope>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>artemis-log-processor</artifactId>
+         <version>${project.version}</version>
+         <scope>provided</scope>
       </dependency>
       <dependency>
          <groupId>jakarta.transaction</groupId>
diff --git a/artemis-jdbc-store/pom.xml b/artemis-jdbc-store/pom.xml
index 0b935086f9..0af30b9390 100644
--- a/artemis-jdbc-store/pom.xml
+++ b/artemis-jdbc-store/pom.xml
@@ -33,27 +33,16 @@
 
    <dependencies>
 
-      <!-- Logging -->
+      <!-- logging -->
       <dependency>
-         <groupId>org.jboss.logging</groupId>
-         <artifactId>jboss-logging-processor</artifactId>
-         <scope>provided</scope>
-         <optional>true</optional>
-      </dependency>
-      <dependency>
-         <groupId>org.jboss.logging</groupId>
-         <artifactId>jboss-logging</artifactId>
+         <groupId>org.slf4j</groupId>
+         <artifactId>slf4j-api</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.jboss.logmanager</groupId>
-         <artifactId>jboss-logmanager</artifactId>
+         <groupId>org.apache.logging.log4j</groupId>
+         <artifactId>log4j-slf4j-impl</artifactId>
          <scope>test</scope>
       </dependency>
-      <dependency>
-          <groupId>org.wildfly.common</groupId>
-          <artifactId>wildfly-common</artifactId>
-          <scope>test</scope>
-      </dependency>
       <dependency>
          <groupId>org.apache.activemq</groupId>
          <artifactId>artemis-commons</artifactId>
diff --git a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/drivers/AbstractJDBCDriver.java b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/drivers/AbstractJDBCDriver.java
index 24b622f748..7b775a98d7 100644
--- a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/drivers/AbstractJDBCDriver.java
+++ b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/drivers/AbstractJDBCDriver.java
@@ -25,7 +25,8 @@ import java.util.Arrays;
 import java.util.stream.Stream;
 
 import org.apache.activemq.artemis.jdbc.store.sql.SQLProvider;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Class to hold common database functionality such as drivers and connections
@@ -33,7 +34,7 @@ import org.jboss.logging.Logger;
 @SuppressWarnings("SynchronizeOnNonFinalField")
 public abstract class AbstractJDBCDriver {
 
-   private static final Logger logger = Logger.getLogger(AbstractJDBCDriver.class);
+   private static final Logger logger = LoggerFactory.getLogger(AbstractJDBCDriver.class);
 
    protected SQLProvider sqlProvider;
 
@@ -74,11 +75,11 @@ public abstract class AbstractJDBCDriver {
             }
             connection.commit();
          } catch (SQLException e) {
-            logger.error(JDBCUtils.appendSQLExceptionDetails(new StringBuilder(), e, dropTableSql));
+            logger.error(JDBCUtils.appendSQLExceptionDetails(new StringBuilder(), e, dropTableSql).toString());
             try {
                connection.rollback();
             } catch (SQLException rollbackEx) {
-               logger.error(JDBCUtils.appendSQLExceptionDetails(new StringBuilder(), rollbackEx, dropTableSql));
+               logger.error(JDBCUtils.appendSQLExceptionDetails(new StringBuilder(), rollbackEx, dropTableSql).toString());
                throw rollbackEx;
             }
             throw e;
@@ -87,7 +88,7 @@ public abstract class AbstractJDBCDriver {
    }
 
    private void createTableIfNotExists(String tableName, String... sqls) throws SQLException {
-      logger.tracef("Validating if table %s didn't exist before creating", tableName);
+      logger.trace("Validating if table {} didn't exist before creating", tableName);
       try (Connection connection = connectionProvider.getConnection()) {
          try {
             connection.setAutoCommit(false);
@@ -96,12 +97,12 @@ public abstract class AbstractJDBCDriver {
                if (rs == null || !rs.next()) {
                   tableExists = false;
                   if (logger.isTraceEnabled()) {
-                     logger.tracef("Table %s did not exist, creating it with SQL=%s", tableName, Arrays.toString(sqls));
+                     logger.trace("Table {} did not exist, creating it with SQL={}", tableName, Arrays.toString(sqls));
                   }
                   if (rs != null) {
                      final SQLWarning sqlWarning = rs.getWarnings();
                      if (sqlWarning != null) {
-                        logger.warn(JDBCUtils.appendSQLExceptionDetails(new StringBuilder(), sqlWarning));
+                        logger.warn(JDBCUtils.appendSQLExceptionDetails(new StringBuilder(), sqlWarning).toString());
                      }
                   }
                } else {
@@ -109,13 +110,13 @@ public abstract class AbstractJDBCDriver {
                }
             }
             if (tableExists) {
-               logger.tracef("Validating if the existing table %s is initialized or not", tableName);
+               logger.trace("Validating if the existing table {} is initialized or not", tableName);
                try (Statement statement = connection.createStatement();
                     ResultSet cntRs = statement.executeQuery(sqlProvider.getCountJournalRecordsSQL())) {
-                  logger.tracef("Validation of the existing table %s initialization is started", tableName);
+                  logger.trace("Validation of the existing table {} initialization is started", tableName);
                   int rows;
                   if (cntRs.next() && (rows = cntRs.getInt(1)) > 0) {
-                     logger.tracef("Table %s did exist but is not empty. Skipping initialization. Found %d rows.", tableName, rows);
+                     logger.trace("Table {} did exist but is not empty. Skipping initialization. Found %d rows.", tableName, rows);
                      if (logger.isDebugEnabled()) {
                         final long expectedRows = Stream.of(sqls).map(String::toUpperCase).filter(sql -> sql.contains("INSERT INTO")).count();
                         if (rows < expectedRows) {
@@ -130,9 +131,9 @@ public abstract class AbstractJDBCDriver {
                         return !(upperCaseSql.contains("CREATE TABLE") || upperCaseSql.contains("CREATE INDEX"));
                      }).toArray(String[]::new);
                      if (sqls.length > 0) {
-                        logger.tracef("Table %s did exist but is empty. Starting initialization.", tableName);
+                        logger.trace("Table {} did exist but is empty. Starting initialization.", tableName);
                      } else {
-                        logger.tracef("Table %s did exist but is empty. Initialization completed: no initialization statements left.", tableName);
+                        logger.trace("Table {} did exist but is empty. Initialization completed: no initialization statements left.", tableName);
                         connection.commit();
                      }
                   }
@@ -141,7 +142,7 @@ public abstract class AbstractJDBCDriver {
                   //some DBMS just return stale information about table existence
                   //and can fail on later attempts to access them
                   if (logger.isTraceEnabled()) {
-                     logger.trace(JDBCUtils.appendSQLExceptionDetails(new StringBuilder("Can't verify the initialization of table ").append(tableName).append(" due to:"), e, sqlProvider.getCountJournalRecordsSQL()));
+                     logger.trace(JDBCUtils.appendSQLExceptionDetails(new StringBuilder("Can't verify the initialization of table ").append(tableName).append(" due to:"), e, sqlProvider.getCountJournalRecordsSQL()).toString());
                   }
                   try {
                      connection.rollback();
@@ -149,7 +150,7 @@ public abstract class AbstractJDBCDriver {
                      logger.debug("Rollback failed while validating initialization of a table", rollbackEx);
                   }
                   connection.setAutoCommit(false);
-                  logger.tracef("Table %s seems to exist, but we can't verify the initialization. Keep trying to create and initialize.", tableName);
+                  logger.trace("Table {} seems to exist, but we can't verify the initialization. Keep trying to create and initialize.", tableName);
                }
             }
             if (sqls.length > 0) {
@@ -158,7 +159,7 @@ public abstract class AbstractJDBCDriver {
                      statement.executeUpdate(sql);
                      final SQLWarning statementSqlWarning = statement.getWarnings();
                      if (statementSqlWarning != null) {
-                        logger.warn(JDBCUtils.appendSQLExceptionDetails(new StringBuilder(), statementSqlWarning, sql));
+                        logger.warn(JDBCUtils.appendSQLExceptionDetails(new StringBuilder(), statementSqlWarning, sql).toString());
                      }
                   }
                }
@@ -167,11 +168,11 @@ public abstract class AbstractJDBCDriver {
             }
          } catch (SQLException e) {
             final String sqlStatements = String.join("\n", sqls);
-            logger.error(JDBCUtils.appendSQLExceptionDetails(new StringBuilder(), e, sqlStatements));
+            logger.error(JDBCUtils.appendSQLExceptionDetails(new StringBuilder(), e, sqlStatements).toString());
             try {
                connection.rollback();
             } catch (SQLException rollbackEx) {
-               logger.error(JDBCUtils.appendSQLExceptionDetails(new StringBuilder(), rollbackEx, sqlStatements));
+               logger.error(JDBCUtils.appendSQLExceptionDetails(new StringBuilder(), rollbackEx, sqlStatements).toString());
                throw rollbackEx;
             }
             throw e;
diff --git a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/drivers/JDBCConnectionProvider.java b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/drivers/JDBCConnectionProvider.java
index 9f972d39d8..a5237c1da7 100644
--- a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/drivers/JDBCConnectionProvider.java
+++ b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/drivers/JDBCConnectionProvider.java
@@ -25,12 +25,12 @@ import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.apache.activemq.artemis.jdbc.store.logging.LoggingConnection;
 import org.apache.activemq.artemis.jdbc.store.sql.PropertySQLProvider;
-import org.apache.activemq.artemis.journal.ActiveMQJournalLogger;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class JDBCConnectionProvider {
 
-   private static final Logger logger = Logger.getLogger(JDBCConnectionProvider.class);
+   private static final Logger logger = LoggerFactory.getLogger(JDBCConnectionProvider.class);
    private DataSource dataSource;
    private Executor networkTimeoutExecutor;
    private int networkTimeoutMillis;
@@ -64,7 +64,7 @@ public class JDBCConnectionProvider {
             connection = new LoggingConnection(connection, logger);
          }
       } catch (SQLException e) {
-         logger.error(JDBCUtils.appendSQLExceptionDetails(new StringBuilder(), e));
+         logger.error(JDBCUtils.appendSQLExceptionDetails(new StringBuilder(), e).toString());
          throw e;
       }
 
@@ -78,8 +78,8 @@ public class JDBCConnectionProvider {
                connection.setNetworkTimeout(this.networkTimeoutExecutor, this.networkTimeoutMillis);
             } catch (SQLException e) {
                supportNetworkTimeout = false;
-               logger.warn(JDBCUtils.appendSQLExceptionDetails(new StringBuilder(), e));
-               ActiveMQJournalLogger.LOGGER.warn("Unable to set a network timeout on the JDBC connection: won't retry again in the future");
+               logger.warn(JDBCUtils.appendSQLExceptionDetails(new StringBuilder(), e).toString());
+               logger.warn("Unable to set a network timeout on the JDBC connection: won't retry again in the future");
             } catch (Throwable throwable) {
                supportNetworkTimeout = false;
                //it included SecurityExceptions and UnsupportedOperationException
@@ -112,7 +112,7 @@ public class JDBCConnectionProvider {
             }
          }
       } catch (SQLException e) {
-         logger.error(JDBCUtils.appendSQLExceptionDetails(new StringBuilder(), e));
+         logger.error(JDBCUtils.appendSQLExceptionDetails(new StringBuilder(), e).toString());
       }
    }
 
diff --git a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/drivers/JDBCUtils.java b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/drivers/JDBCUtils.java
index 37c1e97d89..9eeb13e72c 100644
--- a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/drivers/JDBCUtils.java
+++ b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/drivers/JDBCUtils.java
@@ -21,28 +21,29 @@ import java.util.Map;
 
 import org.apache.activemq.artemis.jdbc.store.sql.PropertySQLProvider;
 import org.apache.activemq.artemis.jdbc.store.sql.SQLProvider;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class JDBCUtils {
 
-   private static final Logger logger = Logger.getLogger(JDBCUtils.class);
+   private static final Logger logger = LoggerFactory.getLogger(JDBCUtils.class);
 
    public static SQLProvider.Factory getSQLProviderFactory(String url) {
       PropertySQLProvider.Factory.SQLDialect dialect = PropertySQLProvider.Factory.identifyDialect(url);
-      logger.tracef("getSQLProvider Returning SQL provider for dialect %s for url::%s", dialect, url);
+      logger.trace("getSQLProvider Returning SQL provider for dialect {} for url::{}", dialect, url);
       return new PropertySQLProvider.Factory(dialect);
    }
 
    public static SQLProvider getSQLProvider(String driverClass, String tableName, SQLProvider.DatabaseStoreType storeType) {
       PropertySQLProvider.Factory.SQLDialect dialect = PropertySQLProvider.Factory.identifyDialect(driverClass);
-      logger.tracef("getSQLProvider Returning SQL provider for dialect %s for driver::%s, tableName::%s", dialect, driverClass, tableName);
+      logger.trace("getSQLProvider Returning SQL provider for dialect {} for driver::{}, tableName::{}", dialect, driverClass, tableName);
       PropertySQLProvider.Factory factory = new PropertySQLProvider.Factory(dialect);
       return factory.create(tableName, storeType);
    }
 
    public static SQLProvider getSQLProvider(Map<String, Object> dataSourceProperties, String tableName, SQLProvider.DatabaseStoreType storeType) {
       PropertySQLProvider.Factory.SQLDialect dialect = PropertySQLProvider.Factory.investigateDialect(dataSourceProperties);
-      logger.tracef("getSQLProvider Returning SQL provider for dialect %s, tableName::%s", dialect, tableName);
+      logger.trace("getSQLProvider Returning SQL provider for dialect {}, tableName::{}", dialect, tableName);
       PropertySQLProvider.Factory factory = new PropertySQLProvider.Factory(dialect);
       return factory.create(tableName, storeType);
    }
diff --git a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFile.java b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFile.java
index 1ee9c77677..54255cf88e 100644
--- a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFile.java
+++ b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFile.java
@@ -34,11 +34,12 @@ import org.apache.activemq.artemis.core.io.SequentialFile;
 import org.apache.activemq.artemis.core.io.buffer.TimedBuffer;
 import org.apache.activemq.artemis.core.journal.EncodingSupport;
 import org.apache.activemq.artemis.core.journal.impl.SimpleWaitIOCallback;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class JDBCSequentialFile implements SequentialFile {
 
-   private static final Logger logger = Logger.getLogger(JDBCSequentialFile.class);
+   private static final Logger logger = LoggerFactory.getLogger(JDBCSequentialFile.class);
 
    private final String filename;
 
diff --git a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFileFactory.java b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFileFactory.java
index c9169c52e8..0848e9b05b 100644
--- a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFileFactory.java
+++ b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFileFactory.java
@@ -32,13 +32,13 @@ import org.apache.activemq.artemis.core.io.nio.NIOSequentialFileFactory;
 import org.apache.activemq.artemis.core.server.ActiveMQComponent;
 import org.apache.activemq.artemis.jdbc.store.drivers.JDBCConnectionProvider;
 import org.apache.activemq.artemis.jdbc.store.sql.SQLProvider;
-import org.apache.activemq.artemis.journal.ActiveMQJournalLogger;
 import org.apache.activemq.artemis.utils.collections.ConcurrentHashSet;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class JDBCSequentialFileFactory implements SequentialFileFactory, ActiveMQComponent {
 
-   private static final Logger logger = Logger.getLogger(JDBCSequentialFile.class);
+   private static final Logger logger = LoggerFactory.getLogger(JDBCSequentialFileFactory.class);
 
    private boolean started;
 
@@ -104,7 +104,7 @@ public class JDBCSequentialFileFactory implements SequentialFileFactory, ActiveM
       try {
          dbDriver.stop();
       } catch (SQLException e) {
-         ActiveMQJournalLogger.LOGGER.error("Error stopping file factory, unable to close db connection");
+         logger.error("Error stopping file factory, unable to close db connection");
       }
       started = false;
    }
diff --git a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFileFactoryDriver.java b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFileFactoryDriver.java
index ab6906c3cb..5f3f81d2a7 100644
--- a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFileFactoryDriver.java
+++ b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFileFactoryDriver.java
@@ -29,12 +29,13 @@ import java.util.List;
 import org.apache.activemq.artemis.jdbc.store.drivers.AbstractJDBCDriver;
 import org.apache.activemq.artemis.jdbc.store.drivers.JDBCConnectionProvider;
 import org.apache.activemq.artemis.jdbc.store.sql.SQLProvider;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 @SuppressWarnings("SynchronizeOnNonFinalField")
 public class JDBCSequentialFileFactoryDriver extends AbstractJDBCDriver {
 
-   private static final Logger logger = Logger.getLogger(JDBCSequentialFileFactoryDriver.class);
+   private static final Logger logger = LoggerFactory.getLogger(JDBCSequentialFileFactoryDriver.class);
 
    protected String deleteFile;
    protected String createFile;
@@ -317,7 +318,7 @@ public class JDBCSequentialFileFactoryDriver extends AbstractJDBCDriver {
                      final long filePosition = file.position();
                      readLength = (int) calculateReadLength(blobLength, bytesRemaining, filePosition);
                      if (logger.isDebugEnabled()) {
-                        logger.debugf("trying read %d bytes: blobLength = %d bytesRemaining = %d filePosition = %d",
+                        logger.debug("trying read {} bytes: blobLength = {} bytesRemaining = {} filePosition = {}",
                                 readLength, blobLength, bytesRemaining, filePosition);
                      }
                      if (readLength < 0) {
diff --git a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalImpl.java b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalImpl.java
index a4281b33dc..90d7967e3f 100644
--- a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalImpl.java
+++ b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalImpl.java
@@ -54,11 +54,12 @@ import org.apache.activemq.artemis.jdbc.store.drivers.AbstractJDBCDriver;
 import org.apache.activemq.artemis.jdbc.store.drivers.JDBCConnectionProvider;
 import org.apache.activemq.artemis.jdbc.store.sql.SQLProvider;
 import org.apache.activemq.artemis.utils.collections.SparseArrayLinkedList;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class JDBCJournalImpl extends AbstractJDBCDriver implements Journal {
 
-   private static final Logger logger = Logger.getLogger(JDBCJournalImpl.class);
+   private static final Logger logger = LoggerFactory.getLogger(JDBCJournalImpl.class);
 
    // Sync Delay in ms
    //private static final int SYNC_DELAY = 5;
@@ -159,7 +160,7 @@ public class JDBCJournalImpl extends AbstractJDBCDriver implements Journal {
 
    @Override
    protected void prepareStatements() {
-      logger.tracef("preparing statements");
+      logger.trace("preparing statements");
       insertJournalRecords = sqlProvider.getInsertJournalRecordsSQL();
       selectJournalRecords = sqlProvider.getSelectJournalRecordsSQL();
       countJournalRecords = sqlProvider.getCountJournalRecordsSQL();
diff --git a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalRecord.java b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalRecord.java
index 1ae8d1d91b..37814f002f 100644
--- a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalRecord.java
+++ b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalRecord.java
@@ -31,10 +31,13 @@ import org.apache.activemq.artemis.core.journal.EncodingSupport;
 import org.apache.activemq.artemis.core.journal.IOCompletion;
 import org.apache.activemq.artemis.core.persistence.Persister;
 import org.apache.activemq.artemis.core.journal.RecordInfo;
-import org.apache.activemq.artemis.journal.ActiveMQJournalLogger;
 import org.apache.activemq.artemis.utils.ActiveMQBufferInputStream;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 class JDBCJournalRecord {
+
+   private static final Logger logger = LoggerFactory.getLogger(JDBCJournalRecord.class);
    /*
    Database Table Schema:
 
@@ -137,7 +140,7 @@ class JDBCJournalRecord {
          record.read(recordBytes);
          txData.read(txDataBytes);
       } catch (IOException e) {
-         ActiveMQJournalLogger.LOGGER.error("Error occurred whilst reading Journal Record", e);
+         logger.error("Error occurred whilst reading Journal Record", e);
          throw e;
       }
 
diff --git a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/logging/LoggingConnection.java b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/logging/LoggingConnection.java
index 8a9284abeb..b2dc1dc4b4 100644
--- a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/logging/LoggingConnection.java
+++ b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/logging/LoggingConnection.java
@@ -37,7 +37,7 @@ import java.util.Map;
 import java.util.Properties;
 import java.util.concurrent.Executor;
 
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
 
 public class LoggingConnection implements Connection {
 
@@ -47,8 +47,6 @@ public class LoggingConnection implements Connection {
 
    private Logger logger;
 
-   private Logger.Level level = Logger.Level.TRACE;
-
    public LoggingConnection(Connection connection, Logger logger) {
       this.connection = connection;
       this.logger = logger;
@@ -66,132 +64,132 @@ public class LoggingConnection implements Connection {
    @Override
    public Statement createStatement() throws SQLException {
       LoggingStatement statement = new LoggingStatement(connection.createStatement(), logger);
-      logger.logf(level, "%s.createStatement() = %s", connectionID, statement.getStatementID());
+      logger.trace("{}.createStatement() = {}", connectionID, statement.getStatementID());
       return statement;
    }
 
    @Override
    public PreparedStatement prepareStatement(String sql) throws SQLException {
       LoggingPreparedStatement statement = new LoggingPreparedStatement(connection.prepareStatement(sql), logger);
-      logger.logf(level, "%s.prepareStatement(%s) = %s", connectionID, sql, statement.getStatementID());
+      logger.trace("{}.prepareStatement({}) = {}", connectionID, sql, statement.getStatementID());
       return statement;
    }
 
    @Override
    public CallableStatement prepareCall(String sql) throws SQLException {
       CallableStatement statement = connection.prepareCall(sql);
-      logger.logf(level, "%s.prepareCall(%s) = %s", connectionID, sql, LoggingUtil.getID(statement));
+      logger.trace("{}.prepareCall({}) = {}", connectionID, sql, LoggingUtil.getID(statement));
       return statement;
    }
 
    @Override
    public String nativeSQL(String sql) throws SQLException {
       String x = connection.nativeSQL(sql);
-      logger.logf(level, "%s.nativeSQL(%s) = %s", connectionID, sql, x);
+      logger.trace("{}.nativeSQL({}) = {}", connectionID, sql, x);
       return x;
    }
 
    @Override
    public void setAutoCommit(boolean autoCommit) throws SQLException {
-      logger.logf(level, "%s.setAutoCommit(%s)", connectionID, autoCommit);
+      logger.trace("{}.setAutoCommit({})", connectionID, autoCommit);
       connection.setAutoCommit(autoCommit);
    }
 
    @Override
    public boolean getAutoCommit() throws SQLException {
       boolean x = connection.getAutoCommit();
-      logger.logf(level, "%s.getAutoCommit() = %s", connectionID, x);
+      logger.trace("{}.getAutoCommit() = {}", connectionID, x);
       return x;
    }
 
    @Override
    public void commit() throws SQLException {
-      logger.logf(level, "%s.commit()", connectionID);
+      logger.trace("{}.commit()", connectionID);
       connection.commit();
    }
 
    @Override
    public void rollback() throws SQLException {
-      logger.logf(level, "%s.rollback()", connectionID);
+      logger.trace("{}.rollback()", connectionID);
       connection.rollback();
    }
 
    @Override
    public void close() throws SQLException {
-      logger.logf(level, "%s.close()", connectionID);
+      logger.trace("{}.close()", connectionID);
       connection.close();
    }
 
    @Override
    public boolean isClosed() throws SQLException {
       boolean x = connection.isClosed();
-      logger.logf(level, "%s.isClosed() = %s", connectionID, x);
+      logger.trace("{}.isClosed() = {}", connectionID, x);
       return x;
    }
 
    @Override
    public DatabaseMetaData getMetaData() throws SQLException {
       DatabaseMetaData x = connection.getMetaData();
-      logger.logf(level, "%s.getMetaData() = %s", connectionID, x);
+      logger.trace("{}.getMetaData() = {}", connectionID, x);
       return x;
    }
 
    @Override
    public void setReadOnly(boolean readOnly) throws SQLException {
-      logger.logf(level, "%s.setReadOnly(%s)", connectionID, readOnly);
+      logger.trace("{}.setReadOnly({})", connectionID, readOnly);
       connection.setReadOnly(readOnly);
    }
 
    @Override
    public boolean isReadOnly() throws SQLException {
       boolean x = connection.isReadOnly();
-      logger.logf(level, "%s.isReadOnly() = %s", connectionID, x);
+      logger.trace("{}.isReadOnly() = {}", connectionID, x);
       return x;
    }
 
    @Override
    public void setCatalog(String catalog) throws SQLException {
-      logger.logf(level, "%s.setCatalog(%s)", connectionID, catalog);
+      logger.trace("{}.setCatalog({})", connectionID, catalog);
       connection.setCatalog(catalog);
    }
 
    @Override
    public String getCatalog() throws SQLException {
       String x = connection.getCatalog();
-      logger.logf(level, "%s.getCatalog() = %s", connectionID, x);
+      logger.trace("{}.getCatalog() = {}", connectionID, x);
       return x;
    }
 
    @Override
    public void setTransactionIsolation(int level) throws SQLException {
-      logger.logf(this.level, "%s.setTransactionIsolation(%s)", connectionID, level);
+      logger.trace("{}.setTransactionIsolation({})", connectionID, level);
       connection.setTransactionIsolation(level);
    }
 
    @Override
    public int getTransactionIsolation() throws SQLException {
       int x = connection.getTransactionIsolation();
-      logger.logf(level, "%s.getTransactionIsolation() = %s", connectionID, x);
+      logger.trace("{}.getTransactionIsolation() = {}", connectionID, x);
       return x;
    }
 
    @Override
    public SQLWarning getWarnings() throws SQLException {
       SQLWarning x = connection.getWarnings();
-      logger.logf(level, "%s.getWarnings() = %s", connectionID, x);
+      logger.trace("{}.getWarnings() = {}", connectionID, x);
       return x;
    }
 
    @Override
    public void clearWarnings() throws SQLException {
-      logger.logf(level, "%s.clearWarnings()", connectionID);
+      logger.trace("{}.clearWarnings()", connectionID);
       connection.clearWarnings();
    }
 
    @Override
    public Statement createStatement(int resultSetType, int resultSetConcurrency) throws SQLException {
       LoggingStatement statement = new LoggingStatement(connection.createStatement(resultSetType, resultSetConcurrency), logger);
-      logger.logf(level, "%s.createStatement(%s, %s) = %s", connectionID, resultSetType, resultSetConcurrency, statement.getStatementID());
+      logger.trace("{}.createStatement({}, {}) = {}", connectionID, resultSetType, resultSetConcurrency, statement.getStatementID());
       return statement;
    }
 
@@ -200,66 +198,66 @@ public class LoggingConnection implements Connection {
                                              int resultSetType,
                                              int resultSetConcurrency) throws SQLException {
       LoggingPreparedStatement statement = new LoggingPreparedStatement(connection.prepareStatement(sql, resultSetType, resultSetConcurrency), logger);
-      logger.logf(level, "%s.prepareStatement(%s, %s, %s) = %s", connectionID, sql, resultSetType, resultSetConcurrency, statement.getStatementID());
+      logger.trace("{}.prepareStatement({}, {}, {}) = {}", connectionID, sql, resultSetType, resultSetConcurrency, statement.getStatementID());
       return statement;
    }
 
    @Override
    public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency) throws SQLException {
       CallableStatement statement = connection.prepareCall(sql, resultSetType, resultSetConcurrency);
-      logger.logf(level, "%s.createStatement(%s, %s) = %s", connectionID, sql, resultSetType, resultSetConcurrency, LoggingUtil.getID(statement));
+      logger.trace("{}.createStatement({}, {}) = {}", connectionID, sql, resultSetType, resultSetConcurrency, LoggingUtil.getID(statement));
       return statement;
    }
 
    @Override
    public Map<String, Class<?>> getTypeMap() throws SQLException {
       Map<String, Class<?>> x = connection.getTypeMap();
-      logger.logf(level, "%s.getTypeMap() = %s", connectionID, x);
+      logger.trace("{}.getTypeMap() = {}", connectionID, x);
       return x;
    }
 
    @Override
    public void setTypeMap(Map<String, Class<?>> map) throws SQLException {
-      logger.logf(level, "%s.setTypeMap(%s)", connectionID, map);
+      logger.trace("{}.setTypeMap({})", connectionID, map);
       connection.setTypeMap(map);
    }
 
    @Override
    public void setHoldability(int holdability) throws SQLException {
-      logger.logf(level, "%s.setHoldability(%s)", connectionID, holdability);
+      logger.trace("{}.setHoldability({})", connectionID, holdability);
       connection.setHoldability(holdability);
    }
 
    @Override
    public int getHoldability() throws SQLException {
       int x = connection.getHoldability();
-      logger.logf(level, "%s.getHoldability() = %s", connectionID, x);
+      logger.trace("{}.getHoldability() = {}", connectionID, x);
       return x;
    }
 
    @Override
    public Savepoint setSavepoint() throws SQLException {
       Savepoint x = connection.setSavepoint();
-      logger.logf(level, "%s.setSavepoint() = %s", connectionID, x);
+      logger.trace("{}.setSavepoint() = {}", connectionID, x);
       return x;
    }
 
    @Override
    public Savepoint setSavepoint(String name) throws SQLException {
       Savepoint x = connection.setSavepoint(name);
-      logger.logf(level, "%s.setSavepoint(%s) = %s", connectionID, name, x);
+      logger.trace("{}.setSavepoint({}) = {}", connectionID, name, x);
       return x;
    }
 
    @Override
    public void rollback(Savepoint savepoint) throws SQLException {
-      logger.logf(level, "%s.rollback(%s)", connectionID, savepoint);
+      logger.trace("{}.rollback({})", connectionID, savepoint);
       connection.rollback(savepoint);
    }
 
    @Override
    public void releaseSavepoint(Savepoint savepoint) throws SQLException {
-      logger.logf(level, "%s.releaseSavepoint(%s)", connectionID, savepoint);
+      logger.trace("{}.releaseSavepoint({})", connectionID, savepoint);
       connection.releaseSavepoint(savepoint);
    }
 
@@ -268,7 +266,7 @@ public class LoggingConnection implements Connection {
                                     int resultSetConcurrency,
                                     int resultSetHoldability) throws SQLException {
       LoggingStatement statement = new LoggingStatement(connection.createStatement(resultSetType, resultSetConcurrency, resultSetHoldability), logger);
-      logger.logf(level, "%s.createStatement(%s, %s, %s) = %s", connectionID, resultSetType, resultSetConcurrency, resultSetHoldability, statement.getStatementID());
+      logger.trace("{}.createStatement({}, {}, {}) = {}", connectionID, resultSetType, resultSetConcurrency, resultSetHoldability, statement.getStatementID());
       return statement;
    }
 
@@ -278,7 +276,7 @@ public class LoggingConnection implements Connection {
                                              int resultSetConcurrency,
                                              int resultSetHoldability) throws SQLException {
       LoggingPreparedStatement statement = new LoggingPreparedStatement(connection.prepareStatement(sql, resultSetType, resultSetConcurrency, resultSetHoldability), logger);
-      logger.logf(level, "%s.prepareStatement(%s, %s, %s, %s) = %s", connectionID, sql, resultSetType, resultSetConcurrency, resultSetHoldability, statement.getStatementID());
+      logger.trace("{}.prepareStatement({}, {}, {}, {}) = {}", connectionID, sql, resultSetType, resultSetConcurrency, resultSetHoldability, statement.getStatementID());
       return statement;
    }
 
@@ -288,149 +286,149 @@ public class LoggingConnection implements Connection {
                                         int resultSetConcurrency,
                                         int resultSetHoldability) throws SQLException {
       CallableStatement statement = connection.prepareCall(sql, resultSetType, resultSetConcurrency, resultSetHoldability);
-      logger.logf(level, "%s.prepareCall(%s, %s, %s, %s) = %s", connectionID, sql, resultSetType, resultSetConcurrency, resultSetHoldability, LoggingUtil.getID(statement));
+      logger.trace("{}.prepareCall({}, {}, {}, {}) = {}", connectionID, sql, resultSetType, resultSetConcurrency, resultSetHoldability, LoggingUtil.getID(statement));
       return statement;
    }
 
    @Override
    public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) throws SQLException {
       LoggingPreparedStatement preparedStatement = new LoggingPreparedStatement(connection.prepareStatement(sql, autoGeneratedKeys), logger);
-      logger.logf(level, "%s.prepareStatement(%s, %s) = %s", connectionID, sql, autoGeneratedKeys, preparedStatement.getStatementID());
+      logger.trace("{}.prepareStatement({}, {}) = {}", connectionID, sql, autoGeneratedKeys, preparedStatement.getStatementID());
       return preparedStatement;
    }
 
    @Override
    public PreparedStatement prepareStatement(String sql, int[] columnIndexes) throws SQLException {
       LoggingPreparedStatement statement = new LoggingPreparedStatement(connection.prepareStatement(sql, columnIndexes), logger);
-      logger.logf(level, "%s.prepareStatement(%s, %s) = %s", connectionID, sql, Arrays.toString(columnIndexes), statement.getStatementID());
+      logger.trace("{}.prepareStatement({}, {}) = {}", connectionID, sql, Arrays.toString(columnIndexes), statement.getStatementID());
       return statement;
    }
 
    @Override
    public PreparedStatement prepareStatement(String sql, String[] columnNames) throws SQLException {
       LoggingPreparedStatement statement = new LoggingPreparedStatement(connection.prepareStatement(sql, columnNames), logger);
-      logger.logf(level, "%s.prepareStatement(%s, %s) = %s", connectionID, sql, Arrays.toString(columnNames), statement.getStatementID());
+      logger.trace("{}.prepareStatement({}, {}) = {}", connectionID, sql, Arrays.toString(columnNames), statement.getStatementID());
       return statement;
    }
 
    @Override
    public Clob createClob() throws SQLException {
       Clob x = connection.createClob();
-      logger.logf(level, "%s.createClob() = %s", connectionID, x);
+      logger.trace("{}.createClob() = {}", connectionID, x);
       return x;
    }
 
    @Override
    public Blob createBlob() throws SQLException {
       Blob x = connection.createBlob();
-      logger.logf(level, "%s.createBlob() = %s", connectionID, x);
+      logger.trace("{}.createBlob() = {}", connectionID, x);
       return x;
    }
 
    @Override
    public NClob createNClob() throws SQLException {
       NClob x = connection.createNClob();
-      logger.logf(level, "%s.createNClob() = %s", connectionID, x);
+      logger.trace("{}.createNClob() = {}", connectionID, x);
       return x;
    }
 
    @Override
    public SQLXML createSQLXML() throws SQLException {
       SQLXML x = connection.createSQLXML();
-      logger.logf(level, "%s.createSQLXML() = %s", connectionID, x);
+      logger.trace("{}.createSQLXML() = {}", connectionID, x);
       return x;
    }
 
    @Override
    public boolean isValid(int timeout) throws SQLException {
       boolean x = connection.isValid(timeout);
-      logger.logf(level, "%s.isValid(%s) = %s", connectionID, timeout, x);
+      logger.trace("{}.isValid({}) = {}", connectionID, timeout, x);
       return x;
    }
 
    @Override
    public void setClientInfo(String name, String value) throws SQLClientInfoException {
-      logger.logf(level, "%s.setClientInfo(%s, %s)", connectionID, name, value);
+      logger.trace("{}.setClientInfo({}, {})", connectionID, name, value);
       connection.setClientInfo(name, value);
    }
 
    @Override
    public void setClientInfo(Properties properties) throws SQLClientInfoException {
-      logger.logf(level, "%s.setClientInfo(%s)", connectionID, properties);
+      logger.trace("{}.setClientInfo({})", connectionID, properties);
       connection.setClientInfo(properties);
    }
 
    @Override
    public String getClientInfo(String name) throws SQLException {
       String x = connection.getClientInfo(name);
-      logger.logf(level, "%s.getClientInfo(%s) = %s", connectionID, name, x);
+      logger.trace("{}.getClientInfo({}) = {}", connectionID, name, x);
       return x;
    }
 
    @Override
    public Properties getClientInfo() throws SQLException {
       Properties x = connection.getClientInfo();
-      logger.logf(level, "%s.getClientInfo() = %s", connectionID, x);
+      logger.trace("{}.getClientInfo() = {}", connectionID, x);
       return x;
    }
 
    @Override
    public Array createArrayOf(String typeName, Object[] elements) throws SQLException {
       Array x = connection.createArrayOf(typeName, elements);
-      logger.logf(level, "%s.createArrayOf(%s, %s) = %s", connectionID, typeName, Arrays.toString(elements), x);
+      logger.trace("{}.createArrayOf({}, {}) = {}", connectionID, typeName, Arrays.toString(elements), x);
       return x;
    }
 
    @Override
    public Struct createStruct(String typeName, Object[] attributes) throws SQLException {
       Struct x = connection.createStruct(typeName, attributes);
-      logger.logf(level, "%s.createStruct(%s, %s) = %s", connectionID, typeName, Arrays.toString(attributes), x);
+      logger.trace("{}.createStruct({}, {}) = {}", connectionID, typeName, Arrays.toString(attributes), x);
       return x;
    }
 
    @Override
    public void setSchema(String schema) throws SQLException {
-      logger.logf(level, "%s.setSchema(%s)", connectionID, schema);
+      logger.trace("{}.setSchema({})", connectionID, schema);
       connection.setSchema(schema);
    }
 
    @Override
    public String getSchema() throws SQLException {
       String x = connection.getSchema();
-      logger.logf(level, "%s.getSchema() = %s", connectionID, x);
+      logger.trace("{}.getSchema() = {}", connectionID, x);
       return x;
    }
 
    @Override
    public void abort(Executor executor) throws SQLException {
-      logger.logf(level, "%s.abort(%s)", connectionID, executor);
+      logger.trace("{}.abort({})", connectionID, executor);
       connection.abort(executor);
    }
 
    @Override
    public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException {
-      logger.logf(level, "%s.setNetworkTimeout(%s, %d)", connectionID, executor, milliseconds);
+      logger.trace("{}.setNetworkTimeout({}, {})", connectionID, executor, milliseconds);
       connection.setNetworkTimeout(executor, milliseconds);
    }
 
    @Override
    public int getNetworkTimeout() throws SQLException {
       int x = connection.getNetworkTimeout();
-      logger.logf(level, "%s.getNetworkTimeout() = %s", connectionID, x);
+      logger.trace("{}.getNetworkTimeout() = {}", connectionID, x);
       return x;
    }
 
    @Override
    public <T> T unwrap(Class<T> iface) throws SQLException {
       T x = connection.unwrap(iface);
-      logger.logf(level, "%s.unwrap(%s) = %s", connectionID, iface, x);
+      logger.trace("{}.unwrap({}) = {}", connectionID, iface, x);
       return x;
    }
 
    @Override
    public boolean isWrapperFor(Class<?> iface) throws SQLException {
       boolean x = connection.isWrapperFor(iface);
-      logger.logf(level, "%s.isWrapperFor() = %s", connectionID, iface, x);
+      logger.trace("{}.isWrapperFor() = {}", connectionID, iface, x);
       return x;
    }
 }
diff --git a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/logging/LoggingPreparedStatement.java b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/logging/LoggingPreparedStatement.java
index 4cf270d4bb..e1568eba33 100644
--- a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/logging/LoggingPreparedStatement.java
+++ b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/logging/LoggingPreparedStatement.java
@@ -39,7 +39,7 @@ import java.sql.Time;
 import java.sql.Timestamp;
 import java.util.Calendar;
 
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
 
 public class LoggingPreparedStatement extends LoggingStatement implements PreparedStatement {
 
@@ -53,354 +53,354 @@ public class LoggingPreparedStatement extends LoggingStatement implements Prepar
    @Override
    public ResultSet executeQuery() throws SQLException {
       LoggingResultSet rs = new LoggingResultSet(preparedStatement.executeQuery(), logger);
-      logger.logf(level, "%s.executeQuery() = %s", statementID, rs.getResultSetID());
+      logger.trace("{}.executeQuery() = {}", statementID, rs.getResultSetID());
       return rs;
    }
 
    @Override
    public int executeUpdate() throws SQLException {
       int i = preparedStatement.executeUpdate();
-      logger.logf(level, "%s.executeUpdate() = %s", statementID, i);
+      logger.trace("{}.executeUpdate() = {}", statementID, i);
       return i;
    }
 
    @Override
    public void setNull(int parameterIndex, int sqlType) throws SQLException {
-      logger.logf(level, "%s.setNull(%d, %d)", statementID, parameterIndex, sqlType);
+      logger.trace("{}.setNull({}, {})", statementID, parameterIndex, sqlType);
       preparedStatement.setNull(parameterIndex, sqlType);
    }
 
    @Override
    public void setBoolean(int parameterIndex, boolean x) throws SQLException {
-      logger.logf(level, "%s.setBoolean(%d, %s)", statementID, parameterIndex, x);
+      logger.trace("{}.setBoolean({}, {})", statementID, parameterIndex, x);
       preparedStatement.setBoolean(parameterIndex, x);
    }
 
    @Override
    public void setByte(int parameterIndex, byte x) throws SQLException {
-      logger.logf(level, "%s.setByte(%d, %s)", statementID, parameterIndex, x);
+      logger.trace("{}.setByte({}, {})", statementID, parameterIndex, x);
       preparedStatement.setByte(parameterIndex, x);
    }
 
    @Override
    public void setShort(int parameterIndex, short x) throws SQLException {
-      logger.logf(level, "%s.setShort(%d, %d)", statementID, parameterIndex, x);
+      logger.trace("{}.setShort({}, {})", statementID, parameterIndex, x);
       preparedStatement.setShort(parameterIndex, x);
    }
 
    @Override
    public void setInt(int parameterIndex, int x) throws SQLException {
-      logger.logf(level, "%s.setInt(%d, %d)", statementID, parameterIndex, x);
+      logger.trace("{}.setInt({}, {})", statementID, parameterIndex, x);
       preparedStatement.setInt(parameterIndex, x);
    }
 
    @Override
    public void setLong(int parameterIndex, long x) throws SQLException {
-      logger.logf(level, "%s.setLong(%d, %s)", statementID, parameterIndex, x);
+      logger.trace("{}.setLong({}, {})", statementID, parameterIndex, x);
       preparedStatement.setLong(parameterIndex, x);
    }
 
    @Override
    public void setFloat(int parameterIndex, float x) throws SQLException {
-      logger.logf(level, "%s.setFloat(%d, %f)", statementID, parameterIndex, x);
+      logger.trace("{}.setFloat({}, {})", statementID, parameterIndex, x);
       preparedStatement.setFloat(parameterIndex, x);
    }
 
    @Override
    public void setDouble(int parameterIndex, double x) throws SQLException {
-      logger.logf(level, "%s.setDouble(%d, %d)", statementID, parameterIndex, x);
+      logger.trace("{}.setDouble({}, {})", statementID, parameterIndex, x);
       preparedStatement.setDouble(parameterIndex, x);
    }
 
    @Override
    public void setBigDecimal(int parameterIndex, BigDecimal x) throws SQLException {
-      logger.logf(level, "%s.setBigDecimal(%d, %s)", statementID, parameterIndex, x);
+      logger.trace("{}.setBigDecimal({}, {})", statementID, parameterIndex, x);
       preparedStatement.setBigDecimal(parameterIndex, x);
    }
 
    @Override
    public void setString(int parameterIndex, String x) throws SQLException {
-      logger.logf(level, "%s.setString(%d, %s)", statementID, parameterIndex, x);
+      logger.trace("{}.setString({}, {})", statementID, parameterIndex, x);
       preparedStatement.setString(parameterIndex, x);
    }
 
    @Override
    public void setBytes(int parameterIndex, byte[] x) throws SQLException {
-      logger.logf(level, "%s.setBytes(%d, %s)", statementID, parameterIndex, x);
+      logger.trace("{}.setBytes({}, {})", statementID, parameterIndex, x);
       preparedStatement.setBytes(parameterIndex, x);
    }
 
    @Override
    public void setDate(int parameterIndex, Date x) throws SQLException {
-      logger.logf(level, "%s.setDate(%d, %s)", statementID, parameterIndex, x);
+      logger.trace("{}.setDate({}, {})", statementID, parameterIndex, x);
       preparedStatement.setDate(parameterIndex, x);
    }
 
    @Override
    public void setTime(int parameterIndex, Time x) throws SQLException {
-      logger.logf(level, "%s.setTime(%d, %s)", statementID, parameterIndex, x);
+      logger.trace("{}.setTime({}, {})", statementID, parameterIndex, x);
       preparedStatement.setTime(parameterIndex, x);
    }
 
    @Override
    public void setTimestamp(int parameterIndex, Timestamp x) throws SQLException {
-      logger.logf(level, "%s.setTimestamp(%d, %s)", statementID, parameterIndex, x);
+      logger.trace("{}.setTimestamp({}, {})", statementID, parameterIndex, x);
       preparedStatement.setTimestamp(parameterIndex, x);
    }
 
    @Override
    public void setAsciiStream(int parameterIndex, InputStream x, int length) throws SQLException {
-      logger.logf(level, "%s.setAsciiStream(%d, %s, %d)", statementID, parameterIndex, x, length);
+      logger.trace("{}.setAsciiStream({}, {}, {})", statementID, parameterIndex, x, length);
       preparedStatement.setAsciiStream(parameterIndex, x, length);
    }
 
    @Override
    public void setUnicodeStream(int parameterIndex, InputStream x, int length) throws SQLException {
-      logger.logf(level, "%s.setUnicodeStream(%d, %s, %d)", statementID, parameterIndex, x, length);
+      logger.trace("{}.setUnicodeStream({}, {}, {})", statementID, parameterIndex, x, length);
       preparedStatement.setUnicodeStream(parameterIndex, x, length);
    }
 
    @Override
    public void setBinaryStream(int parameterIndex, InputStream x, int length) throws SQLException {
-      logger.logf(level, "%s.setBinaryStream(%d, %s, %d)", statementID, parameterIndex, x, length);
+      logger.trace("{}.setBinaryStream({}, {}, {})", statementID, parameterIndex, x, length);
       preparedStatement.setBinaryStream(parameterIndex, x, length);
    }
 
    @Override
    public void clearParameters() throws SQLException {
-      logger.logf(level, "%s.clearParameters()", statementID);
+      logger.trace("{}.clearParameters()", statementID);
       preparedStatement.clearParameters();
    }
 
    @Override
    public void setObject(int parameterIndex, Object x, int targetSqlType) throws SQLException {
-      logger.logf(level, "%s.setObject(%d, %s, %d)", statementID, parameterIndex, x, targetSqlType);
+      logger.trace("{}.setObject({}, {}, {})", statementID, parameterIndex, x, targetSqlType);
       preparedStatement.setObject(parameterIndex, x, targetSqlType);
    }
 
    @Override
    public void setObject(int parameterIndex, Object x) throws SQLException {
-      logger.logf(level, "%s.setObject(%d, %s)", statementID, parameterIndex, x);
+      logger.trace("{}.setObject({}, {})", statementID, parameterIndex, x);
       preparedStatement.setObject(parameterIndex, x);
    }
 
    @Override
    public boolean execute() throws SQLException {
       boolean b = preparedStatement.execute();
-      logger.logf(level, "%s.execute() = %s", statementID, b);
+      logger.trace("{}.execute() = {}", statementID, b);
       return b;
    }
 
    @Override
    public void addBatch() throws SQLException {
-      logger.logf(level, "%s.addBatch()", statementID);
+      logger.trace("{}.addBatch()", statementID);
       preparedStatement.addBatch();
    }
 
    @Override
    public void setCharacterStream(int parameterIndex, Reader reader, int length) throws SQLException {
-      logger.logf(level, "%s.setCharacterStream(%d, %s, %d)", statementID, parameterIndex, reader, length);
+      logger.trace("{}.setCharacterStream({}, {}, {})", statementID, parameterIndex, reader, length);
       preparedStatement.setCharacterStream(parameterIndex, reader, length);
    }
 
    @Override
    public void setRef(int parameterIndex, Ref x) throws SQLException {
-      logger.logf(level, "%s.setRef(%d, %s)", statementID, parameterIndex, x);
+      logger.trace("{}.setRef({}, {})", statementID, parameterIndex, x);
       preparedStatement.setRef(parameterIndex, x);
    }
 
    @Override
    public void setBlob(int parameterIndex, Blob x) throws SQLException {
-      logger.logf(level, "%s.setBlob(%d, %s)", statementID, parameterIndex, x);
+      logger.trace("{}.setBlob({}, {})", statementID, parameterIndex, x);
       preparedStatement.setBlob(parameterIndex, x);
    }
 
    @Override
    public void setClob(int parameterIndex, Clob x) throws SQLException {
-      logger.logf(level, "%s.setClob(%d, %x)", statementID, parameterIndex, x);
+      logger.trace("{}.setClob({}, {})", statementID, parameterIndex, x);
       preparedStatement.setClob(parameterIndex, x);
    }
 
    @Override
    public void setArray(int parameterIndex, Array x) throws SQLException {
-      logger.logf(level, "%s.setArray(%d, %s)", statementID, parameterIndex, x);
+      logger.trace("{}.setArray({}, {})", statementID, parameterIndex, x);
       preparedStatement.setArray(parameterIndex, x);
    }
 
    @Override
    public ResultSetMetaData getMetaData() throws SQLException {
       ResultSetMetaData resultSetMetaData = preparedStatement.getMetaData();
-      logger.logf(level, "%s.getMetaData() = %s", statementID, LoggingUtil.getID(resultSetMetaData));
+      logger.trace("{}.getMetaData() = {}", statementID, LoggingUtil.getID(resultSetMetaData));
       return resultSetMetaData;
    }
 
    @Override
    public void setDate(int parameterIndex, Date x, Calendar cal) throws SQLException {
-      logger.logf(level, "%s.setDate(%d, %s, %s)", statementID, parameterIndex, x, cal);
+      logger.trace("{}.setDate({}, {}, {})", statementID, parameterIndex, x, cal);
       preparedStatement.setDate(parameterIndex, x, cal);
    }
 
    @Override
    public void setTime(int parameterIndex, Time x, Calendar cal) throws SQLException {
-      logger.logf(level, "%s.setTime(%d, %s, %s)", statementID, parameterIndex, x, cal);
+      logger.trace("{}.setTime({}, {}, {})", statementID, parameterIndex, x, cal);
       preparedStatement.setTime(parameterIndex, x, cal);
    }
 
    @Override
    public void setTimestamp(int parameterIndex, Timestamp x, Calendar cal) throws SQLException {
-      logger.logf(level, "%s.setTimestamp(%d, %s, %s)", statementID, parameterIndex, x, cal);
+      logger.trace("{}.setTimestamp({}, {}, {})", statementID, parameterIndex, x, cal);
       preparedStatement.setTimestamp(parameterIndex, x, cal);
    }
 
    @Override
    public void setNull(int parameterIndex, int sqlType, String typeName) throws SQLException {
-      logger.logf(level, "%s.setNull(%d, %d, %s)", statementID, parameterIndex, sqlType, typeName);
+      logger.trace("{}.setNull({}, {}, {})", statementID, parameterIndex, sqlType, typeName);
       preparedStatement.setNull(parameterIndex, sqlType, typeName);
    }
 
    @Override
    public void setURL(int parameterIndex, URL x) throws SQLException {
-      logger.logf(level, "%s.setURL(%d, %s)", statementID, parameterIndex, x);
+      logger.trace("{}.setURL({}, {})", statementID, parameterIndex, x);
       preparedStatement.setURL(parameterIndex, x);
    }
 
    @Override
    public ParameterMetaData getParameterMetaData() throws SQLException {
       ParameterMetaData x = preparedStatement.getParameterMetaData();
-      logger.logf(level, "%s.getParameterMetaData() = %s", statementID, x);
+      logger.trace("{}.getParameterMetaData() = {}", statementID, x);
       return x;
    }
 
    @Override
    public void setRowId(int parameterIndex, RowId x) throws SQLException {
-      logger.logf(level, "%s.setRowId(%d, %s)", statementID, parameterIndex, x);
+      logger.trace("{}.setRowId({}, {})", statementID, parameterIndex, x);
       preparedStatement.setRowId(parameterIndex, x);
    }
 
    @Override
    public void setNString(int parameterIndex, String value) throws SQLException {
-      logger.logf(level, "%s.setNString(%d, %s)", statementID, parameterIndex, value);
+      logger.trace("{}.setNString({}, {})", statementID, parameterIndex, value);
       preparedStatement.setNString(parameterIndex, value);
    }
 
    @Override
    public void setNCharacterStream(int parameterIndex, Reader value, long length) throws SQLException {
-      logger.logf(level, "%s.setNCharacterStream(%d, %s, %d)", statementID, parameterIndex, value, length);
+      logger.trace("{}.setNCharacterStream({}, {}, {})", statementID, parameterIndex, value, length);
       preparedStatement.setNCharacterStream(parameterIndex, value, length);
    }
 
    @Override
    public void setNClob(int parameterIndex, NClob value) throws SQLException {
-      logger.logf(level, "%s.setNClob(%d, %s)", statementID, parameterIndex, value);
+      logger.trace("{}.setNClob({}, {})", statementID, parameterIndex, value);
       preparedStatement.setNClob(parameterIndex, value);
    }
 
    @Override
    public void setClob(int parameterIndex, Reader reader, long length) throws SQLException {
-      logger.logf(level, "%s.setClob(%d, %s, %s)", statementID, parameterIndex, reader, length);
+      logger.trace("{}.setClob({}, {}, {})", statementID, parameterIndex, reader, length);
       preparedStatement.setClob(parameterIndex, reader, length);
    }
 
    @Override
    public void setBlob(int parameterIndex, InputStream inputStream, long length) throws SQLException {
-      logger.logf(level, "%s.setBlob(%d, %s, %d)", statementID, parameterIndex, inputStream, length);
+      logger.trace("{}.setBlob({}, {}, {})", statementID, parameterIndex, inputStream, length);
       preparedStatement.setBlob(parameterIndex, inputStream, length);
    }
 
    @Override
    public void setNClob(int parameterIndex, Reader reader, long length) throws SQLException {
-      logger.logf(level, "%s.setNClob(%d, %s, %d)", statementID, parameterIndex, reader, length);
+      logger.trace("{}.setNClob({}, {}, {})", statementID, parameterIndex, reader, length);
       preparedStatement.setNClob(parameterIndex, reader, length);
    }
 
    @Override
    public void setSQLXML(int parameterIndex, SQLXML xmlObject) throws SQLException {
-      logger.logf(level, "%s.setSQLXML(%d, %s)", statementID, parameterIndex, xmlObject);
+      logger.trace("{}.setSQLXML({}, {})", statementID, parameterIndex, xmlObject);
       preparedStatement.setSQLXML(parameterIndex, xmlObject);
    }
 
    @Override
    public void setObject(int parameterIndex, Object x, int targetSqlType, int scaleOrLength) throws SQLException {
-      logger.logf(level, "%s.setNull(%d, %d)", statementID, parameterIndex, x);
+      logger.trace("{}.setNull({}, {})", statementID, parameterIndex, x);
       preparedStatement.setObject(parameterIndex, x, targetSqlType, scaleOrLength);
    }
 
    @Override
    public void setAsciiStream(int parameterIndex, InputStream x, long length) throws SQLException {
-      logger.logf(level, "%s.setNull(%d, %d)", statementID, parameterIndex, x);
+      logger.trace("{}.setNull({}, {})", statementID, parameterIndex, x);
       preparedStatement.setAsciiStream(parameterIndex, x, length);
    }
 
    @Override
    public void setBinaryStream(int parameterIndex, InputStream x, long length) throws SQLException {
-      logger.logf(level, "%s.setNull(%d, %d)", statementID, parameterIndex, x);
+      logger.trace("{}.setNull({}, {})", statementID, parameterIndex, x);
       preparedStatement.setBinaryStream(parameterIndex, x, length);
    }
 
    @Override
    public void setCharacterStream(int parameterIndex, Reader reader, long length) throws SQLException {
-      logger.logf(level, "%s.setCharacterStream(%d, %s, %d)", statementID, parameterIndex, reader, length);
+      logger.trace("{}.setCharacterStream({}, {}, {})", statementID, parameterIndex, reader, length);
       preparedStatement.setCharacterStream(parameterIndex, reader, length);
    }
 
    @Override
    public void setAsciiStream(int parameterIndex, InputStream x) throws SQLException {
-      logger.logf(level, "%s.setAsciiStream(%d, %d)", statementID, parameterIndex, x);
+      logger.trace("{}.setAsciiStream({}, {})", statementID, parameterIndex, x);
       preparedStatement.setAsciiStream(parameterIndex, x);
    }
 
    @Override
    public void setBinaryStream(int parameterIndex, InputStream x) throws SQLException {
-      logger.logf(level, "%s.setBinaryStream(%d, %s)", statementID, parameterIndex, x);
+      logger.trace("{}.setBinaryStream({}, {})", statementID, parameterIndex, x);
       preparedStatement.setBinaryStream(parameterIndex, x);
    }
 
    @Override
    public void setCharacterStream(int parameterIndex, Reader reader) throws SQLException {
-      logger.logf(level, "%s.setCharacterStream(%d, %s)", statementID, parameterIndex, reader);
+      logger.trace("{}.setCharacterStream({}, {})", statementID, parameterIndex, reader);
       preparedStatement.setCharacterStream(parameterIndex, reader);
    }
 
    @Override
    public void setNCharacterStream(int parameterIndex, Reader value) throws SQLException {
-      logger.logf(level, "%s.setNCharacterStream(%d, %s)", statementID, parameterIndex, value);
+      logger.trace("{}.setNCharacterStream({}, {})", statementID, parameterIndex, value);
       preparedStatement.setNCharacterStream(parameterIndex, value);
    }
 
    @Override
    public void setClob(int parameterIndex, Reader reader) throws SQLException {
-      logger.logf(level, "%s.setClob(%d, %s)", statementID, parameterIndex, reader);
+      logger.trace("{}.setClob({}, {})", statementID, parameterIndex, reader);
       preparedStatement.setClob(parameterIndex, reader);
    }
 
    @Override
    public void setBlob(int parameterIndex, InputStream inputStream) throws SQLException {
-      logger.logf(level, "%s.setBlob(%d, %s)", statementID, parameterIndex, inputStream);
+      logger.trace("{}.setBlob({}, {})", statementID, parameterIndex, inputStream);
       preparedStatement.setBlob(parameterIndex, inputStream);
    }
 
    @Override
    public void setNClob(int parameterIndex, Reader reader) throws SQLException {
-      logger.logf(level, "%s.setNClob(%d, %s)", statementID, parameterIndex, reader);
+      logger.trace("{}.setNClob({}, {})", statementID, parameterIndex, reader);
       preparedStatement.setNClob(parameterIndex, reader);
    }
 
    @Override
    public void setObject(int parameterIndex, Object x, SQLType targetSqlType, int scaleOrLength) throws SQLException {
-      logger.logf(level, "%s.setObject(%d, %s, %s, %d)", statementID, parameterIndex, x, targetSqlType, scaleOrLength);
+      logger.trace("{}.setObject({}, {}, {}, {})", statementID, parameterIndex, x, targetSqlType, scaleOrLength);
       preparedStatement.setObject(parameterIndex, x, targetSqlType, scaleOrLength);
    }
 
    @Override
    public void setObject(int parameterIndex, Object x, SQLType targetSqlType) throws SQLException {
-      logger.logf(level, "%s.setObject(%d, %s, %d)", statementID, parameterIndex, x, targetSqlType);
+      logger.trace("{}.setObject({}, {}, {})", statementID, parameterIndex, x, targetSqlType);
       preparedStatement.setObject(parameterIndex, x, targetSqlType);
    }
 
    @Override
    public long executeLargeUpdate() throws SQLException {
       long l = preparedStatement.executeLargeUpdate();
-      logger.logf(level, "%s.executeLargeUpdate() = %s", statementID, l);
+      logger.trace("{}.executeLargeUpdate() = {}", statementID, l);
       return l;
    }
 }
diff --git a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/logging/LoggingResultSet.java b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/logging/LoggingResultSet.java
index 05dcac429c..ba27f674a6 100644
--- a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/logging/LoggingResultSet.java
+++ b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/logging/LoggingResultSet.java
@@ -41,7 +41,8 @@ import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Map;
 
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+
 
 public class LoggingResultSet implements ResultSet {
 
@@ -51,8 +52,6 @@ public class LoggingResultSet implements ResultSet {
 
    private final Logger logger;
 
-   private static final Logger.Level level = Logger.Level.TRACE;
-
    public LoggingResultSet(ResultSet resultSet, Logger logger) {
       this.resultSet = resultSet;
       this.logger = logger;
@@ -70,1234 +69,1234 @@ public class LoggingResultSet implements ResultSet {
    @Override
    public boolean next() throws SQLException {
       boolean b = resultSet.next();
-      logger.logf(level, "%s.next() = %s", resultSetID, b);
+      logger.trace("{}.next() = {}", resultSetID, b);
       return b;
    }
 
    @Override
    public void close() throws SQLException {
-      logger.logf(level, "%s.close()", resultSetID);
+      logger.trace("{}.close()", resultSetID);
       resultSet.close();
    }
 
    @Override
    public boolean wasNull() throws SQLException {
       boolean b = resultSet.wasNull();
-      logger.logf(level, "%s.wasNull() = %s", resultSetID, b);
+      logger.trace("{}.wasNull() = {}", resultSetID, b);
       return b;
    }
 
    @Override
    public String getString(int columnIndex) throws SQLException {
       String x = resultSet.getString(columnIndex);
-      logger.logf(level, "%s.getString(%s) = %s", resultSetID, columnIndex, x);
+      logger.trace("{}.getString({}) = {}", resultSetID, columnIndex, x);
       return x;
    }
 
    @Override
    public boolean getBoolean(int columnIndex) throws SQLException {
       boolean x = resultSet.getBoolean(columnIndex);
-      logger.logf(level, "%s.getBoolean(%s) = %s", resultSetID, columnIndex, x);
+      logger.trace("{}.getBoolean({}) = {}", resultSetID, columnIndex, x);
       return x;
    }
 
    @Override
    public byte getByte(int columnIndex) throws SQLException {
       byte x = resultSet.getByte(columnIndex);
-      logger.logf(level, "%s.getByte(%s) = %s", resultSetID, columnIndex, x);
+      logger.trace("{}.getByte({}) = {}", resultSetID, columnIndex, x);
       return x;
    }
 
    @Override
    public short getShort(int columnIndex) throws SQLException {
       short x = resultSet.getShort(columnIndex);
-      logger.logf(level, "%s.getShort(%s) = %s", resultSetID, columnIndex, x);
+      logger.trace("{}.getShort({}) = {}", resultSetID, columnIndex, x);
       return x;
    }
 
    @Override
    public int getInt(int columnIndex) throws SQLException {
       int x = resultSet.getInt(columnIndex);
-      logger.logf(level, "%s.getInt(%s) = %s", resultSetID, columnIndex, x);
+      logger.trace("{}.getInt({}) = {}", resultSetID, columnIndex, x);
       return x;
    }
 
    @Override
    public long getLong(int columnIndex) throws SQLException {
       long x = resultSet.getLong(columnIndex);
-      logger.logf(level, "%s.getLong(%s) = %s", resultSetID, columnIndex, x);
+      logger.trace("{}.getLong({}) = {}", resultSetID, columnIndex, x);
       return x;
    }
 
    @Override
    public float getFloat(int columnIndex) throws SQLException {
       float x = resultSet.getFloat(columnIndex);
-      logger.logf(level, "%s.getFloat(%s) = %s", resultSetID, columnIndex, x);
+      logger.trace("{}.getFloat({}) = {}", resultSetID, columnIndex, x);
       return x;
    }
 
    @Override
    public double getDouble(int columnIndex) throws SQLException {
       double x = resultSet.getDouble(columnIndex);
-      logger.logf(level, "%s.getDouble(%s) = %s", resultSetID, columnIndex, x);
+      logger.trace("{}.getDouble({}) = {}", resultSetID, columnIndex, x);
       return x;
    }
 
    @Override
    public BigDecimal getBigDecimal(int columnIndex, int scale) throws SQLException {
       BigDecimal x = resultSet.getBigDecimal(columnIndex);
-      logger.logf(level, "%s.getBigDecimal(%s) = %s", resultSetID, columnIndex, x);
+      logger.trace("{}.getBigDecimal({}) = {}", resultSetID, columnIndex, x);
       return x;
    }
 
    @Override
    public byte[] getBytes(int columnIndex) throws SQLException {
       byte[] x = resultSet.getBytes(columnIndex);
-      logger.logf(level, "%s.getBytes(%s) = %s", resultSetID, columnIndex, Arrays.toString(x));
+      logger.trace("{}.getBytes({}) = {}", resultSetID, columnIndex, Arrays.toString(x));
       return x;
    }
 
    @Override
    public Date getDate(int columnIndex) throws SQLException {
       Date x = resultSet.getDate(columnIndex);
-      logger.logf(level, "%s.getDate(%s) = %s", resultSetID, columnIndex, x);
+      logger.trace("{}.getDate({}) = {}", resultSetID, columnIndex, x);
       return x;
    }
 
    @Override
    public Time getTime(int columnIndex) throws SQLException {
       Time x = resultSet.getTime(columnIndex);
-      logger.logf(level, "%s.getTime(%s) = %s", resultSetID, columnIndex, x);
+      logger.trace("{}.getTime({}) = {}", resultSetID, columnIndex, x);
       return x;
    }
 
    @Override
    public Timestamp getTimestamp(int columnIndex) throws SQLException {
       Timestamp x = resultSet.getTimestamp(columnIndex);
-      logger.logf(level, "%s.getTimestamp(%s) = %s", resultSetID, columnIndex, x);
+      logger.trace("{}.getTimestamp({}) = {}", resultSetID, columnIndex, x);
       return x;
    }
 
    @Override
    public InputStream getAsciiStream(int columnIndex) throws SQLException {
       InputStream x = resultSet.getAsciiStream(columnIndex);
-      logger.logf(level, "%s.getAsciiStream(%s) = %s", resultSetID, columnIndex, x);
+      logger.trace("{}.getAsciiStream({}) = {}", resultSetID, columnIndex, x);
       return x;
    }
 
    @Override
    public InputStream getUnicodeStream(int columnIndex) throws SQLException {
       InputStream x = resultSet.getUnicodeStream(columnIndex);
-      logger.logf(level, "%s.getUnicodeStream(%s) = %s", resultSetID, columnIndex, x);
+      logger.trace("{}.getUnicodeStream({}) = {}", resultSetID, columnIndex, x);
       return x;
    }
 
    @Override
    public InputStream getBinaryStream(int columnIndex) throws SQLException {
       InputStream x = resultSet.getBinaryStream(columnIndex);
-      logger.logf(level, "%s.getBinaryStream(%s) = %s", resultSetID, columnIndex, x);
+      logger.trace("{}.getBinaryStream({}) = {}", resultSetID, columnIndex, x);
       return x;
    }
 
    @Override
    public String getString(String columnLabel) throws SQLException {
       String x = resultSet.getString(columnLabel);
-      logger.logf(level, "%s.getString(%s) = %s", resultSetID, columnLabel, x);
+      logger.trace("{}.getString({}) = {}", resultSetID, columnLabel, x);
       return x;
    }
 
    @Override
    public boolean getBoolean(String columnLabel) throws SQLException {
       boolean x = resultSet.getBoolean(columnLabel);
-      logger.logf(level, "%s.getBoolean(%s) = %s", resultSetID, columnLabel, x);
+      logger.trace("{}.getBoolean({}) = {}", resultSetID, columnLabel, x);
       return x;
    }
 
    @Override
    public byte getByte(String columnLabel) throws SQLException {
       byte x = resultSet.getByte(columnLabel);
-      logger.logf(level, "%s.getByte(%s) = %s", resultSetID, columnLabel, x);
+      logger.trace("{}.getByte({}) = {}", resultSetID, columnLabel, x);
       return x;
    }
 
    @Override
    public short getShort(String columnLabel) throws SQLException {
       short x = resultSet.getShort(columnLabel);
-      logger.logf(level, "%s.getShort(%s) = %s", resultSetID, columnLabel, x);
+      logger.trace("{}.getShort({}) = {}", resultSetID, columnLabel, x);
       return x;
    }
 
    @Override
    public int getInt(String columnLabel) throws SQLException {
       int x = resultSet.getInt(columnLabel);
-      logger.logf(level, "%s.getInt(%s) = %s", resultSetID, columnLabel, x);
+      logger.trace("{}.getInt({}) = {}", resultSetID, columnLabel, x);
       return x;
    }
 
    @Override
    public long getLong(String columnLabel) throws SQLException {
       long x = resultSet.getLong(columnLabel);
-      logger.logf(level, "%s.getLong(%s) = %s", resultSetID, columnLabel, x);
+      logger.trace("{}.getLong({}) = {}", resultSetID, columnLabel, x);
       return x;
    }
 
    @Override
    public float getFloat(String columnLabel) throws SQLException {
       float x = resultSet.getFloat(columnLabel);
-      logger.logf(level, "%s.getFloat(%s) = %s", resultSetID, columnLabel, x);
+      logger.trace("{}.getFloat({}) = {}", resultSetID, columnLabel, x);
       return x;
    }
 
    @Override
    public double getDouble(String columnLabel) throws SQLException {
       double x = resultSet.getDouble(columnLabel);
-      logger.logf(level, "%s.getDouble(%s) = %s", resultSetID, columnLabel, x);
+      logger.trace("{}.getDouble({}) = {}", resultSetID, columnLabel, x);
       return x;
    }
 
    @Override
    public BigDecimal getBigDecimal(String columnLabel, int scale) throws SQLException {
       BigDecimal x = resultSet.getBigDecimal(columnLabel);
-      logger.logf(level, "%s.getBigDecimal(%s) = %s", resultSetID, columnLabel, x);
+      logger.trace("{}.getBigDecimal({}) = {}", resultSetID, columnLabel, x);
       return x;
    }
 
    @Override
    public byte[] getBytes(String columnLabel) throws SQLException {
       byte[] x = resultSet.getBytes(columnLabel);
-      logger.logf(level, "%s.getBytes(%s) = %s", resultSetID, columnLabel, Arrays.toString(x));
+      logger.trace("{}.getBytes({}) = {}", resultSetID, columnLabel, Arrays.toString(x));
       return x;
    }
 
    @Override
    public Date getDate(String columnLabel) throws SQLException {
       Date x = resultSet.getDate(columnLabel);
-      logger.logf(level, "%s.getDate(%s) = %s", resultSetID, columnLabel, x);
+      logger.trace("{}.getDate({}) = {}", resultSetID, columnLabel, x);
       return x;
    }
 
    @Override
    public Time getTime(String columnLabel) throws SQLException {
       Time x = resultSet.getTime(columnLabel);
-      logger.logf(level, "%s.getTime(%s) = %s", resultSetID, columnLabel, x);
+      logger.trace("{}.getTime({}) = {}", resultSetID, columnLabel, x);
       return x;
    }
 
    @Override
    public Timestamp getTimestamp(String columnLabel) throws SQLException {
       Timestamp x = resultSet.getTimestamp(columnLabel);
-      logger.logf(level, "%s.getTimestamp(%s) = %s", resultSetID, columnLabel, x);
+      logger.trace("{}.getTimestamp({}) = {}", resultSetID, columnLabel, x);
       return x;
    }
 
    @Override
    public InputStream getAsciiStream(String columnLabel) throws SQLException {
       InputStream x = resultSet.getAsciiStream(columnLabel);
-      logger.logf(level, "%s.getAsciiStream(%s) = %s", resultSetID, columnLabel, x);
+      logger.trace("{}.getAsciiStream({}) = {}", resultSetID, columnLabel, x);
       return x;
    }
 
    @Override
    public InputStream getUnicodeStream(String columnLabel) throws SQLException {
       InputStream x = resultSet.getUnicodeStream(columnLabel);
-      logger.logf(level, "%s.getUnicodeStream(%s) = %s", resultSetID, columnLabel, x);
+      logger.trace("{}.getUnicodeStream({}) = {}", resultSetID, columnLabel, x);
       return x;
    }
 
    @Override
    public InputStream getBinaryStream(String columnLabel) throws SQLException {
       InputStream x = resultSet.getBinaryStream(columnLabel);
-      logger.logf(level, "%s.getBinaryStream(%s) = %s", resultSetID, columnLabel, x);
+      logger.trace("{}.getBinaryStream({}) = {}", resultSetID, columnLabel, x);
       return x;
    }
 
    @Override
    public SQLWarning getWarnings() throws SQLException {
       SQLWarning x = resultSet.getWarnings();
-      logger.logf(level, "%s.getWarnings) = %s", resultSetID, x);
+      logger.trace("{}.getWarnings) = {}", resultSetID, x);
       return x;
    }
 
    @Override
    public void clearWarnings() throws SQLException {
-      logger.logf(level, "%s.clearWarnings()", resultSetID);
+      logger.trace("{}.clearWarnings()", resultSetID);
       resultSet.clearWarnings();
    }
 
    @Override
    public String getCursorName() throws SQLException {
       String x = resultSet.getCursorName();
-      logger.logf(level, "%s.getCursorName() = %s", resultSetID, x);
+      logger.trace("{}.getCursorName() = {}", resultSetID, x);
       return x;
    }
 
    @Override
    public ResultSetMetaData getMetaData() throws SQLException {
       ResultSetMetaData x = resultSet.getMetaData();
-      logger.logf(level, "%s.getMetaData() = %s", resultSetID, x);
+      logger.trace("{}.getMetaData() = {}", resultSetID, x);
       return x;
    }
 
    @Override
    public Object getObject(int columnIndex) throws SQLException {
       String x = resultSet.getString(columnIndex);
-      logger.logf(level, "%s.getString(%s) = %s", resultSetID, columnIndex, x);
+      logger.trace("{}.getString({}) = {}", resultSetID, columnIndex, x);
       return x;
    }
 
    @Override
    public Object getObject(String columnLabel) throws SQLException {
       Object x = resultSet.getObject(columnLabel);
-      logger.logf(level, "%s.getObject(%s) = %s", resultSetID, columnLabel, x);
+      logger.trace("{}.getObject({}) = {}", resultSetID, columnLabel, x);
       return x;
    }
 
    @Override
    public int findColumn(String columnLabel) throws SQLException {
       int x = resultSet.findColumn(columnLabel);
-      logger.logf(level, "%s.findColumn(%s) = %s", resultSetID, columnLabel, x);
+      logger.trace("{}.findColumn({}) = {}", resultSetID, columnLabel, x);
       return x;
    }
 
    @Override
    public Reader getCharacterStream(int columnIndex) throws SQLException {
       Reader x = resultSet.getCharacterStream(columnIndex);
-      logger.logf(level, "%s.getCharacterStream(%s) = %s", resultSetID, columnIndex, x);
+      logger.trace("{}.getCharacterStream({}) = {}", resultSetID, columnIndex, x);
       return x;
    }
 
    @Override
    public Reader getCharacterStream(String columnLabel) throws SQLException {
       Reader x = resultSet.getCharacterStream(columnLabel);
-      logger.logf(level, "%s.getCharacterStream(%s) = %s", resultSetID, columnLabel, x);
+      logger.trace("{}.getCharacterStream({}) = {}", resultSetID, columnLabel, x);
       return x;
    }
 
    @Override
    public BigDecimal getBigDecimal(int columnIndex) throws SQLException {
       BigDecimal x = resultSet.getBigDecimal(columnIndex);
-      logger.logf(level, "%s.getBigDecimal(%s) = %s", resultSetID, columnIndex, x);
+      logger.trace("{}.getBigDecimal({}) = {}", resultSetID, columnIndex, x);
       return x;
    }
 
    @Override
    public BigDecimal getBigDecimal(String columnLabel) throws SQLException {
       BigDecimal x = resultSet.getBigDecimal(columnLabel);
-      logger.logf(level, "%s.getBigDecimal(%s) = %s", resultSetID, columnLabel, x);
+      logger.trace("{}.getBigDecimal({}) = {}", resultSetID, columnLabel, x);
       return x;
    }
 
    @Override
    public boolean isBeforeFirst() throws SQLException {
       boolean x = resultSet.isBeforeFirst();
-      logger.logf(level, "%s.isBeforeFirst() = %s", resultSetID, x);
+      logger.trace("{}.isBeforeFirst() = {}", resultSetID, x);
       return x;
    }
 
    @Override
    public boolean isAfterLast() throws SQLException {
       boolean x = resultSet.isAfterLast();
-      logger.logf(level, "%s.isAfterLast() = %s", resultSetID, x);
+      logger.trace("{}.isAfterLast() = {}", resultSetID, x);
       return x;
    }
 
    @Override
    public boolean isFirst() throws SQLException {
       boolean x = resultSet.isFirst();
-      logger.logf(level, "%s.isFirst() = %s", resultSetID, x);
+      logger.trace("{}.isFirst() = {}", resultSetID, x);
       return x;
    }
 
    @Override
    public boolean isLast() throws SQLException {
       boolean x = resultSet.isLast();
-      logger.logf(level, "%s.isLast() = %s", resultSetID, x);
+      logger.trace("{}.isLast() = {}", resultSetID, x);
       return x;
    }
 
    @Override
    public void beforeFirst() throws SQLException {
-      logger.logf(level, "%s.beforeFirst()", resultSetID);
+      logger.trace("{}.beforeFirst()", resultSetID);
       resultSet.beforeFirst();
    }
 
    @Override
    public void afterLast() throws SQLException {
-      logger.logf(level, "%s.afterLast()", resultSetID);
+      logger.trace("{}.afterLast()", resultSetID);
       resultSet.afterLast();
    }
 
    @Override
    public boolean first() throws SQLException {
       boolean x = resultSet.first();
-      logger.logf(level, "%s.first() = %s", resultSetID, x);
+      logger.trace("{}.first() = {}", resultSetID, x);
       return x;
    }
 
    @Override
    public boolean last() throws SQLException {
       boolean x = resultSet.last();
-      logger.logf(level, "%s.last() = %s", resultSetID, x);
+      logger.trace("{}.last() = {}", resultSetID, x);
       return x;
    }
 
    @Override
    public int getRow() throws SQLException {
       int x = resultSet.getRow();
-      logger.logf(level, "%s.getRow() = %s", resultSetID, x);
+      logger.trace("{}.getRow() = {}", resultSetID, x);
       return x;
    }
 
    @Override
    public boolean absolute(int row) throws SQLException {
       boolean x = resultSet.absolute(row);
-      logger.logf(level, "%s.absolute(%s) = %s", resultSetID, row, x);
+      logger.trace("{}.absolute({}) = {}", resultSetID, row, x);
       return x;
    }
 
    @Override
    public boolean relative(int rows) throws SQLException {
       boolean x = resultSet.relative(rows);
-      logger.logf(level, "%s.relative(%s) = %s", resultSetID, rows, x);
+      logger.trace("{}.relative({}) = {}", resultSetID, rows, x);
       return x;
    }
 
    @Override
    public boolean previous() throws SQLException {
       boolean x = resultSet.previous();
-      logger.logf(level, "%s.previous() = %s", resultSetID, x);
+      logger.trace("{}.previous() = {}", resultSetID, x);
       return x;
    }
 
    @Override
    public void setFetchDirection(int direction) throws SQLException {
-      logger.logf(level, "%s.setFetchDirection(%s)", resultSetID, direction);
+      logger.trace("{}.setFetchDirection({})", resultSetID, direction);
       resultSet.setFetchDirection(direction);
    }
 
    @Override
    public int getFetchDirection() throws SQLException {
       int x = resultSet.getFetchDirection();
-      logger.logf(level, "%s.getFetchDirection() = %s", resultSetID, x);
+      logger.trace("{}.getFetchDirection() = {}", resultSetID, x);
       return x;
    }
 
    @Override
    public void setFetchSize(int rows) throws SQLException {
-      logger.logf(level, "%s.setFetchSize(%s)", resultSetID, rows);
+      logger.trace("{}.setFetchSize({})", resultSetID, rows);
       resultSet.setFetchSize(rows);
    }
 
    @Override
    public int getFetchSize() throws SQLException {
       int x = resultSet.getFetchSize();
-      logger.logf(level, "%s.getFetchSize() = %s", resultSetID, x);
+      logger.trace("{}.getFetchSize() = {}", resultSetID, x);
       return x;
    }
 
    @Override
    public int getType() throws SQLException {
       int x = resultSet.getType();
-      logger.logf(level, "%s.getType() = %s", resultSetID, x);
+      logger.trace("{}.getType() = {}", resultSetID, x);
       return x;
    }
 
    @Override
    public int getConcurrency() throws SQLException {
       int x = resultSet.getConcurrency();
-      logger.logf(level, "%s.getConcurrency() = %s", resultSetID, x);
+      logger.trace("{}.getConcurrency() = {}", resultSetID, x);
       return x;
    }
 
    @Override
    public boolean rowUpdated() throws SQLException {
       boolean x = resultSet.rowUpdated();
-      logger.logf(level, "%s.rowUpdated() = %s", resultSetID, x);
+      logger.trace("{}.rowUpdated() = {}", resultSetID, x);
       return x;
    }
 
    @Override
    public boolean rowInserted() throws SQLException {
       boolean x = resultSet.rowInserted();
-      logger.logf(level, "%s.rowInserted() = %s", resultSetID, x);
+      logger.trace("{}.rowInserted() = {}", resultSetID, x);
       return x;
    }
 
    @Override
    public boolean rowDeleted() throws SQLException {
       boolean x = resultSet.rowDeleted();
-      logger.logf(level, "%s.rowDeleted() = %s", resultSetID, x);
+      logger.trace("{}.rowDeleted() = {}", resultSetID, x);
       return x;
    }
 
    @Override
    public void updateNull(int columnIndex) throws SQLException {
-      logger.logf(level, "%s.updateNull(%s)", resultSetID, columnIndex);
+      logger.trace("{}.updateNull({})", resultSetID, columnIndex);
       resultSet.updateNull(columnIndex);
    }
 
    @Override
    public void updateBoolean(int columnIndex, boolean x) throws SQLException {
-      logger.logf(level, "%s.updateBoolean(%s, %s)", resultSetID, columnIndex, x);
+      logger.trace("{}.updateBoolean({}, {})", resultSetID, columnIndex, x);
       resultSet.updateBoolean(columnIndex, x);
    }
 
    @Override
    public void updateByte(int columnIndex, byte x) throws SQLException {
-      logger.logf(level, "%s.updateByte(%s, %s)", resultSetID, columnIndex, x);
+      logger.trace("{}.updateByte({}, {})", resultSetID, columnIndex, x);
       resultSet.updateByte(columnIndex, x);
    }
 
    @Override
    public void updateShort(int columnIndex, short x) throws SQLException {
-      logger.logf(level, "%s.updateShort(%s, %s)", resultSetID, columnIndex, x);
+      logger.trace("{}.updateShort({}, {})", resultSetID, columnIndex, x);
       resultSet.updateShort(columnIndex, x);
    }
 
    @Override
    public void updateInt(int columnIndex, int x) throws SQLException {
-      logger.logf(level, "%s.updateInt(%s, %s)", resultSetID, columnIndex, x);
+      logger.trace("{}.updateInt({}, {})", resultSetID, columnIndex, x);
       resultSet.updateInt(columnIndex, x);
    }
 
    @Override
    public void updateLong(int columnIndex, long x) throws SQLException {
-      logger.logf(level, "%s.updateLong(%s, %s)", resultSetID, columnIndex, x);
+      logger.trace("{}.updateLong({}, {})", resultSetID, columnIndex, x);
       resultSet.updateLong(columnIndex, x);
    }
 
    @Override
    public void updateFloat(int columnIndex, float x) throws SQLException {
-      logger.logf(level, "%s.updateFloat(%s, %s)", resultSetID, columnIndex, x);
+      logger.trace("{}.updateFloat({}, {})", resultSetID, columnIndex, x);
       resultSet.updateFloat(columnIndex, x);
    }
 
    @Override
    public void updateDouble(int columnIndex, double x) throws SQLException {
-      logger.logf(level, "%s.updateDouble(%s, %s)", resultSetID, columnIndex, x);
+      logger.trace("{}.updateDouble({}, {})", resultSetID, columnIndex, x);
       resultSet.updateDouble(columnIndex, x);
    }
 
    @Override
    public void updateBigDecimal(int columnIndex, BigDecimal x) throws SQLException {
-      logger.logf(level, "%s.updateBigDecimal(%s, %s)", resultSetID, columnIndex, x);
+      logger.trace("{}.updateBigDecimal({}, {})", resultSetID, columnIndex, x);
       resultSet.updateBigDecimal(columnIndex, x);
    }
 
    @Override
    public void updateString(int columnIndex, String x) throws SQLException {
-      logger.logf(level, "%s.updateString(%s, %s)", resultSetID, columnIndex, x);
+      logger.trace("{}.updateString({}, {})", resultSetID, columnIndex, x);
       resultSet.updateString(columnIndex, x);
    }
 
    @Override
    public void updateBytes(int columnIndex, byte[] x) throws SQLException {
-      logger.logf(level, "%s.updateBytes(%s, %s)", resultSetID, columnIndex, x);
+      logger.trace("{}.updateBytes({}, {})", resultSetID, columnIndex, x);
       resultSet.updateBytes(columnIndex, x);
    }
 
    @Override
    public void updateDate(int columnIndex, Date x) throws SQLException {
-      logger.logf(level, "%s.updateDate(%s, %s)", resultSetID, columnIndex, x);
+      logger.trace("{}.updateDate({}, {})", resultSetID, columnIndex, x);
       resultSet.updateDate(columnIndex, x);
    }
 
    @Override
    public void updateTime(int columnIndex, Time x) throws SQLException {
-      logger.logf(level, "%s.updateTime(%s, %s)", resultSetID, columnIndex, x);
+      logger.trace("{}.updateTime({}, {})", resultSetID, columnIndex, x);
       resultSet.updateTime(columnIndex, x);
    }
 
    @Override
    public void updateTimestamp(int columnIndex, Timestamp x) throws SQLException {
-      logger.logf(level, "%s.updateTimestamp(%s, %s)", resultSetID, columnIndex, x);
+      logger.trace("{}.updateTimestamp({}, {})", resultSetID, columnIndex, x);
       resultSet.updateTimestamp(columnIndex, x);
    }
 
    @Override
    public void updateAsciiStream(int columnIndex, InputStream x, int length) throws SQLException {
-      logger.logf(level, "%s.updateAsciiStream(%s, %s, %s)", resultSetID, columnIndex, x, length);
+      logger.trace("{}.updateAsciiStream({}, {}, {})", resultSetID, columnIndex, x, length);
       resultSet.updateAsciiStream(columnIndex, x, length);
    }
 
    @Override
    public void updateBinaryStream(int columnIndex, InputStream x, int length) throws SQLException {
-      logger.logf(level, "%s.updateBinaryStream(%s, %s, %s)", resultSetID, columnIndex, x, length);
+      logger.trace("{}.updateBinaryStream({}, {}, {})", resultSetID, columnIndex, x, length);
       resultSet.updateBinaryStream(columnIndex, x, length);
    }
 
    @Override
    public void updateCharacterStream(int columnIndex, Reader x, int length) throws SQLException {
-      logger.logf(level, "%s.updateCharacterStream(%s, %s, %s)", resultSetID, columnIndex, x, length);
+      logger.trace("{}.updateCharacterStream({}, {}, {})", resultSetID, columnIndex, x, length);
       resultSet.updateCharacterStream(columnIndex, x, length);
    }
 
    @Override
    public void updateObject(int columnIndex, Object x, int scaleOrLength) throws SQLException {
-      logger.logf(level, "%s.updateObject(%s, %s, %s)", resultSetID, columnIndex, x, scaleOrLength);
+      logger.trace("{}.updateObject({}, {}, {})", resultSetID, columnIndex, x, scaleOrLength);
       resultSet.updateObject(columnIndex, x, scaleOrLength);
    }
 
    @Override
    public void updateObject(int columnIndex, Object x) throws SQLException {
-      logger.logf(level, "%s.updateObject(%s, %s)", resultSetID, columnIndex, x);
+      logger.trace("{}.updateObject({}, {})", resultSetID, columnIndex, x);
       resultSet.updateObject(columnIndex, x);
    }
 
    @Override
    public void updateNull(String columnLabel) throws SQLException {
-      logger.logf(level, "%s.updateNull(%s)", resultSetID, columnLabel);
+      logger.trace("{}.updateNull({})", resultSetID, columnLabel);
       resultSet.updateNull(columnLabel);
    }
 
    @Override
    public void updateBoolean(String columnLabel, boolean x) throws SQLException {
-      logger.logf(level, "%s.updateBoolean(%s, %s)", resultSetID, columnLabel, x);
+      logger.trace("{}.updateBoolean({}, {})", resultSetID, columnLabel, x);
       resultSet.updateBoolean(columnLabel, x);
    }
 
    @Override
    public void updateByte(String columnLabel, byte x) throws SQLException {
-      logger.logf(level, "%s.updateByte(%s, %s)", resultSetID, columnLabel, x);
+      logger.trace("{}.updateByte({}, {})", resultSetID, columnLabel, x);
       resultSet.updateByte(columnLabel, x);
    }
 
    @Override
    public void updateShort(String columnLabel, short x) throws SQLException {
-      logger.logf(level, "%s.updateShort(%s, %s)", resultSetID, columnLabel, x);
+      logger.trace("{}.updateShort({}, {})", resultSetID, columnLabel, x);
       resultSet.updateShort(columnLabel, x);
    }
 
    @Override
    public void updateInt(String columnLabel, int x) throws SQLException {
-      logger.logf(level, "%s.updateInt(%s, %s)", resultSetID, columnLabel, x);
+      logger.trace("{}.updateInt({}, {})", resultSetID, columnLabel, x);
       resultSet.updateInt(columnLabel, x);
    }
 
    @Override
    public void updateLong(String columnLabel, long x) throws SQLException {
-      logger.logf(level, "%s.updateLong(%s, %s)", resultSetID, columnLabel, x);
+      logger.trace("{}.updateLong({}, {})", resultSetID, columnLabel, x);
       resultSet.updateLong(columnLabel, x);
    }
 
    @Override
    public void updateFloat(String columnLabel, float x) throws SQLException {
-      logger.logf(level, "%s.updateFloat(%s, %s)", resultSetID, columnLabel, x);
+      logger.trace("{}.updateFloat({}, {})", resultSetID, columnLabel, x);
       resultSet.updateFloat(columnLabel, x);
    }
 
    @Override
    public void updateDouble(String columnLabel, double x) throws SQLException {
-      logger.logf(level, "%s.updateDouble(%s, %s)", resultSetID, columnLabel, x);
+      logger.trace("{}.updateDouble({}, {})", resultSetID, columnLabel, x);
       resultSet.updateDouble(columnLabel, x);
    }
 
    @Override
    public void updateBigDecimal(String columnLabel, BigDecimal x) throws SQLException {
-      logger.logf(level, "%s.updateBigDecimal(%s, %s)", resultSetID, columnLabel, x);
+      logger.trace("{}.updateBigDecimal({}, {})", resultSetID, columnLabel, x);
       resultSet.updateBigDecimal(columnLabel, x);
    }
 
    @Override
    public void updateString(String columnLabel, String x) throws SQLException {
-      logger.logf(level, "%s.updateString(%s, %s)", resultSetID, columnLabel, x);
+      logger.trace("{}.updateString({}, {})", resultSetID, columnLabel, x);
       resultSet.updateString(columnLabel, x);
    }
 
    @Override
    public void updateBytes(String columnLabel, byte[] x) throws SQLException {
-      logger.logf(level, "%s.updateBytes(%s, %s)", resultSetID, columnLabel, x);
+      logger.trace("{}.updateBytes({}, {})", resultSetID, columnLabel, x);
       resultSet.updateBytes(columnLabel, x);
    }
 
    @Override
    public void updateDate(String columnLabel, Date x) throws SQLException {
-      logger.logf(level, "%s.updateDate(%s, %s)", resultSetID, columnLabel, x);
+      logger.trace("{}.updateDate({}, {})", resultSetID, columnLabel, x);
       resultSet.updateDate(columnLabel, x);
    }
 
    @Override
    public void updateTime(String columnLabel, Time x) throws SQLException {
-      logger.logf(level, "%s.updateTime(%s, %s)", resultSetID, columnLabel, x);
+      logger.trace("{}.updateTime({}, {})", resultSetID, columnLabel, x);
       resultSet.updateTime(columnLabel, x);
    }
 
    @Override
    public void updateTimestamp(String columnLabel, Timestamp x) throws SQLException {
-      logger.logf(level, "%s.updateTimestamp(%s, %s)", resultSetID, columnLabel, x);
+      logger.trace("{}.updateTimestamp({}, {})", resultSetID, columnLabel, x);
       resultSet.updateTimestamp(columnLabel, x);
    }
 
    @Override
    public void updateAsciiStream(String columnLabel, InputStream x, int length) throws SQLException {
-      logger.logf(level, "%s.updateAsciiStream(%s, %s, %s)", resultSetID, columnLabel, x, length);
+      logger.trace("{}.updateAsciiStream({}, {}, {})", resultSetID, columnLabel, x, length);
       resultSet.updateAsciiStream(columnLabel, x, length);
    }
 
    @Override
    public void updateBinaryStream(String columnLabel, InputStream x, int length) throws SQLException {
-      logger.logf(level, "%s.updateBinaryStream(%s, %s, %s)", resultSetID, columnLabel, x, length);
+      logger.trace("{}.updateBinaryStream({}, {}, {})", resultSetID, columnLabel, x, length);
       resultSet.updateBinaryStream(columnLabel, x, length);
    }
 
    @Override
    public void updateCharacterStream(String columnLabel, Reader x, int length) throws SQLException {
-      logger.logf(level, "%s.updateCharacterStream(%s, %s, %s)", resultSetID, columnLabel, x, length);
+      logger.trace("{}.updateCharacterStream({}, {}, {})", resultSetID, columnLabel, x, length);
       resultSet.updateCharacterStream(columnLabel, x, length);
    }
 
    @Override
    public void updateObject(String columnLabel, Object x, int scaleOrLength) throws SQLException {
-      logger.logf(level, "%s.updateObject(%s, %s, %s)", resultSetID, columnLabel, x, scaleOrLength);
+      logger.trace("{}.updateObject({}, {}, {})", resultSetID, columnLabel, x, scaleOrLength);
       resultSet.updateObject(columnLabel, x, scaleOrLength);
    }
 
    @Override
    public void updateObject(String columnLabel, Object x) throws SQLException {
-      logger.logf(level, "%s.updateObject(%s, %s)", resultSetID, columnLabel, x);
+      logger.trace("{}.updateObject({}, {})", resultSetID, columnLabel, x);
       resultSet.updateObject(columnLabel, x);
    }
 
    @Override
    public void insertRow() throws SQLException {
-      logger.logf(level, "%s.insertRow()", resultSetID);
+      logger.trace("{}.insertRow()", resultSetID);
       resultSet.insertRow();
    }
 
    @Override
    public void updateRow() throws SQLException {
-      logger.logf(level, "%s.updateRow()", resultSetID);
+      logger.trace("{}.updateRow()", resultSetID);
       resultSet.updateRow();
    }
 
    @Override
    public void deleteRow() throws SQLException {
-      logger.logf(level, "%s.deleteRow()", resultSetID);
+      logger.trace("{}.deleteRow()", resultSetID);
       resultSet.deleteRow();
    }
 
    @Override
    public void refreshRow() throws SQLException {
-      logger.logf(level, "%s.refreshRow()", resultSetID);
+      logger.trace("{}.refreshRow()", resultSetID);
       resultSet.refreshRow();
    }
 
    @Override
    public void cancelRowUpdates() throws SQLException {
-      logger.logf(level, "%s.cancelRowUpdates()", resultSetID);
+      logger.trace("{}.cancelRowUpdates()", resultSetID);
       resultSet.cancelRowUpdates();
    }
 
    @Override
    public void moveToInsertRow() throws SQLException {
-      logger.logf(level, "%s.moveToInsertRow()", resultSetID);
+      logger.trace("{}.moveToInsertRow()", resultSetID);
       resultSet.moveToInsertRow();
    }
 
    @Override
    public void moveToCurrentRow() throws SQLException {
-      logger.logf(level, "%s.moveToCurrentRow()", resultSetID);
+      logger.trace("{}.moveToCurrentRow()", resultSetID);
       resultSet.moveToCurrentRow();
    }
 
    @Override
    public Statement getStatement() throws SQLException {
       Statement x = resultSet.getStatement();
-      logger.logf(level, "%s.getStatement() = %s", resultSetID, x);
+      logger.trace("{}.getStatement() = {}", resultSetID, x);
       return x;
    }
 
    @Override
    public Object getObject(int columnIndex, Map<String, Class<?>> map) throws SQLException {
       Object x = resultSet.getObject(columnIndex, map);
-      logger.logf(level, "%s.getObject(%s, %s) = %s", resultSetID, columnIndex, map, x);
+      logger.trace("{}.getObject({}, {}) = {}", resultSetID, columnIndex, map, x);
... 31264 lines suppressed ...