From c30766555a9fb62a6fcb7b70ab3c25207e22b38d Mon Sep 17 00:00:00 2001
From: Stian Sigvartsen <stian.sigvartsen@payara.fish>
Date: Mon, 27 Apr 2026 13:32:36 +0100
Subject: [PATCH 1/6] FISH-1523 These are not used nor replaced with module
 local equivalents

---
 .../main/java/com/sun/logging/LogDomains.java | 51 +------------------
 1 file changed, 1 insertion(+), 50 deletions(-)

diff --git a/nucleus/common/common-util/src/main/java/com/sun/logging/LogDomains.java b/nucleus/common/common-util/src/main/java/com/sun/logging/LogDomains.java
index 7ca131841eb..b2506ab66b2 100644
--- a/nucleus/common/common-util/src/main/java/com/sun/logging/LogDomains.java
+++ b/nucleus/common/common-util/src/main/java/com/sun/logging/LogDomains.java
@@ -75,16 +75,6 @@ private LogDomains() {}
 
     public static final String RESOURCE_BUNDLE_MESSAGES = "LogMessages";
 
-    /**
-     * Field
-     */
-    public static final String STD_LOGGER = DOMAIN_ROOT + "enterprise.system.std";
-
-    /**
-     * Field
-     */
-    public static final String TOOLS_LOGGER = DOMAIN_ROOT + "enterprise.system.tools";
-
     /**
      * Field
      */
@@ -130,11 +120,6 @@ private LogDomains() {}
      */
     public static final String SECURITY_LOGGER = DOMAIN_ROOT + "enterprise.system.core.security";
 
-    /**
-     * Field
-     */
-    public static final String SECURITY_SSL_LOGGER = DOMAIN_ROOT + "enterprise.system.ssl.security";
-
     /**
      * Field
      */
@@ -162,10 +147,7 @@ private LogDomains() {}
      * Field
      */
     public static final String JNDI_LOGGER = DOMAIN_ROOT + "enterprise.system.core.naming";
-    /**
-     * Field
-     */
-    public static final String ACTIVATION_LOGGER = DOMAIN_ROOT + "enterprise.system.activation";
+
     /**
      * Field
      */
@@ -182,16 +164,6 @@ private LogDomains() {}
      */
     public static final String DPL_LOGGER = DOMAIN_ROOT + "enterprise.system.tools.deployment";
 
-    /**
-     * Deployment audit logger
-     */
-    public static final String DPLAUDIT_LOGGER = DOMAIN_ROOT + "enterprise.system.tools.deployment.audit";
-
-    /**
-     * Field
-     */
-    public static final String DIAGNOSTICS_LOGGER = DOMAIN_ROOT + "enterprise.system.tools.diagnostics";
-
     /**
      * JAXRPC Logger
      */
@@ -239,11 +211,6 @@ private LogDomains() {}
      */
     public static final String CONFIG_LOGGER = DOMAIN_ROOT + "enterprise.system.core.config";
 
-    /**
-     * Process Launcher Logger
-     */
-    public static final String PROCESS_LAUNCHER_LOGGER = DOMAIN_ROOT + "enterprise.tools.launcher";
-
     /**
      * GMS Logger
      */
@@ -259,12 +226,6 @@ private LogDomains() {}
      */
     public static final String JMX_LOGGER = DOMAIN_ROOT + "enterprise.system.jmx";
 
-    /**
-     * core/kernel Logger
-     */
-    public static final String SERVICES_LOGGER = DOMAIN_ROOT + "enterprise.system.core.services";
-
-    /**
      * webservices logger
      */
     public static final String WEBSERVICES_LOGGER = DOMAIN_ROOT + "enterprise.webservices";
@@ -279,16 +240,6 @@ private LogDomains() {}
      */
     public static final String PERSISTENCE_LOGGER = DOMAIN_ROOT + "org.glassfish.persistence";
 
-    /**
-     * virtualization logger
-     */
-    public static final String VIRTUALIZATION_LOGGER = DOMAIN_ROOT + "org.glassfish.virtualization";
-
-    /**
-     * PaaS logger
-     */
-    public static final String PAAS_LOGGER = DOMAIN_ROOT + "org.glassfish.paas";
-
     /**
      * Returns initialized logger using resource bundle found by the class's
      * classloader.

From 2d2b9dea8f9933416da5a6c72d484b9282df6bc1 Mon Sep 17 00:00:00 2001
From: Stian Sigvartsen <stian.sigvartsen@payara.fish>
Date: Mon, 27 Apr 2026 17:10:03 +0100
Subject: [PATCH 2/6] FISH-1523 These appear to have been copied to local
 LoggerUtils within modules

---
 .../main/java/com/sun/logging/LogDomains.java | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/nucleus/common/common-util/src/main/java/com/sun/logging/LogDomains.java b/nucleus/common/common-util/src/main/java/com/sun/logging/LogDomains.java
index b2506ab66b2..6ede04429f0 100644
--- a/nucleus/common/common-util/src/main/java/com/sun/logging/LogDomains.java
+++ b/nucleus/common/common-util/src/main/java/com/sun/logging/LogDomains.java
@@ -216,25 +216,6 @@ private LogDomains() {}
      */
     public static final String GMS_LOGGER = DOMAIN_ROOT + "org.glassfish.gms";
 
