[cpp-sp COMMIT] in /branches/REL_2/shibsp: Makefile.am attribute/resolver/AttributeExtractor.h attribute/resolver/imp...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Sep 21 20:37:05 2011
New Revision: 3520

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3520&view=rev
Log:
https://issues.shibboleth.net/jira/browse/SSPCPP-343

Modified:
    branches/REL_2/shibsp/Makefile.am
    branches/REL_2/shibsp/attribute/resolver/AttributeExtractor.h
    branches/REL_2/shibsp/attribute/resolver/impl/ChainingAttributeExtractor.cpp
    branches/REL_2/shibsp/shibsp.vcxproj
    branches/REL_2/shibsp/shibsp.vcxproj.filters

Modified: branches/REL_2/shibsp/Makefile.am
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/shibsp/Makefile.am?rev=3520&r1=3519&r2=3520&view=diff
==============================================================================
--- branches/REL_2/shibsp/Makefile.am (original)
+++ branches/REL_2/shibsp/Makefile.am Wed Sep 21 20:37:05 2011
@@ -205,6 +205,7 @@
 	attribute/resolver/impl/ChainingAttributeResolver.cpp \
 	attribute/resolver/impl/QueryAttributeResolver.cpp \
 	attribute/resolver/impl/SimpleAggregationAttributeResolver.cpp \
+    attribute/resolver/impl/AuthnAuthorityAttributeExtractor.cpp \
 	attribute/resolver/impl/ChainingAttributeExtractor.cpp \
 	attribute/resolver/impl/DelegationAttributeExtractor.cpp \
 	attribute/resolver/impl/KeyDescriptorAttributeExtractor.cpp \

Modified: branches/REL_2/shibsp/attribute/resolver/AttributeExtractor.h
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/shibsp/attribute/resolver/AttributeExtractor.h?rev=3520&r1=3519&r2=3520&view=diff
==============================================================================
--- branches/REL_2/shibsp/attribute/resolver/AttributeExtractor.h (original)
+++ branches/REL_2/shibsp/attribute/resolver/AttributeExtractor.h Wed Sep 21 20:37:05 2011
@@ -109,6 +109,9 @@
     /** AttributeExtractor for KeyInfo information. */
     #define KEYDESCRIPTOR_ATTRIBUTE_EXTRACTOR "KeyDescriptor"
 
+    /** AttributeExtractor for AuthenticatingAuthority information. */
+    #define AUTHNAUTHORITY_ATTRIBUTE_EXTRACTOR "AuthnAuthority"
+
     /** AttributeExtractor based on chaining together other extractors. */
     #define CHAINING_ATTRIBUTE_EXTRACTOR "Chaining"
 };

Modified: branches/REL_2/shibsp/attribute/resolver/impl/ChainingAttributeExtractor.cpp
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/shibsp/attribute/resolver/impl/ChainingAttributeExtractor.cpp?rev=3520&r1=3519&r2=3520&view=diff
==============================================================================
--- branches/REL_2/shibsp/attribute/resolver/impl/ChainingAttributeExtractor.cpp (original)
+++ branches/REL_2/shibsp/attribute/resolver/impl/ChainingAttributeExtractor.cpp Wed Sep 21 20:37:05 2011
@@ -82,6 +82,7 @@
     static const XMLCh _AttributeExtractor[] =  UNICODE_LITERAL_18(A,t,t,r,i,b,u,t,e,E,x,t,r,a,c,t,o,r);
     static const XMLCh _type[] =                UNICODE_LITERAL_4(t,y,p,e);
 
+    SHIBSP_DLLLOCAL PluginManager<AttributeExtractor,string,const DOMElement*>::Factory AuthnAuthorityAttributeExtractorFactory;
     SHIBSP_DLLLOCAL PluginManager<AttributeExtractor,string,const DOMElement*>::Factory DelegationAttributeExtractorFactory;
     SHIBSP_DLLLOCAL PluginManager<AttributeExtractor,string,const DOMElement*>::Factory KeyDescriptorAttributeExtractorFactory;
     SHIBSP_DLLLOCAL PluginManager<AttributeExtractor,string,const DOMElement*>::Factory XMLAttributeExtractorFactory;
@@ -93,6 +94,7 @@
 
 void SHIBSP_API shibsp::registerAttributeExtractors()
 {
+    SPConfig::getConfig().AttributeExtractorManager.registerFactory(AUTHNAUTHORITY_ATTRIBUTE_EXTRACTOR, AuthnAuthorityAttributeExtractorFactory);
     SPConfig::getConfig().AttributeExtractorManager.registerFactory(DELEGATION_ATTRIBUTE_EXTRACTOR, DelegationAttributeExtractorFactory);
     SPConfig::getConfig().AttributeExtractorManager.registerFactory(KEYDESCRIPTOR_ATTRIBUTE_EXTRACTOR, KeyDescriptorAttributeExtractorFactory);
     SPConfig::getConfig().AttributeExtractorManager.registerFactory(XML_ATTRIBUTE_EXTRACTOR, XMLAttributeExtractorFactory);

Modified: branches/REL_2/shibsp/shibsp.vcxproj
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/shibsp/shibsp.vcxproj?rev=3520&r1=3519&r2=3520&view=diff
==============================================================================
--- branches/REL_2/shibsp/shibsp.vcxproj (original)
+++ branches/REL_2/shibsp/shibsp.vcxproj Wed Sep 21 20:37:05 2011
@@ -179,6 +179,7 @@
     <ClCompile Include="attribute\Base64AttributeDecoder.cpp" />
     <ClCompile Include="attribute\filtering\impl\DummyAttributeFilter.cpp" />
     <ClCompile Include="attribute\filtering\impl\NameIDQualifierStringFunctor.cpp" />
+    <ClCompile Include="attribute\resolver\impl\AuthnAuthorityAttributeExtractor.cpp" />
     <ClCompile Include="binding\impl\XMLProtocolProvider.cpp" />
     <ClCompile Include="handler\impl\DiscoveryFeed.cpp" />
     <ClCompile Include="handler\impl\LogoutInitiator.cpp" />

Modified: branches/REL_2/shibsp/shibsp.vcxproj.filters
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/shibsp/shibsp.vcxproj.filters?rev=3520&r1=3519&r2=3520&view=diff

[... 14 lines stripped ...]