ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1660076 - in /webservices/wss4j/trunk/ws-security-common/src/main: java/org/apache/wss4j/common/crypto/ java/org/apache/wss4j/common/derivedKey/ java/org/apache/wss4j/common/kerberos/ java/org/apache/wss4j/common/saml/ java/org/apache/wss4...
Date Mon, 16 Feb 2015 11:48:28 GMT
Author: coheigea
Date: Mon Feb 16 11:48:27 2015
New Revision: 1660076

URL: http://svn.apache.org/r1660076
Log:
Using Multiple Catch in ws-security-commons

Modified:
    webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/CertificateStore.java
    webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/JasyptPasswordEncryptor.java
    webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Merlin.java
    webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/MerlinDevice.java
    webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/derivedKey/P_SHA1.java
    webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/kerberos/KerberosClientExceptionAction.java
    webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/kerberos/KerberosServiceExceptionAction.java
    webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/kerberos/KerberosTokenDecoderImpl.java
    webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SAMLUtil.java
    webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SamlAssertionWrapper.java
    webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/AttachmentUtils.java
    webservices/wss4j/trunk/ws-security-common/src/main/resources/messages/wss4j_errors.properties

Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/CertificateStore.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/CertificateStore.java?rev=1660076&r1=1660075&r2=1660076&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/CertificateStore.java
(original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/CertificateStore.java
Mon Feb 16 11:48:27 2015
@@ -247,27 +247,10 @@ public class CertificateStore extends Cr
                 validator = CertPathValidator.getInstance("PKIX", provider);
             }
             validator.validate(path, param);
-        } catch (java.security.NoSuchProviderException e) {
-                throw new WSSecurityException(
-                    WSSecurityException.ErrorCode.FAILURE, "certpath", e,
-                    e.getMessage()
-                );
-        } catch (NoSuchAlgorithmException e) {
-                throw new WSSecurityException(
-                    WSSecurityException.ErrorCode.FAILURE, "certpath", e,
-                    e.getMessage()
-                );
-        } catch (java.security.cert.CertificateException e) {
-                throw new WSSecurityException(
-                    WSSecurityException.ErrorCode.FAILURE, "certpath", e,
-                    e.getMessage()
-                );
-        } catch (java.security.InvalidAlgorithmParameterException e) {
-                throw new WSSecurityException(
-                    WSSecurityException.ErrorCode.FAILURE, "certpath", e,
-                    e.getMessage()
-                );
-        } catch (java.security.cert.CertPathValidatorException e) {
+        } catch (java.security.NoSuchProviderException | NoSuchAlgorithmException 
+            | java.security.cert.CertificateException
+            | java.security.InvalidAlgorithmParameterException
+            | java.security.cert.CertPathValidatorException e) {
                 throw new WSSecurityException(
                     WSSecurityException.ErrorCode.FAILURE, "certpath", e,
                     e.getMessage()

Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/JasyptPasswordEncryptor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/JasyptPasswordEncryptor.java?rev=1660076&r1=1660075&r2=1660076&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/JasyptPasswordEncryptor.java
(original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/JasyptPasswordEncryptor.java
Mon Feb 16 11:48:27 2015
@@ -74,9 +74,7 @@ public class JasyptPasswordEncryptor imp
                 new WSPasswordCallback("", WSPasswordCallback.PASSWORD_ENCRYPTOR_PASSWORD);
             try {
                 callbackHandler.handle(new Callback[]{pwCb});
-            } catch (IOException e) {
-                LOG.debug("Error in getting master password: ", e);
-            } catch (UnsupportedCallbackException e) {
+            } catch (IOException | UnsupportedCallbackException e) {
                 LOG.debug("Error in getting master password: ", e);
             }
             if (pwCb.getPassword() != null) {
@@ -97,9 +95,7 @@ public class JasyptPasswordEncryptor imp
                 new WSPasswordCallback("", WSPasswordCallback.PASSWORD_ENCRYPTOR_PASSWORD);
             try {
                 callbackHandler.handle(new Callback[]{pwCb});
-            } catch (IOException e) {
-                LOG.debug("Error in getting master password: ", e);
-            } catch (UnsupportedCallbackException e) {
+            } catch (IOException | UnsupportedCallbackException e) {
                 LOG.debug("Error in getting master password: ", e);
             }
             if (pwCb.getPassword() != null) {

Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Merlin.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Merlin.java?rev=1660076&r1=1660075&r2=1660076&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Merlin.java
(original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Merlin.java
Mon Feb 16 11:48:27 2015
@@ -338,7 +338,7 @@ public class Merlin extends CryptoBase {
                 if (DO_DEBUG) {
                     LOG.debug(e.getMessage(), e);
                 }
-                throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, "ioError00",
e);
+                throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, "failedCredentialLoad",
e);
             } finally {
                 if (is != null) {
                     is.close();
@@ -400,21 +400,11 @@ public class Merlin extends CryptoBase {
                     
             ks.load(input, storepass == null || storepass.length() == 0
                 ? new char[0] : storepass.toCharArray());
-        } catch (IOException e) {
+        } catch (IOException | GeneralSecurityException e) {
             if (DO_DEBUG) {
                 LOG.debug(e.getMessage(), e);
             }
-            throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, "ioError00",
e);
-        } catch (GeneralSecurityException e) {
-            if (DO_DEBUG) {
-                LOG.debug(e.getMessage(), e);
-            }
-            throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, "secError00",
e);
-        } catch (Exception e) {
-            if (DO_DEBUG) {
-                LOG.debug(e.getMessage(), e);
-            }
-            throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, "error00",
e);
+            throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, "failedCredentialLoad",
e);
         }
         return ks;
     }
@@ -707,15 +697,7 @@ public class Merlin extends CryptoBase {
                 throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, "empty",
msg);
             }
             return (PrivateKey) keyTmp;
