HHH-18964 remove WebSphereJtaPlatform and WebSphereExtendedJtaPlatform

hibernate · Jan 24, 2025 · f526071 · f526071
1 parent b7f4310
commit f526071
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 378 deletions.
diff --git a/...c/main/java/org/hibernate/boot/registry/selector/internal/DefaultJtaPlatformSelector.java b/...c/main/java/org/hibernate/boot/registry/selector/internal/DefaultJtaPlatformSelector.java
@@ -11,8 +11,6 @@
 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.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;
 import org.hibernate.engine.transaction.jta.platform.internal.WeblogicJtaPlatform;
 import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform;
@@ -33,9 +31,7 @@ else if ( name.startsWith( "org." ) ) {
 				case "JBossAS" -> JBossAppServerJtaPlatform.class;
 				case "JBossTS" -> JBossStandAloneJtaPlatform.class;
 				case "Weblogic" -> WeblogicJtaPlatform.class;
-				case "WebSphereLiberty" -> WebSphereLibertyJtaPlatform.class;
-				case "WebSphere" -> WebSphereJtaPlatform.class;
-				case "WebSphereExtended" -> WebSphereExtendedJtaPlatform.class;
+				case "WebSphere", "WebSphereLiberty" -> WebSphereLibertyJtaPlatform.class;
 				case "Atomikos" -> AtomikosJtaPlatform.class;
 				case "Resin" -> ResinJtaPlatform.class;
 				case "GlassFish", "Payara", "SunOne" -> GlassFishJtaPlatform.class;

diff --git a/...a/org/hibernate/engine/transaction/jta/platform/internal/StandardJtaPlatformResolver.java b/...a/org/hibernate/engine/transaction/jta/platform/internal/StandardJtaPlatformResolver.java
@@ -96,17 +96,6 @@ public JtaPlatform resolveJtaPlatform(Map<?,?> configurationValues, ServiceRegis
 		catch (ClassLoadingException ignore) {
 		}
 
-		// WebSphere traditional ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		for ( WebSphereJtaPlatform.WebSphereEnvironment webSphereEnvironment
-				: WebSphereJtaPlatform.WebSphereEnvironment.values() ) {
-			try {
-				final Class<?> accessClass = classLoaderService.classForName( webSphereEnvironment.getTmAccessClassName() );
-				return new WebSphereJtaPlatform( accessClass, webSphereEnvironment );
-			}
-			catch (ClassLoadingException ignore) {
-			}
-		}
-
 		// Finally, return the default...
 		log.debugf( "Could not resolve JtaPlatform, using default [%s]", NoJtaPlatform.class.getName() );
 		return NoJtaPlatform.INSTANCE;

diff --git a/.../org/hibernate/engine/transaction/jta/platform/internal/WebSphereExtendedJtaPlatform.java b/.../org/hibernate/engine/transaction/jta/platform/internal/WebSphereExtendedJtaPlatform.java
diff --git a/...ain/java/org/hibernate/engine/transaction/jta/platform/internal/WebSphereJtaPlatform.java b/...ain/java/org/hibernate/engine/transaction/jta/platform/internal/WebSphereJtaPlatform.java