From d59a95f8f078ebd56693036acc92be89d3138536 Mon Sep 17 00:00:00 2001 From: cantor Date: Sun, 3 Feb 2008 04:50:39 +0000 Subject: [PATCH] Forgot to register chaining resolver plugin. git-svn-id: https://svn.middleware.georgetown.edu/cpp-sp/trunk@2716 cb58f699-b61c-0410-a6fe-9272a202ed29 --- shibsp/attribute/resolver/impl/ChainingAttributeResolver.cpp | 9 ++++++++- shibsp/attribute/resolver/impl/QueryAttributeResolver.cpp | 5 ----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/shibsp/attribute/resolver/impl/ChainingAttributeResolver.cpp b/shibsp/attribute/resolver/impl/ChainingAttributeResolver.cpp index e819e90..a11dcc7 100644 --- a/shibsp/attribute/resolver/impl/ChainingAttributeResolver.cpp +++ b/shibsp/attribute/resolver/impl/ChainingAttributeResolver.cpp @@ -133,12 +133,19 @@ namespace shibsp { static const XMLCh _AttributeResolver[] = UNICODE_LITERAL_17(A,t,t,r,i,b,u,t,e,R,e,s,o,l,v,e,r); static const XMLCh _type[] = UNICODE_LITERAL_4(t,y,p,e); - AttributeResolver* SHIBSP_DLLLOCAL ChainingAttributeResolverFactory(const DOMElement* & e) + SHIBSP_DLLLOCAL PluginManager::Factory QueryResolverFactory; + AttributeResolver* SHIBSP_DLLLOCAL ChainingResolverFactory(const DOMElement* const & e) { return new ChainingAttributeResolver(e); } }; +void SHIBSP_API shibsp::registerAttributeResolvers() +{ + SPConfig::getConfig().AttributeResolverManager.registerFactory(QUERY_ATTRIBUTE_RESOLVER, QueryResolverFactory); + SPConfig::getConfig().AttributeResolverManager.registerFactory(CHAINING_ATTRIBUTE_RESOLVER, ChainingResolverFactory); +} + ChainingAttributeResolver::ChainingAttributeResolver(const DOMElement* e) { SPConfig& conf = SPConfig::getConfig(); diff --git a/shibsp/attribute/resolver/impl/QueryAttributeResolver.cpp b/shibsp/attribute/resolver/impl/QueryAttributeResolver.cpp index 98e5aba..c75b2e5 100644 --- a/shibsp/attribute/resolver/impl/QueryAttributeResolver.cpp +++ b/shibsp/attribute/resolver/impl/QueryAttributeResolver.cpp @@ -216,11 +216,6 @@ namespace shibsp { }; -void SHIBSP_API shibsp::registerAttributeResolvers() -{ - SPConfig::getConfig().AttributeResolverManager.registerFactory(QUERY_ATTRIBUTE_RESOLVER, QueryResolverFactory); -} - QueryResolver::QueryResolver(const DOMElement* e) : m_log(Category::getInstance(SHIBSP_LOGCAT".AttributeResolver")) { #ifdef _DEBUG -- 2.1.4