projects
/
shibboleth
/
cpp-opensaml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
boost changes and header fixes
[shibboleth/cpp-opensaml.git]
/
saml
/
saml2
/
metadata
/
MetadataProvider.h
diff --git
a/saml/saml2/metadata/MetadataProvider.h
b/saml/saml2/metadata/MetadataProvider.h
index
63c74e7
..
05d2493
100644
(file)
--- a/
saml/saml2/metadata/MetadataProvider.h
+++ b/
saml/saml2/metadata/MetadataProvider.h
@@
-31,6
+31,7
@@
#include <vector>
#include <iostream>
#include <vector>
#include <iostream>
+#include <boost/ptr_container/ptr_vector.hpp>
#include <xmltooling/exceptions.h>
#include <xmltooling/security/CredentialResolver.h>
#include <xmltooling/exceptions.h>
#include <xmltooling/security/CredentialResolver.h>
@@
-97,6
+98,13
@@
namespace opensaml {
virtual ~MetadataProvider();
/**
virtual ~MetadataProvider();
/**
+ * Returns an identifier for the provider for logging/status purposes.
+ *
+ * @return an identifier, or null
+ */
+ virtual const char* getId() const;
+
+ /**
* Adds a metadata filter to apply to any resolved metadata. Will not be applied
* to metadata that is already loaded.
*
* Adds a metadata filter to apply to any resolved metadata. Will not be applied
* to metadata that is already loaded.
*
@@
-243,7
+251,7
@@
namespace opensaml {
void doFilters(xmltooling::XMLObject& xmlObject) const;
private:
void doFilters(xmltooling::XMLObject& xmlObject) const;
private:
-
std::vector<MetadataFilter*
> m_filters;
+
boost::ptr_vector<MetadataFilter
> m_filters;
};
#if defined (_MSC_VER)
};
#if defined (_MSC_VER)
@@
-264,6
+272,9
@@
namespace opensaml {
/** MetadataProvider that wraps a sequence of metadata providers. */
#define CHAINING_METADATA_PROVIDER "Chaining"
/** 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"
/** MetadataProvider that returns an empty "dummy" entity descriptor. */
#define NULL_METADATA_PROVIDER "Null"