-    /**
-     * AMX Logger
-     */
-    public static final String AMX_LOGGER = DOMAIN_ROOT + "enterprise.system.amx";
-
-    /**
-     * JMX Logger
-     */
-    public static final String JMX_LOGGER = DOMAIN_ROOT + "enterprise.system.jmx";
-
-     * webservices logger
-     */
-    public static final String WEBSERVICES_LOGGER = DOMAIN_ROOT + "enterprise.webservices";
-
-    /**
-     * monitoring logger
-     */
-    public static final String MONITORING_LOGGER = DOMAIN_ROOT + "enterprise.system.tools.monitor";
-
     /**
      * persistence logger
      */

From 417ab9f6ba3f41b32713b71004b42218f59743a8 Mon Sep 17 00:00:00 2001
From: Stian Sigvartsen <stian.sigvartsen@payara.fish>
Date: Tue, 28 Apr 2026 13:48:25 +0100
Subject: [PATCH 3/6] FISH-1523 javax.enterprise.system.core.transaction >>
 jakarta.transactions

---
 .../src/main/help/en/help/reference/list-log-levels.html        | 2 +-
 .../src/main/resources/MICRO-INF/domain/logging.properties      | 2 +-
 .../test/resources/domains/domain1/config/logging.properties    | 2 +-
 .../test/resources/domains/domain2/config/logging.properties    | 2 +-
 .../test/resources/domains/domain3/config/logging.properties    | 2 +-
 .../resources/domains/domainNoLog/config/logging.properties     | 2 +-
 .../admin/template/src/main/resources/config/logging.properties | 2 +-
 .../common-util/src/test/resources/config/logging.properties    | 2 +-
 .../sun/enterprise/server/logging/commands/list-log-levels.1    | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/appserver/admingui/reference-manual/src/main/help/en/help/reference/list-log-levels.html b/appserver/admingui/reference-manual/src/main/help/en/help/reference/list-log-levels.html
index f8cd37fcadf..dcbe45fd4f7 100644
--- a/appserver/admingui/reference-manual/src/main/help/en/help/reference/list-log-levels.html
+++ b/appserver/admingui/reference-manual/src/main/help/en/help/reference/list-log-levels.html
@@ -192,7 +192,7 @@ <h2 id="_list_log_levels">list-log-levels</h2>
 javax.enterprise.system.core.naming     &lt;INFO&gt;
 javax.enterprise.system.core.security   &lt;INFO&gt;
 javax.enterprise.system.core.selfmanagement     &lt;INFO&gt;
-javax.enterprise.system.core.transaction        &lt;INFO&gt;
+jakarta.transactions        &lt;INFO&gt;
 jakarta.enterprise.system &lt;INFO&gt;
 javax.enterprise.system.tools.admin     &lt;INFO&gt;
 javax.enterprise.system.tools.backup    &lt;INFO&gt;
diff --git a/appserver/extras/payara-micro/payara-micro-boot/src/main/resources/MICRO-INF/domain/logging.properties b/appserver/extras/payara-micro/payara-micro-boot/src/main/resources/MICRO-INF/domain/logging.properties
index 6e82417ce00..7097ba5517a 100644
--- a/appserver/extras/payara-micro/payara-micro-boot/src/main/resources/MICRO-INF/domain/logging.properties
+++ b/appserver/extras/payara-micro/payara-micro-boot/src/main/resources/MICRO-INF/domain/logging.properties
@@ -18,7 +18,7 @@ org.glassfish.wasp.level=INFO
 javax.enterprise.system.core.level=INFO
 javax.enterprise.system.core.classloading.level=INFO
 javax.enterprise.system.tools.deployment.level=INFO
-javax.enterprise.system.core.transaction.level=INFO
+jakarta.transactions.level=INFO
 org.apache.catalina.level=INFO
 org.apache.coyote.level=INFO
 javax.level=INFO
diff --git a/nucleus/admin/launcher/src/test/resources/domains/domain1/config/logging.properties b/nucleus/admin/launcher/src/test/resources/domains/domain1/config/logging.properties
index f644340c3c4..8e0cb5a2b5b 100644
--- a/nucleus/admin/launcher/src/test/resources/domains/domain1/config/logging.properties
+++ b/nucleus/admin/launcher/src/test/resources/domains/domain1/config/logging.properties
@@ -56,7 +56,7 @@ java.util.logging.FileHandler.formatter=java.util.logging.XMLFormatter
 javax.enterprise.system.tools.deployment.level=INFO
 javax.enterprise.system.container.ejb.level=INFO
 com.sun.enterprise.server.logging.GFFileHandler.formatter=com.sun.enterprise.server.logging.UniformLogFormatter
-javax.enterprise.system.core.transaction.level=INFO
+jakarta.transactions.level=INFO
 org.apache.catalina.level=INFO
 com.sun.enterprise.server.logging.GFFileHandler.rotationTimelimitInMinutes=0
 javax.enterprise.system.container.ejb.mdb.level=INFO
diff --git a/nucleus/admin/launcher/src/test/resources/domains/domain2/config/logging.properties b/nucleus/admin/launcher/src/test/resources/domains/domain2/config/logging.properties
index f644340c3c4..8e0cb5a2b5b 100644
--- a/nucleus/admin/launcher/src/test/resources/domains/domain2/config/logging.properties
+++ b/nucleus/admin/launcher/src/test/resources/domains/domain2/config/logging.properties
@@ -56,7 +56,7 @@ java.util.logging.FileHandler.formatter=java.util.logging.XMLFormatter
 javax.enterprise.system.tools.deployment.level=INFO
 javax.enterprise.system.container.ejb.level=INFO
 com.sun.enterprise.server.logging.GFFileHandler.formatter=com.sun.enterprise.server.logging.UniformLogFormatter
