You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ni...@apache.org on 2012/03/23 05:25:43 UTC

svn commit: r1304184 - in /cxf/branches/2.5.x-fixes: ./ api/src/main/java/org/apache/cxf/transport/TransportURIResolver.java

Author: ningjiang
Date: Fri Mar 23 04:25:42 2012
New Revision: 1304184

URL: http://svn.apache.org/viewvc?rev=1304184&view=rev
Log:
Merged revisions 1304181 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1304181 | ningjiang | 2012-03-23 12:01:19 +0800 (Fri, 23 Mar 2012) | 1 line
  
  CXF-4195 fixed the configuration issue of http conduit for WsdlUrl
........

Modified:
    cxf/branches/2.5.x-fixes/   (props changed)
    cxf/branches/2.5.x-fixes/api/src/main/java/org/apache/cxf/transport/TransportURIResolver.java

Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
  Merged /cxf/trunk:r1304181

Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.5.x-fixes/api/src/main/java/org/apache/cxf/transport/TransportURIResolver.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/api/src/main/java/org/apache/cxf/transport/TransportURIResolver.java?rev=1304184&r1=1304183&r2=1304184&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/api/src/main/java/org/apache/cxf/transport/TransportURIResolver.java (original)
+++ cxf/branches/2.5.x-fixes/api/src/main/java/org/apache/cxf/transport/TransportURIResolver.java Fri Mar 23 04:25:42 2012
@@ -26,6 +26,8 @@ import java.net.URISyntaxException;
 import java.util.HashSet;
 import java.util.Set;
 
+import javax.xml.namespace.QName;
+
 import org.xml.sax.InputSource;
 
 import org.apache.cxf.Bus;
@@ -101,6 +103,8 @@ public class TransportURIResolver extend
                 }
                 if (ci != null) {
                     EndpointInfo info = new EndpointInfo();
+                    // set the endpointInfo name which could be used for configuration
+                    info.setName(new QName("http://cxf.apache.org", "TransportURIResolver"));
                     info.setAddress(base.toString());
                     final Conduit c = ci.getConduit(info);
                     Message message = new MessageImpl();