[java-opensaml COMMIT] in /trunk: opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/artifact/BasicSAML...

[noreply at shibboleth.net]

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

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3034&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.

Added:
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/config/SAMLConfigurationSupport.java
      - copied, changed from r3031, trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/config/Configuration.java
Removed:
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/config/Configuration.java
Modified:
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/artifact/BasicSAMLArtifactMapEntry.java
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/encryption/Encrypter.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2delrestrict/impl/DelegateMarshaller.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/encoding/BaseSAML1MessageEncoder.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/encoding/HTTPArtifactEncoder.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/encoding/HTTPSOAP11Encoder.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthenticationStatementMarshaller.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ConditionsMarshaller.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/RequestAbstractTypeMarshaller.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ResponseAbstractTypeMarshaller.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/BaseSAML2MessageEncoder.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/HTTPArtifactEncoder.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/HTTPSOAP11Encoder.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionMarshaller.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnStatementMarshaller.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ConditionsMarshaller.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/LogoutRequestMarshaller.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/RequestAbstractTypeMarshaller.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusResponseTypeMarshaller.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectConfirmationDataMarshaller.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AffiliationDescriptorMarshaller.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EntitiesDescriptorMarshaller.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EntityDescriptorMarshaller.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/RoleDescriptorMarshaller.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/RoundTripTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/SAMLProtocolMessageXMLSignatureSecurityPolicyRuleTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/impl/KeyInfoConfirmationDataTypeTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/provider/RequiredValidUntilTest.java

Modified: trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/artifact/BasicSAMLArtifactMapEntry.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/artifact/BasicSAMLArtifactMapEntry.java?rev=3034&r1=3033&r2=3034&view=diff
==============================================================================
--- trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/artifact/BasicSAMLArtifactMapEntry.java (original)
+++ trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/artifact/BasicSAMLArtifactMapEntry.java Wed Apr 11 23:22:20 2012
@@ -28,12 +28,13 @@
 
 import org.joda.time.DateTime;
 import org.opensaml.core.xml.XMLRuntimeException;
+import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
 import org.opensaml.core.xml.io.MarshallingException;
 import org.opensaml.core.xml.io.UnmarshallingException;
 import org.opensaml.core.xml.util.XMLObjectSupport;
 import org.opensaml.saml.common.SAMLObject;
 import org.opensaml.saml.common.binding.artifact.SAMLArtifactMap.SAMLArtifactMapEntry;
-import org.opensaml.saml.config.Configuration;
+import org.opensaml.saml.config.SAMLConfigurationSupport;
 import org.opensaml.util.storage.AbstractExpiringObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -210,7 +211,7 @@

[... 870 lines stripped ...]