diff --git a/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/DefaultJtaPlatformSelector.java b/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/DefaultJtaPlatformSelector.java index e50e32b4752e..eea0f43fa19b 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/DefaultJtaPlatformSelector.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/DefaultJtaPlatformSelector.java @@ -10,7 +10,7 @@ import org.hibernate.engine.transaction.jta.platform.internal.JBossAppServerJtaPlatform; import org.hibernate.engine.transaction.jta.platform.internal.JBossStandAloneJtaPlatform; import org.hibernate.engine.transaction.jta.platform.internal.ResinJtaPlatform; -import org.hibernate.engine.transaction.jta.platform.internal.SunOneJtaPlatform; +import org.hibernate.engine.transaction.jta.platform.internal.GlassFishJtaPlatform; import org.hibernate.engine.transaction.jta.platform.internal.WebSphereExtendedJtaPlatform; import org.hibernate.engine.transaction.jta.platform.internal.WebSphereJtaPlatform; import org.hibernate.engine.transaction.jta.platform.internal.WebSphereLibertyJtaPlatform; @@ -38,7 +38,7 @@ public Class resolve(final String name) { case "WebSphereExtended" -> WebSphereExtendedJtaPlatform.class; case "Atomikos" -> AtomikosJtaPlatform.class; case "Resin" -> ResinJtaPlatform.class; - case "SunOne" -> SunOneJtaPlatform.class; + case "GlassFish", "Payara", "SunOne" -> GlassFishJtaPlatform.class; default -> null; }; } diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/SunOneJtaPlatform.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/GlassFishJtaPlatform.java similarity index 93% rename from hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/SunOneJtaPlatform.java rename to hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/GlassFishJtaPlatform.java index a5cf93639f6f..e0ef2b5f694e 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/SunOneJtaPlatform.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/GlassFishJtaPlatform.java @@ -15,7 +15,7 @@ * @author Emmanuel Bernard * @author Steve Ebersole */ -public class SunOneJtaPlatform extends AbstractJtaPlatform { +public class GlassFishJtaPlatform extends AbstractJtaPlatform { public static final String TM_NAME = "java:appserver/TransactionManager"; public static final String UT_NAME = "java:comp/UserTransaction"; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/strategyselectors/JtaPlatformSelectorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/strategyselectors/JtaPlatformSelectorTest.java index 40988abd7eff..db1313f0b437 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/strategyselectors/JtaPlatformSelectorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/strategyselectors/JtaPlatformSelectorTest.java @@ -9,7 +9,7 @@ import org.hibernate.engine.transaction.jta.platform.internal.JBossAppServerJtaPlatform; import org.hibernate.engine.transaction.jta.platform.internal.JBossStandAloneJtaPlatform; import org.hibernate.engine.transaction.jta.platform.internal.ResinJtaPlatform; -import org.hibernate.engine.transaction.jta.platform.internal.SunOneJtaPlatform; +import org.hibernate.engine.transaction.jta.platform.internal.GlassFishJtaPlatform; import org.hibernate.engine.transaction.jta.platform.internal.WebSphereExtendedJtaPlatform; import org.hibernate.engine.transaction.jta.platform.internal.WebSphereJtaPlatform; import org.hibernate.engine.transaction.jta.platform.internal.WebSphereLibertyJtaPlatform; @@ -62,11 +62,25 @@ public void verifyAllJtaPlatformResolve() { testJtaPlatformResolves( strategySelector, - SunOneJtaPlatform.class, + GlassFishJtaPlatform.class, "SunOne", "org.hibernate.service.jta.platform.internal.SunOneJtaPlatform" ); + testJtaPlatformResolves( + strategySelector, + GlassFishJtaPlatform.class, + "GlassFish", + "org.hibernate.service.jta.platform.internal.SunOneJtaPlatform" + ); + + testJtaPlatformResolves( + strategySelector, + GlassFishJtaPlatform.class, + "Payara", + "org.hibernate.service.jta.platform.internal.SunOneJtaPlatform" + ); + testJtaPlatformResolves( strategySelector, WeblogicJtaPlatform.class,