svn commit: r1541038 - in /webservices/wss4j/trunk: ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/ ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/transformer/

[coheigea]

Author: coheigea
Date: Tue Nov 12 12:52:33 2013
New Revision: 1541038

URL: http://svn.apache.org/r1541038
Log:
Refining previous commit

Modified:
    
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/AttachmentContentSignatureTransform.java
    
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/transformer/AttachmentContentSignatureTransform.java

Modified: 
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/AttachmentContentSignatureTransform.java
URL: 
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/AttachmentContentSignatureTransform.java?rev=1541038&r1=1541037&r2=1541038&view=diff
==============================================================================
--- 
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/AttachmentContentSignatureTransform.java
 (original)
+++ 
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/AttachmentContentSignatureTransform.java
 Tue Nov 12 12:52:33 2013
@@ -178,7 +178,7 @@ public class AttachmentContentSignatureT
             if (lowerCaseMimeType != null 
                 && (lowerCaseMimeType.startsWith("text/xml")
                     || lowerCaseMimeType.startsWith("application/xml")
-                    || lowerCaseMimeType.matches("application/.*xml.*"))) {
+                    || 
lowerCaseMimeType.matches("(application|image)/.*\\+xml.*"))) {
                 /* 5.4.2:
                  * Content of an XML Content-Type MUST be XML canonicalized 
using
                  * Exclusive XML Canonicalization without comments,as 
specified by

Modified: 
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/transformer/AttachmentContentSignatureTransform.java
URL: 
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/transformer/AttachmentContentSignatureTransform.java?rev=1541038&r1=1541037&r2=1541038&view=diff
==============================================================================
--- 
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/transformer/AttachmentContentSignatureTransform.java
 (original)
+++ 
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/transformer/AttachmentContentSignatureTransform.java
 Tue Nov 12 12:52:33 2013
@@ -82,7 +82,7 @@ public class AttachmentContentSignatureT
         if (lowerCaseMimeType != null 
             && (lowerCaseMimeType.startsWith("text/xml")
                 || lowerCaseMimeType.startsWith("application/xml")
-                || lowerCaseMimeType.matches("application/.*xml.*"))) {
+                || 
lowerCaseMimeType.matches("(application|image)/.*\\+xml.*"))) {
             /* 5.4.2:
              * Content of an XML Content-Type MUST be XML canonicalized using
              * Exclusive XML Canonicalization without comments,as specified by