From f3915c37e60b87956818ed9c8449019c79c6da4f Mon Sep 17 00:00:00 2001
From: cantor <cantor@cb58f699-b61c-0410-a6fe-9272a202ed29>
Date: Tue, 13 Oct 2009 02:41:15 +0000
Subject: [PATCH] Reducing header overuse, non-inlining selected methods
 (CPPOST-35).

git-svn-id: https://svn.middleware.georgetown.edu/cpp-sp/branches/REL_2@3133 cb58f699-b61c-0410-a6fe-9272a202ed29
---
 adfs/adfs.cpp                               | 1 +
 memcache-store/memcache-store.cpp           | 1 +
 odbc-store/odbc-store.cpp                   | 5 +++--
 shibsp/SPConfig.cpp                         | 3 ++-
 shibsp/handler/impl/MetadataGenerator.cpp   | 5 +++--
 shibsp/impl/StorageServiceSessionCache.cpp  | 1 +
 shibsp/metadata/DynamicMetadataProvider.cpp | 8 ++++----
 util/resolvertest.cpp                       | 1 +
 8 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/adfs/adfs.cpp b/adfs/adfs.cpp
index 47fdca0..bc2aa8d 100644
--- a/adfs/adfs.cpp
+++ b/adfs/adfs.cpp
@@ -63,6 +63,7 @@
 # include <saml/saml2/metadata/EndpointManager.h>
 # include <xmltooling/XMLToolingConfig.h>
 # include <xmltooling/impl/AnyElement.h>
+# include <xmltooling/util/ParserPool.h>
 # include <xmltooling/validation/ValidatorSuite.h>
 using namespace opensaml::saml2md;
 # ifndef min
diff --git a/memcache-store/memcache-store.cpp b/memcache-store/memcache-store.cpp
index 192b197..758f4ff 100644
--- a/memcache-store/memcache-store.cpp
+++ b/memcache-store/memcache-store.cpp
@@ -42,6 +42,7 @@
 #include <xercesc/util/XMLUniDefs.hpp>
 
 #include <xmltooling/logging.h>
+#include <xmltooling/unicode.h>
 #include <xmltooling/XMLToolingConfig.h>
 #include <xmltooling/util/NDC.h>
 #include <xmltooling/util/StorageService.h>
diff --git a/odbc-store/odbc-store.cpp b/odbc-store/odbc-store.cpp
index 8bb7989..546eefc 100644
--- a/odbc-store/odbc-store.cpp
+++ b/odbc-store/odbc-store.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2001-2007 Internet2
+ *  Copyright 2001-2009 Internet2
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 /**
  * odbc-store.cpp
  *
- * Storage Service using ODBC
+ * Storage Service using ODBC.
  */
 
 #if defined (_MSC_VER) || defined(__BORLANDC__)
@@ -39,6 +39,7 @@
 
 #include <xercesc/util/XMLUniDefs.hpp>
 #include <xmltooling/logging.h>
+#include <xmltooling/unicode.h>
 #include <xmltooling/XMLToolingConfig.h>
 #include <xmltooling/util/NDC.h>
 #include <xmltooling/util/StorageService.h>
diff --git a/shibsp/SPConfig.cpp b/shibsp/SPConfig.cpp
index 326f995..8c1fa44 100644
--- a/shibsp/SPConfig.cpp
+++ b/shibsp/SPConfig.cpp
@@ -18,7 +18,7 @@
 /**
  * SPConfig.cpp
  *
- * Library configuration
+ * Library configuration.
  */
 
 #include "internal.h"
@@ -61,6 +61,7 @@
 #include <xercesc/util/XMLUniDefs.hpp>
 #include <xmltooling/XMLToolingConfig.h>
 #include <xmltooling/util/NDC.h>
+#include <xmltooling/util/ParserPool.h>
 #include <xmltooling/util/PathResolver.h>
 #include <xmltooling/util/TemplateEngine.h>
 #include <xmltooling/util/XMLHelper.h>