-        } catch (KeyStoreException ex) {
-            throw new WSSecurityException(
-                WSSecurityException.ErrorCode.FAILURE, "noPrivateKey", ex, ex.getMessage()
-            );
-        } catch (UnrecoverableKeyException ex) {
-            throw new WSSecurityException(
-                WSSecurityException.ErrorCode.FAILURE, "noPrivateKey", ex, ex.getMessage()
-            );
-        } catch (NoSuchAlgorithmException ex) {
+        } catch (KeyStoreException | UnrecoverableKeyException | NoSuchAlgorithmException
ex) {
             throw new WSSecurityException(
                 WSSecurityException.ErrorCode.FAILURE, "noPrivateKey", ex, ex.getMessage()
             );
@@ -761,15 +743,7 @@ public class Merlin extends CryptoBase {
                 throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, "empty",
msg);
             }
             return (PrivateKey) keyTmp;
-        } catch (KeyStoreException ex) {
-            throw new WSSecurityException(
-                WSSecurityException.ErrorCode.FAILURE, "noPrivateKey", ex, ex.getMessage()
-            );
-        } catch (UnrecoverableKeyException ex) {
-            throw new WSSecurityException(
-                WSSecurityException.ErrorCode.FAILURE, "noPrivateKey", ex, ex.getMessage()
-            );
-        } catch (NoSuchAlgorithmException ex) {
+        } catch (KeyStoreException | UnrecoverableKeyException | NoSuchAlgorithmException
ex) {
             throw new WSSecurityException(
                 WSSecurityException.ErrorCode.FAILURE, "noPrivateKey", ex, ex.getMessage()
             );
@@ -808,11 +782,7 @@ public class Merlin extends CryptoBase {
             if (foundCerts != null && foundCerts[0] != null && foundCerts[0].equals(certs[0]))
{
                 try {
                     certs[0].checkValidity();
-                } catch (CertificateExpiredException e) {
-                    throw new WSSecurityException(
-                        WSSecurityException.ErrorCode.FAILED_CHECK, "invalidCert", e
-                    );
-                } catch (CertificateNotYetValidException e) {
+                } catch (CertificateExpiredException | CertificateNotYetValidException e)
{
                     throw new WSSecurityException(
                         WSSecurityException.ErrorCode.FAILED_CHECK, "invalidCert", e
                     );
@@ -925,33 +895,11 @@ public class Merlin extends CryptoBase {
                 validator = CertPathValidator.getInstance("PKIX", provider);
             }
             validator.validate(path, param);
-        } catch (NoSuchProviderException e) {
-                throw new WSSecurityException(
-                    WSSecurityException.ErrorCode.FAILURE, "certpath", e
-                );
-        } catch (NoSuchAlgorithmException e) {
-                throw new WSSecurityException(
-                    WSSecurityException.ErrorCode.FAILURE,
-                    "certpath", e, e.getMessage()
-                );
-        } catch (CertificateException e) {
-                throw new WSSecurityException(
-                    WSSecurityException.ErrorCode.FAILURE, "certpath", e
-                );
-        } catch (java.security.InvalidAlgorithmParameterException e) {
-                throw new WSSecurityException(
-                    WSSecurityException.ErrorCode.FAILURE, "certpath", e
-                );
-        } catch (java.security.cert.CertPathValidatorException e) {
-                throw new WSSecurityException(
-                    WSSecurityException.ErrorCode.FAILED_AUTHENTICATION, "certpath", e
-                );
-        } catch (KeyStoreException e) {
-                throw new WSSecurityException(
-                    WSSecurityException.ErrorCode.FAILURE, "certpath", e
-                );
-        } catch (NullPointerException e) {
-                // NPE thrown by JDK 1.7 for one of the test cases
+        } catch (NoSuchProviderException | NoSuchAlgorithmException 
+            | CertificateException | java.security.InvalidAlgorithmParameterException
+            | java.security.cert.CertPathValidatorException 
+            | KeyStoreException
+            | NullPointerException e) {
                 throw new WSSecurityException(
                     WSSecurityException.ErrorCode.FAILURE, "certpath", e
                 );

Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/MerlinDevice.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/MerlinDevice.java?rev=1660076&r1=1660075&r2=1660076&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/MerlinDevice.java
(original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/MerlinDevice.java
Mon Feb 16 11:48:27 2015
@@ -207,7 +207,7 @@ public class MerlinDevice extends Merlin
                 if (DO_DEBUG) {
                     LOG.debug(e.getMessage(), e);
                 }
-                throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, "ioError00",
e);
+                throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, "failedCredentialLoad",
e);
             } finally {
                 if (is != null) {
                     is.close();

Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/derivedKey/P_SHA1.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/derivedKey/P_SHA1.java?rev=1660076&r1=1660075&r2=1660076&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/derivedKey/P_SHA1.java
(original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/derivedKey/P_SHA1.java
Mon Feb 16 11:48:27 2015
@@ -63,9 +63,7 @@ public class P_SHA1 implements Derivatio
             System.arraycopy(tempBytes, offset, key, 0, key.length);
 
             return key;
-        } catch (NoSuchAlgorithmException e) {
-            throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, "errorInKeyDerivation",
e);
-        } catch (InvalidKeyException e) {
+        } catch (NoSuchAlgorithmException | InvalidKeyException e) {
             throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, "errorInKeyDerivation",
e);
         }
     }

Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/kerberos/KerberosClientExceptionAction.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/kerberos/KerberosClientExceptionAction.java?rev=1660076&r1=1660075&r2=1660076&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/kerberos/KerberosClientExceptionAction.java
(original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/kerberos/KerberosClientExceptionAction.java
Mon Feb 16 11:48:27 2015
@@ -132,12 +132,7 @@ public class KerberosClientExceptionActi
 
                 krbCtx.setSecretKey(key);
             }
-            catch (ClassNotFoundException e) {
-                throw new WSSecurityException(
-                    ErrorCode.FAILURE, "kerberosServiceTicketError", new Object[] {}, e
-                );
-            }
-            catch (NoSuchMethodException e) {
+            catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException
e) {
                 throw new WSSecurityException(
                     ErrorCode.FAILURE, "kerberosServiceTicketError", new Object[] {}, e
                 );
@@ -147,11 +142,6 @@ public class KerberosClientExceptionActi
                     ErrorCode.FAILURE, "kerberosServiceTicketError", new Object[] {}, e.getCause()
                 );
             }
