Skip to content
Browse files

rollback jaxb+jackson

  • Loading branch information...
1 parent 07f9a49 commit c5945c2a73e7bca06be736933228c803b56bf43a @patriot1burke patriot1burke committed
View
5 ...n/src/main/java/org/jboss/resteasy/plugins/providers/jackson/ResteasyJacksonProvider.java
@@ -23,13 +23,14 @@
@Produces({"application/*+json", "text/json"})
public class ResteasyJacksonProvider extends JacksonJsonProvider
{
-
+/*
+ // todo figure out a nice way to support jackson + jaxb
public ResteasyJacksonProvider() {
super();
Annotations[] ANNOTATIONS = {Annotations.JACKSON, Annotations.JAXB};
_mapperConfig.setAnnotationsToUse(ANNOTATIONS);
}
-
+*/
@Override
public boolean isReadable(Class<?> aClass, Type type, Annotation[] annotations, MediaType mediaType)
View
5 ...roviders/jackson/src/test/java/org/jboss/resteasy/test/providers/jackson/JacksonTest.java
@@ -190,7 +190,7 @@ public static void setUp() throws Exception
{
dispatcher.getRegistry().addPerRequestResource(JacksonService.class);
dispatcher.getRegistry().addPerRequestResource(XmlService.class);
- dispatcher.getRegistry().addPerRequestResource(JAXBService.class);
+ //dispatcher.getRegistry().addPerRequestResource(JAXBService.class);
}
@Test
@@ -257,6 +257,8 @@ public void testJackson() throws Exception
}
+/*
+// todo figure out a nice way to support JAXB + Jackson
@XmlRootElement
public static class XmlResourceWithJAXB {
@@ -354,6 +356,7 @@ public void testJacksonJAXB() throws Exception {
}
+*/
@Test
public void testJacksonProxy() throws Exception
{
View
1 jaxrs/security/pom.xml
@@ -4,6 +4,7 @@
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxrs-all</artifactId>
<version>3.0-beta-2</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<name>Resteasy Security</name>
<description/>

0 comments on commit c5945c2

Please sign in to comment.
Something went wrong with that request. Please try again.