[servicemix-scm] make it easier to provide both SAAJ properties and SAAJ Mime Headers to allow the provision of SOAPAction easier and fix for SM-49

[jstrachan]

Commit in servicemix/base/src/main/java/org/servicemix/components/saaj on MAIN
SaajMarshaler.java	+12	-3	1.3 -> 1.4

make it easier to provide both SAAJ properties and SAAJ Mime Headers to allow the provision of SOAPAction easier and fix for SM-49

---

servicemix/base/src/main/java/org/servicemix/components/saaj

SaajMarshaler.java 1.3 -> 1.4

diff -u -r1.3 -r1.4
--- SaajMarshaler.java	30 Aug 2005 14:11:36 -0000	1.3
+++ SaajMarshaler.java	31 Aug 2005 11:45:06 -0000	1.4
@@ -40,7 +40,7 @@

 import java.util.Iterator;
 
 /**

- * @version $Revision: 1.3 $

+ * @version $Revision: 1.4 $

  */
 public class SaajMarshaler {
 

@@ -120,6 +120,9 @@

             String name = (String) iter.next();
             Object value = normalizedMessage.getProperty(name);
             if (shouldIncludeHeader(normalizedMessage, name, value)) {

+                soapMessage.getMimeHeaders().addHeader(name, value.toString());
+            }
+            if (shouldIncludeProperty(normalizedMessage, name, value)) {

                 soapMessage.setProperty(name, value);
             }
         }

@@ -137,10 +140,16 @@

     }
 
     /**

-     * Decides whether or not the given header should be included in the SAAJ message.
-     * We could provide some type based filter here.

+     * Decides whether or not the given header should be included in the SAAJ message as a MimeHeader

      */
     protected boolean shouldIncludeHeader(NormalizedMessage normalizedMessage, String name, Object value) {

+        return true;
+    }
+
+    /**
+     * Decides whether or not the given property should be included in the SAAJ message as a property
+     */
+    private boolean shouldIncludeProperty(NormalizedMessage normalizedMessage, String name, Object value) {

         return true;
     }
 

CVSspam 0.2.8