-javax.enterprise.system.core.transaction.level=INFO
+jakarta.transactions.level=INFO
 org.apache.catalina.level=INFO
 com.sun.enterprise.server.logging.GFFileHandler.rotationTimelimitInMinutes=0
 javax.enterprise.system.container.ejb.mdb.level=INFO
diff --git a/nucleus/admin/launcher/src/test/resources/domains/domain3/config/logging.properties b/nucleus/admin/launcher/src/test/resources/domains/domain3/config/logging.properties
index f644340c3c4..8e0cb5a2b5b 100644
--- a/nucleus/admin/launcher/src/test/resources/domains/domain3/config/logging.properties
+++ b/nucleus/admin/launcher/src/test/resources/domains/domain3/config/logging.properties
@@ -56,7 +56,7 @@ java.util.logging.FileHandler.formatter=java.util.logging.XMLFormatter
 javax.enterprise.system.tools.deployment.level=INFO
 javax.enterprise.system.container.ejb.level=INFO
 com.sun.enterprise.server.logging.GFFileHandler.formatter=com.sun.enterprise.server.logging.UniformLogFormatter
-javax.enterprise.system.core.transaction.level=INFO
+jakarta.transactions.level=INFO
 org.apache.catalina.level=INFO
 com.sun.enterprise.server.logging.GFFileHandler.rotationTimelimitInMinutes=0
 javax.enterprise.system.container.ejb.mdb.level=INFO
diff --git a/nucleus/admin/launcher/src/test/resources/domains/domainNoLog/config/logging.properties b/nucleus/admin/launcher/src/test/resources/domains/domainNoLog/config/logging.properties
index f644340c3c4..8e0cb5a2b5b 100644
--- a/nucleus/admin/launcher/src/test/resources/domains/domainNoLog/config/logging.properties
+++ b/nucleus/admin/launcher/src/test/resources/domains/domainNoLog/config/logging.properties
@@ -56,7 +56,7 @@ java.util.logging.FileHandler.formatter=java.util.logging.XMLFormatter
 javax.enterprise.system.tools.deployment.level=INFO
 javax.enterprise.system.container.ejb.level=INFO
 com.sun.enterprise.server.logging.GFFileHandler.formatter=com.sun.enterprise.server.logging.UniformLogFormatter
-javax.enterprise.system.core.transaction.level=INFO
+jakarta.transactions.level=INFO
 org.apache.catalina.level=INFO
 com.sun.enterprise.server.logging.GFFileHandler.rotationTimelimitInMinutes=0
 javax.enterprise.system.container.ejb.mdb.level=INFO
diff --git a/nucleus/admin/template/src/main/resources/config/logging.properties b/nucleus/admin/template/src/main/resources/config/logging.properties
index 89bd73d2c69..417a0a67f0f 100644
--- a/nucleus/admin/template/src/main/resources/config/logging.properties
+++ b/nucleus/admin/template/src/main/resources/config/logging.properties
@@ -114,7 +114,7 @@ javax.enterprise.system.core.config.level=INFO
 javax.enterprise.system.core.level=INFO
 javax.enterprise.system.core.security.level=INFO
 javax.enterprise.system.core.selfmanagement.level=INFO
-javax.enterprise.system.core.transaction.level=INFO
+jakarta.transactions.level=INFO
 javax.enterprise.system.level=INFO
 javax.enterprise.system.ssl.security.level=INFO
 javax.enterprise.system.tools.admin.level=INFO
diff --git a/nucleus/common/common-util/src/test/resources/config/logging.properties b/nucleus/common/common-util/src/test/resources/config/logging.properties
index bdfb2ea2655..0706ac9b11c 100644
--- a/nucleus/common/common-util/src/test/resources/config/logging.properties
+++ b/nucleus/common/common-util/src/test/resources/config/logging.properties
@@ -88,7 +88,7 @@ javax.enterprise.system.core.level=INFO
 javax.enterprise.system.core.classloading.level=INFO
 java.util.logging.ConsoleHandler.level=FINEST
 javax.enterprise.system.tools.deployment.level=INFO
-javax.enterprise.system.core.transaction.level=INFO
+jakarta.transactions.level=INFO
 org.apache.catalina.level=INFO
 org.apache.coyote.level=INFO
 javax.level=INFO
diff --git a/nucleus/core/logging/src/main/manpages/com/sun/enterprise/server/logging/commands/list-log-levels.1 b/nucleus/core/logging/src/main/manpages/com/sun/enterprise/server/logging/commands/list-log-levels.1
index 0e4b0a40e77..426ad2abfed 100644
--- a/nucleus/core/logging/src/main/manpages/com/sun/enterprise/server/logging/commands/list-log-levels.1
+++ b/nucleus/core/logging/src/main/manpages/com/sun/enterprise/server/logging/commands/list-log-levels.1
@@ -67,7 +67,7 @@ EXAMPLES
                javax.enterprise.system.core.naming     <INFO>
                javax.enterprise.system.core.security   <INFO>
                javax.enterprise.system.core.selfmanagement     <INFO>
-               javax.enterprise.system.core.transaction        <INFO>
+               jakarta.transactions        <INFO>
                jakarta.enterprise.system <INFO>
                javax.enterprise.system.tools.admin     <INFO>
                javax.enterprise.system.tools.backup    <INFO>

