Skip to content

Commit e51e41a

Browse files
committed
Revert "HHH-18964 remove SunOneJtaPlatform"
This reverts commit cd1755f.
1 parent ba9e0a2 commit e51e41a

File tree

3 files changed

+41
-0
lines changed

3 files changed

+41
-0
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +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;
1314
import org.hibernate.engine.transaction.jta.platform.internal.WebSphereExtendedJtaPlatform;
1415
import org.hibernate.engine.transaction.jta.platform.internal.WebSphereJtaPlatform;
1516
import org.hibernate.engine.transaction.jta.platform.internal.WebSphereLibertyJtaPlatform;
@@ -37,6 +38,7 @@ else if ( name.startsWith( "org." ) ) {
3738
case "WebSphereExtended" -> WebSphereExtendedJtaPlatform.class;
3839
case "Atomikos" -> AtomikosJtaPlatform.class;
3940
case "Resin" -> ResinJtaPlatform.class;
41+
case "SunOne" -> SunOneJtaPlatform.class;
4042
default -> null;
4143
};
4244
}
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
/*
2+
* SPDX-License-Identifier: LGPL-2.1-or-later
3+
* Copyright Red Hat Inc. and Hibernate Authors
4+
*/
5+
package org.hibernate.engine.transaction.jta.platform.internal;
6+
7+
import jakarta.transaction.TransactionManager;
8+
import jakarta.transaction.UserTransaction;
9+
10+
/**
11+
* {@link org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform} implementation for Sun ONE Application Server 7 and above
12+
*
13+
* @author Robert Davidson
14+
* @author Sanjeev Krishnan
15+
* @author Emmanuel Bernard
16+
* @author Steve Ebersole
17+
*/
18+
public class SunOneJtaPlatform extends AbstractJtaPlatform {
19+
public static final String TM_NAME = "java:appserver/TransactionManager";
20+
public static final String UT_NAME = "java:comp/UserTransaction";
21+
22+
@Override
23+
protected TransactionManager locateTransactionManager() {
24+
return (TransactionManager) jndiService().locate( TM_NAME );
25+
}
26+
27+
@Override
28+
protected UserTransaction locateUserTransaction() {
29+
return (UserTransaction) jndiService().locate( UT_NAME );
30+
}
31+
}

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +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;
1213
import org.hibernate.engine.transaction.jta.platform.internal.WebSphereExtendedJtaPlatform;
1314
import org.hibernate.engine.transaction.jta.platform.internal.WebSphereJtaPlatform;
1415
import org.hibernate.engine.transaction.jta.platform.internal.WebSphereLibertyJtaPlatform;
@@ -59,6 +60,13 @@ public void verifyAllJtaPlatformResolve() {
5960
"org.hibernate.service.jta.platform.internal.ResinJtaPlatform"
6061
);
6162

63+
testJtaPlatformResolves(
64+
strategySelector,
65+
SunOneJtaPlatform.class,
66+
"SunOne",
67+
"org.hibernate.service.jta.platform.internal.SunOneJtaPlatform"
68+
);
69+
6270
testJtaPlatformResolves(
6371
strategySelector,
6472
WeblogicJtaPlatform.class,

0 commit comments

Comments
 (0)