tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmannibu...@apache.org
Subject git commit: backport from trunk (missed?) - making cxf.jaxrs.skip-provider-scanning usable
Date Wed, 29 Oct 2014 14:23:40 GMT
Repository: tomee
Updated Branches:
  refs/heads/tomee-1.7.x 9189aaea5 -> 4484e3d4e


backport from trunk (missed?) - making cxf.jaxrs.skip-provider-scanning usable


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

Branch: refs/heads/tomee-1.7.x
Commit: 4484e3d4ec580847b161aabf732edcd8e14224b2
Parents: 9189aae
Author: Romain Manni-Bucau <rmannibucau@apache.org>
Authored: Wed Oct 29 15:23:16 2014 +0100
Committer: Romain Manni-Bucau <rmannibucau@apache.org>
Committed: Wed Oct 29 15:23:16 2014 +0100

----------------------------------------------------------------------
 .../java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/4484e3d4/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 94b324c..c30888a 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
@@ -744,7 +744,8 @@ public class CxfRsHttpListener implements RsHttpListener {
 
         // another property to configure the scanning of providers but this one is consistent
with current cxf config
         // the other one is more generic but need another file
-        final boolean ignoreAutoProviders = "false".equalsIgnoreCase(serviceConfiguration.getProperties().getProperty(CXF_JAXRS_PREFIX
+ "skip-provider-scanning"));
+        final String key = CXF_JAXRS_PREFIX + "skip-provider-scanning";
+        final boolean ignoreAutoProviders = "true".equalsIgnoreCase(SystemInstance.get().getProperty(key,
serviceConfiguration.getProperties().getProperty(key, "false")));
         final Collection<Object> additionalProviders = ignoreAutoProviders ? Collections.emptyList()
: givenAdditionalProviders;
         List<Object> providers = null;
         if (providersConfig != null) {


Mime
View raw message