Config changes and rework for new credential APIs.

[shibboleth/sp.git] / shibsp / ServiceProvider.h

diff --git a/shibsp/ServiceProvider.h b/shibsp/ServiceProvider.h
index 45c76b3..7689a7a 100644 (file)
--- a/shibsp/ServiceProvider.h
+++ b/shibsp/ServiceProvider.h
@@ -25,7 +25,7 @@
 
 #include <shibsp/util/PropertySet.h>
 #include <saml/binding/SecurityPolicyRule.h>
-#include <xmltooling/security/CredentialResolver.h>
+#include <xmltooling/Lockable.h>
 #include <xmltooling/util/StorageService.h>
 
 namespace shibsp {
@@ -94,14 +94,6 @@ namespace shibsp {
         virtual ListenerService* getListenerService(bool required=true) const=0;
         
         /**
-         * Returns a CredentialResolver instance mapped to a key.
-         * 
-         * @param id    a NULL-terminated key identifying the CredentialResolver to the configuration 
-         * @return  a CredentialResolver if available, or NULL
-         */
-        virtual xmltooling::CredentialResolver* getCredentialResolver(const char* id) const=0;
-
-        /**
                 * Returns the security policy settings for an identified policy.
          *
                 * @param id    identifies the policy to return