Skip to content

Commit 4d6ce3c

Browse files
committed
HHH-18964 rename SunOneJtaPlatform to GlassFishJtaPlatform
1 parent e51e41a commit 4d6ce3c

File tree

3 files changed

+19
-5
lines changed

3 files changed

+19
-5
lines changed

hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/DefaultJtaPlatformSelector.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import org.hibernate.engine.transaction.jta.platform.internal.JBossAppServerJtaPlatform;
1111
import org.hibernate.engine.transaction.jta.platform.internal.JBossStandAloneJtaPlatform;
1212
import org.hibernate.engine.transaction.jta.platform.internal.ResinJtaPlatform;
13-
import org.hibernate.engine.transaction.jta.platform.internal.SunOneJtaPlatform;
13+
import org.hibernate.engine.transaction.jta.platform.internal.GlassFishJtaPlatform;
1414
import org.hibernate.engine.transaction.jta.platform.internal.WebSphereExtendedJtaPlatform;
1515
import org.hibernate.engine.transaction.jta.platform.internal.WebSphereJtaPlatform;
1616
import org.hibernate.engine.transaction.jta.platform.internal.WebSphereLibertyJtaPlatform;
@@ -38,7 +38,7 @@ else if ( name.startsWith( "org." ) ) {
3838
case "WebSphereExtended" -> WebSphereExtendedJtaPlatform.class;
3939
case "Atomikos" -> AtomikosJtaPlatform.class;
4040
case "Resin" -> ResinJtaPlatform.class;
41-
case "SunOne" -> SunOneJtaPlatform.class;
41+
case "GlassFish", "Payara", "SunOne" -> GlassFishJtaPlatform.class;
4242
default -> null;
4343
};
4444
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* @author Emmanuel Bernard
1616
* @author Steve Ebersole
1717
*/
18-
public class SunOneJtaPlatform extends AbstractJtaPlatform {
18+
public class GlassFishJtaPlatform extends AbstractJtaPlatform {
1919
public static final String TM_NAME = "java:appserver/TransactionManager";
2020
public static final String UT_NAME = "java:comp/UserTransaction";
2121

hibernate-core/src/test/java/org/hibernate/orm/test/strategyselectors/JtaPlatformSelectorTest.java

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import org.hibernate.engine.transaction.jta.platform.internal.JBossAppServerJtaPlatform;
1010
import org.hibernate.engine.transaction.jta.platform.internal.JBossStandAloneJtaPlatform;
1111
import org.hibernate.engine.transaction.jta.platform.internal.ResinJtaPlatform;
12-
import org.hibernate.engine.transaction.jta.platform.internal.SunOneJtaPlatform;
12+
import org.hibernate.engine.transaction.jta.platform.internal.GlassFishJtaPlatform;
1313
import org.hibernate.engine.transaction.jta.platform.internal.WebSphereExtendedJtaPlatform;
1414
import org.hibernate.engine.transaction.jta.platform.internal.WebSphereJtaPlatform;
1515
import org.hibernate.engine.transaction.jta.platform.internal.WebSphereLibertyJtaPlatform;
@@ -62,11 +62,25 @@ public void verifyAllJtaPlatformResolve() {
6262

6363
testJtaPlatformResolves(
6464
strategySelector,
65-
SunOneJtaPlatform.class,
65+
GlassFishJtaPlatform.class,
6666
"SunOne",
6767
"org.hibernate.service.jta.platform.internal.SunOneJtaPlatform"
6868
);
6969

70+
testJtaPlatformResolves(
71+
strategySelector,
72+
GlassFishJtaPlatform.class,
73+
"GlassFish",
74+
"org.hibernate.service.jta.platform.internal.SunOneJtaPlatform"
75+
);
76+
77+
testJtaPlatformResolves(
78+
strategySelector,
79+
GlassFishJtaPlatform.class,
80+
"Payara",
81+
"org.hibernate.service.jta.platform.internal.SunOneJtaPlatform"
82+
);
83+
7084
testJtaPlatformResolves(
7185
strategySelector,
7286
WeblogicJtaPlatform.class,

0 commit comments

Comments
 (0)