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 2009/05/07 17:55:09 UTC
svn commit: r772686 - in /cxf/branches/2.1.x-fixes: ./
rt/core/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java
rt/core/src/main/java/org/apache/cxf/transport/http/WSDLQueryHandler.java
Author: dkulp
Date: Thu May 7 15:55:08 2009
New Revision: 772686
URL: http://svn.apache.org/viewvc?rev=772686&view=rev
Log:
Merged revisions 772658 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r772658 | dkulp | 2009-05-07 10:28:58 -0400 (Thu, 07 May 2009) | 3 lines
[CXF-2184, CXF-2203] Fix attachment serializer id formatting
Use given URL for imported schemas in ?wsdl
........
Modified:
cxf/branches/2.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java
cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/transport/http/WSDLQueryHandler.java
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 7 15:55:08 2009
@@ -1 +1 @@
-/cxf/trunk:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761113,761120,761317,761759,761789,762393,762518,762567,763200,763272,763495,763854,763931,763942,763953,764033-764034,764581,764599-764606,764887,765357,766013,766058,766100-766101,766763,766770,766860,766962-766963,767159,767191,767927,771416,772143,772402
+/cxf/trunk:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761113,761120,761317,761759,761789,762393,762518,762567,763200,763272,763495,763854,763931,763942,763953,764033-764034,764581,764599-764606,764887,765357,766013,766058,766100-766101,766763,766770,766860,766962-766963,767159,767191,767927,771416,772143,772402,772658
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java?rev=772686&r1=772685&r2=772686&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java (original)
+++ cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java Thu May 7 15:55:08 2009
@@ -125,6 +125,10 @@
writer.write("Content-Transfer-Encoding: binary\r\n");
writer.write("Content-ID: <");
+ if (attachmentId.charAt(0) == '<'
+ && attachmentId.charAt(attachmentId.length() - 1) == '>') {
+ attachmentId = attachmentId.substring(1, attachmentId.length() - 1);
+ }
writer.write(URLDecoder.decode(attachmentId, "UTF-8"));
writer.write(">\r\n\r\n");
}
Modified: cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/transport/http/WSDLQueryHandler.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/transport/http/WSDLQueryHandler.java?rev=772686&r1=772685&r2=772686&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/transport/http/WSDLQueryHandler.java (original)
+++ cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/transport/http/WSDLQueryHandler.java Thu May 7 15:55:08 2009
@@ -109,7 +109,15 @@
try {
int idx = baseUri.toLowerCase().indexOf("?");
Map<String, String> params = UrlUtilities.parseQueryString(baseUri.substring(idx + 1));
- String base = baseUri.substring(0, baseUri.toLowerCase().indexOf("?"));
+
+ String base;
+
+ if (endpointInfo.getProperty("publishedEndpointUrl") != null) {
+ base = String.valueOf(endpointInfo.getProperty("publishedEndpointUrl"));
+ } else {
+ base = baseUri.substring(0, baseUri.toLowerCase().indexOf("?"));
+ }
+
String wsdl = params.get("wsdl");
String xsd = params.get("xsd");