Author: sergeyb
Date: Thu Oct 17 16:06:29 2013
New Revision: 1533128
URL: http://svn.apache.org/r1533128
Log:
Merged revisions 1532895 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1532895 | sergeyb | 2013-10-16 21:30:55 +0100 (Wed, 16 Oct 2013) | 1 line
JSON & DOM4J providers should support composite JSON media types by default
........
Modified:
cxf/branches/2.7.x-fixes/ (props changed)
cxf/branches/2.7.x-fixes/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/dom4j/DOM4JProvider.java
cxf/branches/2.7.x-fixes/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JSONProvider.java
Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
Merged /cxf/trunk:r1532895
Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.7.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.7.x-fixes/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/dom4j/DOM4JProvider.java?rev=1533128&r1=1533127&r2=1533128&view=diff
==============================================================================
---
cxf/branches/2.7.x-fixes/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/dom4j/DOM4JProvider.java
(original)
+++
cxf/branches/2.7.x-fixes/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/dom4j/DOM4JProvider.java
Thu Oct 17 16:06:29 2013
@@ -25,8 +25,10 @@ import java.io.StringReader;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
+import javax.ws.rs.Consumes;
import javax.ws.rs.NotAcceptableException;
import javax.ws.rs.NotSupportedException;
+import javax.ws.rs.Produces;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
@@ -38,8 +40,8 @@ import javax.ws.rs.ext.Providers;
import org.apache.cxf.jaxrs.provider.AbstractConfigurableProvider;
import org.apache.cxf.staxutils.StaxUtils;
[email protected]({"application/xml", "application/*+xml", "text/xml",
"application/json" })
[email protected]({"application/xml", "application/*+xml", "text/xml",
"application/json" })
+@Produces({"application/xml", "application/*+xml", "text/xml",
"application/json", "application/*+json" })
+@Consumes({"application/xml", "application/*+xml", "text/xml",
"application/json", "application/*+json" })
public class DOM4JProvider extends AbstractConfigurableProvider
implements MessageBodyReader<org.dom4j.Document>,
MessageBodyWriter<org.dom4j.Document> {
Modified:
cxf/branches/2.7.x-fixes/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JSONProvider.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JSONProvider.java?rev=1533128&r1=1533127&r2=1533128&view=diff
==============================================================================
---
cxf/branches/2.7.x-fixes/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JSONProvider.java
(original)
+++
cxf/branches/2.7.x-fixes/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JSONProvider.java
Thu Oct 17 16:06:29 2013
@@ -79,8 +79,8 @@ import org.codehaus.jettison.mapped.Simp
import org.codehaus.jettison.mapped.TypeConverter;
import org.codehaus.jettison.util.StringIndenter;
-@Produces("application/json")
-@Consumes("application/json")
+@Produces({"application/json", "application/*+json" })
+@Consumes({"application/json", "application/*+json" })
@Provider
public class JSONProvider<T> extends AbstractJAXBProvider<T> {
