svn commit: r1355439 - in /cxf/branches/2.6.x-fixes: ./ rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/dom4j/DOM4JProvider.java

[sergeyb]

Author: sergeyb
Date: Fri Jun 29 15:09:46 2012
New Revision: 1355439

URL: http://svn.apache.org/viewvc?rev=1355439&view=rev
Log:
Merged revisions 1355437 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1355437 | sergeyb | 2012-06-29 16:07:36 +0100 (Fri, 29 Jun 2012) | 1 line
  
  Updating DOM4JProvider to support text/xml
........

Modified:
    cxf/branches/2.6.x-fixes/   (props changed)
    
cxf/branches/2.6.x-fixes/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/dom4j/DOM4JProvider.java

Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
    svn:mergeinfo = /cxf/trunk:1355437

Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.6.x-fixes/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/dom4j/DOM4JProvider.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/dom4j/DOM4JProvider.java?rev=1355439&r1=1355438&r2=1355439&view=diff
==============================================================================
--- 
cxf/branches/2.6.x-fixes/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/dom4j/DOM4JProvider.java
 (original)
+++ 
cxf/branches/2.6.x-fixes/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/dom4j/DOM4JProvider.java
 Fri Jun 29 15:09:46 2012
@@ -35,8 +35,8 @@ import javax.ws.rs.ext.Providers;
 
 import org.apache.cxf.helpers.DOMUtils;
 
-@javax.ws.rs.Produces({"application/xml", "application/json" })
-@javax.ws.rs.Consumes({"application/xml", "application/json" })
+@javax.ws.rs.Produces({"application/xml", "text/xml", "application/json" })
+@javax.ws.rs.Consumes({"application/xml", "text/xml", "application/json" })
 public class DOM4JProvider implements MessageBodyReader<org.dom4j.Document>,
                 MessageBodyWriter<org.dom4j.Document> {