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

[noreply at shibboleth.net]

Author: putmanb
Date: Wed Apr 11 23:22:11 2012
New Revision: 4171

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4171&view=rev
Log:
Remove legacy inheritance cruft of the old SAML Configuration singleton.
Rename to reflect its current refactoring to a support class for the new ConfigurationService.

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-api/src/main/java/net/shibboleth/idp/saml/profile/config/idwsf/SsosProfileConfiguration.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/saml1/ArtifactResolutionProfileConfiguration.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/saml1/AttributeQueryProfileConfiguration.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/saml1/SsoProfileConfiguration.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/saml2/ArtifactResolutionProfileConfiguration.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/saml2/AttributeQueryProfileConfiguration.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/saml2/EcpProfileConfiguration.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/saml2/LogoutProfileConfiguration.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/saml2/SsoProfileConfiguration.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=4171&r1=4170&r2=4171&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 Wed Apr 11 23:22:11 2012
@@ -24,7 +24,7 @@
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.saml.common.SAMLObjectBuilder;
 import org.opensaml.saml.common.xml.SAMLConstants;
-import org.opensaml.saml.config.Configuration;
+import org.opensaml.saml.config.SAMLConfigurationSupport;
 import org.opensaml.saml.saml1.core.Attribute;
 
 /**
@@ -43,7 +43,7 @@
         super();
 
         attributeBuilder =
-                (SAMLObjectBuilder<Attribute>) Configuration.getBuilderFactory().getBuilder(Attribute.TYPE_NAME);
+                (SAMLObjectBuilder<Attribute>) SAMLConfigurationSupport.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=4171&r1=4170&r2=4171&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 Wed Apr 11 23:22:11 2012
@@ -26,7 +26,7 @@
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.saml.common.SAMLObjectBuilder;
 import org.opensaml.saml.common.xml.SAMLConstants;
-import org.opensaml.saml.config.Configuration;
+import org.opensaml.saml.config.SAMLConfigurationSupport;
 import org.opensaml.saml.saml2.core.Attribute;
 
 /**
@@ -48,7 +48,7 @@
         super();
 
         attributeBuilder =
-                (SAMLObjectBuilder<Attribute>) Configuration.getBuilderFactory().getBuilder(Attribute.TYPE_NAME);
+                (SAMLObjectBuilder<Attribute>) SAMLConfigurationSupport.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=4171&r1=4170&r2=4171&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 Wed Apr 11 23:22:11 2012
@@ -26,7 +26,7 @@
 import org.opensaml.core.xml.XMLObjectBuilder;

[... 170 lines stripped ...]