Reduce number of global elements by adding types, and switch plugins back to lax...

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

diff --git a/shibsp/ServiceProvider.h b/shibsp/ServiceProvider.h
index ecb86fb..2a4e4b7 100644 (file)
--- a/shibsp/ServiceProvider.h
+++ b/shibsp/ServiceProvider.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2001-2007 Internet2
+ *  Copyright 2001-2010 Internet2
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,12 +24,19 @@
 #define __shibsp_sp_h__
 
 #include <shibsp/util/PropertySet.h>
+
+#include <xmltooling/Lockable.h>
+
+namespace xmltooling {
+    class XMLTOOL_API SOAPTransport;
+    class XMLTOOL_API StorageService;
+};
+
 #ifndef SHIBSP_LITE
-# include <saml/binding/SecurityPolicyRule.h>
-# include <xmltooling/soap/SOAPTransport.h>
-# include <xmltooling/util/StorageService.h>
+namespace opensaml {
+    class SAML_API SecurityPolicyRule;
+};
 #endif
-#include <xmltooling/Lockable.h>
 
 namespace shibsp {
 
@@ -54,9 +61,9 @@ namespace shibsp {
     {
         MAKE_NONCOPYABLE(ServiceProvider);
     protected:
-        ServiceProvider() {}
+        ServiceProvider();
     public:
-        virtual ~ServiceProvider() {}
+        virtual ~ServiceProvider();
         
         /**
          * Loads a configuration and prepares the instance for use.
@@ -78,8 +85,8 @@ namespace shibsp {
         /**
          * Returns a StorageService instance based on an ID.
          * 
-         * @param id    a NULL-terminated key identifying the StorageService to the configuration 
-         * @return  a StorageService if available, or NULL
+         * @param id    a nullptr-terminated key identifying the StorageService to the configuration 
+         * @return  a StorageService if available, or nullptr
          */
         virtual xmltooling::StorageService* getStorageService(const char* id) const=0;
 #endif
@@ -118,20 +125,19 @@ namespace shibsp {
         virtual const std::vector<const opensaml::SecurityPolicyRule*>& getPolicyRules(const char* id) const=0;
 
         /**
-         * Sets implementation-specific transport options for an identified policy.
+         * Sets implementation-specific transport options.
          *
-                * @param id        identifies the policy to return
          * @param transport a SOAPTransport object
          * @return  true iff all options were successfully set
          */
-        virtual bool setTransportOptions(const char* id, xmltooling::SOAPTransport& transport) const=0;
+        virtual bool setTransportOptions(xmltooling::SOAPTransport& transport) const=0;
 #endif
 
         /**
          * Returns a RequestMapper instance.
          * 
          * @param required  true iff an exception should be thrown if no RequestMapper is available
-         * @param a RequestMapper
+         * @return  a RequestMapper
          */
         virtual RequestMapper* getRequestMapper(bool required=true) const=0;
         
@@ -139,7 +145,7 @@ namespace shibsp {
          * Returns an Application instance matching the specified ID.
          * 
          * @param applicationId the ID of the application
-         * @return  pointer to the application, or NULL
+         * @return  pointer to the application, or nullptr
          */
         virtual const Application* getApplication(const char* applicationId) const=0;