Author: rmannibucau Date: Sun Sep 14 09:37:50 2014 New Revision: 1624821 URL: http://svn.apache.org/r1624821 Log: s/fleece/johnzon/
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/pom.xml tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java Modified: tomee/tomee/trunk/server/openejb-cxf-rs/pom.xml URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/pom.xml?rev=1624821&r1=1624820&r2=1624821&view=diff ============================================================================== --- tomee/tomee/trunk/server/openejb-cxf-rs/pom.xml (original) +++ tomee/tomee/trunk/server/openejb-cxf-rs/pom.xml Sun Sep 14 09:37:50 2014 @@ -114,9 +114,9 @@ <artifactId>cxf-rt-rs-extension-providers</artifactId> <version>${cxf.version}</version> </dependency> - <dependency> <!-- FleeceProvider, WadlDocumentMessageBodyWriter and JsrProvider --> - <groupId>org.apache.fleece</groupId> - <artifactId>fleece-jaxrs</artifactId> + <dependency> <!-- JohnzonProvider, WadlDocumentMessageBodyWriter and JsrProvider --> + <groupId>org.apache.johnzon</groupId> + <artifactId>johnzon-jaxrs</artifactId> <version>1.0-SNAPSHOT</version> </dependency> </dependencies> Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java?rev=1624821&r1=1624820&r2=1624821&view=diff ============================================================================== --- tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java (original) +++ tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java Sun Sep 14 09:37:50 2014 @@ -39,9 +39,9 @@ import org.apache.cxf.jaxrs.provider.Sou import org.apache.cxf.service.invoker.Invoker; import org.apache.cxf.transport.DestinationFactory; import org.apache.cxf.transport.servlet.BaseUrlHelper; -import org.apache.fleece.jaxrs.FleeceProvider; -import org.apache.fleece.jaxrs.JsrProvider; -import org.apache.fleece.jaxrs.WadlDocumentMessageBodyWriter; +import org.apache.johnzon.jaxrs.JohnzonProvider; +import org.apache.johnzon.jaxrs.JsrProvider; +import org.apache.johnzon.jaxrs.WadlDocumentMessageBodyWriter; import org.apache.openejb.BeanContext; import org.apache.openejb.Injection; import org.apache.openejb.api.internal.Internal; @@ -710,7 +710,7 @@ public class CxfRsHttpListener implement jaxb.setMarshallerProperties(jaxbProperties); final List<Object> providers = new ArrayList<>(2); - providers.add(new FleeceProvider<>()); + providers.add(new JohnzonProvider<>()); providers.add(jaxb); return providers; }