From 720a04d672a647b08e5fb92ebccb7eb393eca313 Mon Sep 17 00:00:00 2001
From: Stian Sigvartsen <stian.sigvartsen@payara.fish>
Date: Tue, 28 Apr 2026 13:49:17 +0100
Subject: [PATCH 4/6] FISH-1523 enterprise.system.core.transaction >>
 transactions

---
 .../common-util/src/main/java/com/sun/logging/LogDomains.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nucleus/common/common-util/src/main/java/com/sun/logging/LogDomains.java b/nucleus/common/common-util/src/main/java/com/sun/logging/LogDomains.java
index 6ede04429f0..13ae45cfc20 100644
--- a/nucleus/common/common-util/src/main/java/com/sun/logging/LogDomains.java
+++ b/nucleus/common/common-util/src/main/java/com/sun/logging/LogDomains.java
@@ -123,7 +123,7 @@ private LogDomains() {}
     /**
      * Field
      */
-    public static final String TRANSACTION_LOGGER = DOMAIN_ROOT + "enterprise.system.core.transaction";
+    public static final String TRANSACTION_LOGGER = DOMAIN_ROOT + "transactions";
 
     /**
      * Field

From 9e5d18c0280eae2a6e4a633970f654a1b5317a1b Mon Sep 17 00:00:00 2001
From: Stian Sigvartsen <stian.sigvartsen@payara.fish>
Date: Wed, 29 Apr 2026 13:18:23 +0100
Subject: [PATCH 5/6] FISH-1523 javax.enterprise.system.core.transaction is
 more about the internal workings than relating to the API itself, so move to
 a .engine sub-namespace to allow separation

---
 .../src/main/help/en/help/reference/list-log-levels.html        | 2 +-
 .../src/main/resources/MICRO-INF/domain/logging.properties      | 2 +-
 .../test/resources/domains/domain1/config/logging.properties    | 2 +-
 .../test/resources/domains/domain2/config/logging.properties    | 2 +-
 .../test/resources/domains/domain3/config/logging.properties    | 2 +-
 .../resources/domains/domainNoLog/config/logging.properties     | 2 +-
 .../admin/template/src/main/resources/config/logging.properties | 2 +-
 .../common-util/src/main/java/com/sun/logging/LogDomains.java   | 2 +-
 .../common-util/src/test/resources/config/logging.properties    | 2 +-
 .../sun/enterprise/server/logging/commands/list-log-levels.1    | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/appserver/admingui/reference-manual/src/main/help/en/help/reference/list-log-levels.html b/appserver/admingui/reference-manual/src/main/help/en/help/reference/list-log-levels.html
index dcbe45fd4f7..325ad9d8588 100644
--- a/appserver/admingui/reference-manual/src/main/help/en/help/reference/list-log-levels.html
+++ b/appserver/admingui/reference-manual/src/main/help/en/help/reference/list-log-levels.html
@@ -192,7 +192,7 @@ <h2 id="_list_log_levels">list-log-levels</h2>
 javax.enterprise.system.core.naming     &lt;INFO&gt;
 javax.enterprise.system.core.security   &lt;INFO&gt;
 javax.enterprise.system.core.selfmanagement     &lt;INFO&gt;
-jakarta.transactions        &lt;INFO&gt;
+jakarta.transactions.engine        &lt;INFO&gt;
 jakarta.enterprise.system &lt;INFO&gt;
 javax.enterprise.system.tools.admin     &lt;INFO&gt;
 javax.enterprise.system.tools.backup    &lt;INFO&gt;
diff --git a/appserver/extras/payara-micro/payara-micro-boot/src/main/resources/MICRO-INF/domain/logging.properties b/appserver/extras/payara-micro/payara-micro-boot/src/main/resources/MICRO-INF/domain/logging.properties
index 7097ba5517a..1a5f8ca0041 100644
--- a/appserver/extras/payara-micro/payara-micro-boot/src/main/resources/MICRO-INF/domain/logging.properties
+++ b/appserver/extras/payara-micro/payara-micro-boot/src/main/resources/MICRO-INF/domain/logging.properties
@@ -18,7 +18,7 @@ org.glassfish.wasp.level=INFO
 javax.enterprise.system.core.level=INFO
 javax.enterprise.system.core.classloading.level=INFO
 javax.enterprise.system.tools.deployment.level=INFO
-jakarta.transactions.level=INFO
+jakarta.transactions.engine.level=INFO
 org.apache.catalina.level=INFO
 org.apache.coyote.level=INFO
 javax.level=INFO
diff --git a/nucleus/admin/launcher/src/test/resources/domains/domain1/config/logging.properties b/nucleus/admin/launcher/src/test/resources/domains/domain1/config/logging.properties
index 8e0cb5a2b5b..ca3639d36d4 100644
--- a/nucleus/admin/launcher/src/test/resources/domains/domain1/config/logging.properties
+++ b/nucleus/admin/launcher/src/test/resources/domains/domain1/config/logging.properties
@@ -56,7 +56,7 @@ java.util.logging.FileHandler.formatter=java.util.logging.XMLFormatter
 javax.enterprise.system.tools.deployment.level=INFO
 javax.enterprise.system.container.ejb.level=INFO
 com.sun.enterprise.server.logging.GFFileHandler.formatter=com.sun.enterprise.server.logging.UniformLogFormatter
-jakarta.transactions.level=INFO
+jakarta.transactions.engine.level=INFO
 org.apache.catalina.level=INFO
 com.sun.enterprise.server.logging.GFFileHandler.rotationTimelimitInMinutes=0
 javax.enterprise.system.container.ejb.mdb.level=INFO
diff --git a/nucleus/admin/launcher/src/test/resources/domains/domain2/config/logging.properties b/nucleus/admin/launcher/src/test/resources/domains/domain2/config/logging.properties
index 8e0cb5a2b5b..ca3639d36d4 100644
--- a/nucleus/admin/launcher/src/test/resources/domains/domain2/config/logging.properties
+++ b/nucleus/admin/launcher/src/test/resources/domains/domain2/config/logging.properties
@@ -56,7 +56,7 @@ java.util.logging.FileHandler.formatter=java.util.logging.XMLFormatter
 javax.enterprise.system.tools.deployment.level=INFO
 javax.enterprise.system.container.ejb.level=INFO
 com.sun.enterprise.server.logging.GFFileHandler.formatter=com.sun.enterprise.server.logging.UniformLogFormatter
-jakarta.transactions.level=INFO
+jakarta.transactions.engine.level=INFO
 org.apache.catalina.level=INFO
 com.sun.enterprise.server.logging.GFFileHandler.rotationTimelimitInMinutes=0
 javax.enterprise.system.container.ejb.mdb.level=INFO
diff --git a/nucleus/admin/launcher/src/test/resources/domains/domain3/config/logging.properties b/nucleus/admin/launcher/src/test/resources/domains/domain3/config/logging.properties
index 8e0cb5a2b5b..ca3639d36d4 100644
--- a/nucleus/admin/launcher/src/test/resources/domains/domain3/config/logging.properties
+++ b/nucleus/admin/launcher/src/test/resources/domains/domain3/config/logging.properties
@@ -56,7 +56,7 @@ java.util.logging.FileHandler.formatter=java.util.logging.XMLFormatter
 javax.enterprise.system.tools.deployment.level=INFO
 javax.enterprise.system.container.ejb.level=INFO
 com.sun.enterprise.server.logging.GFFileHandler.formatter=com.sun.enterprise.server.logging.UniformLogFormatter
-jakarta.transactions.level=INFO
+jakarta.transactions.engine.level=INFO
 org.apache.catalina.level=INFO
 com.sun.enterprise.server.logging.GFFileHandler.rotationTimelimitInMinutes=0
 javax.enterprise.system.container.ejb.mdb.level=INFO
diff --git a/nucleus/admin/launcher/src/test/resources/domains/domainNoLog/config/logging.properties b/nucleus/admin/launcher/src/test/resources/domains/domainNoLog/config/logging.properties
index 8e0cb5a2b5b..ca3639d36d4 100644
--- a/nucleus/admin/launcher/src/test/resources/domains/domainNoLog/config/logging.properties
+++ b/nucleus/admin/launcher/src/test/resources/domains/domainNoLog/config/logging.properties
@@ -56,7 +56,7 @@ java.util.logging.FileHandler.formatter=java.util.logging.XMLFormatter
 javax.enterprise.system.tools.deployment.level=INFO
 javax.enterprise.system.container.ejb.level=INFO
 com.sun.enterprise.server.logging.GFFileHandler.formatter=com.sun.enterprise.server.logging.UniformLogFormatter
-jakarta.transactions.level=INFO
+jakarta.transactions.engine.level=INFO
 org.apache.catalina.level=INFO
 com.sun.enterprise.server.logging.GFFileHandler.rotationTimelimitInMinutes=0
 javax.enterprise.system.container.ejb.mdb.level=INFO
diff --git a/nucleus/admin/template/src/main/resources/config/logging.properties b/nucleus/admin/template/src/main/resources/config/logging.properties
index 417a0a67f0f..ee3b556909f 100644
--- a/nucleus/admin/template/src/main/resources/config/logging.properties
+++ b/nucleus/admin/template/src/main/resources/config/logging.properties
@@ -114,7 +114,7 @@ javax.enterprise.system.core.config.level=INFO
 javax.enterprise.system.core.level=INFO
 javax.enterprise.system.core.security.level=INFO
 javax.enterprise.system.core.selfmanagement.level=INFO
-jakarta.transactions.level=INFO
+jakarta.transactions.engine.level=INFO
 javax.enterprise.system.level=INFO
 javax.enterprise.system.ssl.security.level=INFO
 javax.enterprise.system.tools.admin.level=INFO
diff --git a/nucleus/common/common-util/src/main/java/com/sun/logging/LogDomains.java b/nucleus/common/common-util/src/main/java/com/sun/logging/LogDomains.java
index 13ae45cfc20..5a85391cff8 100644
--- a/nucleus/common/common-util/src/main/java/com/sun/logging/LogDomains.java
+++ b/nucleus/common/common-util/src/main/java/com/sun/logging/LogDomains.java
@@ -123,7 +123,7 @@ private LogDomains() {}
     /**
      * Field
      */
