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/07/16 21:34:35 UTC
svn commit: r794797 - in /cxf/branches/2.2.x-fixes: ./
rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java
Author: dkulp
Date: Thu Jul 16 19:34:35 2009
New Revision: 794797
URL: http://svn.apache.org/viewvc?rev=794797&view=rev
Log:
Merged revisions 794778 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r794778 | dkulp | 2009-07-16 15:01:56 -0400 (Thu, 16 Jul 2009) | 1 line
[CXF-2344] Make sure id and headers are copied in attachments
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 16 19:34:35 2009
@@ -1 +1 @@
-/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784184,784893,784895,785279-785282,785468,785621,785624,785651,785734,785866,786142,786271-786272,786395,786512,786514,786582-786583,786638,786647,786850,787200,787269,787277-787279,787290-787291,787305,787323,787366,787849,788030,788060,788187,788444,788451,788703,788752,788774,788819-788820,789013,789371,789387,789420,789527-789530,789704-789705,789788,789811,789896-789901,790074,790094,790134,790188,790294,790553,790637-790644,790868,791301,791354,791538,791753,791947,792007,792096,792183,792261-792265,792271,792604,792683-792685,792975,792985,793059,793570,794297,794396,794680,794728,794771
+/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784184,784893,784895,785279-785282,785468,785621,785624,785651,785734,785866,786142,786271-786272,786395,786512,786514,786582-786583,786638,786647,786850,787200,787269,787277-787279,787290-787291,787305,787323,787366,787849,788030,788060,788187,788444,788451,788703,788752,788774,788819-788820,789013,789371,789387,789420,789527-789530,789704-789705,789788,789811,789896-789901,790074,790094,790134,790188,790294,790553,790637-790644,790868,791301,791354,791538,791753,791947,792007,792096,792183,792261-792265,792271,792604,792683-792685,792975,792985,793059,793570,794297,794396,794680,794728,794771,794778
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.2.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java?rev=794797&r1=794796&r2=794797&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java (original)
+++ cxf/branches/2.2.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java Thu Jul 16 19:34:35 2009
@@ -21,6 +21,7 @@
import java.util.Collection;
+import java.util.Iterator;
import java.util.ResourceBundle;
import javax.xml.namespace.QName;
@@ -108,13 +109,17 @@
StaxUtils.copy(node, new W3CDOMStreamWriter(part));
}
-
- // TODO: setup mime headers
Collection<Attachment> atts = message.getAttachments();
if (atts != null) {
for (Attachment a : atts) {
AttachmentPart ap = soapMessage.createAttachmentPart(a.getDataHandler());
-
+ ap.setContentId(a.getId());
+ Iterator<String> i = a.getHeaderNames();
+ while (i != null && i.hasNext()) {
+ String h = i.next();
+ String val = a.getHeader(h);
+ ap.addMimeHeader(h, val);
+ }
soapMessage.addAttachmentPart(ap);
}
}