Skip to content

Commit f526071

Browse files
committed
HHH-18964 remove WebSphereJtaPlatform and WebSphereExtendedJtaPlatform
1 parent b7f4310 commit f526071

File tree

6 files changed

+1
-378
lines changed

6 files changed

+1
-378
lines changed

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
import org.hibernate.engine.transaction.jta.platform.internal.JBossStandAloneJtaPlatform;
1212
import org.hibernate.engine.transaction.jta.platform.internal.ResinJtaPlatform;
1313
import org.hibernate.engine.transaction.jta.platform.internal.GlassFishJtaPlatform;
14-
import org.hibernate.engine.transaction.jta.platform.internal.WebSphereExtendedJtaPlatform;
15-
import org.hibernate.engine.transaction.jta.platform.internal.WebSphereJtaPlatform;
1614
import org.hibernate.engine.transaction.jta.platform.internal.WebSphereLibertyJtaPlatform;
1715
import org.hibernate.engine.transaction.jta.platform.internal.WeblogicJtaPlatform;
1816
import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform;
@@ -33,9 +31,7 @@ else if ( name.startsWith( "org." ) ) {
3331
case "JBossAS" -> JBossAppServerJtaPlatform.class;
3432
case "JBossTS" -> JBossStandAloneJtaPlatform.class;
3533
case "Weblogic" -> WeblogicJtaPlatform.class;
36-
case "WebSphereLiberty" -> WebSphereLibertyJtaPlatform.class;
37-
case "WebSphere" -> WebSphereJtaPlatform.class;
38-
case "WebSphereExtended" -> WebSphereExtendedJtaPlatform.class;
34+
case "WebSphere", "WebSphereLiberty" -> WebSphereLibertyJtaPlatform.class;
3935
case "Atomikos" -> AtomikosJtaPlatform.class;
4036
case "Resin" -> ResinJtaPlatform.class;
4137
case "GlassFish", "Payara", "SunOne" -> GlassFishJtaPlatform.class;

hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/StandardJtaPlatformResolver.java

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -96,17 +96,6 @@ public JtaPlatform resolveJtaPlatform(Map<?,?> configurationValues, ServiceRegis
9696
catch (ClassLoadingException ignore) {
9797
}
9898

99-
// WebSphere traditional ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
100-
for ( WebSphereJtaPlatform.WebSphereEnvironment webSphereEnvironment
101-
: WebSphereJtaPlatform.WebSphereEnvironment.values() ) {
102-
try {
103-
final Class<?> accessClass = classLoaderService.classForName( webSphereEnvironment.getTmAccessClassName() );
104-
return new WebSphereJtaPlatform( accessClass, webSphereEnvironment );
105-
}
106-
catch (ClassLoadingException ignore) {
107-
}
108-
}
109-
11099
// Finally, return the default...
111100
log.debugf( "Could not resolve JtaPlatform, using default [%s]", NoJtaPlatform.class.getName() );
112101
return NoJtaPlatform.INSTANCE;

hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/WebSphereExtendedJtaPlatform.java

Lines changed: 0 additions & 238 deletions
This file was deleted.

hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/WebSphereJtaPlatform.java

Lines changed: 0 additions & 103 deletions
This file was deleted.

0 commit comments

Comments
 (0)