[java-identity-provider COMMIT] in /trunk/idp-attribute-resolver-impl/src: main/java/edu/internet2/middleware/shibbol...

[noreply at shibboleth.net]

Author: putmanb
Date: Wed Sep  4 23:06:00 2013
New Revision: 4749

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4749&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/idp-attribute-resolver-impl/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/V2SAMLProfileRequestContext.java
    trunk/idp-attribute-resolver-impl/src/test/resources/data/net/shibboleth/idp/attribute/resolver/impl/ad/requestContextUnimplemented.script

Modified: trunk/idp-attribute-resolver-impl/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/V2SAMLProfileRequestContext.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/V2SAMLProfileRequestContext.java?rev=4749&r1=4748&r2=4749&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/V2SAMLProfileRequestContext.java (original)
+++ trunk/idp-attribute-resolver-impl/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/V2SAMLProfileRequestContext.java Wed Sep  4 23:06:00 2013
@@ -18,6 +18,7 @@
 package edu.internet2.middleware.shibboleth.common.attribute.provider;
 
 import java.util.Collection;
+
 import java.util.Map;
 
 import javax.annotation.Nonnull;
@@ -32,10 +33,10 @@
 import org.joda.time.DateTime;
 import org.opensaml.core.xml.XMLObject;
 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;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -181,8 +182,8 @@
      * 
      * @return null
      */
-    public MetadataProvider getMetadataProvider() {
-        log.error("AttributeDefinition: '{}' call unsupported method getMetadataProvider", getId());
+    public MetadataResolver getMetadataResolver() {
+        log.error("AttributeDefinition: '{}' call unsupported method getMetadataResolver", getId());
         return null;
     }
 
@@ -411,8 +412,8 @@
      * 
      * @param param ignored.
      */
-    public void setMetadataProvider(Object param) {
-        log.error("AttributeDefinition: '{}' call unsupported method setMetadataProvider", getId());
+    public void setMetadataResolver(Object param) {
+        log.error("AttributeDefinition: '{}' call unsupported method setMetadataResolver", getId());
 
     }
 

Modified: trunk/idp-attribute-resolver-impl/src/test/resources/data/net/shibboleth/idp/attribute/resolver/impl/ad/requestContextUnimplemented.script
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/test/resources/data/net/shibboleth/idp/attribute/resolver/impl/ad/requestContextUnimplemented.script?rev=4749&r1=4748&r2=4749&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/test/resources/data/net/shibboleth/idp/attribute/resolver/impl/ad/requestContextUnimplemented.script (original)
+++ trunk/idp-attribute-resolver-impl/src/test/resources/data/net/shibboleth/idp/attribute/resolver/impl/ad/requestContextUnimplemented.script Wed Sep  4 23:06:00 2013
@@ -6,7 +6,7 @@
 requestContext.getLocalEntityMetadata();
 requestContext.getLocalEntityRole();
 requestContext.getLocalEntityRoleMetadata();
-requestContext.getMetadataProvider();
+requestContext.getMetadataResolver();
 requestContext.getOuboundSAMLMessageSigningCredential();
 requestContext.getOutboundMessageArtifactType();
 requestContext.getOutboundSAMLMessage();
@@ -50,7 +50,7 @@
 requestContext.setLocalEntityMetadata(null);
 requestContext.setLocalEntityRole(null);
 requestContext.setLocalEntityRoleMetadata(null);
-requestContext.setMetadataProvider("foo");
+requestContext.setMetadataResolver("foo");
 requestContext.setOutboundMessageArtifactType(null);
 requestContext.setOutboundSAMLMessage(null);
 requestContext.setOutboundSAMLMessageId("foo");