Author: sergeyb
Date: Mon Dec 27 18:22:15 2010
New Revision: 1053124
URL: http://svn.apache.org/viewvc?rev=1053124&view=rev
Log:
Merged revisions 1053123 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1053123 | sergeyb | 2010-12-27 18:20:56 +0000 (Mon, 27 Dec 2010) | 1 line
[CXF-3198] Applying a patch on behalf of Rahul Somasunderam
........
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/XMLBeansElementProvider.java
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 27 18:22:15 2010
@@ -1 +1 @@
-/cxf/trunk:1041183,1041790,1041993,1042346,1042571,1042724,1042805,1042821,1043225,1043229,1043902,1043907,1043954,1044085,1044238-1044305,1045024,1048915,1048919,1048930,1049078,1049426,1049937,1050005,1050021,1050095,1050102,1050113,1050156,1050165,1050280,1051115,1051613,1051790,1051792,1052338,1052516,1052541,1052993-1052994,1052996-1052997,1053114,1053119
+/cxf/trunk:1041183,1041790,1041993,1042346,1042571,1042724,1042805,1042821,1043225,1043229,1043902,1043907,1043954,1044085,1044238-1044305,1045024,1048915,1048919,1048930,1049078,1049426,1049937,1050005,1050021,1050095,1050102,1050113,1050156,1050165,1050280,1051115,1051613,1051790,1051792,1052338,1052516,1052541,1052993-1052994,1052996-1052997,1053114,1053119,1053123
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/XMLBeansElementProvider.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/XMLBeansElementProvider.java?rev=1053124&r1=1053123&r2=1053124&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/XMLBeansElementProvider.java
(original)
+++
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/XMLBeansElementProvider.java
Mon Dec 27 18:22:15 2010
@@ -44,10 +44,11 @@ import org.apache.xmlbeans.XmlObject;
/**
* Provider for XMLBeans data objects.
*/
-...@produces("application/xml")
-...@consumes("application/xml")
+...@produces({"application/xml", "application/*+xml", "text/xml" })
+...@consumes({"application/xml", "application/*+xml", "text/xml" })
@Provider
-public class XMLBeansElementProvider implements MessageBodyReader<XmlObject>,
MessageBodyWriter<XmlObject> {
+public class XMLBeansElementProvider extends AbstractConfigurableProvider
+ implements MessageBodyReader<XmlObject>, MessageBodyWriter<XmlObject> {
/** {...@inheritdoc} */
public XmlObject readFrom(Class<XmlObject> type, Type genericType,
