cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r1304186 - in /cxf/branches/2.4.x-fixes: ./ api/src/main/java/org/apache/cxf/transport/TransportURIResolver.java
Date Sun, 25 Mar 2012 18:16:06 GMT
Author: ningjiang
Date: Fri Mar 23 04:36:42 2012
New Revision: 1304186

URL: http://svn.apache.org/viewvc?rev=1304186&view=rev
Log:
Merged revisions 1304184 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes

................
  r1304184 | ningjiang | 2012-03-23 12:25:42 +0800 (Fri, 23 Mar 2012) | 9 lines
  
  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.4.x-fixes/   (props changed)
    cxf/branches/2.4.x-fixes/api/src/main/java/org/apache/cxf/transport/TransportURIResolver.java

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Mar 23 04:36:42 2012
@@ -0,0 +1,2 @@
+/cxf/branches/2.5.x-fixes:1304184
+/cxf/trunk:1304181

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

Modified: cxf/branches/2.4.x-fixes/api/src/main/java/org/apache/cxf/transport/TransportURIResolver.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/api/src/main/java/org/apache/cxf/transport/TransportURIResolver.java?rev=1304186&r1=1304185&r2=1304186&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/api/src/main/java/org/apache/cxf/transport/TransportURIResolver.java
(original)
+++ cxf/branches/2.4.x-fixes/api/src/main/java/org/apache/cxf/transport/TransportURIResolver.java
Fri Mar 23 04:36: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();



Mime
View raw message