-            catch (IllegalAccessException e) {
-                throw new WSSecurityException(
-                     ErrorCode.FAILURE, "kerberosServiceTicketError", new Object[] {}, e
-                );
-            }
         }
 
         return krbCtx;

Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/kerberos/KerberosServiceExceptionAction.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/kerberos/KerberosServiceExceptionAction.java?rev=1660076&r1=1660075&r2=1660076&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/kerberos/KerberosServiceExceptionAction.java
(original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/kerberos/KerberosServiceExceptionAction.java
Mon Feb 16 11:48:27 2015
@@ -124,12 +124,7 @@ public class KerberosServiceExceptionAct
 
                     krbServiceCtx.setSessionKey(key);
                 }
-                catch (ClassNotFoundException e) {
-                    throw new WSSecurityException(
-                        ErrorCode.FAILURE, KERBEROS_TICKET_VALIDATION_ERROR_MSG_ID, new Object[]
{}, e
-                    );
-                }
-                catch (NoSuchMethodException e) {
+                catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException
e) {
                     throw new WSSecurityException(
                         ErrorCode.FAILURE, KERBEROS_TICKET_VALIDATION_ERROR_MSG_ID, new Object[]
{}, e
                     );
@@ -139,11 +134,6 @@ public class KerberosServiceExceptionAct
                         ErrorCode.FAILURE, KERBEROS_TICKET_VALIDATION_ERROR_MSG_ID, new Object[]
{}, e.getCause()
                     );
                 }
