Repository: cxf Updated Branches: refs/heads/master bbe1a2adb -> d8f82a8c0
[CXF-5879]: Distinguishing client or service in FactoryBeanListener Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d8f82a8c Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d8f82a8c Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d8f82a8c Branch: refs/heads/master Commit: d8f82a8c0cfbeb07f53c1aff81dd73b45544ef0b Parents: bbe1a2a Author: Andrei Shakirin <[email protected]> Authored: Tue Jul 15 10:01:02 2014 +0200 Committer: Andrei Shakirin <[email protected]> Committed: Tue Jul 15 10:01:02 2014 +0200 ---------------------------------------------------------------------- .../apache/cxf/service/factory/FactoryBeanListener.java | 10 ++++++++++ .../java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java | 4 ++++ .../java/org/apache/cxf/frontend/ClientFactoryBean.java | 1 + .../java/org/apache/cxf/frontend/ServerFactoryBean.java | 10 ++++++++++ .../apache/cxf/jaxrs/client/JAXRSClientFactoryBean.java | 1 + 5 files changed, 26 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/d8f82a8c/core/src/main/java/org/apache/cxf/service/factory/FactoryBeanListener.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/service/factory/FactoryBeanListener.java b/core/src/main/java/org/apache/cxf/service/factory/FactoryBeanListener.java index e511895..9a77506 100644 --- a/core/src/main/java/org/apache/cxf/service/factory/FactoryBeanListener.java +++ b/core/src/main/java/org/apache/cxf/service/factory/FactoryBeanListener.java @@ -97,6 +97,11 @@ public interface FactoryBeanListener { /** * Server, targetObject, Class */ + PRE_SERVER_CREATE, + + /** + * Server, targetObject, Class + */ SERVER_CREATED, /** @@ -112,6 +117,11 @@ public interface FactoryBeanListener { /** * Endpoint, Client */ + PRE_CLIENT_CREATE, + + /** + * Endpoint, Client + */ CLIENT_CREATED, /** http://git-wip-us.apache.org/repos/asf/cxf/blob/d8f82a8c/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java index 58b6040..a49e0a3 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java @@ -158,6 +158,10 @@ public class JAXRSServerFactoryBean extends AbstractJAXRSFactoryBean { } Endpoint ep = createEndpoint(); + + getServiceFactory().sendEvent(FactoryBeanListener.Event.PRE_SERVER_CREATE, + server); + server = new ServerImpl(getBus(), ep, getDestinationFactory(), http://git-wip-us.apache.org/repos/asf/cxf/blob/d8f82a8c/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientFactoryBean.java ---------------------------------------------------------------------- diff --git a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientFactoryBean.java b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientFactoryBean.java index f8e70aa..ce3da9c 100644 --- a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientFactoryBean.java +++ b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientFactoryBean.java @@ -89,6 +89,7 @@ public class ClientFactoryBean extends AbstractWSDLBasedEndpointFactory { Endpoint ep = null; try { ep = createEndpoint(); + this.getServiceFactory().sendEvent(FactoryBeanListener.Event.PRE_CLIENT_CREATE, ep); applyProperties(ep); client = createClient(ep); initializeAnnotationInterceptors(ep, getServiceClass()); http://git-wip-us.apache.org/repos/asf/cxf/blob/d8f82a8c/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java ---------------------------------------------------------------------- diff --git a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java index 9b93af8..cd54fe6 100644 --- a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java +++ b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java @@ -157,6 +157,16 @@ public class ServerFactoryBean extends AbstractWSDLBasedEndpointFactory { } Endpoint ep = createEndpoint(); + + getServiceFactory().sendEvent(FactoryBeanListener.Event.PRE_SERVER_CREATE, server, serviceBean, + serviceBean == null + ? getServiceClass() == null + ? getServiceFactory().getServiceClass() + : getServiceClass() + : getServiceClass() == null + ? ClassHelper.getRealClass(getServiceBean()) + : getServiceClass()); + server = new ServerImpl(getBus(), ep, getDestinationFactory(), http://git-wip-us.apache.org/repos/asf/cxf/blob/d8f82a8c/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBean.java ---------------------------------------------------------------------- diff --git a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBean.java b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBean.java index fcbcb43..95b4676 100644 --- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBean.java +++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBean.java @@ -210,6 +210,7 @@ public class JAXRSClientFactoryBean extends AbstractJAXRSFactoryBean { try { Endpoint ep = createEndpoint(); + this.getServiceFactory().sendEvent(FactoryBeanListener.Event.PRE_CLIENT_CREATE, ep); ClientState actualState = getActualState(); WebClient client = actualState == null ? new WebClient(getAddress()) : new WebClient(actualState);
