svn commit: r1375433 - /santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSec.java

[co...@apache.org]

Author: coheigea
Date: Tue Aug 21 08:55:06 2012
New Revision: 1375433

URL: http://svn.apache.org/viewvc?rev=1375433&view=rev
Log:
Remove automatic BouncyCastle loading

Modified:
    santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSec.java

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSec.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSec.java?rev=1375433&r1=1375432&r2=1375433&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSec.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSec.java Tue Aug 21 08:55:06 2012
@@ -19,15 +19,11 @@
 package org.apache.xml.security.stax.ext;
 
 import java.net.URISyntaxException;
-import java.security.Provider;
-import java.security.Security;
 import java.security.interfaces.DSAPrivateKey;
 import java.security.interfaces.RSAPrivateKey;
 
 import javax.crypto.SecretKey;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.xml.security.stax.config.Init;
 
 /**
@@ -40,25 +36,11 @@ import org.apache.xml.security.stax.conf
  */
 public class XMLSec {
     
-    private static final transient Log logger = LogFactory.getLog(XMLSec.class);
-
-
     //todo crl check
     //todo outgoing client setup per policy
 
     static {
         try {
-            Class<?> c = 
-                XMLSec.class.getClassLoader().loadClass("org.bouncycastle.jce.provider.BouncyCastleProvider");
-            if (null == Security.getProvider("BC")) {
-                Security.addProvider((Provider) c.newInstance());
-            }
-        } catch (Throwable e) {
-            logger.debug("Adding BouncyCastle provider failed", e);
-            // throw new RuntimeException("Adding BouncyCastle provider failed", e);
-        }
-
-        try {
             Init.init(XMLSec.class.getClassLoader().getResource("security-config.xml").toURI());
         } catch (XMLSecurityException e) {
             throw new RuntimeException(e.getMessage(), e);