Added plugin unregistration, add plugin aliases.

diff --git a/saml/SAMLConfig.cpp b/saml/SAMLConfig.cpp
index d17142b..ad8a6df 100644 (file)
--- a/saml/SAMLConfig.cpp
+++ b/saml/SAMLConfig.cpp
@@ -95,6 +95,9 @@ void SAMLInternalConfig::term()
     saml1p::ProtocolSchemaValidators.destroyValidators();
     saml2::AssertionSchemaValidators.destroyValidators();
     saml2md::MetadataSchemaValidators.destroyValidators();
+    
+    MetadataFilterManager.deregisterFactories();
+    MetadataProviderManager.deregisterFactories();
 
     XMLToolingConfig::getConfig().term();
     Category::getInstance(SAML_LOGCAT".SAMLConfig").info("library shutdown complete");

diff --git a/saml/saml2/metadata/impl/MetadataProvider.cpp b/saml/saml2/metadata/impl/MetadataProvider.cpp
index b5b5684..b0bf178 100644 (file)
--- a/saml/saml2/metadata/impl/MetadataProvider.cpp
+++ b/saml/saml2/metadata/impl/MetadataProvider.cpp
@@ -103,7 +103,10 @@ namespace opensaml {
 
 void SAML_API opensaml::saml2md::registerMetadataProviders()
 {
-    SAMLConfig::getConfig().MetadataProviderManager.registerFactory(FILESYSTEM_METADATA_PROVIDER, FilesystemMetadataProviderFactory);
+    SAMLConfig& conf=SAMLConfig::getConfig();
+    conf.MetadataProviderManager.registerFactory(FILESYSTEM_METADATA_PROVIDER, FilesystemMetadataProviderFactory);
+    conf.MetadataProviderManager.registerFactory("edu.internet2.middleware.shibboleth.metadata.provider.XMLMetadata", FilesystemMetadataProviderFactory);
+    conf.MetadataProviderManager.registerFactory("edu.internet2.middleware.shibboleth.common.provider.XMLMetadata", FilesystemMetadataProviderFactory);
 }
 
 void SAML_API opensaml::saml2md::registerMetadataFilters()