From b9d7913407d0e18c0968b97ea63666ef2e4599d7 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@pivotal.io>
Date: Thu, 27 Aug 2015 11:52:50 +0200
Subject: [PATCH] Deprecate XmlBeans support (following the XMLBeans retirement
 at Apache)

Issue: SPR-13399
---
 .../oxm/config/OxmNamespaceHandler.java       |  5 +--
 ...mlBeansMarshallerBeanDefinitionParser.java |  2 ++
 .../oxm/xmlbeans/XmlBeansMarshaller.java      |  2 ++
 .../oxm/config/spring-oxm-4.2.xsd             | 32 -------------------
 4 files changed, 7 insertions(+), 34 deletions(-)

diff --git a/spring-oxm/src/main/java/org/springframework/oxm/config/OxmNamespaceHandler.java b/spring-oxm/src/main/java/org/springframework/oxm/config/OxmNamespaceHandler.java
index c11bc0bdd58..ba973011678 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/config/OxmNamespaceHandler.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/config/OxmNamespaceHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,11 +28,12 @@ import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
 public class OxmNamespaceHandler extends NamespaceHandlerSupport {
 
 	@Override
+	@SuppressWarnings("deprecation")
 	public void init() {
 		registerBeanDefinitionParser("jaxb2-marshaller", new Jaxb2MarshallerBeanDefinitionParser());
 		registerBeanDefinitionParser("jibx-marshaller", new JibxMarshallerBeanDefinitionParser());
-		registerBeanDefinitionParser("xmlbeans-marshaller", new XmlBeansMarshallerBeanDefinitionParser());
 		registerBeanDefinitionParser("castor-marshaller", new CastorMarshallerBeanDefinitionParser());
+		registerBeanDefinitionParser("xmlbeans-marshaller", new XmlBeansMarshallerBeanDefinitionParser());
 	}
 
 }
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/config/XmlBeansMarshallerBeanDefinitionParser.java b/spring-oxm/src/main/java/org/springframework/oxm/config/XmlBeansMarshallerBeanDefinitionParser.java
index 580c7c09db4..e5a6e025747 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/config/XmlBeansMarshallerBeanDefinitionParser.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/config/XmlBeansMarshallerBeanDefinitionParser.java
@@ -28,7 +28,9 @@ import org.springframework.util.StringUtils;
  *
  * @author Arjen Poutsma
  * @since 3.0
+ * @deprecated as of Spring 4.2, following the XMLBeans retirement at Apache
  */
+@Deprecated
 class XmlBeansMarshallerBeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
 
 	@Override
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlBeansMarshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlBeansMarshaller.java
index f29306a7427..af0599431fc 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlBeansMarshaller.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlBeansMarshaller.java
@@ -75,7 +75,9 @@ import org.springframework.util.xml.StaxUtils;
  * @see #setValidating
  * @see #setXmlOptions
  * @see XmlOptionsFactoryBean
+ * @deprecated as of Spring 4.2, following the XMLBeans retirement at Apache
  */
+@Deprecated
 public class XmlBeansMarshaller extends AbstractMarshaller {
 
 	private XmlOptions xmlOptions;
diff --git a/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-4.2.xsd b/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-4.2.xsd
index 0735976bbb1..8e63fdb7ae1 100644
--- a/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-4.2.xsd
+++ b/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-4.2.xsd
@@ -120,38 +120,6 @@
 		</xsd:complexType>
 	</xsd:element>
 
-	<xsd:element name="xmlbeans-marshaller">
-		<xsd:complexType>
-			<xsd:annotation>
-				<xsd:documentation source="java:org.springframework.oxm.xmlbeans.XmlBeansMarshaller">
-					Defines a XMLBeans Marshaller.
-				</xsd:documentation>
-				<xsd:appinfo>
-					<tool:annotation>
-						<tool:exports type="org.springframework.oxm.xmlbeans.XmlBeansMarshaller"/>
-					</tool:annotation>
-				</xsd:appinfo>
-			</xsd:annotation>
-			<xsd:complexContent>
-				<xsd:extension base="beans:identifiedType">
-					<xsd:attribute name="options" type="xsd:string">
-						<xsd:annotation>
-							<xsd:documentation source="java:org.apache.xmlbeans.XmlOptions">
-								The bean name of the XmlOptions that is to be used for this marshaller. Typically a
-								XmlOptionsFactoryBean definition.
-							</xsd:documentation>
-							<xsd:appinfo>
-								<tool:annotation kind="ref">
-									<tool:expected-type type="org.apache.xmlbeans.XmlOptions"/>
-								</tool:annotation>
-							</xsd:appinfo>
-						</xsd:annotation>
-					</xsd:attribute>
-				</xsd:extension>
-			</xsd:complexContent>
-		</xsd:complexType>
-	</xsd:element>
-
 	<xsd:simpleType name="classType">
 		<xsd:annotation>
 			<xsd:documentation source="java:java.lang.Class">A class supported by a marshaller.</xsd:documentation>