You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2018/10/16 21:22:58 UTC
[1/3] tomee git commit: Allow custom JSON Providers to replace Johnzon
Repository: tomee
Updated Branches:
refs/heads/tomee-7.0.x 1dea4fb49 -> 1b73ff86c
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/e6e9f60e
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/e6e9f60e
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/e6e9f60e
Branch: refs/heads/tomee-7.0.x
Commit: e6e9f60e991387c0ecfeacff438366a0c24ef17e
Parents: 980d7f6
Author: Jonathan S. Fisher <jo...@emoneyusa.com>
Authored: Sat Sep 15 16:16:51 2018 -0500
Committer: Jonathan S. Fisher <ex...@gmail.com>
Committed: Sat Sep 22 13:22:05 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/e6e9f60e/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 31bd2e0..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.TomEEJohnzonProvider",
- "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/e6e9f60e/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 e10172f..9366de7 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/3] tomee git commit: add doc reference in system.properties
Posted by jg...@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/0d16fc8d
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/0d16fc8d
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/0d16fc8d
Branch: refs/heads/tomee-7.0.x
Commit: 0d16fc8d7083ff48bf8e95405debfece7b0552bc
Parents: e6e9f60
Author: Jonathan S. Fisher <jo...@emoneyusa.com>
Authored: Mon Sep 17 14:31:34 2018 -0500
Committer: Jonathan S. Fisher <ex...@gmail.com>
Committed: Sat Sep 22 13:22:15 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/0d16fc8d/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 301dfd5..2e158bf 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");
[3/3] tomee git commit: Merge branch 'allow-custom-json-provider' of
github.com:exabrial/tomee into tomee-7.0.x
Posted by jg...@apache.org.
Merge branch 'allow-custom-json-provider' of github.com:exabrial/tomee into tomee-7.0.x
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/1b73ff86
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/1b73ff86
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/1b73ff86
Branch: refs/heads/tomee-7.0.x
Commit: 1b73ff86c8594ccc7967d886f0961a85922b2aa2
Parents: 1dea4fb 0d16fc8
Author: Jonathan Gallimore <jo...@jrg.me.uk>
Authored: Tue Oct 16 22:22:45 2018 +0100
Committer: Jonathan Gallimore <jo...@jrg.me.uk>
Committed: Tue Oct 16 22:22:45 2018 +0100
----------------------------------------------------------------------
.../org/apache/openejb/server/cxf/rs/CxfRSService.java | 13 ++++++++++---
.../openejb/server/cxf/rs/CxfRsHttpListener.java | 6 ++++--
.../java/org/apache/tomee/installer/Installer.java | 2 ++
3 files changed, 16 insertions(+), 5 deletions(-)
----------------------------------------------------------------------