diff --git a/shibsp/handler/impl/MetadataGenerator.cpp b/shibsp/handler/impl/MetadataGenerator.cpp
index f07c5a0..f9da6ab 100644
--- a/shibsp/handler/impl/MetadataGenerator.cpp
+++ b/shibsp/handler/impl/MetadataGenerator.cpp
@@ -38,11 +38,12 @@
 # include <xmltooling/security/Credential.h>
 # include <xmltooling/security/CredentialCriteria.h>
 # include <xmltooling/signature/Signature.h>
+# include <xmltooling/util/ParserPool.h>
 # include <xmltooling/util/PathResolver.h>
+# include <xercesc/framework/LocalFileInputSource.hpp>
+# include <xercesc/framework/Wrapper4InputSource.hpp>
 #endif
 
-#include <xercesc/framework/LocalFileInputSource.hpp>
-#include <xercesc/framework/Wrapper4InputSource.hpp>
 
 using namespace shibsp;
 #ifndef SHIBSP_LITE
diff --git a/shibsp/impl/StorageServiceSessionCache.cpp b/shibsp/impl/StorageServiceSessionCache.cpp
index 5d23f12..fa018bb 100644
--- a/shibsp/impl/StorageServiceSessionCache.cpp
+++ b/shibsp/impl/StorageServiceSessionCache.cpp
@@ -43,6 +43,7 @@
 #include <xmltooling/io/HTTPResponse.h>
 #include <xmltooling/util/DateTime.h>
 #include <xmltooling/util/NDC.h>
+#include <xmltooling/util/ParserPool.h>
 #include <xmltooling/util/XMLHelper.h>
 #include <xercesc/util/XMLUniDefs.hpp>
 
diff --git a/shibsp/metadata/DynamicMetadataProvider.cpp b/shibsp/metadata/DynamicMetadataProvider.cpp
index 2698baa..98605c1 100644
--- a/shibsp/metadata/DynamicMetadataProvider.cpp
+++ b/shibsp/metadata/DynamicMetadataProvider.cpp
@@ -26,11 +26,13 @@
 #include "ServiceProvider.h"
 #include "metadata/MetadataProviderCriteria.h"
 
+#include <xercesc/framework/Wrapper4InputSource.hpp>
+#include <xercesc/util/XMLUniDefs.hpp>
+#include <xsec/framework/XSECDefs.hpp>
 #include <saml/version.h>
 #include <saml/binding/SAMLArtifact.h>
 #include <saml/saml2/metadata/Metadata.h>
 #include <saml/saml2/metadata/DynamicMetadataProvider.h>
-
 #include <xmltooling/logging.h>
 #include <xmltooling/XMLToolingConfig.h>
 #include <xmltooling/security/Credential.h>
@@ -39,11 +41,9 @@
 #include <xmltooling/security/X509TrustEngine.h>
 #include <xmltooling/soap/HTTPSOAPTransport.h>
 #include <xmltooling/util/NDC.h>
+#include <xmltooling/util/ParserPool.h>
 #include <xmltooling/util/XMLHelper.h>
 
-#include <xercesc/framework/Wrapper4InputSource.hpp>
-#include <xercesc/util/XMLUniDefs.hpp>
-
 using namespace shibsp;
 using namespace opensaml;
 using namespace xmltooling::logging;
diff --git a/util/resolvertest.cpp b/util/resolvertest.cpp
index e9424ec..9a1709d 100644
--- a/util/resolvertest.cpp
+++ b/util/resolvertest.cpp
@@ -47,6 +47,7 @@
 #include <saml/saml2/metadata/MetadataProvider.h>
 #include <xercesc/util/XMLUniDefs.hpp>
 #include <xmltooling/XMLToolingConfig.h>
+#include <xmltooling/util/ParserPool.h>
 #include <xmltooling/util/XMLHelper.h>
 
 using namespace shibsp;
-- 
2.1.4