Metadata support for old and new schemas, and API changes.
[java-idp.git] / src / edu / internet2 / middleware / shibboleth / serviceprovider / ITrust.java
index 7d25c70..036a0be 100644 (file)
@@ -35,8 +35,8 @@ import java.util.Iterator;
 
 import org.opensaml.SAMLObject;
 
 
 import org.opensaml.SAMLObject;
 
-import edu.internet2.middleware.shibboleth.metadata.EntityLocator;
-import edu.internet2.middleware.shibboleth.metadata.ProviderRole;
+import edu.internet2.middleware.shibboleth.metadata.Metadata;
+import edu.internet2.middleware.shibboleth.metadata.RoleDescriptor;
 
 /**
  * @author Howard Gilbert
 
 /**
  * @author Howard Gilbert
@@ -54,9 +54,9 @@ public interface ITrust {
         */
        boolean validate(
                Iterator revocations,
         */
        boolean validate(
                Iterator revocations,
-               ProviderRole role,
+               RoleDescriptor role,
                SAMLObject token,
                SAMLObject token,
-               EntityLocator locator
+               Metadata locator
        );
        
        /*
        );
        
        /*
@@ -64,7 +64,7 @@ public interface ITrust {
         */
        boolean attach (
                Iterator revocations,
         */
        boolean attach (
                Iterator revocations,
-               ProviderRole role
+               RoleDescriptor role
        );
 
 }
        );
 
 }