[cpp-opensaml COMMIT] in /branches/REL_2/saml: Makefile.am SAMLConfig.cpp SAMLConfig.h saml.vcxproj saml.vcxproj.filt...

[noreply at shibboleth.net]

Author: scantor
Date: Sun Feb 26 01:24:38 2012
New Revision: 713

URL: http://svn.shibboleth.net/view/cpp-opensaml?rev=713&view=rev
Log:
https://issues.shibboleth.net/jira/browse/SSPCPP-342

Added:
    branches/REL_2/saml/saml2/metadata/EntityMatcher.h
    branches/REL_2/saml/saml2/metadata/impl/EntityAttributesEntityMatcher.cpp
      - copied, changed from r712, branches/REL_2/saml/saml2/metadata/impl/WhitelistMetadataFilter.cpp
    branches/REL_2/saml/saml2/metadata/impl/NameEntityMatcher.cpp
Modified:
    branches/REL_2/saml/Makefile.am
    branches/REL_2/saml/SAMLConfig.cpp
    branches/REL_2/saml/SAMLConfig.h
    branches/REL_2/saml/saml.vcxproj
    branches/REL_2/saml/saml.vcxproj.filters
    branches/REL_2/saml/saml2/metadata/impl/BlacklistMetadataFilter.cpp
    branches/REL_2/saml/saml2/metadata/impl/WhitelistMetadataFilter.cpp

Modified: branches/REL_2/saml/Makefile.am
URL: http://svn.shibboleth.net/view/cpp-opensaml/branches/REL_2/saml/Makefile.am?rev=713&r1=712&r2=713&view=diff
==============================================================================
--- branches/REL_2/saml/Makefile.am (original)
+++ branches/REL_2/saml/Makefile.am Sun Feb 26 01:24:38 2012
@@ -87,6 +87,7 @@
 	saml2/metadata/DiscoverableMetadataProvider.h \
 	saml2/metadata/DynamicMetadataProvider.h \
 	saml2/metadata/EndpointManager.h \
+    saml2/metadata/EntityMatcher.h \
 	saml2/metadata/Metadata.h \
 	saml2/metadata/MetadataCredentialContext.h \
 	saml2/metadata/MetadataCredentialCriteria.h \
@@ -146,6 +147,7 @@
 	saml2/metadata/impl/ChainingMetadataProvider.cpp \
 	saml2/metadata/impl/DiscoverableMetadataProvider.cpp \
 	saml2/metadata/impl/DynamicMetadataProvider.cpp \
+    saml2/metadata/impl/EntityAttributesEntityMatcher.cpp \
     saml2/metadata/impl/EntityAttributesMetadataFilter.cpp \
 	saml2/metadata/impl/EntityRoleMetadataFilter.cpp \
 	saml2/metadata/impl/FolderMetadataProvider.cpp \
@@ -154,6 +156,7 @@
 	saml2/metadata/impl/MetadataImpl.cpp \
 	saml2/metadata/impl/MetadataProvider.cpp \
 	saml2/metadata/impl/MetadataSchemaValidators.cpp \
+    saml2/metadata/impl/NameEntityMatcher.cpp \
 	saml2/metadata/impl/NullMetadataProvider.cpp \
 	saml2/metadata/impl/ObservableMetadataProvider.cpp \
 	saml2/metadata/impl/SignatureMetadataFilter.cpp \

Modified: branches/REL_2/saml/SAMLConfig.cpp
URL: http://svn.shibboleth.net/view/cpp-opensaml/branches/REL_2/saml/SAMLConfig.cpp?rev=713&r1=712&r2=713&view=diff
==============================================================================
--- branches/REL_2/saml/SAMLConfig.cpp (original)
+++ branches/REL_2/saml/SAMLConfig.cpp Sun Feb 26 01:24:38 2012
@@ -48,6 +48,7 @@
 #include "saml1/core/Assertions.h"
 #include "saml1/core/Protocols.h"
 #include "saml2/core/Protocols.h"
+#include "saml2/metadata/EntityMatcher.h"
 #include "saml2/metadata/Metadata.h"
 #include "saml2/metadata/MetadataFilter.h"
 #include "saml2/metadata/MetadataProvider.h"
@@ -186,6 +187,7 @@
     saml2md::registerMetadataClasses();
     saml2md::registerMetadataProviders();
     saml2md::registerMetadataFilters();
+    saml2md::registerEntityMatchers();
     registerSAMLArtifacts();
     registerMessageEncoders();
     registerMessageDecoders();
@@ -218,6 +220,7 @@
     MessageEncoderManager.deregisterFactories();
     SecurityPolicyRuleManager.deregisterFactories();
     SAMLArtifactManager.deregisterFactories();
+    EntityMatcherManager.deregisterFactories();
     MetadataFilterManager.deregisterFactories();
     MetadataProviderManager.deregisterFactories();
 

Modified: branches/REL_2/saml/SAMLConfig.h
URL: http://svn.shibboleth.net/view/cpp-opensaml/branches/REL_2/saml/SAMLConfig.h?rev=713&r1=712&r2=713&view=diff
==============================================================================
--- branches/REL_2/saml/SAMLConfig.h (original)
+++ branches/REL_2/saml/SAMLConfig.h Sun Feb 26 01:24:38 2012
@@ -48,6 +48,7 @@
     namespace saml2md {
         class SAML_API ContactPerson;
         class SAML_API EntityDescriptor;
+        class SAML_API EntityMatcher;
         class SAML_API MetadataProvider;
         class SAML_API MetadataFilter;
         class SAML_API RoleDescriptor;
@@ -191,6 +192,9 @@
         /** Manages factories for MetadataFilter plugins. */
         xmltooling::PluginManager<saml2md::MetadataFilter,std::string,const xercesc::DOMElement*> MetadataFilterManager;
 
+        /** Manages factories for EntityMatcher plugins. */
+        xmltooling::PluginManager<saml2md::EntityMatcher,std::string,const xercesc::DOMElement*> EntityMatcherManager;
+
     protected:
         SAMLConfig();
         

Modified: branches/REL_2/saml/saml.vcxproj
URL: http://svn.shibboleth.net/view/cpp-opensaml/branches/REL_2/saml/saml.vcxproj?rev=713&r1=712&r2=713&view=diff
==============================================================================
--- branches/REL_2/saml/saml.vcxproj (original)
+++ branches/REL_2/saml/saml.vcxproj Sun Feb 26 01:24:38 2012
@@ -177,8 +177,10 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="saml2\metadata\impl\DiscoverableMetadataProvider.cpp" />

[... 634 lines stripped ...]