Tweaked AA role API

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

diff --git a/shib-target/shib-ccache.cpp b/shib-target/shib-ccache.cpp
index 0a69bea..6c69ebe 100644 (file)
--- a/shib-target/shib-ccache.cpp
+++ b/shib-target/shib-ccache.cpp
@@ -739,7 +739,7 @@ SAMLResponse* InternalCCacheEntry::getNewResponse()
         }
 
         // Now try metadata.
-        Iterator<const IEndpoint*> endpoints=AA->getAttributeServices()->getEndpoints();
+        Iterator<const IEndpoint*> endpoints=AA->getAttributeServiceManager()->getEndpoints();
         while (!response && endpoints.hasNext()) {
             const IEndpoint* ep=endpoints.next();
             try {

diff --git a/shib/shib.h b/shib/shib.h
index f4e2dcc..e7eb889 100644 (file)
--- a/shib/shib.h
+++ b/shib/shib.h
@@ -221,7 +221,7 @@ namespace shibboleth
 
     struct SHIB_EXPORTS IAttributeAuthorityDescriptor : public virtual IRoleDescriptor
     {
-        virtual const IEndpointManager* getAttributeServices() const=0;
+        virtual const IEndpointManager* getAttributeServiceManager() const=0;
         virtual const IEndpointManager* getAssertionIDRequestServiceManager() const=0;
         virtual saml::Iterator<const XMLCh*> getNameIDFormats() const=0;
         virtual saml::Iterator<const XMLCh*> getAttributeProfiles() const=0;

diff --git a/test/shibtest.cpp b/test/shibtest.cpp
index 4f8745c..1caf218 100644 (file)
--- a/test/shibtest.cpp
+++ b/test/shibtest.cpp
@@ -147,7 +147,7 @@ int main(int argc,char* argv[])
         Trust t(app->getTrustProviders());
 
         SAMLResponse* response=NULL;
-        Iterator<const IEndpoint*> endpoints=AA->getAttributeServices()->getEndpoints();
+        Iterator<const IEndpoint*> endpoints=AA->getAttributeServiceManager()->getEndpoints();
         while (!response && endpoints.hasNext()) {
             const IEndpoint* ep=endpoints.next();
             try {

diff --git a/xmlproviders/XMLMetadata.cpp b/xmlproviders/XMLMetadata.cpp
index db4eba7..d5d2476 100644 (file)
--- a/xmlproviders/XMLMetadata.cpp
+++ b/xmlproviders/XMLMetadata.cpp
@@ -326,7 +326,7 @@ namespace {
         public:
             AARole(const EntityDescriptor* provider, time_t validUntil, const DOMElement* e);
             ~AARole();
-            const IEndpointManager* getAttributeServices() const {return &m_query;}
+            const IEndpointManager* getAttributeServiceManager() const {return &m_query;}
             const IEndpointManager* getAssertionIDRequestServiceManager() const {return &m_idreq;}
             saml::Iterator<const XMLCh*> getNameIDFormats() const {return m_formats;}
             saml::Iterator<const XMLCh*> getAttributeProfiles() const {return m_attrprofs;}