Hid plugin mgr.

git-svn-id: https://svn.middleware.georgetown.edu/cpp-sp/trunk@1352 cb58f699-b61c-0410-a6fe-9272a202ed29

diff --git a/shib-mysql-ccache/shib-mysql-ccache.cpp b/shib-mysql-ccache/shib-mysql-ccache.cpp
index 47baeaf..9ae19a4 100644 (file)
--- a/shib-mysql-ccache/shib-mysql-ccache.cpp
+++ b/shib-mysql-ccache/shib-mysql-ccache.cpp
@@ -208,7 +208,7 @@ ShibMySQLCCache::ShibMySQLCCache(const DOMElement* e)
   initialized = true;
 
   m_cache = dynamic_cast<ISessionCache*>(
-      SAMLConfig::getConfig().m_plugMgr.newPlugin(
+      SAMLConfig::getConfig().getPlugMgr().newPlugin(
         "edu.internet2.middleware.shibboleth.target.provider.MemorySessionCache", e
         )
     );
@@ -617,13 +617,13 @@ IPlugIn* new_mysql_ccache(const DOMElement* e)
 extern "C" int SHIBMYSQL_EXPORTS saml_extension_init(void*)
 {
   // register this ccache type
-  SAMLConfig::getConfig().m_plugMgr.regFactory(PLUGINTYPE, &new_mysql_ccache);
+  SAMLConfig::getConfig().getPlugMgr().regFactory(PLUGINTYPE, &new_mysql_ccache);
   return 0;
 }
 
 extern "C" void SHIBMYSQL_EXPORTS saml_extension_term()
 {
-  SAMLConfig::getConfig().m_plugMgr.unregFactory(PLUGINTYPE);
+  SAMLConfig::getConfig().getPlugMgr().unregFactory(PLUGINTYPE);
 }
 
 /*************************************************************************

diff --git a/test/posttest.cpp b/test/posttest.cpp
index 1bb7855..a679314 100644 (file)
--- a/test/posttest.cpp
+++ b/test/posttest.cpp
@@ -94,7 +94,7 @@ int main(int argc,char* argv[])
         dummy->setAttributeNS(NULL,url,src.get());
 
         IMetadata* metadatas[1];
-        metadatas[0]=dynamic_cast<IMetadata*>(conf1.m_plugMgr.newPlugin("edu.internet2.middleware.shibboleth.provider.XMLMetadata",dummy));
+        metadatas[0]=dynamic_cast<IMetadata*>(conf1.getPlugMgr().newPlugin("edu.internet2.middleware.shibboleth.provider.XMLMetadata",dummy));
         dummydoc->release();
         ArrayIterator<IMetadata*> sites(metadatas,1);
         

diff --git a/xmlproviders/XMLCredentials.cpp b/xmlproviders/XMLCredentials.cpp
index 723349f..7b2594b 100644 (file)
--- a/xmlproviders/XMLCredentials.cpp
+++ b/xmlproviders/XMLCredentials.cpp
@@ -144,7 +144,7 @@ void XMLCredentialsImpl::init()
             
             if (!cr_type.empty()) {
                 try {
-                    IPlugIn* plugin=SAMLConfig::getConfig().m_plugMgr.newPlugin(cr_type.c_str(),child);
+                    IPlugIn* plugin=SAMLConfig::getConfig().getPlugMgr().newPlugin(cr_type.c_str(),child);
                     ICredResolver* cr=dynamic_cast<ICredResolver*>(plugin);
                     if (cr)
                         m_resolverMap[id.get()]=cr;

diff --git a/xmlproviders/XMLMetadata.cpp b/xmlproviders/XMLMetadata.cpp
index d6e8352..f79b4f2 100644 (file)
--- a/xmlproviders/XMLMetadata.cpp
+++ b/xmlproviders/XMLMetadata.cpp
@@ -866,7 +866,7 @@ XMLMetadataImpl::AARole::AARole(const EntityDescriptor* provider, time_t validUn
             // Manufacture an endpoint for the SOAP binding.
             m_query.add(
                 new Endpoint(
-                    SAMLBinding::SAML_SOAP_HTTPS,
+                    SAMLBinding::SOAP,
                     static_cast<DOMElement*>(nlist->item(i))->getAttributeNS(NULL,SHIB_L(Location))
                     )
                 );

diff --git a/xmlproviders/XMLProviders.cpp b/xmlproviders/XMLProviders.cpp
index 4b233c3..6d109bb 100644 (file)
--- a/xmlproviders/XMLProviders.cpp
+++ b/xmlproviders/XMLProviders.cpp
@@ -144,12 +144,12 @@ extern "C" int XML_EXPORTS saml_extension_init(void*)
 
     // Register metadata factories
     SAMLConfig& conf=SAMLConfig::getConfig();
-    conf.m_plugMgr.regFactory("edu.internet2.middleware.shibboleth.common.provider.XMLMetadata",&XMLMetadataFactory);
-    conf.m_plugMgr.regFactory("edu.internet2.middleware.shibboleth.common.provider.XMLRevocation",&XMLRevocationFactory);
-    conf.m_plugMgr.regFactory("edu.internet2.middleware.shibboleth.common.provider.XMLTrust",&XMLTrustFactory);
-    conf.m_plugMgr.regFactory("edu.internet2.middleware.shibboleth.common.Credentials",&XMLCredentialsFactory);
-    conf.m_plugMgr.regFactory("edu.internet2.middleware.shibboleth.common.Credentials.FileCredentialResolver",&FileCredResolverFactory);
-    conf.m_plugMgr.regFactory("edu.internet2.middleware.shibboleth.target.provider.XMLAAP",&XMLAAPFactory);
+    conf.getPlugMgr().regFactory("edu.internet2.middleware.shibboleth.common.provider.XMLMetadata",&XMLMetadataFactory);
+    conf.getPlugMgr().regFactory("edu.internet2.middleware.shibboleth.common.provider.XMLRevocation",&XMLRevocationFactory);
+    conf.getPlugMgr().regFactory("edu.internet2.middleware.shibboleth.common.provider.XMLTrust",&XMLTrustFactory);
+    conf.getPlugMgr().regFactory("edu.internet2.middleware.shibboleth.common.Credentials",&XMLCredentialsFactory);
+    conf.getPlugMgr().regFactory("edu.internet2.middleware.shibboleth.common.Credentials.FileCredentialResolver",&FileCredResolverFactory);
+    conf.getPlugMgr().regFactory("edu.internet2.middleware.shibboleth.target.provider.XMLAAP",&XMLAAPFactory);
 
     SAMLAttribute::setFactory(&ShibAttributeFactory);
 
@@ -160,12 +160,12 @@ extern "C" void XML_EXPORTS saml_extension_term()
 {
     // Unregister metadata factories
     SAMLConfig& conf=SAMLConfig::getConfig();
-    conf.m_plugMgr.unregFactory("edu.internet2.middleware.shibboleth.common.provider.XMLMetadata");
-    conf.m_plugMgr.unregFactory("edu.internet2.middleware.shibboleth.common.provider.XMLRevocation");
-    conf.m_plugMgr.unregFactory("edu.internet2.middleware.shibboleth.common.provider.XMLTrust");
-    conf.m_plugMgr.unregFactory("edu.internet2.middleware.shibboleth.common.Credentials");
-    conf.m_plugMgr.unregFactory("edu.internet2.middleware.shibboleth.common.Credentials.FileCredentialResolver");
-    conf.m_plugMgr.unregFactory("edu.internet2.middleware.shibboleth.target.provider.XMLAAP");
+    conf.getPlugMgr().unregFactory("edu.internet2.middleware.shibboleth.common.provider.XMLMetadata");
+    conf.getPlugMgr().unregFactory("edu.internet2.middleware.shibboleth.common.provider.XMLRevocation");
+    conf.getPlugMgr().unregFactory("edu.internet2.middleware.shibboleth.common.provider.XMLTrust");
+    conf.getPlugMgr().unregFactory("edu.internet2.middleware.shibboleth.common.Credentials");
+    conf.getPlugMgr().unregFactory("edu.internet2.middleware.shibboleth.common.Credentials.FileCredentialResolver");
+    conf.getPlugMgr().unregFactory("edu.internet2.middleware.shibboleth.target.provider.XMLAAP");
 
     SAMLAttribute::setFactory(NULL);
 }