Repository: tomee Updated Branches: refs/heads/develop abf8de7a7 -> 3222d017e
adding appcontext in ExtensionProviderRegistration Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/3222d017 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/3222d017 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/3222d017 Branch: refs/heads/develop Commit: 3222d017ebf3034f0a8f68501f94c26a5a9e35ea Parents: abf8de7 Author: Romain Manni-Bucau <[email protected]> Authored: Mon Nov 17 12:10:08 2014 +0100 Committer: Romain Manni-Bucau <[email protected]> Committed: Mon Nov 17 12:10:08 2014 +0100 ---------------------------------------------------------------------- .../org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java | 3 ++- .../server/cxf/rs/event/ExtensionProviderRegistration.java | 9 ++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/3222d017/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 f561311..df967df 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 @@ -798,7 +798,8 @@ public class CxfRsHttpListener implements RsHttpListener { addMandatoryProviders(providers); } - SystemInstance.get().fireEvent(new ExtensionProviderRegistration(providers)); + SystemInstance.get().fireEvent(new ExtensionProviderRegistration( + AppFinder.findAppContextOrWeb(Thread.currentThread().getContextClassLoader(), AppFinder.AppContextTransformer.INSTANCE), providers)); LOGGER.info("Using providers:"); for (final Object provider : providers) { http://git-wip-us.apache.org/repos/asf/tomee/blob/3222d017/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/event/ExtensionProviderRegistration.java ---------------------------------------------------------------------- diff --git a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/event/ExtensionProviderRegistration.java b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/event/ExtensionProviderRegistration.java index 56aaef4..cfae25c 100644 --- a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/event/ExtensionProviderRegistration.java +++ b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/event/ExtensionProviderRegistration.java @@ -16,6 +16,7 @@ */ package org.apache.openejb.server.cxf.rs.event; +import org.apache.openejb.AppContext; import org.apache.openejb.observer.Event; import java.util.List; @@ -25,11 +26,17 @@ import java.util.List; @Event public class ExtensionProviderRegistration { private final List<Object> providers; + private final AppContext appContext; - public ExtensionProviderRegistration(final List<Object> existings) { + public ExtensionProviderRegistration(final AppContext ctx, final List<Object> existings) { + this.appContext = ctx; this.providers = existings; } + public AppContext getAppContext() { + return appContext; + } + public List<Object> getProviders() { return providers; }
