[java-opensaml COMMIT] in /trunk: opensaml-core/src/main/java/org/opensaml/core/criterion/ opensaml-core/src/main/jav...

[noreply at shibboleth.net]

Author: putmanb
Date: Fri Sep 20 18:58:53 2013
New Revision: 3450

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3450&view=rev
Log:
Eliminate duplicative EntityIDCriterion/EntityIdCriterion in favor of a single one, which for visibility reasons is moved to core.
Eliminate duplicative MetadataCriterion in saml-impl in favor of new EntityRoleCriterion and ProtocolCriterion in saml-api.

Added:
    trunk/opensaml-core/src/main/java/org/opensaml/core/criterion/
    trunk/opensaml-core/src/main/java/org/opensaml/core/criterion/EntityIdCriterion.java   (with props)
Modified:
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/EntityIdCriterion.java
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/metadata/resolver/MetadataResolver.java
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/metadata/resolver/RoleDescriptorResolver.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/BaseSAMLSimpleSignatureSecurityHandler.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/BaseSAMLXMLSignatureSecurityHandler.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/SAMLMDClientCertAuthSecurityHandler.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractMetadataResolver.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/security/MetadataCredentialResolver.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/security/MetadataCriterion.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/EntitiesDescriptorNameProcessorTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/NodeProcessingMetadataFilterTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/BasicRoleDescriptorResolverTest.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/DOMMetadataResolverTest.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/resolver/impl/FilesystemMetadataResolverTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolverTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/ResourceBackedMetadataResolverTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/support/AttributeConsumingServiceSelectorTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/core/SignedAssertionTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/security/MetadataCredentialResolverTest.java
    trunk/opensaml-security-api/src/main/java/org/opensaml/security/criteria/EntityIDCriterion.java
    trunk/opensaml-security-api/src/main/java/org/opensaml/security/criteria/PeerEntityIDCriterion.java
    trunk/opensaml-security-impl/src/main/java/org/opensaml/security/credential/criteria/impl/EvaluableEntityIDCredentialCriterion.java
    trunk/opensaml-security-impl/src/main/java/org/opensaml/security/credential/impl/KeyStoreCredentialResolver.java
    trunk/opensaml-security-impl/src/main/java/org/opensaml/security/messaging/impl/BaseClientCertAuthSecurityHandler.java
    trunk/opensaml-security-impl/src/main/resources/credential-criteria-registry.properties
    trunk/opensaml-security-impl/src/test/java/org/opensaml/security/credential/criteria/impl/EvaluableEntityIDCredentialCriterionTest.java
    trunk/opensaml-security-impl/src/test/java/org/opensaml/security/trust/impl/ChainingTrustEngineTest.java
    trunk/opensaml-security-impl/src/test/java/org/opensaml/security/trust/impl/ExplicitKeyTrustEngineTest.java
    trunk/opensaml-security-impl/src/test/java/org/opensaml/security/trust/impl/ExplicitX509CertificateTrustEngineTest.java
    trunk/opensaml-security-impl/src/test/java/org/opensaml/security/x509/impl/PKIXX509CredentialTrustEngineTest.java
    trunk/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/impl/ExplicitKeySignatureTrustEngineTest.java
    trunk/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/signature/support/impl/PKIXSignatureTrustEngineTest.java

Modified: trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/metadata/resolver/MetadataResolver.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/metadata/resolver/MetadataResolver.java?rev=3450&r1=3449&r2=3450&view=diff
==============================================================================
--- trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/metadata/resolver/MetadataResolver.java (original)

[... 1163 lines stripped ...]