svn commit: r1049975 - in /webservices/wss4j/trunk/src: main/java/org/apache/ws/security/message/ main/java/org/apache/ws/security/saml/ test/java/org/apache/ws/security/message/

Thu, 16 Dec 2010 05:51:42 -0800 

Author: coheigea
Date: Thu Dec 16 13:51:17 2010
New Revision: 1049975

URL: http://svn.apache.org/viewvc?rev=1049975&view=rev
Log:
[WSS-259] - Minor stuff.

Modified:
    
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/message/WSSecDKEncrypt.java
    
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/message/WSSecDKSign.java
    
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/message/WSSecEncrypt.java
    
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/message/WSSecSignature.java
    
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/WSSecSignatureSAML.java
    
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/EncryptionPartsTest.java

Modified: 
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/message/WSSecDKEncrypt.java
URL: 
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/main/java/org/apache/ws/security/message/WSSecDKEncrypt.java?rev=1049975&r1=1049974&r2=1049975&view=diff
==============================================================================
--- 
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/message/WSSecDKEncrypt.java
 (original)
+++ 
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/message/WSSecDKEncrypt.java
 Thu Dec 16 13:51:17 2010
@@ -61,7 +61,7 @@ public class WSSecDKEncrypt extends WSSe
                 
         String soapNamespace = WSSecurityUtil.getSOAPNamespace(envelope);
         if (parts == null) {
-            parts = new ArrayList<WSEncryptionPart>();
+            parts = new ArrayList<WSEncryptionPart>(1);
             WSEncryptionPart encP = 
                 new WSEncryptionPart(
                     WSConstants.ELEM_BODY, 

Modified: 
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/message/WSSecDKSign.java
URL: 
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/main/java/org/apache/ws/security/message/WSSecDKSign.java?rev=1049975&r1=1049974&r2=1049975&view=diff
==============================================================================
--- 
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/message/WSSecDKSign.java
 (original)
+++ 
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/message/WSSecDKSign.java
 Thu Dec 16 13:51:17 2010
@@ -86,7 +86,7 @@ public class WSSecDKSign extends WSSecDe
         prepare(doc, secHeader);
         String soapNamespace = 
WSSecurityUtil.getSOAPNamespace(doc.getDocumentElement());
         if (parts == null) {
-            parts = new ArrayList<WSEncryptionPart>();
+            parts = new ArrayList<WSEncryptionPart>(1);
             WSEncryptionPart encP = 
                 new WSEncryptionPart(
                     WSConstants.ELEM_BODY,

Modified: 
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/message/WSSecEncrypt.java
URL: 
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/main/java/org/apache/ws/security/message/WSSecEncrypt.java?rev=1049975&r1=1049974&r2=1049975&view=diff
==============================================================================
--- 
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/message/WSSecEncrypt.java
 (original)
+++ 
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/message/WSSecEncrypt.java
 Thu Dec 16 13:51:17 2010
@@ -258,7 +258,7 @@ public class WSSecEncrypt extends WSSecE
         }
         
         if (parts == null) {
-            parts = new ArrayList<WSEncryptionPart>();
+            parts = new ArrayList<WSEncryptionPart>(1);
             String soapNamespace = WSSecurityUtil.getSOAPNamespace(envelope);
             WSEncryptionPart encP = 
                 new WSEncryptionPart(

Modified: 
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/message/WSSecSignature.java
URL: 
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/main/java/org/apache/ws/security/message/WSSecSignature.java?rev=1049975&r1=1049974&r2=1049975&view=diff
==============================================================================
--- 
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/message/WSSecSignature.java
 (original)
+++ 
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/message/WSSecSignature.java
 Thu Dec 16 13:51:17 2010
@@ -287,7 +287,7 @@ public class WSSecSignature extends WSSe
 
         prepare(doc, cr, secHeader);
         if (parts == null) {
-            parts = new ArrayList<WSEncryptionPart>();
+            parts = new ArrayList<WSEncryptionPart>(1);
             String soapNamespace = 
WSSecurityUtil.getSOAPNamespace(doc.getDocumentElement());
             WSEncryptionPart encP = 
                 new WSEncryptionPart(

Modified: 
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/WSSecSignatureSAML.java
URL: 
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/WSSecSignatureSAML.java?rev=1049975&r1=1049974&r2=1049975&view=diff
==============================================================================
--- 
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/WSSecSignatureSAML.java
 (original)
+++ 
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/WSSecSignatureSAML.java
 Thu Dec 16 13:51:17 2010
@@ -119,7 +119,7 @@ public class WSSecSignatureSAML extends 
 
         String soapNamespace = 
WSSecurityUtil.getSOAPNamespace(doc.getDocumentElement());
         if (parts == null) {
-            parts = new ArrayList<WSEncryptionPart>();
+            parts = new ArrayList<WSEncryptionPart>(1);
             WSEncryptionPart encP = 
                 new WSEncryptionPart(WSConstants.ELEM_BODY, soapNamespace, 
"Content");
             parts.add(encP);

Modified: 
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/EncryptionPartsTest.java
URL: 
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/EncryptionPartsTest.java?rev=1049975&r1=1049974&r2=1049975&view=diff
==============================================================================
--- 
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/EncryptionPartsTest.java
 (original)
+++ 
webservices/wss4j/trunk/src/test/java/org/apache/ws/security/message/EncryptionPartsTest.java
 Thu Dec 16 13:51:17 2010
@@ -351,12 +351,12 @@ public class EncryptionPartsTest extends
         
         Document encryptedDoc = encrypt.build(doc, crypto, secHeader);
         
+        String outputString = 
+            
org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(encryptedDoc);
         if (LOG.isDebugEnabled()) {
-            String outputString = 
-                
org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(encryptedDoc);
             LOG.debug(outputString);
         }
-        
+        assertTrue (!outputString.contains("testMethod"));
         List<WSSecurityEngineResult> results = verify(encryptedDoc);
         
         QName bodyName = new QName(soapConstants.getEnvelopeURI(), "Body");

Reply via email to