[java-identity-provider COMMIT] in /trunk/idp-saml-impl/src: main/java/net/shibboleth/idp/saml/impl/profile/AddSamlMe...

[noreply at shibboleth.net]

Author: putmanb
Date: Fri Sep 20 18:58:47 2013
New Revision: 4784

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

Modified:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/AddSamlMetadataToMessageContext.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/security/KeyAuthorityNodeProcessorTest.java

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/AddSamlMetadataToMessageContext.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/AddSamlMetadataToMessageContext.java?rev=4784&r1=4783&r2=4784&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/AddSamlMetadataToMessageContext.java (original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/AddSamlMetadataToMessageContext.java Fri Sep 20 18:58:47 2013
@@ -31,12 +31,12 @@
 import net.shibboleth.utilities.java.support.resolver.Resolver;
 import net.shibboleth.utilities.java.support.resolver.ResolverException;
 
+import org.opensaml.core.criterion.EntityIdCriterion;
 import org.opensaml.messaging.context.BasicMessageMetadataContext;
 import org.opensaml.messaging.context.MessageContext;
 import org.opensaml.messaging.context.navigate.ChildContextLookup;
 import org.opensaml.saml.common.messaging.context.SamlMetadataContext;
 import org.opensaml.saml.common.messaging.context.SamlProtocolContext;
-import org.opensaml.saml.criterion.EntityIdCriterion;
 import org.opensaml.saml.criterion.EntityRoleCriterion;
 import org.opensaml.saml.criterion.ProtocolCriterion;
 import org.opensaml.saml.saml2.metadata.EntityDescriptor;

Modified: trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/security/KeyAuthorityNodeProcessorTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/security/KeyAuthorityNodeProcessorTest.java?rev=4784&r1=4783&r2=4784&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/security/KeyAuthorityNodeProcessorTest.java (original)
+++ trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/security/KeyAuthorityNodeProcessorTest.java Fri Sep 20 18:58:47 2013
@@ -26,8 +26,8 @@
 import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
 import net.shibboleth.utilities.java.support.resolver.ResolverException;
 
+import org.opensaml.core.criterion.EntityIdCriterion;
 import org.opensaml.core.xml.XMLObjectBaseTestCase;
-import org.opensaml.saml.criterion.EntityIdCriterion;
 import org.opensaml.saml.metadata.resolver.filter.MetadataNodeProcessor;
 import org.opensaml.saml.metadata.resolver.filter.impl.NodeProcessingMetadataFilter;
 import org.opensaml.saml.metadata.resolver.impl.FilesystemMetadataResolver;