Wrong key passed to session lookup.

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

diff --git a/shibsp/RequestMapper.h b/shibsp/RequestMapper.h
index 0c9264d..646cbdd 100644 (file)
--- a/shibsp/RequestMapper.h
+++ b/shibsp/RequestMapper.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2001-2006 Internet2
+ *  Copyright 2001-2007 Internet2
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,12 +25,12 @@
 
 #include <shibsp/base.h>
 #include <xmltooling/Lockable.h>
+#include <xmltooling/io/HTTPRequest.h>
 
 namespace shibsp {
 
     class SHIBSP_API AccessControl;
     class SHIBSP_API PropertySet;
-    class SHIBSP_API SPRequest;
 
     /**
      * Interface to a request mapping plugin
@@ -55,7 +55,7 @@ namespace shibsp {
          * @param request   SP request
          * @return configuration settings and effective AccessControl plugin, if any
          */        
-        virtual Settings getSettings(const SPRequest& request) const=0;
+        virtual Settings getSettings(const xmltooling::HTTPRequest& request) const=0;
     };
 
     /**
@@ -64,10 +64,10 @@ namespace shibsp {
     void SHIBSP_API registerRequestMappers();
 
     /** XML-based RequestMapper implementation. */
-    #define XML_REQUEST_MAPPER      "edu.internet2.middleware.shibboleth.sp.provider.XMLRequestMapProvider"
+    #define XML_REQUEST_MAPPER      "XML"
 
     /** Hybrid of XML and platform-specific configuration. */
-    #define NATIVE_REQUEST_MAPPER   "edu.internet2.middleware.shibboleth.sp.provider.NativeRequestMapProvider"
+    #define NATIVE_REQUEST_MAPPER   "Native"
 };
 
 #endif /* __shibsp_reqmap_h__ */