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

[noreply at shibboleth.net]

Author: putmanb
Date: Wed Sep  4 23:06:03 2013
New Revision: 3437

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3437&view=rev
Log:
Remove old MetadataProvider interface and all references.
Add missing require valid metadata method to RoleDescriptorResolver interface.
Strip down, clean up and fix ChainingMetadataResolver so it actually works again, re-enable its tests.

Modified:
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/AbstractEndpointSelector.java
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/metadata/resolver/RoleDescriptorResolver.java
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/provider/
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractObservableMetadataResolver.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/BaseMetadataResolver.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/BasicRoleDescriptorResolver.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/ChainingMetadataResolver.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/ObservableMetadataResolver.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/security/MetadataCredentialResolverFactory.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/ChainingMetadataResolverTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FileBackedHTTPMetadataResolverTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/support/AttributeConsumingServiceSelectorTest.java

Modified: trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/AbstractEndpointSelector.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/AbstractEndpointSelector.java?rev=3437&r1=3436&r2=3437&view=diff
==============================================================================
--- trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/AbstractEndpointSelector.java (original)
+++ trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/AbstractEndpointSelector.java Wed Sep  4 23:06:03 2013
@@ -23,10 +23,10 @@
 import javax.xml.namespace.QName;
 
 import org.opensaml.saml.common.SAMLObject;
+import org.opensaml.saml.metadata.resolver.MetadataResolver;
 import org.opensaml.saml.saml2.metadata.Endpoint;
 import org.opensaml.saml.saml2.metadata.EntityDescriptor;
 import org.opensaml.saml.saml2.metadata.RoleDescriptor;
-import org.opensaml.saml.saml2.metadata.provider.MetadataProvider;
 
 /**
  * Endpoint selectors choose the endpoint that should be used to contact a peer.
@@ -42,8 +42,8 @@
     /** SAML response within the message flow. */
     private SAMLObject samlResponse;
 
-    /** Provider of metadata for the relying party. */
-    private MetadataProvider metadataProvider;
+    /** Resolver of metadata for the relying party. */
+    private MetadataResolver metadataResolver;
 
     /** Metadata of party to select endpoing for. */
     private EntityDescriptor entityMetadata;
@@ -78,21 +78,21 @@
     }
 
     /**
-     * Gets the metadata provider used to look up entity information.
+     * Gets the metadata resolver used to look up entity information.
      * 
-     * @return metadata provider used to look up entity information
+     * @return metadata resolver used to look up entity information
      */
-    public MetadataProvider getMetadataProvider() {
-        return metadataProvider;
+    public MetadataResolver getMetadataResolver() {
+        return metadataResolver;
     }
 
     /**
-     * Sets the metadata provider used to look up entity information.
+     * Sets the metadata resolver used to look up entity information.
      * 
-     * @param provider metadata provider used to look up entity information
+     * @param resolver metadata resolver used to look up entity information
      */
-    public void setMetadataProvider(MetadataProvider provider) {
-        metadataProvider = provider;
+    public void setMetadataResolver(MetadataResolver resolver) {
+        metadataResolver = resolver;
     }
 
     /**

Modified: trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/metadata/resolver/RoleDescriptorResolver.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/metadata/resolver/RoleDescriptorResolver.java?rev=3437&r1=3436&r2=3437&view=diff
==============================================================================
--- trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/metadata/resolver/RoleDescriptorResolver.java (original)
+++ trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/metadata/resolver/RoleDescriptorResolver.java Wed Sep  4 23:06:03 2013
@@ -43,5 +43,21 @@
  */
 public interface RoleDescriptorResolver extends Resolver<RoleDescriptor, CriteriaSet>, IdentifiableComponent,

[... 848 lines stripped ...]