[java-identity-provider COMMIT] in /trunk: idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/Abst...

[noreply at shibboleth.net]

Author: lajoie
Date: Thu Apr 12 16:02:41 2012
New Revision: 4173

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4173&view=rev
Log:
Fix some out-dated calls

Modified:
    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
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml1/AddAuthenticationStatementToAssertion.java

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=4173&r1=4172&r2=4173&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 Apr 12 16:02:41 2012
@@ -22,9 +22,9 @@
 import net.shibboleth.idp.attribute.AttributeEncodingException;
 
 import org.opensaml.core.xml.XMLObject;
+import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
 import org.opensaml.saml.common.SAMLObjectBuilder;
 import org.opensaml.saml.common.xml.SAMLConstants;
-import org.opensaml.saml.config.SAMLConfigurationSupport;
 import org.opensaml.saml.saml1.core.Attribute;
 
 /**
@@ -43,7 +43,8 @@
         super();
 
         attributeBuilder =
-                (SAMLObjectBuilder<Attribute>) SAMLConfigurationSupport.getBuilderFactory().getBuilder(Attribute.TYPE_NAME);
+                (SAMLObjectBuilder<Attribute>) XMLObjectProviderRegistrySupport.getBuilderFactory().getBuilder(
+                        Attribute.TYPE_NAME);
     }
 
     /** {@inheritDoc} */

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=4173&r1=4172&r2=4173&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 Apr 12 16:02:41 2012
@@ -24,9 +24,9 @@
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 import org.opensaml.core.xml.XMLObject;
+import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
 import org.opensaml.saml.common.SAMLObjectBuilder;
 import org.opensaml.saml.common.xml.SAMLConstants;
-import org.opensaml.saml.config.SAMLConfigurationSupport;
 import org.opensaml.saml.saml2.core.Attribute;
 
 /**
@@ -48,7 +48,8 @@
         super();
 
         attributeBuilder =
-                (SAMLObjectBuilder<Attribute>) SAMLConfigurationSupport.getBuilderFactory().getBuilder(Attribute.TYPE_NAME);
+                (SAMLObjectBuilder<Attribute>) XMLObjectProviderRegistrySupport.getBuilderFactory().getBuilder(
+                        Attribute.TYPE_NAME);
     }
 
     /** {@inheritDoc} */

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=4173&r1=4172&r2=4173&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 Apr 12 16:02:41 2012
@@ -24,9 +24,9 @@
 
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.core.xml.XMLObjectBuilder;
+import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
 import org.opensaml.core.xml.schema.XSAny;
 import org.opensaml.core.xml.schema.XSString;
-import org.opensaml.saml.config.SAMLConfigurationSupport;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -60,7 +60,7 @@
         }
 
         final XMLObjectBuilder<XSString> stringBuilder =
-                SAMLConfigurationSupport.getBuilderFactory().getBuilder(XSString.TYPE_NAME);
+                XMLObjectProviderRegistrySupport.getBuilderFactory().getBuilder(XSString.TYPE_NAME);
 
         LOG.debug("Encoding value {} of attribute {}", value, attribute.getId());
         final XSString samlAttributeValue = stringBuilder.buildObject(attributeValueElementName, XSString.TYPE_NAME);

[... 41 lines stripped ...]