Author: dkulp Date: Wed Aug 31 02:15:56 2011 New Revision: 1163472 URL: http://svn.apache.org/viewvc?rev=1163472&view=rev Log: Merged revisions 1163471 via svnmerge from https://svn.us.apache.org/repos/asf/cxf/branches/2.4.x-fixes
................ r1163471 | dkulp | 2011-08-30 22:14:37 -0400 (Tue, 30 Aug 2011) | 10 lines Merged revisions 1163470 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1163470 | dkulp | 2011-08-30 22:13:13 -0400 (Tue, 30 Aug 2011) | 2 lines [CXF-3780] Fix problem of DynamicClientFactory not honoring https settings ........ ................ Modified: cxf/branches/2.3.x-fixes/ (props changed) cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java cxf/branches/2.3.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java?rev=1163472&r1=1163471&r2=1163472&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java (original) +++ cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java Wed Aug 31 02:15:56 2011 @@ -170,12 +170,11 @@ public class ClientImpl /** * Create a Client that uses a specific EndpointImpl. * @param bus - * @param wsdlUrl * @param service * @param port * @param endpointImplFactory */ - public ClientImpl(Bus bus, URL wsdlUrl, Service svc, QName port, + public ClientImpl(Bus bus, Service svc, QName port, EndpointImplFactory endpointImplFactory) { this.bus = bus; outFaultObserver = new ClientOutFaultObserver(bus); Modified: cxf/branches/2.3.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java?rev=1163472&r1=1163471&r2=1163472&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java (original) +++ cxf/branches/2.3.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java Wed Aug 31 02:15:56 2011 @@ -256,15 +256,14 @@ public class DynamicClientFactory { if (classLoader == null) { classLoader = Thread.currentThread().getContextClassLoader(); } - URL u = composeUrl(wsdlUrl); - LOG.log(Level.FINE, "Creating client from URL " + u.toString()); + LOG.log(Level.FINE, "Creating client from WSDL " + wsdlUrl); WSDLServiceFactory sf = (service == null) ? (new WSDLServiceFactory(bus, wsdlUrl)) : (new WSDLServiceFactory(bus, wsdlUrl, service)); sf.setAllowElementRefs(allowRefs); Service svc = sf.create(); - ClientImpl client = new ClientImpl(bus, u, svc, port, + ClientImpl client = new ClientImpl(bus, svc, port, getEndpointImplFactory()); //all SI's should have the same schemas
