From a54aae6a9ae32638ebffa2e898771cf956e2ad4b Mon Sep 17 00:00:00 2001
From: Scott Cantor <cantor.2@osu.edu>
Date: Fri, 2 Mar 2007 03:39:39 +0000
Subject: [PATCH] Moved handler sources.

---
 .cdtproject                                        |  4 +-
 shibsp/Makefile.am                                 | 20 +++++----
 shibsp/SPConfig.cpp                                |  2 +-
 shibsp/ServiceProvider.cpp                         |  2 +-
 shibsp/{ => handler}/AbstractHandler.h             |  4 +-
 shibsp/{ => handler}/Handler.h                     |  2 +-
 shibsp/{remoting => handler}/RemotedHandler.h      |  8 ++--
 shibsp/{ => handler/impl}/AbstractHandler.cpp      |  4 +-
 .../{remoting => handler}/impl/RemotedHandler.cpp  |  2 +-
 shibsp/impl/XMLServiceProvider.cpp                 |  2 +-
 shibsp/shibsp.vcproj                               | 52 +++++++++++++---------
 11 files changed, 60 insertions(+), 42 deletions(-)
 rename shibsp/{ => handler}/AbstractHandler.h (95%)
 rename shibsp/{ => handler}/Handler.h (98%)
 rename shibsp/{remoting => handler}/RemotedHandler.h (93%)
 rename shibsp/{ => handler/impl}/AbstractHandler.cpp (88%)
 rename shibsp/{remoting => handler}/impl/RemotedHandler.cpp (99%)

diff --git a/.cdtproject b/.cdtproject
index fa13b21..10a5b0a 100644
--- a/.cdtproject
+++ b/.cdtproject
@@ -8,12 +8,14 @@
         
     <item id="org.eclipse.cdt.core.pathentry">
 <pathentry kind="out" path=""/>
-<pathentry excluding="util/|impl/|security/|metadata/|remoting/|remoting/impl/|attribute/|binding/|binding/impl/|attribute/resolver/|attribute/resolver/impl/" kind="src" path="shibsp"/>
+<pathentry excluding="util/|impl/|security/|metadata/|remoting/|remoting/impl/|attribute/|binding/|binding/impl/|attribute/resolver/|attribute/resolver/impl/|handler/|handler/impl/" kind="src" path="shibsp"/>
 <pathentry excluding="resolver/|resolver/impl/" kind="src" path="shibsp/attribute"/>
 <pathentry excluding="impl/" kind="src" path="shibsp/attribute/resolver"/>
 <pathentry kind="src" path="shibsp/attribute/resolver/impl"/>
 <pathentry excluding="impl/" kind="src" path="shibsp/binding"/>
 <pathentry kind="src" path="shibsp/binding/impl"/>
+<pathentry excluding="impl/" kind="src" path="shibsp/handler"/>
+<pathentry kind="src" path="shibsp/handler/impl"/>
 <pathentry kind="src" path="shibsp/impl"/>
 <pathentry kind="src" path="shibsp/metadata"/>
 <pathentry excluding="impl/" kind="src" path="shibsp/remoting"/>
diff --git a/shibsp/Makefile.am b/shibsp/Makefile.am
index 1e0c521..2d94a68 100644
--- a/shibsp/Makefile.am
+++ b/shibsp/Makefile.am
@@ -13,6 +13,8 @@ attrresincludedir = $(includedir)/shibsp/attribute/resolver
 
 bindincludedir = $(includedir)/shibsp/binding
 
+handincludedir = $(includedir)/shibsp/handler
+
 mdincludedir = $(includedir)/shibsp/metadata
 
 remincludedir = $(includedir)/shibsp/remoting
@@ -22,13 +24,11 @@ secincludedir = $(includedir)/shibsp/security
 utilincludedir = $(includedir)/shibsp/util
 
 libshibspinclude_HEADERS = \
-	AbstractHandler.h \
 	AbstractSPRequest.h \
 	AccessControl.h \
 	Application.h \
 	base.h \
 	exceptions.h \
-	Handler.h \
 	paths.h \
 	RequestMapper.h \
 	ServiceProvider.h \
@@ -51,14 +51,18 @@ attrresinclude_HEADERS = \
 
 bindinclude_HEADERS = \
 	binding/SOAPClient.h
-	
+
+handinclude_HEADERS = \
+	handler/AbstractHandler.h \
+	handler/Handler.h \
+	handler/RemotedHandler.h
+
 mdinclude_HEADERS = \
 	metadata/MetadataExt.h
 
 reminclude_HEADERS = \
-	ddf.h \
-	ListenerService.h \
-	RemotedHandler.h
+	remoting/ddf.h \
+	remoting/ListenerService.h
 	
 secinclude_HEADERS = \
 	security/PKIXTrustEngine.h
@@ -74,7 +78,6 @@ noinst_HEADERS = \
 	remoting/impl/SocketListener.h
 
 libshibsp_la_SOURCES = \
-	AbstractHandler.cpp \
 	AbstractSPRequest.cpp \
 	Application.cpp \
 	ServiceProvider.cpp \
