Repository: tomee Updated Branches: refs/heads/master c4a50f3dd -> 2f48d94ab
tolerate johnzon JsonbJaxrsProvider if added + using OWB and johnzon stagings to validate they are compatible with tomee Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/2f48d94a Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/2f48d94a Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/2f48d94a Branch: refs/heads/master Commit: 2f48d94ab18aa7dd2771c0bbfd5acd1dfa1c5e40 Parents: c4a50f3 Author: Romain manni-Bucau <rmannibu...@gmail.com> Authored: Thu Feb 18 23:26:17 2016 +0100 Committer: Romain manni-Bucau <rmannibu...@gmail.com> Committed: Thu Feb 18 23:26:17 2016 +0100 ---------------------------------------------------------------------- pom.xml | 24 ++++++++------------ server/openejb-cxf-rs/pom.xml | 8 +++++++ .../server/cxf/rs/CxfRsHttpListener.java | 8 ++++--- 3 files changed, 23 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/2f48d94a/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 5711241..171cbd6 100644 --- a/pom.xml +++ b/pom.xml @@ -97,9 +97,9 @@ <javaee-api.version>7.0</javaee-api.version> <openjpa.version>2.4.0</openjpa.version> - <org.apache.openwebbeans.version>1.6.3-SNAPSHOT</org.apache.openwebbeans.version> + <org.apache.openwebbeans.version>1.6.3</org.apache.openwebbeans.version> <jcs.version>2.0-M1</jcs.version> - <johnzon.version>0.9.2-incubating</johnzon.version> + <johnzon.version>0.9.3-incubating</johnzon.version> <!-- Maven module versions --> <maven-bundle-plugin.version>2.3.7</maven-bundle-plugin.version> @@ -686,18 +686,14 @@ </profile> </profiles> <repositories> - <!--<repository>--> - <!--<id>codehaus-snapshot</id>--> - <!--<name>CodeHaus SNAPSHOT repository</name>--> - <!--<url>http://snapshots.repository.codehaus.org</url>--> - <!--<releases>--> - <!--<enabled>false</enabled>--> - <!--</releases>--> - <!--<snapshots>--> - <!--<enabled>true</enabled>--> - <!--</snapshots>--> - <!--</repository>--> - <!-- Apache snapshots --> + <repository> + <id>owb-staging</id> + <url>https://repository.apache.org/content/repositories/orgapacheopenwebbeans-1016/</url> + </repository> + <repository> + <id>johnzon-staging</id> + <url>https://repository.apache.org/content/repositories/orgapachejohnzon-1013/</url> + </repository> <repository> <id>apache-snapshots</id> <name>Apache Snapshots Repository</name> http://git-wip-us.apache.org/repos/asf/tomee/blob/2f48d94a/server/openejb-cxf-rs/pom.xml ---------------------------------------------------------------------- diff --git a/server/openejb-cxf-rs/pom.xml b/server/openejb-cxf-rs/pom.xml index 60e2420..881a290 100644 --- a/server/openejb-cxf-rs/pom.xml +++ b/server/openejb-cxf-rs/pom.xml @@ -119,5 +119,13 @@ <artifactId>johnzon-jaxrs</artifactId> <version>${johnzon.version}</version> </dependency> + <!-- java 8 only, we can add it if we instantiate it after having checked java + NOTE: needs jsonb-api too (available in jonzon groupId) + <dependency> + <groupId>org.apache.johnzon</groupId> + <artifactId>johnzon-jsonb</artifactId> + <version>${johnzon.version}</version> + </dependency> + --> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/tomee/blob/2f48d94a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java ---------------------------------------------------------------------- diff --git a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java index 2dfd582..fec5f10 100644 --- a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java +++ b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java @@ -656,9 +656,11 @@ public class CxfRsHttpListener implements RsHttpListener { boolean customJsonProvider = false; for (final ProviderInfo<?> o : values) { // using getName to not suppose any classloader setup - if (ConfigurableJohnzonProvider.class.getName().equals(o.getResourceClass().getName()) + final String name = o.getResourceClass().getName(); + if ("org.apache.johnzon.jaxrs.ConfigurableJohnzonProvider".equals(name) + || "org.apache.johnzon.jaxrs.jsonb.jaxrs.JsonbJaxrsProvider".equals(name) // contains in case of proxying - || o.getResourceClass().getName().contains("com.fasterxml.jackson.jaxrs.json")) { + || name.contains("com.fasterxml.jackson.jaxrs.json")) { customJsonProvider = true; break; // cause we only handle json for now } @@ -667,7 +669,7 @@ public class CxfRsHttpListener implements RsHttpListener { if (customJsonProvider) { final Iterator<ProviderInfo<?>> it = values.iterator(); while (it.hasNext()) { - if (JohnzonProvider.class.getName().equals(it.next().getResourceClass().getName())) { + if ("org.apache.johnzon.jaxrs.JohnzonProvider".equals(it.next().getResourceClass().getName())) { it.remove(); break; }
