Tweaked some APIs to conform better to eventual metadata

git-svn-id: https://svn.middleware.georgetown.edu/cpp-sp/trunk@1002 cb58f699-b61c-0410-a6fe-9272a202ed29

diff --git a/shib/shib.h b/shib/shib.h
index d68a42f..d6d0090 100644 (file)
--- a/shib/shib.h
+++ b/shib/shib.h
@@ -184,8 +184,7 @@ namespace shibboleth
     struct SHIB_EXPORTS ISSOProviderRole : public virtual IProviderRole
     {
         virtual saml::Iterator<const IEndpoint*> getSingleLogoutServices() const=0;
-        virtual saml::Iterator<const IEndpoint*> getFederationTerminationServices() const=0;
-        virtual saml::Iterator<const IEndpoint*> getRegisterNameIdentifierServices() const=0;
+        virtual saml::Iterator<const IEndpoint*> getManageNameIdentifierServices() const=0;
         virtual ~ISSOProviderRole() {}
     };
     
@@ -215,21 +214,21 @@ namespace shibboleth
         virtual ~IAttributeAuthorityRole() {}
     };
 
-    struct SHIB_EXPORTS IAttributeConsumingService
+    struct SHIB_EXPORTS IAttributeRequestingService
     {
         virtual const XMLCh* getName(const XMLCh* lang) const=0;
         virtual const XMLCh* getDescription(const XMLCh* lang) const=0;
         virtual saml::Iterator<std::pair<const saml::SAMLAttributeDesignator*,bool> > getWantedAttributes() const=0;
         virtual const DOMElement* getElement() const=0;
-        virtual ~IAttributeConsumingService() {}
+        virtual ~IAttributeRequestingService() {}
     };
 
-    struct SHIB_EXPORTS IAttributeConsumerRole : public virtual IProviderRole
+    struct SHIB_EXPORTS IAttributeRequesterRole : public virtual IProviderRole
     {
-        virtual const IAttributeConsumingService* getDefaultAttributeConsumingService() const=0;
-        virtual const IAttributeConsumingService* getAttributeConsumingService(const XMLCh* id) const=0;
-        virtual saml::Iterator<const IAttributeConsumingService*> getAttributeConsumingServices() const=0;
-        virtual ~IAttributeConsumerRole() {}
+        virtual const IAttributeRequestingService* getDefaultAttributeRequestingService() const=0;
+        virtual const IAttributeRequestingService* getAttributeRequestingService(const XMLCh* id) const=0;
+        virtual saml::Iterator<const IAttributeRequestingService*> getAttributeRequestingServices() const=0;
+        virtual ~IAttributeRequesterRole() {}
     };
 
     struct SHIB_EXPORTS IProvider

diff --git a/xmlproviders/XMLMetadata.cpp b/xmlproviders/XMLMetadata.cpp
index 464998a..0b65546 100644 (file)
--- a/xmlproviders/XMLMetadata.cpp
+++ b/xmlproviders/XMLMetadata.cpp
@@ -167,8 +167,7 @@ namespace {
             SSORole(const Provider* provider, const DOMElement* e) : Role(provider,e) {}
             ~SSORole() {}
             Iterator<const IEndpoint*> getSingleLogoutServices() const {return EMPTY(const IEndpoint*);}
-            Iterator<const IEndpoint*> getFederationTerminationServices() const {return EMPTY(const IEndpoint*);}
-            Iterator<const IEndpoint*> getRegisterNameIdentifierServices() const {return EMPTY(const IEndpoint*);}
+            Iterator<const IEndpoint*> getManageNameIdentifierServices() const {return EMPTY(const IEndpoint*);}
         };
         
         class IDPRole : public SSORole, public virtual IIDPProviderRole