From 9a3771712ffcde0970c4fa0bc40dc6e75b338cdc Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@vmware.com>
Date: Thu, 22 Nov 2007 14:56:03 +0000
Subject: [PATCH] SWS-225

---
 .../ws/soap/saaj/SaajSoapMessage.java           |  1 +
 .../ws/transport/TransportConstants.java        | 10 ++++++----
 parent/pom.xml                                  | 17 ++++++++++-------
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapMessage.java b/core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapMessage.java
index f09d575a..40b28a9f 100644
--- a/core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapMessage.java
+++ b/core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapMessage.java
@@ -195,6 +195,7 @@ public class SaajSoapMessage extends AbstractSoapMessage {
         Assert.notNull(dataHandler, "dataHandler must not be null");
         AttachmentPart saajAttachment = getImplementation().addAttachmentPart(getSaajMessage(), dataHandler);
         saajAttachment.setContentId(contentId);
+        saajAttachment.setMimeHeader(TransportConstants.HEADER_CONTENT_TRANSFER_ENCODING, "binary");
         return new SaajAttachment(saajAttachment);
     }
 
diff --git a/core/src/main/java/org/springframework/ws/transport/TransportConstants.java b/core/src/main/java/org/springframework/ws/transport/TransportConstants.java
index ee003116..5bb74f73 100644
--- a/core/src/main/java/org/springframework/ws/transport/TransportConstants.java
+++ b/core/src/main/java/org/springframework/ws/transport/TransportConstants.java
@@ -27,13 +27,15 @@ public interface TransportConstants {
     /** The "Content-Id" header. */
     String HEADER_CONTENT_ID = "Content-Id";
 
-    /** The "Content-Type" header. */
-    String HEADER_CONTENT_TYPE = "Content-Type";
-
     /** The "Content-Length" header. */
     String HEADER_CONTENT_LENGTH = "Content-Length";
 
+    /** The "Content-Transfer-Encoding" header. */
+    String HEADER_CONTENT_TRANSFER_ENCODING = "Content-Transfer-Encoding";
+
+    /** The "Content-Type" header. */
+    String HEADER_CONTENT_TYPE = "Content-Type";
+
     /** The "SOAPAction" header. */
     String HEADER_SOAP_ACTION = "SOAPAction";
-
 }
diff --git a/parent/pom.xml b/parent/pom.xml
index 6a57ddce..1c70dd85 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -41,13 +41,6 @@
             <url>http://download.java.net/maven/1/</url>
             <layout>legacy</layout>
         </repository>
-        <!--
-                <repository>
-                    <id>spring-milestone</id>
-                    <name>Springframework Maven Milestone Repository</name>
-                    <url>http://s3.amazonaws.com/maven.springframework.org/milestone</url>
-                </repository>
-        -->
     </repositories>
     <build>
         <extensions>
@@ -557,6 +550,16 @@
                 <artifactId>xmlsec</artifactId>
                 <version>2.0</version>
             </dependency>
+            <dependency>
+                <groupId>xml-security</groupId>
+                <artifactId>xmlsec</artifactId>
+                <version>1.3.0</version>
+            </dependency>
+            <dependency>
+                <groupId>wss4j</groupId>
+                <artifactId>wss4j</artifactId>
+                <version>1.5.1</version>
+            </dependency>
             <dependency>
                 <groupId>org.acegisecurity</groupId>
                 <artifactId>acegi-security</artifactId>