[java-identity-provider COMMIT] in /trunk: idp-consent-impl/src/test/java/net/shibboleth/idp/attribute/consent/TestDa...

[noreply at shibboleth.net]

Author: putmanb
Date: Thu Mar 29 19:42:45 2012
New Revision: 4147

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4147&view=rev
Log:
Move some saml module classes.

Modified:
    trunk/idp-consent-impl/src/test/java/net/shibboleth/idp/attribute/consent/TestData.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSaml1AttributeEncoder.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSaml2AttributeEncoder.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/SamlEncoderSupport.java

Modified: trunk/idp-consent-impl/src/test/java/net/shibboleth/idp/attribute/consent/TestData.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-consent-impl/src/test/java/net/shibboleth/idp/attribute/consent/TestData.java?rev=4147&r1=4146&r2=4147&view=diff
==============================================================================
--- trunk/idp-consent-impl/src/test/java/net/shibboleth/idp/attribute/consent/TestData.java (original)
+++ trunk/idp-consent-impl/src/test/java/net/shibboleth/idp/attribute/consent/TestData.java Thu Mar 29 19:42:45 2012
@@ -31,8 +31,8 @@
 import net.shibboleth.utilities.java.support.xml.BasicParserPool;
 
 import org.joda.time.DateTime;
-import org.opensaml.DefaultBootstrap;
 import org.opensaml.core.xml.ConfigurationException;
+import org.opensaml.saml.config.DefaultBootstrap;
 import org.opensaml.saml2.metadata.provider.MetadataProvider;
 import org.opensaml.saml2.metadata.provider.MetadataProviderException;
 import org.testng.annotations.DataProvider;

Modified: trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSaml1AttributeEncoder.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSaml1AttributeEncoder.java?rev=4147&r1=4146&r2=4147&view=diff
==============================================================================
--- trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSaml1AttributeEncoder.java (original)
+++ trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSaml1AttributeEncoder.java Thu Mar 29 19:42:45 2012
@@ -21,10 +21,10 @@
 
 import net.shibboleth.idp.attribute.AttributeEncodingException;
 
-import org.opensaml.Configuration;
 import org.opensaml.common.SAMLObjectBuilder;
 import org.opensaml.common.xml.SAMLConstants;
 import org.opensaml.core.xml.XMLObject;
+import org.opensaml.saml.config.Configuration;
 import org.opensaml.saml1.core.Attribute;
 
 /**

Modified: trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSaml2AttributeEncoder.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSaml2AttributeEncoder.java?rev=4147&r1=4146&r2=4147&view=diff
==============================================================================
--- trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSaml2AttributeEncoder.java (original)
+++ trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSaml2AttributeEncoder.java Thu Mar 29 19:42:45 2012
@@ -23,10 +23,10 @@
 import net.shibboleth.utilities.java.support.component.UnmodifiableComponentException;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
-import org.opensaml.Configuration;
 import org.opensaml.common.SAMLObjectBuilder;
 import org.opensaml.common.xml.SAMLConstants;
 import org.opensaml.core.xml.XMLObject;
+import org.opensaml.saml.config.Configuration;
 import org.opensaml.saml2.core.Attribute;
 
 /**

Modified: trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/SamlEncoderSupport.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/SamlEncoderSupport.java?rev=4147&r1=4146&r2=4147&view=diff
==============================================================================
--- trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/SamlEncoderSupport.java (original)
+++ trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/SamlEncoderSupport.java Thu Mar 29 19:42:45 2012
@@ -22,11 +22,11 @@
 import net.shibboleth.idp.attribute.Attribute;
 import net.shibboleth.utilities.java.support.codec.Base64Support;
 
-import org.opensaml.Configuration;
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.core.xml.XMLObjectBuilder;
 import org.opensaml.core.xml.schema.XSAny;
 import org.opensaml.core.xml.schema.XSString;
+import org.opensaml.saml.config.Configuration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;