svn commit: r1683105 - in /webservices/wss4j/trunk: ./ ws-security-common/src/main/resources/messages/ ws-security-dom/src/main/java/org/apache/wss4j/dom/util/ ws-security-dom/src/test/java/org/apache/wss4j/dom/message/

[co...@apache.org]

Author: coheigea
Date: Tue Jun  2 13:31:54 2015
New Revision: 1683105

URL: http://svn.apache.org/r1683105
Log:
Removing old copyright notice

Modified:
    webservices/wss4j/trunk/NOTICE
    webservices/wss4j/trunk/ws-security-common/src/main/resources/messages/wss4j_errors.properties
    webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/WSSecurityUtil.java
    webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/RequireSignedEncryptedDataElementsTest.java

Modified: webservices/wss4j/trunk/NOTICE
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/NOTICE?rev=1683105&r1=1683104&r2=1683105&view=diff
==============================================================================
--- webservices/wss4j/trunk/NOTICE (original)
+++ webservices/wss4j/trunk/NOTICE Tue Jun  2 13:31:54 2015
@@ -4,5 +4,3 @@ Copyright 2004-2015 The Apache Software
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 
-This product includes software Copyright University of Southampton IT
-Innovation Centre, 2006 (http://www.it-innovation.soton.ac.uk).

Modified: webservices/wss4j/trunk/ws-security-common/src/main/resources/messages/wss4j_errors.properties
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/resources/messages/wss4j_errors.properties?rev=1683105&r1=1683104&r2=1683105&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/resources/messages/wss4j_errors.properties (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/resources/messages/wss4j_errors.properties Tue Jun  2 13:31:54 2015
@@ -23,6 +23,7 @@ decoding.general = Error while decoding
 decryptionCryptoFailure = DecryptionCrypto instantiation failed
 decryptionKeyStoreNotSet = Decryption KeyStore is not set
 duplicateError = Multiple security tokens with the same Id have been detected
+elementNotSigned = Element {0} is not signed
 encodeError = Cannot encode the certificate data
 encryptionCryptoFailure = EncryptionCrypto instantiation failed
 encryptionKeyStoreNotSet = Encryption KeyStore is not set
@@ -77,8 +78,6 @@ noUserCertsFound = No certificates for u
 noXMLSig = Cannot setup signature data structure
 parseError = Cannot parse/decode the certificate data
 proxyNotFound = Proxy file ({0}) not found.
-requiredElementNotProtected = Element {0} is not protected
-requiredElementNotSigned = Element {0} is not included in the signature
 resourceNotFound = Cannot load the resource {0}
 signatureCryptoFailure = SignatureCrypto instantiation failed
 signatureKeyStoreNotSet = Signature KeyStore is not set

Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/WSSecurityUtil.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/WSSecurityUtil.java?rev=1683105&r1=1683104&r2=1683105&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/WSSecurityUtil.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/WSSecurityUtil.java Tue Jun  2 13:31:54 2015
@@ -545,7 +545,7 @@ public final class WSSecurityUtil {
         }
         
         throw new WSSecurityException(
-            WSSecurityException.ErrorCode.FAILED_CHECK, "requiredElementNotSigned", 
+            WSSecurityException.ErrorCode.FAILED_CHECK, "elementNotSigned", 
             new Object[] {elem});
     }
     

Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/RequireSignedEncryptedDataElementsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/RequireSignedEncryptedDataElementsTest.java?rev=1683105&r1=1683104&r2=1683105&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/RequireSignedEncryptedDataElementsTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/RequireSignedEncryptedDataElementsTest.java Tue Jun  2 13:31:54 2015
@@ -247,7 +247,7 @@ public class RequireSignedEncryptedDataE
             verify(encryptedSignedDoc, reqData);
             fail("WSSecurityException expected");
         } catch (WSSecurityException e) {
-            assertTrue(e.getMessage().contains("is not included in the signature"));
+            assertTrue(e.getMessage().contains("is not signed"));
         }
     }
     
@@ -261,12 +261,12 @@ public class RequireSignedEncryptedDataE
             verify(encryptedSignedDoc, reqData);
             fail("WSSecurityException expected");
         } catch (WSSecurityException e) {
-            assertTrue(e.getMessage().contains("is not included in the signature"));
+            assertTrue(e.getMessage().contains("is not signed"));
         }
     }
     
     private static void checkFailure(Element attackElement, WSSecurityException e) {
-        final String mex = MessageFormat.format(resources.getString("requiredElementNotSigned"), attackElement);
+        final String mex = MessageFormat.format(resources.getString("elementNotSigned"), attackElement);
         assertTrue(e.getMessage().contains(mex));
         assertEquals(WSSecurityException.ErrorCode.FAILED_CHECK, e.getErrorCode());
     }