Removed commons-codec dependency.

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@1437 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

diff --git a/.classpath b/.classpath
index 00ec0cb..3b4b17e 100644 (file)
--- a/.classpath
+++ b/.classpath
@@ -27,7 +27,6 @@
        <classpathentry kind="lib" path="endorsed/jaxp-api.jar"/>
        <classpathentry kind="lib" path="endorsed/dom.jar"/>
        <classpathentry kind="lib" path="lib/shib-filter.jar"/>
-       <classpathentry kind="lib" path="webApplication/WEB-INF/lib/commons-codec-1.3.jar"/>
        <classpathentry kind="lib" path="webApplication/WEB-INF/lib/xmlsec-20050423.jar"/>
        <classpathentry kind="lib" path="webApplication/WEB-INF/lib/bc-asn1.jar"/>
        <classpathentry kind="output" path="webApplication/WEB-INF/classes"/>

diff --git a/src/edu/internet2/middleware/shibboleth/metadata/provider/XMLMetadataProvider.java b/src/edu/internet2/middleware/shibboleth/metadata/provider/XMLMetadataProvider.java
index ed8a222..d83662b 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/metadata/provider/XMLMetadataProvider.java
+++ b/src/edu/internet2/middleware/shibboleth/metadata/provider/XMLMetadataProvider.java
@@ -39,11 +39,11 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.TimeZone;
 
-import org.apache.commons.codec.binary.Hex;
 import org.apache.log4j.Logger;
 import org.apache.xml.security.encryption.EncryptionMethod;
 import org.apache.xml.security.exceptions.XMLSecurityException;
 import org.apache.xml.security.keys.KeyInfo;
+import org.bouncycastle.util.encoders.Hex;
 import org.opensaml.SAMLAttribute;
 import org.opensaml.SAMLBinding;
 import org.opensaml.SAMLBrowserProfile;
@@ -1162,7 +1162,7 @@ public class XMLMetadataProvider implements Metadata {
                     else {
                         String sourceId;
                         try {
-                            sourceId = new String(Hex.encodeHex(Util.generateSourceId(id)));
+                            sourceId = new String(Hex.encode(Util.generateSourceId(id)));
                         }
                         catch (NoSuchAlgorithmException e1) {
                             log.error("caught exception while encoding sourceId: " + e1.getMessage());

diff --git a/webApplication/WEB-INF/lib/commons-codec-1.3.jar b/webApplication/WEB-INF/lib/commons-codec-1.3.jar
deleted file mode 100644 (file)
index 957b675..0000000
Binary files a/webApplication/WEB-INF/lib/commons-codec-1.3.jar and /dev/null differ