You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2013/04/19 15:33:55 UTC

svn commit: r1469825 - in /webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common: ext/WSSecurityException.java saml/OpenSAMLUtil.java

Author: coheigea
Date: Fri Apr 19 13:33:54 2013
New Revision: 1469825

URL: http://svn.apache.org/r1469825
Log:
Make sure WSS4J resource bundle is loaded first when OpenSAML is initialised

Modified:
    webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/ext/WSSecurityException.java
    webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/OpenSAMLUtil.java

Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/ext/WSSecurityException.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/ext/WSSecurityException.java?rev=1469825&r1=1469824&r2=1469825&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/ext/WSSecurityException.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/ext/WSSecurityException.java Fri Apr 19 13:33:54 2013
@@ -20,7 +20,6 @@
 package org.apache.wss4j.common.ext;
 
 import org.apache.xml.security.exceptions.XMLSecurityException;
-import org.apache.xml.security.utils.I18n;
 
 import javax.xml.namespace.QName;
 
@@ -158,7 +157,7 @@ public class WSSecurityException extends
      * @param errorCode
      */
     public WSSecurityException(ErrorCode errorCode) {
-        this(errorCode, "empty", I18n.getExceptionMessage(errorCode.name()));
+        this(errorCode, errorCode.name());
     }
 
     /**

Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/OpenSAMLUtil.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/OpenSAMLUtil.java?rev=1469825&r1=1469824&r2=1469825&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/OpenSAMLUtil.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/OpenSAMLUtil.java Fri Apr 19 13:33:54 2013
@@ -21,6 +21,7 @@ package org.apache.wss4j.common.saml;
 
 import javax.xml.namespace.QName;
 
+import org.apache.wss4j.common.crypto.WSProviderConfig;
 import org.apache.wss4j.common.ext.WSSecurityException;
 import org.opensaml.xml.*;
 import org.opensaml.xml.io.*;
@@ -56,6 +57,7 @@ public final class OpenSAMLUtil {
                 LOG.debug("Initializing the opensaml2 library...");
             }
             try {
+                WSProviderConfig.init();
                 OpenSAMLBootstrap.bootstrap();
                 builderFactory = Configuration.getBuilderFactory();
                 marshallerFactory = Configuration.getMarshallerFactory();