-    public static final String TRANSACTION_LOGGER = DOMAIN_ROOT + "transactions";
+    public static final String TRANSACTION_LOGGER = DOMAIN_ROOT + "transactions.engine";
 
     /**
      * Field
diff --git a/nucleus/common/common-util/src/test/resources/config/logging.properties b/nucleus/common/common-util/src/test/resources/config/logging.properties
index 0706ac9b11c..5b8bfb46736 100644
--- a/nucleus/common/common-util/src/test/resources/config/logging.properties
+++ b/nucleus/common/common-util/src/test/resources/config/logging.properties
@@ -88,7 +88,7 @@ javax.enterprise.system.core.level=INFO
 javax.enterprise.system.core.classloading.level=INFO
 java.util.logging.ConsoleHandler.level=FINEST
 javax.enterprise.system.tools.deployment.level=INFO
-jakarta.transactions.level=INFO
+jakarta.transactions.engine.level=INFO
 org.apache.catalina.level=INFO
 org.apache.coyote.level=INFO
 javax.level=INFO
diff --git a/nucleus/core/logging/src/main/manpages/com/sun/enterprise/server/logging/commands/list-log-levels.1 b/nucleus/core/logging/src/main/manpages/com/sun/enterprise/server/logging/commands/list-log-levels.1
index 426ad2abfed..1dadf66d25e 100644
--- a/nucleus/core/logging/src/main/manpages/com/sun/enterprise/server/logging/commands/list-log-levels.1
+++ b/nucleus/core/logging/src/main/manpages/com/sun/enterprise/server/logging/commands/list-log-levels.1
@@ -67,7 +67,7 @@ EXAMPLES
                javax.enterprise.system.core.naming     <INFO>
                javax.enterprise.system.core.security   <INFO>
                javax.enterprise.system.core.selfmanagement     <INFO>
-               jakarta.transactions        <INFO>
+               jakarta.transactions.engine        <INFO>
                jakarta.enterprise.system <INFO>
                javax.enterprise.system.tools.admin     <INFO>
                javax.enterprise.system.tools.backup    <INFO>

From cd27ca1dc2475a30a48ae3245bec79c2a1f85771 Mon Sep 17 00:00:00 2001
From: Stian Sigvartsen <stian.sigvartsen@payara.fish>
Date: Wed, 29 Apr 2026 13:23:14 +0100
Subject: [PATCH 6/6] FISH-1523 javax.enterprise.resource.jta >>
 jakarta.transactions.api

---
 .../src/main/help/en/help/reference/list-log-levels.html        | 2 +-
 .../src/main/resources/MICRO-INF/domain/logging.properties      | 2 +-
 appserver/logging/logging.properties                            | 2 +-
 appserver/tests/quicklook/gfproject/utils.xml                   | 2 +-
 .../org/glassfish/cdi/transaction/TransactionScopedCDIUtil.java | 2 +-
 .../glassfish/cdi/transaction/TransactionalInterceptorBase.java | 2 +-
 .../test/resources/domains/domain1/config/logging.properties    | 2 +-
 .../test/resources/domains/domain2/config/logging.properties    | 2 +-
 .../test/resources/domains/domain3/config/logging.properties    | 2 +-
 .../resources/domains/domainNoLog/config/logging.properties     | 2 +-
 .../admin/template/src/main/resources/config/logging.properties | 2 +-
 .../common-util/src/test/resources/config/logging.properties    | 2 +-
 .../sun/enterprise/server/logging/commands/list-log-levels.1    | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/appserver/admingui/reference-manual/src/main/help/en/help/reference/list-log-levels.html b/appserver/admingui/reference-manual/src/main/help/en/help/reference/list-log-levels.html
index 325ad9d8588..56e15c08631 100644
--- a/appserver/admingui/reference-manual/src/main/help/en/help/reference/list-log-levels.html
+++ b/appserver/admingui/reference-manual/src/main/help/en/help/reference/list-log-levels.html
@@ -170,7 +170,7 @@ <h2 id="_list_log_levels">list-log-levels</h2>
 javax.enterprise.resource.javamail      &lt;INFO&gt;
 javax.enterprise.resource.jdo   &lt;INFO&gt;
 javax.enterprise.resource.jms   &lt;INFO&gt;
-javax.enterprise.resource.jta   &lt;INFO&gt;
+jakarta.transactions.api   &lt;INFO&gt;
 javax.enterprise.resource.resourceadapter       &lt;INFO&gt;
 javax.enterprise.resource.sqltrace      &lt;FINE&gt;
 javax.enterprise.resource.webcontainer.jsf.application  &lt;INFO&gt;
diff --git a/appserver/extras/payara-micro/payara-micro-boot/src/main/resources/MICRO-INF/domain/logging.properties b/appserver/extras/payara-micro/payara-micro-boot/src/main/resources/MICRO-INF/domain/logging.properties
index 1a5f8ca0041..b6e65d014c7 100644
--- a/appserver/extras/payara-micro/payara-micro-boot/src/main/resources/MICRO-INF/domain/logging.properties
+++ b/appserver/extras/payara-micro/payara-micro-boot/src/main/resources/MICRO-INF/domain/logging.properties
@@ -33,7 +33,7 @@ javax.enterprise.resource.sqltrace.level=FINE
 org.jvnet.hk2.osgiadapter.level=INFO
 javax.enterprise.system.ssl.security.level=INFO
 javax.enterprise.resource.corba.level=INFO
-javax.enterprise.resource.jta.level=INFO
+jakarta.transactions.api.level=INFO
 javax.enterprise.system.webservices.saaj.level=INFO
 javax.enterprise.system.container.ejb.level=INFO
 javax.enterprise.system.container.ejb.mdb.level=INFO
diff --git a/appserver/logging/logging.properties b/appserver/logging/logging.properties
index 049dec90a2d..e485b3baa61 100644
--- a/appserver/logging/logging.properties
+++ b/appserver/logging/logging.properties
@@ -38,7 +38,7 @@
 # Portions Copyright [2016] [Payara Foundation]
 
 javax.enterprise.resource.corba.level=INFO
-javax.enterprise.resource.jta.level=INFO
+jakarta.transactions.api.level=INFO
 javax.enterprise.system.webservices.saaj.level=INFO
 javax.enterprise.system.container.ejb.level=INFO
 javax.enterprise.system.container.ejb.mdb.level=INFO
diff --git a/appserver/tests/quicklook/gfproject/utils.xml b/appserver/tests/quicklook/gfproject/utils.xml
index a44509c8733..919bd9fe98d 100644
--- a/appserver/tests/quicklook/gfproject/utils.xml
+++ b/appserver/tests/quicklook/gfproject/utils.xml
@@ -83,7 +83,7 @@
     <!-- like in IT 9896, 9212 -->
     <property name="msg_double_apos" value="\[#\|\d\d\d\d-\d\d-\d\dT\d\d:\d\d:\d\d\.\d\d\d\D\d\d\d\d\|(INFO|WARNING|SEVERE)\|[\w.]+?\|.+?\|.*?\|.*?\w''\w.*?\|#\]"/>
     <!-- example msg for reference to understand above regex's:
-    [#|2010-05-15T15:07:39.453+1000|INFO|glassfishv3.0|javax.enterprise.resource.jta.com.sun.enterprise.transaction|_ThreadID=15;_ThreadName=Thread-1;|DTX5019: Using [com.sun.enterprise.transaction.jts.JavaEETransactionManagerJTSDelegate] as the delegate|#]
+    [#|2010-05-15T15:07:39.453+1000|INFO|glassfishv3.0|jakarta.transactions.api.com.sun.enterprise.transaction|_ThreadID=15;_ThreadName=Thread-1;|DTX5019: Using [com.sun.enterprise.transaction.jts.JavaEETransactionManagerJTSDelegate] as the delegate|#]
     [#|yyyy-mm-ddTHH:mm:ss:SSS-ZZZZ|Level|ProductId|Logger Name|Name Value Pairs|MsgId: Message|#]
     -->
 
diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionScopedCDIUtil.java b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionScopedCDIUtil.java
index 83504f997f5..0d290e546a1 100644
--- a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionScopedCDIUtil.java
+++ b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionScopedCDIUtil.java
@@ -92,7 +92,7 @@ public class TransactionScopedCDIUtil {
     public static final String SHARED_LOGMESSAGE_RESOURCE = "org.glassfish.cdi.LogMessages";
 
     @LoggerInfo(subsystem = "AS-CDI-JTA", description = "CDI-JTA", publish = true)
-    public static final String CDI_JTA_LOGGER_SUBSYSTEM_NAME = "javax.enterprise.resource.jta";
+    public static final String CDI_JTA_LOGGER_SUBSYSTEM_NAME = "jakarta.transactions.api";
     private static final Logger _logger = Logger.getLogger(CDI_JTA_LOGGER_SUBSYSTEM_NAME, SHARED_LOGMESSAGE_RESOURCE);
 
     public static void log(String message) {
diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionalInterceptorBase.java b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionalInterceptorBase.java
index 136019fecf6..1c4c36155f2 100644
--- a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionalInterceptorBase.java
+++ b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionalInterceptorBase.java
@@ -90,7 +90,7 @@ public class TransactionalInterceptorBase implements Serializable {
     public static final String SHARED_LOGMESSAGE_RESOURCE = "org.glassfish.cdi.LogMessages";
 
     @LoggerInfo(subsystem = "AS-CDI-JTA", description = "CDI-JTA", publish = true)
-    public static final String CDI_JTA_LOGGER_SUBSYSTEM_NAME = "javax.enterprise.resource.jta";
+    public static final String CDI_JTA_LOGGER_SUBSYSTEM_NAME = "jakarta.transactions.api";
     private static final Logger _logger = Logger.getLogger(CDI_JTA_LOGGER_SUBSYSTEM_NAME, SHARED_LOGMESSAGE_RESOURCE);
 
     @LogMessageInfo(message = "Encountered NamingException while attempting to acquire "
diff --git a/nucleus/admin/launcher/src/test/resources/domains/domain1/config/logging.properties b/nucleus/admin/launcher/src/test/resources/domains/domain1/config/logging.properties
index ca3639d36d4..1dc7959f60e 100644
--- a/nucleus/admin/launcher/src/test/resources/domains/domain1/config/logging.properties
+++ b/nucleus/admin/launcher/src/test/resources/domains/domain1/config/logging.properties
@@ -47,7 +47,7 @@ java.util.logging.ConsoleHandler.formatter=com.sun.enterprise.server.logging.Uni
 org.glassfish.wasp.level=INFO
 javax.enterprise.resource.corba.level=INFO
 javax.enterprise.system.core.classloading.level=INFO
-javax.enterprise.resource.jta.level=INFO
+jakarta.transactions.api.level=INFO
 java.util.logging.ConsoleHandler.level=FINEST
 com.sun.enterprise.server.logging.GFFileHandler.file=logs/server.log
 com.sun.enterprise.server.logging.GFFileHandler.rotationTimelimitInMinutes=0
diff --git a/nucleus/admin/launcher/src/test/resources/domains/domain2/config/logging.properties b/nucleus/admin/launcher/src/test/resources/domains/domain2/config/logging.properties
index ca3639d36d4..1dc7959f60e 100644
--- a/nucleus/admin/launcher/src/test/resources/domains/domain2/config/logging.properties
+++ b/nucleus/admin/launcher/src/test/resources/domains/domain2/config/logging.properties
@@ -47,7 +47,7 @@ java.util.logging.ConsoleHandler.formatter=com.sun.enterprise.server.logging.Uni
 org.glassfish.wasp.level=INFO
 javax.enterprise.resource.corba.level=INFO
 javax.enterprise.system.core.classloading.level=INFO
-javax.enterprise.resource.jta.level=INFO
+jakarta.transactions.api.level=INFO
 java.util.logging.ConsoleHandler.level=FINEST
 com.sun.enterprise.server.logging.GFFileHandler.file=logs/server.log
 com.sun.enterprise.server.logging.GFFileHandler.rotationTimelimitInMinutes=0
diff --git a/nucleus/admin/launcher/src/test/resources/domains/domain3/config/logging.properties b/nucleus/admin/launcher/src/test/resources/domains/domain3/config/logging.properties
index ca3639d36d4..1dc7959f60e 100644
--- a/nucleus/admin/launcher/src/test/resources/domains/domain3/config/logging.properties
+++ b/nucleus/admin/launcher/src/test/resources/domains/domain3/config/logging.properties
@@ -47,7 +47,7 @@ java.util.logging.ConsoleHandler.formatter=com.sun.enterprise.server.logging.Uni
 org.glassfish.wasp.level=INFO
 javax.enterprise.resource.corba.level=INFO
 javax.enterprise.system.core.classloading.level=INFO
-javax.enterprise.resource.jta.level=INFO
+jakarta.transactions.api.level=INFO
 java.util.logging.ConsoleHandler.level=FINEST
 com.sun.enterprise.server.logging.GFFileHandler.file=logs/server.log
 com.sun.enterprise.server.logging.GFFileHandler.rotationTimelimitInMinutes=0
diff --git a/nucleus/admin/launcher/src/test/resources/domains/domainNoLog/config/logging.properties b/nucleus/admin/launcher/src/test/resources/domains/domainNoLog/config/logging.properties
index ca3639d36d4..1dc7959f60e 100644
--- a/nucleus/admin/launcher/src/test/resources/domains/domainNoLog/config/logging.properties
+++ b/nucleus/admin/launcher/src/test/resources/domains/domainNoLog/config/logging.properties
@@ -47,7 +47,7 @@ java.util.logging.ConsoleHandler.formatter=com.sun.enterprise.server.logging.Uni
 org.glassfish.wasp.level=INFO
 javax.enterprise.resource.corba.level=INFO
 javax.enterprise.system.core.classloading.level=INFO
-javax.enterprise.resource.jta.level=INFO
+jakarta.transactions.api.level=INFO
 java.util.logging.ConsoleHandler.level=FINEST
 com.sun.enterprise.server.logging.GFFileHandler.file=logs/server.log
 com.sun.enterprise.server.logging.GFFileHandler.rotationTimelimitInMinutes=0
diff --git a/nucleus/admin/template/src/main/resources/config/logging.properties b/nucleus/admin/template/src/main/resources/config/logging.properties
index ee3b556909f..c93ffb9ed6f 100644
--- a/nucleus/admin/template/src/main/resources/config/logging.properties
+++ b/nucleus/admin/template/src/main/resources/config/logging.properties
@@ -93,7 +93,7 @@ javax.enterprise.resource.corba.level=INFO
 javax.enterprise.resource.javamail.level=INFO
 javax.enterprise.resource.jdo.level=INFO
 javax.enterprise.resource.jms.level=INFO
-javax.enterprise.resource.jta.level=INFO
+jakarta.transactions.api.level=INFO
 javax.enterprise.resource.resourceadapter.level=INFO
 javax.enterprise.resource.sqltrace.level=FINE
 javax.enterprise.resource.webcontainer.jsf.application.level=INFO
diff --git a/nucleus/common/common-util/src/test/resources/config/logging.properties b/nucleus/common/common-util/src/test/resources/config/logging.properties
index 5b8bfb46736..f81efb49987 100644
--- a/nucleus/common/common-util/src/test/resources/config/logging.properties
+++ b/nucleus/common/common-util/src/test/resources/config/logging.properties
@@ -107,7 +107,7 @@ ShoalLogger.level=CONFIG
 com.hazelcast.level=WARNING
 
 javax.enterprise.resource.corba.level=INFO
-javax.enterprise.resource.jta.level=INFO
+jakarta.transactions.api.level=INFO
 javax.enterprise.system.webservices.saaj.level=INFO
 javax.enterprise.system.container.ejb.level=INFO
 javax.enterprise.system.container.ejb.mdb.level=INFO
diff --git a/nucleus/core/logging/src/main/manpages/com/sun/enterprise/server/logging/commands/list-log-levels.1 b/nucleus/core/logging/src/main/manpages/com/sun/enterprise/server/logging/commands/list-log-levels.1
index 1dadf66d25e..81df530922f 100644
--- a/nucleus/core/logging/src/main/manpages/com/sun/enterprise/server/logging/commands/list-log-levels.1
+++ b/nucleus/core/logging/src/main/manpages/com/sun/enterprise/server/logging/commands/list-log-levels.1
@@ -45,7 +45,7 @@ EXAMPLES
                javax.enterprise.resource.javamail      <INFO>
                javax.enterprise.resource.jdo   <INFO>
                javax.enterprise.resource.jms   <INFO>
-               javax.enterprise.resource.jta   <INFO>
+               jakarta.transactions.api   <INFO>
                javax.enterprise.resource.resourceadapter       <INFO>
                javax.enterprise.resource.sqltrace      <FINE>
                javax.enterprise.resource.webcontainer.jsf.application  <INFO>