提交 b9d79134 编写于 作者: J Juergen Hoeller

Deprecate XmlBeans support (following the XMLBeans retirement at Apache)

Issue: SPR-13399
上级 eaba7948
/*
* 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());
}
}
......@@ -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
......
......@@ -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;
......
......@@ -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>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册