You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jf...@apache.org on 2018/10/17 00:13:32 UTC

[1/2] tomee git commit: Allow custom JSON Providers to replace Johnzon

Repository: tomee
Updated Branches:
  refs/heads/master a48208ac3 -> 38959d7fd


Allow custom JSON Providers to replace Johnzon


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/7f18f4bc
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/7f18f4bc
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/7f18f4bc

Branch: refs/heads/master
Commit: 7f18f4bcfe64119b9001d5ac6bffeb7324987a37
Parents: a48208a
Author: Jonathan S. Fisher <jo...@emoneyusa.com>
Authored: Sat Sep 15 16:16:51 2018 -0500
Committer: Jonathan S. Fisher <ex...@gmail.com>
Committed: Tue Oct 16 19:08:21 2018 -0500

----------------------------------------------------------------------
 .../org/apache/openejb/server/cxf/rs/CxfRSService.java | 13 ++++++++++---
 .../openejb/server/cxf/rs/CxfRsHttpListener.java       |  6 ++++--
 2 files changed, 14 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/7f18f4bc/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 347f42b..3f492ce 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
@@ -223,9 +223,16 @@ public class CxfRSService extends RESTService {
             bus.setProperty("skip.default.json.provider.registration", "true"); // client jaxrs, we want johnzon not jettison
 
             final Collection<Object> defaults = new ArrayList<>();
-            for (final String provider : asList(
-                    "org.apache.openejb.server.cxf.rs.johnzon.TomEEJsonbProvider",
-                    "org.apache.openejb.server.cxf.rs.johnzon.TomEEJsonpProvider")) {
+            List<String> jsonProviders;
+            String userConfiguredJsonProviders = SystemInstance.get().getProperty("openejb.jaxrs.jsonProviders");
+            if (userConfiguredJsonProviders == null) {
+                jsonProviders = asList(
+                        "org.apache.openejb.server.cxf.rs.johnzon.TomEEJohnzonProvider",
+                        "org.apache.openejb.server.cxf.rs.johnzon.TomEEJsonpProvider");
+            } else {
+                jsonProviders = asList(userConfiguredJsonProviders.split(","));
+            }
+            for (final String provider : jsonProviders) {
                 if (!isActive(provider)) {
                     continue;
                 }

http://git-wip-us.apache.org/repos/asf/tomee/blob/7f18f4bc/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 e155b9d..1fa8b1a 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
@@ -498,8 +498,10 @@ public class CxfRsHttpListener implements RsHttpListener {
     }
 
     private void addMandatoryProviders(final Collection<Object> instances, final ServiceConfiguration serviceConfiguration) {
-        if (!shouldSkipProvider(WadlDocumentMessageBodyWriter.class.getName())) {
-            instances.add(new WadlDocumentMessageBodyWriter());
+        if (SystemInstance.get().getProperty("openejb.jaxrs.jsonProviders") == null) {
+            if (!shouldSkipProvider(WadlDocumentMessageBodyWriter.class.getName())) {
+                instances.add(new WadlDocumentMessageBodyWriter());
+            }
         }
         if (!shouldSkipProvider(EJBExceptionMapper.class.getName())) {
             instances.add(new EJBExceptionMapper());


[2/2] tomee git commit: add doc reference in system.properties

Posted by jf...@apache.org.
add doc reference in system.properties


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/38959d7f
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/38959d7f
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/38959d7f

Branch: refs/heads/master
Commit: 38959d7fd036ff26f385579defb1e2cac403a5a0
Parents: 7f18f4b
Author: Jonathan S. Fisher <jo...@emoneyusa.com>
Authored: Mon Sep 17 14:31:34 2018 -0500
Committer: Jonathan S. Fisher <ex...@gmail.com>
Committed: Tue Oct 16 19:08:25 2018 -0500

----------------------------------------------------------------------
 .../src/main/java/org/apache/tomee/installer/Installer.java        | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/38959d7f/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java b/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
index 40422f1..5ad3b09 100644
--- a/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
+++ b/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
@@ -780,6 +780,8 @@ public class Installer implements InstallerInterface {
                 systemPropertiesWriter.write("# openejb.jaxrs.application = \n");
                 systemPropertiesWriter.write("# openejb.cxf-rs.wadl-generator.ignoreRequests = false\n");
                 systemPropertiesWriter.write("# openejb.cxf-rs.wadl-generator.ignoreMessageWriters = true\n");
+                systemPropertiesWriter.write("# Replace the Jonhzon JSON Providers with the following classes [comma seperated, no spaces]\n");
+                systemPropertiesWriter.write("# openejb.jaxrs.jsonProviders =\n");
 
                 systemPropertiesWriter.write("#\n");
                 systemPropertiesWriter.write("# These properties are only for cxf service (SOAP webservices) and TomEE+\n");