Skip to content

Commit 08c7855

Browse files
committed
Deprecate Castor support
Issue: SPR-16219
1 parent 40dacd3 commit 08c7855

File tree

5 files changed

+14
-7
lines changed

5 files changed

+14
-7
lines changed

spring-oxm/src/main/java/org/springframework/oxm/castor/CastorMappingException.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2012 the original author or authors.
2+
* Copyright 2002-2017 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.
@@ -23,7 +23,9 @@
2323
*
2424
* @author Juergen Hoeller
2525
* @since 3.0
26+
* @deprecated as of Spring Framework 4.3.13, due to the lack of activity on the Castor project
2627
*/
28+
@Deprecated
2729
@SuppressWarnings("serial")
2830
public class CastorMappingException extends XmlMappingException {
2931

spring-oxm/src/main/java/org/springframework/oxm/castor/CastorMarshaller.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@
7474
* can only be used to unmarshal XML that represents that specific class. If you want to unmarshal
7575
* multiple classes, you have to provide a mapping file using {@code setMappingLocations}.
7676
*
77-
* <p>Due to limitations of Castor's API, it is required to set the encoding used for
78-
* writing to output streams. It defaults to {@code UTF-8}.
77+
* <p>Due to limitations of Castor's API, it is required to set the encoding used for writing
78+
* to output streams. It defaults to {@code UTF-8}.
7979
*
8080
* @author Arjen Poutsma
8181
* @author Jakub Narloch
@@ -86,7 +86,9 @@
8686
* @see #setTargetPackages(String[])
8787
* @see #setMappingLocation(Resource)
8888
* @see #setMappingLocations(Resource[])
89+
* @deprecated as of Spring Framework 4.3.13, due to the lack of activity on the Castor project
8990
*/
91+
@Deprecated
9092
public class CastorMarshaller extends AbstractMarshaller implements InitializingBean, BeanClassLoaderAware {
9193

9294
/**

spring-oxm/src/main/java/org/springframework/oxm/config/CastorMarshallerBeanDefinitionParser.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2013 the original author or authors.
2+
* Copyright 2002-2017 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.
@@ -25,8 +25,10 @@
2525
*
2626
* @author Jakub Narloch
2727
* @since 3.1
28+
* @deprecated as of Spring Framework 4.3.13, due to the lack of activity on the Castor project
2829
*/
29-
public class CastorMarshallerBeanDefinitionParser extends AbstractSimpleBeanDefinitionParser {
30+
@Deprecated
31+
class CastorMarshallerBeanDefinitionParser extends AbstractSimpleBeanDefinitionParser {
3032

3133
@Override
3234
protected String getBeanClassName(Element element) {

spring-oxm/src/main/java/org/springframework/oxm/config/OxmNamespaceHandler.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2016 the original author or authors.
2+
* Copyright 2002-2017 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.
@@ -27,6 +27,7 @@
2727
*/
2828
public class OxmNamespaceHandler extends NamespaceHandlerSupport {
2929

30+
@SuppressWarnings("deprecation")
3031
@Override
3132
public void init() {
3233
registerBeanDefinitionParser("jaxb2-marshaller", new Jaxb2MarshallerBeanDefinitionParser());

spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm.xsd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
<xsd:annotation>
8686
<xsd:documentation
8787
source="java:org.springframework.oxm.castor.CastorMarshaller">
88-
Defines a Castor Marshaller.
88+
Defines a Castor Marshaller. Deprecated as of Spring Framework 4.3.13!
8989
</xsd:documentation>
9090
<xsd:appinfo>
9191
<tool:annotation>

0 commit comments

Comments
 (0)