From ec3d647d1d69095edac927a1f5c13f1d779ff5fc Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Fri, 8 May 2020 19:48:46 +0200
Subject: [PATCH] Update spring-tx.xsd regarding reactive tx mgmt support

Closes gh-25030
---
 .../transaction/config/spring-tx.xsd          | 33 ++++++++++++-------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/spring-tx/src/main/resources/org/springframework/transaction/config/spring-tx.xsd b/spring-tx/src/main/resources/org/springframework/transaction/config/spring-tx.xsd
index 461d13a43f89..2d71c5538326 100644
--- a/spring-tx/src/main/resources/org/springframework/transaction/config/spring-tx.xsd
+++ b/spring-tx/src/main/resources/org/springframework/transaction/config/spring-tx.xsd
@@ -27,7 +27,7 @@
 
 	That is, this advice element is where the transactional semantics of
 	any	number of methods are defined (where transactional semantics
-	includes the propagation settings, the isolation level, the rollback
+	include the propagation settings, the isolation level, the rollback
 	rules, and suchlike).
 				]]></xsd:documentation>
 				<xsd:appinfo>
@@ -43,17 +43,21 @@
 					</xsd:sequence>
 					<xsd:attribute name="transaction-manager" type="xsd:string" default="transactionManager">
 						<xsd:annotation>
-							<xsd:documentation source="java:org.springframework.transaction.PlatformTransactionManager"><![CDATA[
-	The bean name of the PlatformTransactionManager that is to be used
+							<xsd:documentation source="java:org.springframework.transaction.TransactionManager"><![CDATA[
+	The bean name of the TransactionManager that is to be used
 	to drive transactions.
 
+	Supports PlatformTransactionManager implementations for imperative
+	transaction management and ReactiveTransactionManager implementations
+	for reactive transaction management.
+
 	This attribute is not required, and only needs to be specified
-	explicitly if the bean name of the desired PlatformTransactionManager
+	explicitly if the bean name of the desired TransactionManager
 	is not 'transactionManager'.
 							]]></xsd:documentation>
 							<xsd:appinfo>
 								<tool:annotation kind="ref">
-									<tool:expected-type type="org.springframework.transaction.PlatformTransactionManager"/>
+									<tool:expected-type type="org.springframework.transaction.TransactionManager"/>
 								</tool:annotation>
 							</xsd:appinfo>
 						</xsd:annotation>
@@ -67,11 +71,12 @@
 		<xsd:complexType>
 			<xsd:annotation>
 				<xsd:documentation source="java:org.springframework.transaction.annotation.AnnotationTransactionAttributeSource"><![CDATA[
-	Indicates that transaction configuration is defined by Java 5
+	Indicates that transaction configuration is defined by
 	annotations on bean classes, and that proxies are automatically
 	to be created for the relevant annotated beans.
 
-	The default annotations supported are Spring's @Transactional
+	The default annotations supported are Spring's @Transactional,
+	JTA 1.2's @Transactional (if available),
 	and EJB3's @TransactionAttribute (if available).
 
 	Transaction semantics such as propagation settings, the isolation level,
@@ -83,17 +88,21 @@
 			</xsd:annotation>
 			<xsd:attribute name="transaction-manager" type="xsd:string" default="transactionManager">
 				<xsd:annotation>
-					<xsd:documentation source="java:org.springframework.transaction.PlatformTransactionManager"><![CDATA[
-	The bean name of the PlatformTransactionManager that is to be used
+					<xsd:documentation source="java:org.springframework.transaction.TransactionManager"><![CDATA[
+	The bean name of the TransactionManager that is to be used
 	to drive transactions.
 
+	Supports PlatformTransactionManager implementations for imperative
+	transaction management and ReactiveTransactionManager implementations
+	for reactive transaction management.
+
 	This attribute is not required, and only needs to be specified
-	explicitly if the bean name of the desired PlatformTransactionManager
+	explicitly if the bean name of the desired TransactionManager
 	is not 'transactionManager'.
 					]]></xsd:documentation>
 					<xsd:appinfo>
 						<tool:annotation kind="ref">
-							<tool:expected-type type="org.springframework.transaction.PlatformTransactionManager"/>
+							<tool:expected-type type="org.springframework.transaction.TransactionManager"/>
 						</tool:annotation>
 					</xsd:appinfo>
 				</xsd:annotation>
@@ -102,7 +111,7 @@
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
 	Should annotated beans be proxied using Spring's AOP framework,
-	or should they rather be weaved with an AspectJ transaction aspect?
+	or should they rather be woven with an AspectJ transaction aspect?
 
 	AspectJ weaving requires spring-aspects.jar on the classpath,
 	as well as load-time weaving (or compile-time weaving) enabled.