[cpp-opensaml COMMIT] in /branches/REL_2: .gitignore configure.ac saml/Makefile.am saml/saml2/metadata/MetadataProvid...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Sep 28 03:48:19 2011
New Revision: 675

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

Added:
    branches/REL_2/saml/saml2/metadata/impl/FolderMetadataProvider.cpp
Modified:
    branches/REL_2/.gitignore
    branches/REL_2/configure.ac
    branches/REL_2/saml/Makefile.am
    branches/REL_2/saml/saml2/metadata/MetadataProvider.h
    branches/REL_2/saml/saml2/metadata/impl/MetadataProvider.cpp

Modified: branches/REL_2/.gitignore
URL: http://svn.shibboleth.net/view/cpp-opensaml/branches/REL_2/.gitignore?rev=675&r1=674&r2=675&view=diff
==============================================================================
--- branches/REL_2/.gitignore (original)
+++ branches/REL_2/.gitignore Wed Sep 28 03:48:19 2011
@@ -9,6 +9,7 @@
 /config.guess
 /config.h
 /config.h.in
+/config.h.in~
 /config.log
 /config.status
 /config.sub

Modified: branches/REL_2/configure.ac
URL: http://svn.shibboleth.net/view/cpp-opensaml/branches/REL_2/configure.ac?rev=675&r1=674&r2=675&view=diff
==============================================================================
--- branches/REL_2/configure.ac (original)
+++ branches/REL_2/configure.ac Wed Sep 28 03:48:19 2011
@@ -63,6 +63,7 @@
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 AC_TYPE_SIZE_T
+AC_HEADER_DIRENT
 
 # Checks for library functions.
 AC_CHECK_FUNCS([strchr strdup strstr])

Modified: branches/REL_2/saml/Makefile.am
URL: http://svn.shibboleth.net/view/cpp-opensaml/branches/REL_2/saml/Makefile.am?rev=675&r1=674&r2=675&view=diff
==============================================================================
--- branches/REL_2/saml/Makefile.am (original)
+++ branches/REL_2/saml/Makefile.am Wed Sep 28 03:48:19 2011
@@ -147,6 +147,7 @@
 	saml2/metadata/impl/DiscoverableMetadataProvider.cpp \
 	saml2/metadata/impl/DynamicMetadataProvider.cpp \
 	saml2/metadata/impl/EntityRoleMetadataFilter.cpp \
+	saml2/metadata/impl/FolderMetadataProvider.cpp \
 	saml2/metadata/impl/MetadataCredentialContext.cpp \
 	saml2/metadata/impl/MetadataCredentialCriteria.cpp \
 	saml2/metadata/impl/MetadataImpl.cpp \

Modified: branches/REL_2/saml/saml2/metadata/MetadataProvider.h
URL: http://svn.shibboleth.net/view/cpp-opensaml/branches/REL_2/saml/saml2/metadata/MetadataProvider.h?rev=675&r1=674&r2=675&view=diff
==============================================================================
--- branches/REL_2/saml/saml2/metadata/MetadataProvider.h (original)
+++ branches/REL_2/saml/saml2/metadata/MetadataProvider.h Wed Sep 28 03:48:19 2011
@@ -271,6 +271,9 @@
         /** MetadataProvider that wraps a sequence of metadata providers. */
         #define CHAINING_METADATA_PROVIDER  "Chaining"
 
+        /** MetadataProvider that loads a directory of files. */
+        #define FOLDER_METADATA_PROVIDER  "Folder"
+
         /** MetadataProvider that returns an empty "dummy" entity descriptor. */
         #define NULL_METADATA_PROVIDER  "Null"
 

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=675&r1=674&r2=675&view=diff
==============================================================================
--- branches/REL_2/saml/saml2/metadata/impl/MetadataProvider.cpp (original)
+++ branches/REL_2/saml/saml2/metadata/impl/MetadataProvider.cpp Wed Sep 28 03:48:19 2011
@@ -46,6 +46,7 @@
         SAML_DLLLOCAL PluginManager<MetadataProvider,string,const DOMElement*>::Factory XMLMetadataProviderFactory;
         SAML_DLLLOCAL PluginManager<MetadataProvider,string,const DOMElement*>::Factory DynamicMetadataProviderFactory;
         SAML_DLLLOCAL PluginManager<MetadataProvider,string,const DOMElement*>::Factory ChainingMetadataProviderFactory;
+        SAML_DLLLOCAL PluginManager<MetadataProvider,string,const DOMElement*>::Factory FolderMetadataProviderFactory;
         SAML_DLLLOCAL PluginManager<MetadataProvider,string,const DOMElement*>::Factory NullMetadataProviderFactory;
         SAML_DLLLOCAL PluginManager<MetadataFilter,string,const DOMElement*>::Factory BlacklistMetadataFilterFactory;
         SAML_DLLLOCAL PluginManager<MetadataFilter,string,const DOMElement*>::Factory WhitelistMetadataFilterFactory;
@@ -61,6 +62,7 @@
     conf.MetadataProviderManager.registerFactory(XML_METADATA_PROVIDER, XMLMetadataProviderFactory);
     conf.MetadataProviderManager.registerFactory(DYNAMIC_METADATA_PROVIDER, DynamicMetadataProviderFactory);
     conf.MetadataProviderManager.registerFactory(CHAINING_METADATA_PROVIDER, ChainingMetadataProviderFactory);
+    conf.MetadataProviderManager.registerFactory(FOLDER_METADATA_PROVIDER, FolderMetadataProviderFactory);
     conf.MetadataProviderManager.registerFactory(NULL_METADATA_PROVIDER, NullMetadataProviderFactory);
 }