@@ -87,6 +90,8 @@ libshibsp_la_SOURCES = \
 	attribute/resolver/impl/AttributeResolver.cpp \
 	attribute/resolver/impl/SimpleAttributeResolver.cpp \
 	binding/impl/SOAPClient.cpp \
+	handler/impl/RemotedHandler.cpp \
+	handler/impl/AbstractHandler.cpp \
 	impl/RemotedSessionCache.cpp \
 	impl/StorageServiceSessionCache.cpp \
 	impl/XMLAccessControl.cpp \
@@ -96,7 +101,6 @@ libshibsp_la_SOURCES = \
 	metadata/MetadataExtSchemaValidators.cpp \
 	remoting/impl/ddf.cpp \
 	remoting/impl/ListenerService.cpp \
-	remoting/impl/RemotedHandler.cpp \
 	remoting/impl/SocketListener.cpp \
 	remoting/impl/TCPListener.cpp \
 	remoting/impl/UnixListener.cpp \
diff --git a/shibsp/SPConfig.cpp b/shibsp/SPConfig.cpp
index cefcc17..baa1e40 100644
--- a/shibsp/SPConfig.cpp
+++ b/shibsp/SPConfig.cpp
@@ -24,13 +24,13 @@
 #include "internal.h"
 #include "AccessControl.h"
 #include "exceptions.h"
-#include "Handler.h"
 #include "RequestMapper.h"
 #include "ServiceProvider.h"
 #include "SessionCache.h"
 #include "SPConfig.h"
 #include "attribute/AttributeDecoder.h"
 #include "attribute/resolver/AttributeResolver.h"
+#include "handler/Handler.h"
 #include "metadata/MetadataExt.h"
 #include "remoting/ListenerService.h"
 #include "security/PKIXTrustEngine.h"
diff --git a/shibsp/ServiceProvider.cpp b/shibsp/ServiceProvider.cpp
index ff97ad2..7a1eed7 100644
--- a/shibsp/ServiceProvider.cpp
+++ b/shibsp/ServiceProvider.cpp
@@ -24,11 +24,11 @@
 #include "exceptions.h"
 #include "AccessControl.h"
 #include "Application.h"
-#include "Handler.h"
 #include "ServiceProvider.h"
 #include "SessionCache.h"
 #include "SPRequest.h"
 #include "attribute/Attribute.h"
+#include "handler/Handler.h"
 #include "util/TemplateParameters.h"
 
 #include <fstream>
diff --git a/shibsp/AbstractHandler.h b/shibsp/handler/AbstractHandler.h
similarity index 95%
rename from shibsp/AbstractHandler.h
rename to shibsp/handler/AbstractHandler.h
index 0646d3c..ba79ea5 100644
--- a/shibsp/AbstractHandler.h
+++ b/shibsp/handler/AbstractHandler.h
@@ -15,7 +15,7 @@
  */
 
 /**
- * @file shibsp/AbstractHandler.h
+ * @file shibsp/handler/AbstractHandler.h
  * 
  * Base class for handlers based on a DOMPropertySet. 
  */
@@ -23,7 +23,7 @@
 #ifndef __shibsp_abshandler_h__
 #define __shibsp_abshandler_h__
 
