Revert changes on ExtensionProviderRegistration
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/ae7c21ea Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/ae7c21ea Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/ae7c21ea Branch: refs/heads/master Commit: ae7c21ea514594031cad102ad871203ef1f6bcb0 Parents: e75018b Author: Jean-Louis Monteiro <jeano...@gmail.com> Authored: Wed Mar 7 08:12:10 2018 +0100 Committer: Jean-Louis Monteiro <jeano...@gmail.com> Committed: Wed Mar 7 08:12:10 2018 +0100 ---------------------------------------------------------------------- .../apache/openejb/server/cxf/rs/CxfRsHttpListener.java | 2 +- .../cxf/rs/event/ExtensionProviderRegistration.java | 9 +-------- .../microprofile/jwt/jaxrs/MPJWPProviderRegistration.java | 10 ---------- 3 files changed, 2 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/ae7c21ea/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 305a1c1..e10172f 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 @@ -1019,7 +1019,7 @@ public class CxfRsHttpListener implements RsHttpListener { } } - SystemInstance.get().fireEvent(new ExtensionProviderRegistration(server, + SystemInstance.get().fireEvent(new ExtensionProviderRegistration( AppFinder.findAppContextOrWeb(Thread.currentThread().getContextClassLoader(), AppFinder.AppContextTransformer.INSTANCE), providers)); if (!providers.isEmpty()) { http://git-wip-us.apache.org/repos/asf/tomee/blob/ae7c21ea/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 7af089f..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,7 +16,6 @@ */ package org.apache.openejb.server.cxf.rs.event; -import org.apache.cxf.endpoint.Server; import org.apache.openejb.AppContext; import org.apache.openejb.observer.Event; @@ -26,12 +25,10 @@ import java.util.List; // this event can allow to add/remove/resort providers @Event public class ExtensionProviderRegistration { - private final Server server; private final List<Object> providers; private final AppContext appContext; - public ExtensionProviderRegistration(final Server server, final AppContext ctx, final List<Object> existings) { - this.server = server; + public ExtensionProviderRegistration(final AppContext ctx, final List<Object> existings) { this.appContext = ctx; this.providers = existings; } @@ -44,10 +41,6 @@ public class ExtensionProviderRegistration { return providers; } - public Server getServer() { - return server; - } - @Override public String toString() { return "ExtensionProviderRegistration{}"; http://git-wip-us.apache.org/repos/asf/tomee/blob/ae7c21ea/tck/mp-jwt-embedded/src/main/java/org/apache/tomee/microprofile/jwt/jaxrs/MPJWPProviderRegistration.java ---------------------------------------------------------------------- diff --git a/tck/mp-jwt-embedded/src/main/java/org/apache/tomee/microprofile/jwt/jaxrs/MPJWPProviderRegistration.java b/tck/mp-jwt-embedded/src/main/java/org/apache/tomee/microprofile/jwt/jaxrs/MPJWPProviderRegistration.java index 29c146e..2102c89 100644 --- a/tck/mp-jwt-embedded/src/main/java/org/apache/tomee/microprofile/jwt/jaxrs/MPJWPProviderRegistration.java +++ b/tck/mp-jwt-embedded/src/main/java/org/apache/tomee/microprofile/jwt/jaxrs/MPJWPProviderRegistration.java @@ -19,16 +19,6 @@ package org.apache.tomee.microprofile.jwt.jaxrs; import org.apache.openejb.observer.Observes; import org.apache.openejb.server.cxf.rs.event.ExtensionProviderRegistration; import org.apache.tomee.microprofile.jwt.MPJWTFilter; -import org.eclipse.microprofile.auth.LoginConfig; - -import javax.servlet.FilterRegistration; -import javax.servlet.ServletContainerInitializer; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.annotation.HandlesTypes; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; -import java.util.Set; /** * OpenEJB/TomEE hack to register a new provider on the fly
