[cpp-opensaml COMMIT] in /branches/REL_2/saml: Makefile.am saml.vcxproj saml.vcxproj.filters saml2/metadata/MetadataF...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Feb 22 17:55:00 2012
New Revision: 705

URL: http://svn.shibboleth.net/view/cpp-opensaml?rev=705&view=rev
Log:
https://issues.shibboleth.net/jira/browse/CPPOST-73

Modified:
    branches/REL_2/saml/Makefile.am
    branches/REL_2/saml/saml.vcxproj
    branches/REL_2/saml/saml.vcxproj.filters
    branches/REL_2/saml/saml2/metadata/MetadataFilter.h
    branches/REL_2/saml/saml2/metadata/impl/MetadataProvider.cpp

Modified: branches/REL_2/saml/Makefile.am
URL: http://svn.shibboleth.net/view/cpp-opensaml/branches/REL_2/saml/Makefile.am?rev=705&r1=704&r2=705&view=diff
==============================================================================
--- branches/REL_2/saml/Makefile.am (original)
+++ branches/REL_2/saml/Makefile.am Wed Feb 22 17:55:00 2012
@@ -146,6 +146,7 @@
 	saml2/metadata/impl/ChainingMetadataProvider.cpp \
 	saml2/metadata/impl/DiscoverableMetadataProvider.cpp \
 	saml2/metadata/impl/DynamicMetadataProvider.cpp \
+    saml2/metadata/impl/EntityAttributesMetadataFilter.cpp \
 	saml2/metadata/impl/EntityRoleMetadataFilter.cpp \
 	saml2/metadata/impl/FolderMetadataProvider.cpp \
 	saml2/metadata/impl/MetadataCredentialContext.cpp \

Modified: branches/REL_2/saml/saml.vcxproj
URL: http://svn.shibboleth.net/view/cpp-opensaml/branches/REL_2/saml/saml.vcxproj?rev=705&r1=704&r2=705&view=diff
==============================================================================
--- branches/REL_2/saml/saml.vcxproj (original)
+++ branches/REL_2/saml/saml.vcxproj Wed Feb 22 17:55:00 2012
@@ -177,6 +177,7 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="saml2\metadata\impl\DiscoverableMetadataProvider.cpp" />
+    <ClCompile Include="saml2\metadata\impl\EntityAttributesMetadataFilter.cpp" />
     <ClCompile Include="saml2\metadata\impl\FolderMetadataProvider.cpp" />
     <ClCompile Include="SAMLConfig.cpp" />
     <ClCompile Include="util\CommonDomainCookie.cpp" />

Modified: branches/REL_2/saml/saml.vcxproj.filters
URL: http://svn.shibboleth.net/view/cpp-opensaml/branches/REL_2/saml/saml.vcxproj.filters?rev=705&r1=704&r2=705&view=diff
==============================================================================
--- branches/REL_2/saml/saml.vcxproj.filters (original)
+++ branches/REL_2/saml/saml.vcxproj.filters Wed Feb 22 17:55:00 2012
@@ -364,6 +364,9 @@
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="saml2\metadata\impl\FolderMetadataProvider.cpp">
+      <Filter>Source Files\saml2\metadata\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="saml2\metadata\impl\EntityAttributesMetadataFilter.cpp">
       <Filter>Source Files\saml2\metadata\impl</Filter>
     </ClCompile>
   </ItemGroup>

Modified: branches/REL_2/saml/saml2/metadata/MetadataFilter.h
URL: http://svn.shibboleth.net/view/cpp-opensaml/branches/REL_2/saml/saml2/metadata/MetadataFilter.h?rev=705&r1=704&r2=705&view=diff
==============================================================================
--- branches/REL_2/saml/saml2/metadata/MetadataFilter.h (original)
+++ branches/REL_2/saml/saml2/metadata/MetadataFilter.h Wed Feb 22 17:55:00 2012
@@ -83,6 +83,9 @@
         /** MetadataFilter that removes non-retained roles. */
         #define ENTITYROLE_METADATA_FILTER  "EntityRoleWhiteList"
 
+        /** MetadataFilter that adds EntityAttributes extension. */
+        #define ENTITYATTR_METADATA_FILTER "EntityAttributes"
+
         DECL_XMLTOOLING_EXCEPTION(MetadataFilterException,SAML_EXCEPTIONAPI(SAML_API),opensaml::saml2md,MetadataException,Exceptions related to metadata filtering);
     };
 };

Modified: branches/REL_2/saml/saml2/metadata/impl/MetadataProvider.cpp
URL: http://svn.shibboleth.net/view/cpp-opensaml/branches/REL_2/saml/saml2/metadata/impl/MetadataProvider.cpp?rev=705&r1=704&r2=705&view=diff
==============================================================================
--- branches/REL_2/saml/saml2/metadata/impl/MetadataProvider.cpp (original)
+++ branches/REL_2/saml/saml2/metadata/impl/MetadataProvider.cpp Wed Feb 22 17:55:00 2012
@@ -56,6 +56,7 @@
         SAML_DLLLOCAL PluginManager<MetadataFilter,string,const DOMElement*>::Factory SignatureMetadataFilterFactory;
         SAML_DLLLOCAL PluginManager<MetadataFilter,string,const DOMElement*>::Factory RequireValidUntilMetadataFilterFactory;
         SAML_DLLLOCAL PluginManager<MetadataFilter,string,const DOMElement*>::Factory EntityRoleMetadataFilterFactory;
+        SAML_DLLLOCAL PluginManager<MetadataFilter,string,const DOMElement*>::Factory EntityAttributesMetadataFilterFactory;
     };
 };
 
@@ -78,6 +79,8 @@
     // additional name matching Java code
     SAMLConfig::getConfig().MetadataFilterManager.registerFactory("RequiredValidUntil", RequireValidUntilMetadataFilterFactory);
     SAMLConfig::getConfig().MetadataFilterManager.registerFactory(ENTITYROLE_METADATA_FILTER, EntityRoleMetadataFilterFactory);
+    SAMLConfig::getConfig().MetadataFilterManager.registerFactory(ENTITYATTR_METADATA_FILTER, EntityAttributesMetadataFilterFactory);
+
 }
 

[... 2 lines stripped ...]