[java-opensaml COMMIT] in /trunk: opensaml-core/src/main/java/org/opensaml/core/xml/util/IPAddressHelper.java opensam...

[noreply at shibboleth.net]

Author: putmanb
Date: Sat Mar 31 01:18:50 2012
New Revision: 3008

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3008&view=rev
Log:
Move a couple of helper classes to java-support

Removed:
    trunk/opensaml-core/src/main/java/org/opensaml/core/xml/util/IPAddressHelper.java
    trunk/opensaml-core/src/main/java/org/opensaml/core/xml/util/IndexingObjectStore.java
    trunk/opensaml-core/src/test/java/org/opensaml/core/xml/util/IndexingObjectStoreTest.java
Modified:
    trunk/opensaml-security-api/src/main/java/org/opensaml/security/x509/X509Util.java
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509CRLImpl.java
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509CertificateImpl.java

Modified: trunk/opensaml-security-api/src/main/java/org/opensaml/security/x509/X509Util.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-security-api/src/main/java/org/opensaml/security/x509/X509Util.java?rev=3008&r1=3007&r2=3008&view=diff
==============================================================================
--- trunk/opensaml-security-api/src/main/java/org/opensaml/security/x509/X509Util.java (original)
+++ trunk/opensaml-security-api/src/main/java/org/opensaml/security/x509/X509Util.java Sat Mar 31 01:18:50 2012
@@ -34,6 +34,7 @@
 
 import javax.security.auth.x500.X500Principal;
 
+import net.shibboleth.utilities.java.support.net.IPAddressSupport;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 import org.apache.commons.ssl.TrustMaterial;
@@ -46,7 +47,6 @@
 import org.bouncycastle.asn1.x509.SubjectKeyIdentifier;
 import org.bouncycastle.x509.extension.SubjectKeyIdentifierStructure;
 import org.bouncycastle.x509.extension.X509ExtensionUtil;
-import org.opensaml.core.xml.util.IPAddressHelper;
 import org.opensaml.security.SecurityException;
 import org.opensaml.security.SecurityHelper;
 import org.slf4j.Logger;
@@ -432,7 +432,7 @@
 
         if (IP_ADDRESS_ALT_NAME.equals(nameType)) {
             // this is a byte[], IP addr in network byte order
-            return IPAddressHelper.addressToString((byte[]) nameValue);
+            return IPAddressSupport.addressToString((byte[]) nameValue);
         }
 
         if (EDI_PARTY_ALT_NAME.equals(nameType) || X400ADDRESS_ALT_NAME.equals(nameType)

Modified: trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509CRLImpl.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509CRLImpl.java?rev=3008&r1=3007&r2=3008&view=diff
==============================================================================
--- trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509CRLImpl.java (original)
+++ trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509CRLImpl.java Sat Mar 31 01:18:50 2012
@@ -18,11 +18,13 @@
 package org.opensaml.xmlsec.signature.impl;
 
 import java.util.Collections;
+
 import java.util.List;
+
+import net.shibboleth.utilities.java.support.collection.IndexingObjectStore;
 
 import org.opensaml.core.xml.AbstractXMLObject;
 import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.util.IndexingObjectStore;
 import org.opensaml.xmlsec.signature.X509CRL;
 
 import com.google.common.base.Objects;

Modified: trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509CertificateImpl.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509CertificateImpl.java?rev=3008&r1=3007&r2=3008&view=diff
==============================================================================
--- trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509CertificateImpl.java (original)
+++ trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509CertificateImpl.java Sat Mar 31 01:18:50 2012
@@ -18,11 +18,13 @@
 package org.opensaml.xmlsec.signature.impl;
 
 import java.util.Collections;
+
 import java.util.List;
+
+import net.shibboleth.utilities.java.support.collection.IndexingObjectStore;
 
 import org.opensaml.core.xml.AbstractXMLObject;
 import org.opensaml.core.xml.XMLObject;
-import org.opensaml.core.xml.util.IndexingObjectStore;
 import org.opensaml.xmlsec.signature.X509Certificate;
 
 import com.google.common.base.Objects;