You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2011/08/23 21:43:53 UTC
svn commit: r1160871 - in /cxf/branches/2.3.x-fixes: ./
rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java
Author: dkulp
Date: Tue Aug 23 19:43:53 2011
New Revision: 1160871
URL: http://svn.apache.org/viewvc?rev=1160871&view=rev
Log:
Merged revisions 1160868 via svnmerge from
https://svn.us.apache.org/repos/asf/cxf/branches/2.4.x-fixes
................
r1160868 | dkulp | 2011-08-23 15:39:36 -0400 (Tue, 23 Aug 2011) | 10 lines
Merged revisions 1160865 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1160865 | dkulp | 2011-08-23 15:37:16 -0400 (Tue, 23 Aug 2011) | 2 lines
[CXF-3754] Fix ability to configure dispatch clients from Spring
Patch from Jesse Pangburn applied
........
................
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java?rev=1160871&r1=1160870&r2=1160871&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java (original)
+++ cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java Tue Aug 23 19:43:53 2011
@@ -54,6 +54,7 @@ import javax.xml.ws.spi.ServiceDelegate;
import org.apache.cxf.Bus;
import org.apache.cxf.BusException;
+import org.apache.cxf.BusFactory;
import org.apache.cxf.binding.BindingFactoryManager;
import org.apache.cxf.common.i18n.Message;
import org.apache.cxf.common.logging.LogUtils;
@@ -64,12 +65,12 @@ import org.apache.cxf.databinding.DataBi
import org.apache.cxf.databinding.source.SourceDataBinding;
import org.apache.cxf.endpoint.Client;
import org.apache.cxf.endpoint.ClientImpl;
-import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.endpoint.EndpointException;
import org.apache.cxf.endpoint.ServiceContractResolverRegistry;
import org.apache.cxf.feature.AbstractFeature;
import org.apache.cxf.frontend.ClientProxy;
import org.apache.cxf.helpers.CastUtils;
+import org.apache.cxf.interceptor.AbstractBasicInterceptorProvider;
import org.apache.cxf.jaxb.JAXBDataBinding;
import org.apache.cxf.jaxws.binding.soap.JaxWsSoapBindingConfiguration;
import org.apache.cxf.jaxws.handler.HandlerResolverImpl;
@@ -604,38 +605,69 @@ public class ServiceImpl extends Service
Class<T> type,
Mode mode,
WebServiceFeature... features) {
- JaxWsClientFactoryBean clientFac = new JaxWsClientFactoryBean();
+ return createDispatch(portName, type, null, mode, features);
+ }
+ public <T> Dispatch<T> createDispatch(QName portName,
+ Class<T> type,
+ JAXBContext context,
+ Mode mode,
+ WebServiceFeature... features) {
+ //using this instead of JaxWsClientFactoryBean so that handlers are configured
+ JaxWsProxyFactoryBean clientFac = new JaxWsProxyFactoryBean();
//Initialize Features.
configureObject(portName.toString() + ".jaxws-client.proxyFactory", clientFac);
AbstractServiceFactoryBean sf = null;
try {
- sf = createDispatchService(new SourceDataBinding());
+ DataBinding db;
+ if (context != null) {
+ db = new JAXBDataBinding(context);
+ } else {
+ db = new SourceDataBinding();
+ }
+ sf = createDispatchService(db);
} catch (ServiceConstructionException e) {
throw new WebServiceException(e);
}
JaxWsEndpointImpl endpoint = getJaxwsEndpoint(portName, sf, features);
- Client client = new ClientImpl(getBus(), endpoint, clientFac.getConduitSelector());
- for (AbstractFeature af : clientFac.getFeatures()) {
- af.initialize(client, bus);
- }
+ // if the client factory has properties specified, then set those into the endpoint
+ if (clientFac.getProperties() != null) {
+ endpoint.putAll(clientFac.getProperties());
+ }
+ // add all the client factory features onto the endpoint feature list
+ endpoint.getFeatures().addAll(clientFac.getFeatures());
+ // if the client factory has a bus specified (other than the thread default),
+ // then use that for the client. Otherwise use the bus from this service.
+ Bus clientBus = getBus();
+ if (clientFac.getBus() != BusFactory.getThreadDefaultBus(false)
+ && clientFac.getBus() != null) {
+ clientBus = clientFac.getBus();
+ }
+ endpoint.getJaxwsBinding().setHandlerChain(clientFac.getHandlers());
+ // create the client object, then initialize the endpoint features against it
+ Client client = new ClientImpl(clientBus, endpoint, clientFac.getConduitSelector());
for (AbstractFeature af : endpoint.getFeatures()) {
- af.initialize(client, bus);
+ af.initialize(client, clientBus);
}
//CXF-2822
initIntercepors(client, clientFac);
if (executor != null) {
client.getEndpoint().setExecutor(executor);
}
-
- //Set the the EPR's address in EndpointInfo
- PortInfoImpl portInfo = portInfos.get(portName);
- if (portInfo != null && !StringUtils.isEmpty(portInfo.getAddress())) {
- client.getEndpoint().getEndpointInfo().setAddress(portInfo.getAddress());
+ // if the client factory has an address specified, use that, if not
+ // then try to get it from the wsdl
+ if (!StringUtils.isEmpty(clientFac.getAddress())) {
+ client.getEndpoint().getEndpointInfo().setAddress(clientFac.getAddress());
+ } else {
+ //Set the the EPR's address in EndpointInfo
+ PortInfoImpl portInfo = portInfos.get(portName);
+ if (portInfo != null && !StringUtils.isEmpty(portInfo.getAddress())) {
+ client.getEndpoint().getEndpointInfo().setAddress(portInfo.getAddress());
+ }
}
- Dispatch<T> disp = new DispatchImpl<T>(client, mode, type);
+ Dispatch<T> disp = new DispatchImpl<T>(client, mode, context, type);
configureObject(disp);
return disp;
}
@@ -662,36 +694,9 @@ public class ServiceImpl extends Service
JAXBContext context,
Mode mode,
WebServiceFeature... features) {
- JaxWsClientFactoryBean clientFac = new JaxWsClientFactoryBean();
-
- //Initialize Features.
- configureObject(portName.toString() + ".jaxws-client.proxyFactory", clientFac);
-
- AbstractServiceFactoryBean sf = null;
- try {
- JAXBDataBinding db = new JAXBDataBinding(context);
- sf = createDispatchService(db);
- } catch (ServiceConstructionException e) {
- throw new WebServiceException(e);
- }
- Endpoint endpoint = getJaxwsEndpoint(portName, sf, features);
- Client client = new ClientImpl(getBus(), endpoint, clientFac.getConduitSelector());
- for (AbstractFeature af : clientFac.getFeatures()) {
- af.initialize(client, bus);
- }
- //CXF-2822
- initIntercepors(client, clientFac);
- if (executor != null) {
- client.getEndpoint().setExecutor(executor);
- }
-
- Dispatch<Object> disp = new DispatchImpl<Object>(client, mode,
- context, Object.class);
- configureObject(disp);
-
- return disp;
+ return createDispatch(portName, Object.class, context, mode, features);
}
-
+
@Override
public Dispatch<Object> createDispatch(EndpointReference endpointReference,
JAXBContext context,
@@ -711,7 +716,7 @@ public class ServiceImpl extends Service
}
- private void initIntercepors(Client client, JaxWsClientFactoryBean clientFact) {
+ private void initIntercepors(Client client, AbstractBasicInterceptorProvider clientFact) {
client.getInInterceptors().addAll(clientFact.getInInterceptors());
client.getOutInterceptors().addAll(clientFact.getOutInterceptors());
client.getInFaultInterceptors().addAll(clientFact.getInFaultInterceptors());