svn commit: r1861497 - in /webservices/wss4j/branches/2_2_x-fixes: ws-security-dom/src/main/java/org/apache/wss4j/dom/util/EncryptionUtils.java ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SAMLTokenOutputProcessor.java

[coheigea]

Author: coheigea
Date: Mon Jun 17 09:42:45 2019
New Revision: 1861497

URL: http://svn.apache.org/viewvc?rev=1861497&view=rev
Log:
Disable DocTypes

Modified:
    
webservices/wss4j/branches/2_2_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/EncryptionUtils.java
    
webservices/wss4j/branches/2_2_x-fixes/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SAMLTokenOutputProcessor.java

Modified: 
webservices/wss4j/branches/2_2_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/EncryptionUtils.java
URL: 
http://svn.apache.org/viewvc/webservices/wss4j/branches/2_2_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/EncryptionUtils.java?rev=1861497&r1=1861496&r2=1861497&view=diff
==============================================================================
--- 
webservices/wss4j/branches/2_2_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/EncryptionUtils.java
 (original)
+++ 
webservices/wss4j/branches/2_2_x-fixes/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/EncryptionUtils.java
 Mon Jun 17 09:42:45 2019
@@ -391,7 +391,7 @@ public final class EncryptionUtils {
         // For the xop:Include case, we need to replace the xop:Include 
Element with the
         // decrypted Element
         DocumentBuilder db =
-                
org.apache.xml.security.utils.XMLUtils.createDocumentBuilder(false);
+                
org.apache.xml.security.utils.XMLUtils.createDocumentBuilder(true);
         byte[] bytes = JavaUtils.getBytesFromStream(attachmentInputStream);
 
         Document document = null;

Modified: 
webservices/wss4j/branches/2_2_x-fixes/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SAMLTokenOutputProcessor.java
URL: 
http://svn.apache.org/viewvc/webservices/wss4j/branches/2_2_x-fixes/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SAMLTokenOutputProcessor.java?rev=1861497&r1=1861496&r2=1861497&view=diff
==============================================================================
--- 
webservices/wss4j/branches/2_2_x-fixes/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SAMLTokenOutputProcessor.java
 (original)
+++ 
webservices/wss4j/branches/2_2_x-fixes/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SAMLTokenOutputProcessor.java
 Mon Jun 17 09:42:45 2019
@@ -442,7 +442,7 @@ public class SAMLTokenOutputProcessor ex
                 
OutputProcessorUtils.updateSecurityHeaderOrder(outputProcessorChain, 
headerElementName, getAction(), false);
 
                 try {
-                    DocumentBuilder db = XMLUtils.createDocumentBuilder(false);
+                    DocumentBuilder db = XMLUtils.createDocumentBuilder(true);
                     
outputDOMElement(samlAssertionWrapper.toDOM(db.newDocument()), 
subOutputProcessorChain);
                     XMLUtils.repoolDocumentBuilder(db);
                 } catch (ParserConfigurationException ex) {