-                catch (IllegalAccessException e) {
-                    throw new WSSecurityException(
-                        ErrorCode.FAILURE, KERBEROS_TICKET_VALIDATION_ERROR_MSG_ID, new Object[]
{}, e
-                    );
-                }      
             }            
         } finally {
             if (null != secContext && !spnego) {

Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/kerberos/KerberosTokenDecoderImpl.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/kerberos/KerberosTokenDecoderImpl.java?rev=1660076&r1=1660075&r2=1660076&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/kerberos/KerberosTokenDecoderImpl.java
(original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/kerberos/KerberosTokenDecoderImpl.java
Mon Feb 16 11:48:27 2015
@@ -153,9 +153,7 @@ public class KerberosTokenDecoderImpl im
                                                       KeyUsage.getTypeByOrdinal(2));
             
             this.encTicketPart = KerberosDecoder.decodeEncTicketPart(dec);
-        } catch (KerberosException e) {
-            throw new KerberosTokenDecoderException(e);
-        } catch (IOException e) {
+        } catch (KerberosException | IOException e) {
             throw new KerberosTokenDecoderException(e);
         }
     }

Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SAMLUtil.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SAMLUtil.java?rev=1660076&r1=1660075&r2=1660076&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SAMLUtil.java
(original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SAMLUtil.java
Mon Feb 16 11:48:27 2015
@@ -298,13 +298,9 @@ public final class SAMLUtil {
         try {
             // Get the SAML source data using the currently configured callback implementation.
             callbackHandler.handle(new SAMLCallback[]{callback});
-        } catch (IOException e) {
+        } catch (IOException | UnsupportedCallbackException e) {
             throw new IllegalStateException(
-                "IOException while creating SAML assertion wrapper", e
-            );
-        } catch (UnsupportedCallbackException e) {
-            throw new IllegalStateException(
-                "UnsupportedCallbackException while creating SAML assertion wrapper", e
+                "Error while creating SAML assertion wrapper", e
             );
         }
     }

Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SamlAssertionWrapper.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SamlAssertionWrapper.java?rev=1660076&r1=1660075&r2=1660076&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SamlAssertionWrapper.java
(original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SamlAssertionWrapper.java
Mon Feb 16 11:48:27 2015
@@ -36,7 +36,6 @@ import org.apache.wss4j.common.util.DOM2
 import org.apache.wss4j.common.util.InetAddressUtils;
 import org.apache.xml.security.exceptions.XMLSecurityException;
 import org.apache.xml.security.signature.XMLSignature;
-import org.apache.xml.security.signature.XMLSignatureException;
 import org.apache.xml.security.stax.impl.util.IDGenerator;
 import org.joda.time.DateTime;
 import org.opensaml.core.xml.XMLObject;
@@ -757,10 +756,6 @@ public class SamlAssertionWrapper {
                 // Use XML-Security class to obtain SignatureValue
                 XMLSignature xmlSignature = new XMLSignature(signatureElement, "");
                 return xmlSignature.getSignatureValue();
-            } catch (XMLSignatureException e) {
-                throw new WSSecurityException(
-                    WSSecurityException.ErrorCode.FAILURE, "invalidSAMLsecurity", e
-                );
             } catch (XMLSecurityException e) {
                 throw new WSSecurityException(
                     WSSecurityException.ErrorCode.FAILURE, "invalidSAMLsecurity", e

Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/AttachmentUtils.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/AttachmentUtils.java?rev=1660076&r1=1660075&r2=1660076&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/AttachmentUtils.java
(original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/AttachmentUtils.java
Mon Feb 16 11:48:27 2015
@@ -495,9 +495,7 @@ public class AttachmentUtils {
 
                 try {
                     cipher.init(Cipher.DECRYPT_MODE, key, iv);
-                } catch (InvalidKeyException e) {
-                    throw new IOException(e);
-                } catch (InvalidAlgorithmParameterException e) {
+                } catch (InvalidKeyException | InvalidAlgorithmParameterException e) {
                     throw new IOException(e);
                 }
             }
@@ -592,8 +590,6 @@ public class AttachmentUtils {
                         new ByteArrayInputStream(byteArrayOutputStream.toByteArray()),
                         attachment.getSourceStream()
                 );
-            } catch (UnsupportedEncodingException e) {
-                throw new WSSecurityException(WSSecurityException.ErrorCode.FAILED_ENCRYPTION,
e);
             } catch (IOException e) {
                 throw new WSSecurityException(WSSecurityException.ErrorCode.FAILED_ENCRYPTION,
e);
             }

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=1660076&r1=1660075&r2=1660076&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
Mon Feb 16 11:48:27 2015
@@ -26,7 +26,7 @@ duplicateError = Multiple security token
 encodeError = Cannot encode the certificate data
 encryptionCryptoFailure = EncryptionCrypto instantiation failed
 encryptionKeyStoreNotSet = Encryption KeyStore is not set
-error00 = Failed to load credentials.
+failedCredentialLoad = Failed to load credentials.
 invalidCertData = Unexpected number of certificates: {0}
 invalidCertForSKI = An X509 certificate with version 3 must be used for SKI. The presented
cert has version: {0}
 invalidCert = The provided certificate is invalid
@@ -34,7 +34,6 @@ invalidSAMLsecurity = SAML token securit
 invalidSAMLToken = Invalid SAML assertion : {0}
 invalidTimestamp = Invalid timestamp: {0}
 invalidValueType = Bad ValueType \"{0}\"
-ioError00 = Failed to load credentials.
 kerberosLoginError = An error occurred in trying to obtain a TGT: {0}
 kerberosServiceTicketError = An error occurred in trying to obtain a service ticket
 kerberosTicketValidationError = An error occurred in trying to validate a ticket
@@ -80,7 +79,6 @@ proxyNotFound = Proxy file ({0}) not fou
 requiredElementNotProtected = Element {0} is not protected
 requiredElementNotSigned = Element {0} is not included in the signature
 resourceNotFound = Cannot load the resource {0}
-secError00 = Failed to load credentials.
 signatureCryptoFailure = SignatureCrypto instantiation failed
 signatureKeyStoreNotSet = Signature KeyStore is not set
 signatureVerificationCryptoFailure = SignatureVerificationCrypto instantiation failed



Mime
View raw message