Restrict pre-2.4 use of new require rules

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

diff --git a/shibsp/RequestMapper.h b/shibsp/RequestMapper.h
index e3bae59..86513f6 100644 (file)
--- a/shibsp/RequestMapper.h
+++ b/shibsp/RequestMapper.h
@@ -1,17 +1,21 @@
-/*
- *  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.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the University Corporation for Advanced Internet
+ * Development, Inc. (UCAID) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
+ *
+ * UCAID licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the
+ * License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the License.
  */
 
 /**
@@ -26,11 +30,14 @@
 #include <shibsp/base.h>
 #include <xmltooling/Lockable.h>
 
+namespace xmltooling {
+    class XMLTOOL_API HTTPRequest;
+};
+
 namespace shibsp {
 
     class SHIBSP_API AccessControl;
     class SHIBSP_API PropertySet;
-    class SHIBSP_API SPRequest;
 
     /**
      * Interface to a request mapping plugin
@@ -42,9 +49,9 @@ namespace shibsp {
     {
         MAKE_NONCOPYABLE(RequestMapper);
     protected:
-        RequestMapper() {}
+        RequestMapper();
     public:
-        virtual ~RequestMapper() {}
+        virtual ~RequestMapper();
 
         /** Combination of configuration settings and effective access control. */
         typedef std::pair<const PropertySet*,AccessControl*> Settings;
@@ -55,7 +62,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;
     };
 
     /**