Skip to content

Commit 9241039

Browse files
committed
Remove outdated documentation references to WebLogic/WebSphere
See gh-22093
1 parent d03af15 commit 9241039

File tree

8 files changed

+35
-79
lines changed

8 files changed

+35
-79
lines changed

framework-docs/modules/ROOT/pages/core/aop/using-aspectj.adoc

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -828,13 +828,6 @@ The following table summarizes various `LoadTimeWeaver` implementations:
828828
| Running in Red Hat's https://www.jboss.org/jbossas/[JBoss AS] or https://www.wildfly.org/[WildFly]
829829
| `JBossLoadTimeWeaver`
830830

831-
| Running in IBM's https://www-01.ibm.com/software/webservers/appserv/was/[WebSphere]
832-
| `WebSphereLoadTimeWeaver`
833-
834-
| Running in Oracle's
835-
https://www.oracle.com/technetwork/middleware/weblogic/overview/index-085209.html[WebLogic]
836-
| `WebLogicLoadTimeWeaver`
837-
838831
| JVM started with Spring `InstrumentationSavingAgent`
839832
(`java -javaagent:path/to/spring-instrument.jar`)
840833
| `InstrumentationLoadTimeWeaver`
@@ -949,11 +942,11 @@ when you use Spring's LTW support in environments such as application servers an
949942
containers.
950943

951944
[[aop-aj-ltw-environments-tomcat-jboss-etc]]
952-
==== Tomcat, JBoss, WebSphere, WebLogic
945+
==== Tomcat, JBoss, WildFly
953946

954-
Tomcat, JBoss/WildFly, IBM WebSphere Application Server and Oracle WebLogic Server all
955-
provide a general app `ClassLoader` that is capable of local instrumentation. Spring's
956-
native LTW may leverage those ClassLoader implementations to provide AspectJ weaving.
947+
Tomcat and JBoss/WildFly provide a general app `ClassLoader` that is capable of local
948+
instrumentation. Spring's native LTW may leverage those ClassLoader implementations
949+
to provide AspectJ weaving.
957950
You can simply enable load-time weaving, as xref:core/aop/using-aspectj.adoc[described earlier].
958951
Specifically, you do not need to modify the JVM launch script to add
959952
`-javaagent:path/to/spring-instrument.jar`.

framework-docs/modules/ROOT/pages/data-access/transaction/application-server-integration.adoc

Lines changed: 1 addition & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -13,39 +13,7 @@ javadoc for details.
1313
Spring's `JtaTransactionManager` is the standard choice to run on Jakarta EE application
1414
servers and is known to work on all common servers. Advanced functionality, such as
1515
transaction suspension, works on many servers as well (including GlassFish, JBoss and
16-
Geronimo) without any special configuration required. However, for fully supported
17-
transaction suspension and further advanced integration, Spring includes special adapters
18-
for WebLogic Server and WebSphere. These adapters are discussed in the following
19-
sections.
20-
21-
For standard scenarios, including WebLogic Server and WebSphere, consider using the
22-
convenient `<tx:jta-transaction-manager/>` configuration element. When configured,
23-
this element automatically detects the underlying server and chooses the best
24-
transaction manager available for the platform. This means that you need not explicitly
25-
configure server-specific adapter classes (as discussed in the following sections).
26-
Rather, they are chosen automatically, with the standard
27-
`JtaTransactionManager` as the default fallback.
28-
29-
30-
[[transaction-application-server-integration-websphere]]
31-
== IBM WebSphere
32-
33-
On WebSphere 6.1.0.9 and above, the recommended Spring JTA transaction manager to use is
34-
`WebSphereUowTransactionManager`. This special adapter uses IBM's `UOWManager` API,
35-
which is available in WebSphere Application Server 6.1.0.9 and later. With this adapter,
36-
Spring-driven transaction suspension (suspend and resume as initiated by
37-
`PROPAGATION_REQUIRES_NEW`) is officially supported by IBM.
38-
39-
40-
[[transaction-application-server-integration-weblogic]]
41-
== Oracle WebLogic Server
42-
43-
On WebLogic Server 9.0 or above, you would typically use the
44-
`WebLogicJtaTransactionManager` instead of the stock `JtaTransactionManager` class. This
45-
special WebLogic-specific subclass of the normal `JtaTransactionManager` supports the
46-
full power of Spring's transaction definitions in a WebLogic-managed transaction
47-
environment, beyond standard JTA semantics. Features include transaction names,
48-
per-transaction isolation levels, and proper resuming of transactions in all cases.
16+
Geronimo) without any special configuration required.
4917