-#include <shibsp/Handler.h>
+#include <shibsp/handler/Handler.h>
 #include <shibsp/util/DOMPropertySet.h>
 
 namespace shibsp {
diff --git a/shibsp/Handler.h b/shibsp/handler/Handler.h
similarity index 98%
rename from shibsp/Handler.h
rename to shibsp/handler/Handler.h
index 62d3ff8..c26c3c8 100644
--- a/shibsp/Handler.h
+++ b/shibsp/handler/Handler.h
@@ -15,7 +15,7 @@
  */
 
 /**
- * @file shibsp/Handler.h
+ * @file shibsp/handler/Handler.h
  * 
  * Pluggable runtime functionality that implement protocols and services 
  */
diff --git a/shibsp/remoting/RemotedHandler.h b/shibsp/handler/RemotedHandler.h
similarity index 93%
rename from shibsp/remoting/RemotedHandler.h
rename to shibsp/handler/RemotedHandler.h
index f779ebc..3006842 100644
--- a/shibsp/remoting/RemotedHandler.h
+++ b/shibsp/handler/RemotedHandler.h
@@ -15,7 +15,7 @@
  */
 
 /**
- * @file shibsp/remoting/RemotedHandler.h
+ * @file shibsp/handler/RemotedHandler.h
  * 
  * Base class for handlers that need SP request/response layer to be remoted. 
  */
@@ -24,7 +24,7 @@
 #define __shibsp_remhandler_h__
 
 #include <shibsp/SPRequest.h>
-#include <shibsp/Handler.h>
+#include <shibsp/handler/Handler.h>
 #include <shibsp/remoting/ListenerService.h>
 
 namespace shibsp {
@@ -32,13 +32,13 @@ namespace shibsp {
     /**
      * Base class for handlers that need HTTP request/response layer to be remoted.
      */
-    class SHIBSP_API RemotedHandler : public Handler, public Remoted 
+    class SHIBSP_API RemotedHandler : public virtual Handler, public Remoted 
     {
     public:
         virtual ~RemotedHandler() {}
 
     protected:
-        RemotedHandler(const xercesc::DOMElement* e=NULL) {}
+        RemotedHandler() {}
 
         /**
          * Wraps a request by annotating an outgoing data flow with the data needed
diff --git a/shibsp/AbstractHandler.cpp b/shibsp/handler/impl/AbstractHandler.cpp
similarity index 88%
rename from shibsp/AbstractHandler.cpp
rename to shibsp/handler/impl/AbstractHandler.cpp
index 267e5b3..9fc7cf3 100644
--- a/shibsp/AbstractHandler.cpp
+++ b/shibsp/handler/impl/AbstractHandler.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "internal.h"
-#include "AbstractHandler.h"
+#include "handler/AbstractHandler.h"
 
 using namespace shibsp;
 using namespace xercesc;
@@ -30,5 +30,5 @@ using namespace std;
 AbstractHandler::AbstractHandler(
     const DOMElement* e, DOMNodeFilter* filter, const map<string,string>* remapper
     ) {
-    load(e,log4cpp::Category::getInstance(SHIBSP_LOGCAT".AbstractHandler"),filter,remapper);
+    load(e,log4cpp::Category::getInstance(SHIBSP_LOGCAT".Handler"),filter,remapper);
 }
diff --git a/shibsp/remoting/impl/RemotedHandler.cpp b/shibsp/handler/impl/RemotedHandler.cpp
similarity index 99%
rename from shibsp/remoting/impl/RemotedHandler.cpp
rename to shibsp/handler/impl/RemotedHandler.cpp
index 6a8695b..0728b19 100644
--- a/shibsp/remoting/impl/RemotedHandler.cpp
+++ b/shibsp/handler/impl/RemotedHandler.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "internal.h"
-#include "remoting/RemotedHandler.h"
+#include "handler/RemotedHandler.h"
 
 #include <algorithm>
 #include <log4cpp/Category.hh>
diff --git a/shibsp/impl/XMLServiceProvider.cpp b/shibsp/impl/XMLServiceProvider.cpp
index 5715c60..dd00d12 100644
--- a/shibsp/impl/XMLServiceProvider.cpp
+++ b/shibsp/impl/XMLServiceProvider.cpp
@@ -24,7 +24,6 @@
 #include "exceptions.h"
 #include "AccessControl.h"
 #include "Application.h"
-#include "Handler.h"
 #include "RequestMapper.h"
 #include "ServiceProvider.h"
 #include "SessionCache.h"
@@ -32,6 +31,7 @@
 #include "SPRequest.h"
 #include "TransactionLog.h"
 #include "attribute/resolver/AttributeResolver.h"
+#include "handler/Handler.h"
 #include "remoting/ListenerService.h"
 #include "security/PKIXTrustEngine.h"
 #include "util/DOMPropertySet.h"
diff --git a/shibsp/shibsp.vcproj b/shibsp/shibsp.vcproj
index 0ef2a59..3b0a311 100644
--- a/shibsp/shibsp.vcproj
+++ b/shibsp/shibsp.vcproj
@@ -183,10 +183,6 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath=".\AbstractHandler.cpp"
-				>
-			</File>
-			<File
 				RelativePath=".\AbstractSPRequest.cpp"
 				>
 			</File>
@@ -257,10 +253,6 @@
 						>
 					</File>
 					<File
-						RelativePath=".\remoting\impl\RemotedHandler.cpp"
-						>
-					</File>
-					<File
 						RelativePath=".\remoting\impl\SocketListener.cpp"
 						>
 					</File>
@@ -346,6 +338,22 @@
 					</File>
 				</Filter>
 			</Filter>
+			<Filter
+				Name="handler"
+				>
+				<Filter
+					Name="impl"
+					>
+					<File
+						RelativePath=".\handler\impl\AbstractHandler.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\handler\impl\RemotedHandler.cpp"
+						>
+					</File>
+				</Filter>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -353,10 +361,6 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 			<File
-				RelativePath=".\AbstractHandler.h"
-				>
-			</File>
-			<File
 				RelativePath=".\AbstractSPRequest.h"
 				>
 			</File>
@@ -377,10 +381,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\Handler.h"
-				>
-			</File>
-			<File
 				RelativePath=".\internal.h"
 				>
 			</File>
@@ -463,10 +463,6 @@
 					RelativePath=".\remoting\ListenerService.h"
 					>
 				</File>
-				<File
-					RelativePath=".\remoting\RemotedHandler.h"
-					>
-				</File>
 			</Filter>
 			<Filter
 				Name="attribute"
@@ -512,6 +508,22 @@
 					>
 				</File>
 			</Filter>
+			<Filter
+				Name="handler"
+				>
+				<File
+					RelativePath=".\handler\AbstractHandler.h"
+					>
+				</File>
+				<File
+					RelativePath=".\handler\Handler.h"
+					>
+				</File>
+				<File
+					RelativePath=".\handler\RemotedHandler.h"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="Resource Files"
-- 
2.1.4