[java-opensaml COMMIT] in /trunk/opensaml-saml-api/src/main/java/org/opensaml/saml: criterion/ProtocolCriterion.java ...

[noreply at shibboleth.net]

Author: putmanb
Date: Thu Aug  8 18:21:10 2013
New Revision: 3420

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3420&view=rev
Log:
Remove defunct new MetadataProvider interface.

Modified:
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/ProtocolCriterion.java
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/metadata/MetadataProvider.java
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/metadata/MetadataResolver.java

Modified: trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/ProtocolCriterion.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/ProtocolCriterion.java?rev=3420&r1=3419&r2=3420&view=diff
==============================================================================
--- trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/ProtocolCriterion.java (original)
+++ trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/ProtocolCriterion.java Thu Aug  8 18:21:10 2013
@@ -33,8 +33,8 @@
      * @param protocolUri the SAML protocol, never null or empty
      */
     public ProtocolCriterion(final String protocolUri) {
-        protocol =
-                Constraint.isNotNull(StringSupport.trimOrNull(protocolUri), "SAML protocol URI can not be null or empty");
+        protocol = Constraint.isNotNull(StringSupport.trimOrNull(protocolUri), 
+                "SAML protocol URI can not be null or empty");
     }
 
     /**

Modified: trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/metadata/MetadataResolver.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/metadata/MetadataResolver.java?rev=3420&r1=3419&r2=3420&view=diff
==============================================================================
--- trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/metadata/MetadataResolver.java (original)
+++ trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/metadata/MetadataResolver.java Thu Aug  8 18:21:10 2013
@@ -25,13 +25,8 @@
 import org.opensaml.saml.saml2.metadata.EntityDescriptor;
 
 /**
- * A metadata resolver that scans SAML metadata for Entities that match a given set of criteria.
- * 
- * Note, this interface differs from a {@link MetadataProvider} in that the
- * provider is focused on reading in batches of metadata and making them accessible while the resolver is focused on
- * searching for metadata. The resolution process may simply search a static batch or metadata provided by a
- * {@link MetadataProvider} or it may do something more dynamic such as querying a
- * remote service.
+ * A resolver that is capable of resolving {@link EntityDescriptor} instances
+ * which meet certain supplied criteria.
  * 
  * At a minimum, a {@link MetadataResolver} implementation MUST support the following criteria:
  * <ul>