5018

5119

framework-docs/modules/ROOT/pages/data-access/transaction/declarative/annotations.adoc

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -453,10 +453,9 @@ on rollback rule semantics, patterns, and warnings regarding possible unintentio
453453
matches for pattern-based rollback rules.
454454

455455
Currently, you cannot have explicit control over the name of a transaction, where 'name'
456-
means the transaction name that appears in a transaction monitor, if applicable
457-
(for example, WebLogic's transaction monitor), and in logging output. For declarative
458-
transactions, the transaction name is always the fully-qualified class name + `.`
459-
+ the method name of the transactionally advised class. For example, if the
456+
means the transaction name that appears in a transaction monitor and in logging output.
457+
For declarative transactions, the transaction name is always the fully-qualified class
458+
name + `.` + the method name of the transactionally advised class. For example, if the
460459
`handlePayment(..)` method of the `BusinessService` class started a transaction, the
461460
name of the transaction would be: `com.example.BusinessService.handlePayment`.
462461

framework-docs/modules/ROOT/pages/integration/jms/jca-message-endpoint-manager.adoc

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,13 @@ locally, as the following example shows:
5656
----
5757

5858
The specified `WorkManager` can also point to an environment-specific thread pool --
59-
typically through a `SimpleTaskWorkManager` instance's `asyncTaskExecutor` property. Consider
60-
defining a shared thread pool for all your `ResourceAdapter` instances if you happen to
61-
use multiple adapters.
59+
typically through a `SimpleTaskWorkManager` instance's `asyncTaskExecutor` property.
60+
Consider defining a shared thread pool for all your `ResourceAdapter` instances
61+
if you happen to use multiple adapters.
6262

63-
In some environments (such as WebLogic 9 or above), you can instead obtain the entire `ResourceAdapter` object
64-
from JNDI (by using `<jee:jndi-lookup>`). The Spring-based message
65-
listeners can then interact with the server-hosted `ResourceAdapter`, which also use the
66-
server's built-in `WorkManager`.
63+
In some environments, you can instead obtain the entire `ResourceAdapter` object from JNDI
64+
(by using `<jee:jndi-lookup>`). The Spring-based message listeners can then interact with
65+
the server-hosted `ResourceAdapter`, which also use the server's built-in `WorkManager`.
6766

6867
See the javadoc for {api-spring-framework}/jms/listener/endpoint/JmsMessageEndpointManager.html[`JmsMessageEndpointManager`],
6968
{api-spring-framework}/jms/listener/endpoint/JmsActivationSpecConfig.html[`JmsActivationSpecConfig`],

spring-tx/src/main/java/org/springframework/jca/endpoint/GenericMessageEndpointManager.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2021 the original author or authors.
2+
* Copyright 2002-2023 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -67,9 +67,9 @@
6767
* </pre>
6868
*
6969
* <p>The target ResourceAdapter may be configured as a local Spring bean as well
70-
* (the typical case) or obtained from JNDI (e.g. on WebLogic). For the
71-
* example above, a local ResourceAdapter bean could be defined as follows
72-
* (matching the "resourceAdapter" bean reference above):
70+
* (the typical case) or obtained from JNDI. For the example above, a local
71+
* ResourceAdapter bean could be defined as follows (matching the "resourceAdapter"
72+
* bean reference above):
7373
*
7474
* <pre class="code">
7575
* &lt;bean id="resourceAdapter" class="org.springframework.jca.support.ResourceAdapterFactoryBean"&gt;

spring-tx/src/main/java/org/springframework/transaction/TransactionDefinition.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2022 the original author or authors.
2+
* Copyright 2002-2023 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -265,7 +265,7 @@ default boolean isReadOnly() {
265265
/**
266266
* Return the name of this transaction. Can be {@code null}.
267267
* <p>This will be used as the transaction name to be shown in a
268-
* transaction monitor, if applicable (for example, WebLogic's).
268+
* transaction monitor, if applicable.
269269
* <p>In case of Spring's declarative transactions, the exposed name will be
270270
* the {@code fully-qualified class name + "." + method name} (by default).
271271
* @return the name of this transaction ({@code null} by default}

spring-tx/src/main/java/org/springframework/transaction/jta/SpringJtaSynchronizationAdapter.java

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2022 the original author or authors.
2+
* Copyright 2002-2023 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -67,16 +67,15 @@ public SpringJtaSynchronizationAdapter(TransactionSynchronization springSynchron
6767
/**
6868
* Create a new SpringJtaSynchronizationAdapter for the given Spring
6969
* TransactionSynchronization and JTA TransactionManager.
70-
* <p>Note that this adapter will never perform a rollback-only call on WebLogic,
71-
* since WebLogic Server is known to automatically mark the transaction as
72-
* rollback-only in case of a {@code beforeCompletion} exception. Hence,
73-
* on WLS, this constructor is equivalent to the single-arg constructor.
7470
* @param springSynchronization the Spring TransactionSynchronization to delegate to
7571
* @param jtaUserTransaction the JTA UserTransaction to use for rollback-only
7672
* setting in case of an exception thrown in {@code beforeCompletion}
77-
* (can be omitted if the JTA provider itself marks the transaction rollback-only
78-
* in such a scenario, which is required by the JTA specification as of JTA 1.1).
73+
* @deprecated as of 6.0.12 since JTA 1.1+ requires implicit rollback-only setting
74+
* in case of an exception thrown in {@code beforeCompletion}, so the regular
75+
* {@link #SpringJtaSynchronizationAdapter(TransactionSynchronization)} constructor
76+
* is sufficient for all scenarios
7977
*/
78+
@Deprecated(since = "6.0.12")
8079
public SpringJtaSynchronizationAdapter(TransactionSynchronization springSynchronization,
8180
@Nullable UserTransaction jtaUserTransaction) {
8281

@@ -87,21 +86,21 @@ public SpringJtaSynchronizationAdapter(TransactionSynchronization springSynchron
8786
/**
8887
* Create a new SpringJtaSynchronizationAdapter for the given Spring
8988
* TransactionSynchronization and JTA TransactionManager.
90-
* <p>Note that this adapter will never perform a rollback-only call on WebLogic,
91-
* since WebLogic Server is known to automatically mark the transaction as
92-
* rollback-only in case of a {@code beforeCompletion} exception. Hence,
93-
* on WLS, this constructor is equivalent to the single-arg constructor.
9489
* @param springSynchronization the Spring TransactionSynchronization to delegate to
9590
* @param jtaTransactionManager the JTA TransactionManager to use for rollback-only
9691
* setting in case of an exception thrown in {@code beforeCompletion}
97-
* (can be omitted if the JTA provider itself marks the transaction rollback-only
98-
* in such a scenario, which is required by the JTA specification as of JTA 1.1)
92+
* @deprecated as of 6.0.12 since JTA 1.1+ requires implicit rollback-only setting
93+
* in case of an exception thrown in {@code beforeCompletion}, so the regular
94+
* {@link #SpringJtaSynchronizationAdapter(TransactionSynchronization)} constructor
95+
* is sufficient for all scenarios
9996
*/
100-
public SpringJtaSynchronizationAdapter(
101-
TransactionSynchronization springSynchronization, @Nullable TransactionManager jtaTransactionManager) {
97+
@Deprecated(since = "6.0.12")
98+
public SpringJtaSynchronizationAdapter(TransactionSynchronization springSynchronization,
99+
@Nullable TransactionManager jtaTransactionManager) {
102100

103101
this(springSynchronization);
104-
this.jtaTransaction = new UserTransactionAdapter(jtaTransactionManager);
102+
this.jtaTransaction =
103+
(jtaTransactionManager != null ? new UserTransactionAdapter(jtaTransactionManager) : null);
105104
}
106105

107106

spring-tx/src/main/resources/org/springframework/transaction/config/spring-tx.xsd

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,6 @@
156156
<xsd:documentation><![CDATA[
157157
Creates a default JtaTransactionManager bean with name "transactionManager",
158158
matching the default bean name expected by the "annotation-driven" tag.
159-
Automatically detects WebLogic and WebSphere: creating a WebLogicJtaTransactionManager
160-
or WebSphereUowTransactionManager, respectively.
161159
162160
For customization needs, consider defining a JtaTransactionManager bean as a regular
163161
Spring bean definition with name "transactionManager", replacing this element.

0 commit comments

Comments
 (0)