[java-opensaml COMMIT] in /trunk: opensaml-saml-api/src/main/java/org/opensaml/saml/metadata/MetadataResolver.java op...

[noreply at shibboleth.net]

Author: putmanb
Date: Fri Aug  9 21:13:37 2013
New Revision: 3422

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3422&view=rev
Log:
Initial coarse refactoring of existing MetadataProviders to new MetadataResolver interface.
Add new RoleDescriptorResolver interface and a basic impl that wraps a MetadataResolver.
Rip out old MetadataCredentialResolver caching stuff, to be replaced with new XMLObject "annotation"-based mechanism 
when the latter is ready.

Added:
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/metadata/RoleDescriptorResolver.java   (with props)
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/provider/BasicRoleDescriptorResolver.java   (with props)
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/provider/BasicRoleDescriptorResolverTest.java   (with props)
Modified:
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/metadata/MetadataResolver.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/provider/AbstractMetadataProvider.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/provider/AbstractObservableMetadataProvider.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/provider/AbstractReloadingMetadataProvider.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/provider/BaseMetadataProvider.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/provider/ChainingMetadataProvider.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/provider/DOMMetadataProvider.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/provider/FileBackedHTTPMetadataProvider.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/provider/FilesystemMetadataProvider.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/provider/HTTPMetadataProvider.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/provider/ResourceBackedMetadataProvider.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/security/MetadataCredentialResolver.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/security/MetadataCredentialResolverFactory.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/provider/ChainingMetadataProviderTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/provider/FileBackedHTTPMetadataProviderTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/provider/FilesystemMetadataProviderTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/provider/HTTPMetadataProviderTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/provider/RequiredValidUntilTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/provider/ResourceBackedMetadataProviderTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/provider/SignatureValidationFilterTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/metadata/support/AttributeConsumingServiceSelectorTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/security/MetadataCredentialResolverCachingTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/security/MetadataCredentialResolverTest.java

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=3422&r1=3421&r2=3422&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 Fri Aug  9 21:13:37 2013
@@ -35,8 +35,8 @@
  * 
  * Implementations SHOULD also support the following criteria when possible:
  * <ul>
+ * <li>{@link org.opensaml.saml.criterion.EntityRoleCriterion}</li>
  * <li>{@link org.opensaml.saml.criterion.ProtocolCriterion}</li>
- * <li>{@link org.opensaml.saml.criterion.EntityRoleCriterion}</li>
  * <li>{@link org.opensaml.saml.criterion.BindingCriterion}</li>
  * </ul>
  */

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/provider/AbstractMetadataProvider.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/provider/AbstractMetadataProvider.java?rev=3422&r1=3421&r2=3422&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/provider/AbstractMetadataProvider.java (original)

[... 3179 lines stripped ...]