Repository: tomee Updated Branches: refs/heads/master df2aedadb -> 4e8c39f40
TOMEE-1719 support application/*+json by default for jsonp too Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/4e8c39f4 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/4e8c39f4 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/4e8c39f4 Branch: refs/heads/master Commit: 4e8c39f4004880097cd5e323aece5d7e5bcdf2e6 Parents: df2aeda Author: Romain manni-Bucau <rmannibu...@gmail.com> Authored: Fri Feb 26 08:50:53 2016 +0100 Committer: Romain manni-Bucau <rmannibu...@gmail.com> Committed: Fri Feb 26 08:50:53 2016 +0100 ---------------------------------------------------------------------- .../org/apache/openejb/server/cxf/rs/CxfRSService.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/4e8c39f4/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRSService.java ---------------------------------------------------------------------- diff --git a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRSService.java b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRSService.java index e4bdf6b..a5b6290 100644 --- a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRSService.java +++ b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRSService.java @@ -201,7 +201,7 @@ public class CxfRSService extends RESTService { if (userProviders == null) { (all = new ArrayList<>(2)).addAll(asList( new TomEEJohnzonProvider<>(), - new JsrProvider() + new TomEEJsonpProvider() )); } else { all = new ArrayList<>(4 /* blind guess */); @@ -216,7 +216,7 @@ public class CxfRSService extends RESTService { all.addAll(asList( // added after to be after in the list once sorted new TomEEJohnzonProvider<>(), - new JsrProvider())); + new TomEEJsonpProvider())); } bus.setProperty("org.apache.cxf.jaxrs.bus.providers", all); } catch (final Exception e) { @@ -364,4 +364,10 @@ public class CxfRSService extends RESTService { @Consumes({"application/json", "application/*+json"}) public class TomEEJohnzonProvider<T> extends JohnzonProvider<T> { } + + @Provider + @Produces({"application/json", "application/*+json"}) + @Consumes({"application/json", "application/*+json"}) + public class TomEEJsonpProvider extends JsrProvider { + } }