Reducing header overuse, non-inlining selected methods (CPPOST-35).

diff --git a/adfs/adfs.cpp b/adfs/adfs.cpp
index 945c981..8a10777 100644 (file)
--- a/adfs/adfs.cpp
+++ b/adfs/adfs.cpp
@@ -55,12 +55,14 @@
 # include <shibsp/attribute/resolver/ResolutionContext.h>
 # include <shibsp/metadata/MetadataProviderCriteria.h>
 # include <saml/SAMLConfig.h>
+# include <saml/binding/SecurityPolicy.h>
 # include <saml/saml1/core/Assertions.h>
 # include <saml/saml1/profile/AssertionValidator.h>
 # include <saml/saml2/core/Assertions.h>
 # include <saml/saml2/metadata/Metadata.h>
 # include <saml/saml2/metadata/EndpointManager.h>
 # include <saml/saml2/profile/AssertionValidator.h>
+# include <xmltooling/XMLToolingConfig.h>
 # include <xmltooling/impl/AnyElement.h>
 # include <xmltooling/validation/ValidatorSuite.h>
 using namespace opensaml::saml2md;

diff --git a/shibsp/SPConfig.cpp b/shibsp/SPConfig.cpp
index cbc9f8c..326f995 100644 (file)
--- a/shibsp/SPConfig.cpp
+++ b/shibsp/SPConfig.cpp
@@ -55,12 +55,11 @@
 # include "metadata/MetadataExt.h"
 # include "security/PKIXTrustEngine.h"
 # include <saml/SAMLConfig.h>
-#else
-# include <xmltooling/XMLToolingConfig.h>
 #endif
 
 #include <ctime>
 #include <xercesc/util/XMLUniDefs.hpp>
+#include <xmltooling/XMLToolingConfig.h>
 #include <xmltooling/util/NDC.h>
 #include <xmltooling/util/PathResolver.h>
 #include <xmltooling/util/TemplateEngine.h>

diff --git a/shibsp/SPConfig.h b/shibsp/SPConfig.h
index 99f1a22..44975eb 100644 (file)
--- a/shibsp/SPConfig.h
+++ b/shibsp/SPConfig.h
@@ -28,6 +28,7 @@
 # include <saml/binding/MessageDecoder.h>
 #endif
 #include <xmltooling/PluginManager.h>
+#include <xmltooling/QName.h>
 #include <xercesc/dom/DOM.hpp>
 
 /**

diff --git a/shibsp/attribute/Attribute.cpp b/shibsp/attribute/Attribute.cpp
index 36c32bc..4a009c0 100644 (file)
--- a/shibsp/attribute/Attribute.cpp
+++ b/shibsp/attribute/Attribute.cpp
@@ -35,6 +35,10 @@
 #include <xercesc/util/Base64.hpp>
 #include <xercesc/util/XMLUniDefs.hpp>
 
+#ifndef SHIBSP_LITE
+# include <xsec/framework/XSECDefs.hpp>
+#endif
+
 using namespace shibsp;
 using namespace xmltooling;
 using namespace std;
@@ -177,15 +181,15 @@ Attribute* Attribute::unmarshall(DDF& in)
 const vector<string>& XMLAttribute::getSerializedValues() const
 {
     xsecsize_t len;
-    XMLByte *pos, *pos2;\r
+    XMLByte *pos, *pos2;
     if (m_serialized.empty()) {
         for (vector<string>::const_iterator i=m_values.begin(); i!=m_values.end(); ++i) {
             XMLByte* enc = Base64::encode(reinterpret_cast<const XMLByte*>(i->data()), i->size(), &len);
             if (enc) {
-                for (pos=enc, pos2=enc; *pos2; pos2++)\r
-                    if (isgraph(*pos2))\r
-                        *pos++=*pos2;\r
-                *pos=0;\r
+                for (pos=enc, pos2=enc; *pos2; pos2++)
+                    if (isgraph(*pos2))
+                        *pos++=*pos2;
+                *pos=0;
                 m_serialized.push_back(reinterpret_cast<char*>(enc));
 #ifdef SHIBSP_XERCESC_HAS_XMLBYTE_RELEASE
                 XMLString::release(&enc);

diff --git a/shibsp/attribute/resolver/impl/KeyDescriptorAttributeExtractor.cpp b/shibsp/attribute/resolver/impl/KeyDescriptorAttributeExtractor.cpp
index d730b35..525bf9d 100644 (file)
--- a/shibsp/attribute/resolver/impl/KeyDescriptorAttributeExtractor.cpp
+++ b/shibsp/attribute/resolver/impl/KeyDescriptorAttributeExtractor.cpp
@@ -28,6 +28,7 @@
 
 #include <saml/saml2/metadata/Metadata.h>
 #include <saml/saml2/metadata/MetadataCredentialCriteria.h>
+#include <xmltooling/security/Credential.h>
 #include <xmltooling/security/SecurityHelper.h>
 #include <xmltooling/util/XMLHelper.h>
 #include <xercesc/util/XMLUniDefs.hpp>

diff --git a/shibsp/attribute/resolver/impl/SimpleAggregationAttributeResolver.cpp b/shibsp/attribute/resolver/impl/SimpleAggregationAttributeResolver.cpp
index abd1cad..74d2d35 100644 (file)
--- a/shibsp/attribute/resolver/impl/SimpleAggregationAttributeResolver.cpp
+++ b/shibsp/attribute/resolver/impl/SimpleAggregationAttributeResolver.cpp
@@ -40,6 +40,7 @@
 #include <saml/saml2/binding/SAML2SOAPClient.h>
 #include <saml/saml2/core/Protocols.h>
 #include <saml/saml2/metadata/MetadataProvider.h>
+#include <xmltooling/XMLToolingConfig.h>
 #include <xmltooling/util/NDC.h>
 #include <xmltooling/util/XMLHelper.h>
 #include <xercesc/util/XMLUniDefs.hpp>

diff --git a/shibsp/attribute/resolver/impl/XMLAttributeExtractor.cpp b/shibsp/attribute/resolver/impl/XMLAttributeExtractor.cpp
index c27df80..abc2755 100644 (file)
--- a/shibsp/attribute/resolver/impl/XMLAttributeExtractor.cpp
+++ b/shibsp/attribute/resolver/impl/XMLAttributeExtractor.cpp
@@ -35,6 +35,7 @@
 #include <saml/saml2/core/Assertions.h>
 #include <saml/saml2/metadata/MetadataCredentialCriteria.h>
 #include <saml/saml2/metadata/ObservableMetadataProvider.h>
+#include <xmltooling/XMLToolingConfig.h>
 #include <xmltooling/util/NDC.h>
 #include <xmltooling/util/ReloadableXMLFile.h>
 #include <xmltooling/util/XMLHelper.h>

diff --git a/shibsp/binding/impl/SOAPClient.cpp b/shibsp/binding/impl/SOAPClient.cpp
index cc5c6dc..1ae2d7d 100644 (file)
--- a/shibsp/binding/impl/SOAPClient.cpp
+++ b/shibsp/binding/impl/SOAPClient.cpp
@@ -27,6 +27,7 @@
 #include "binding/SOAPClient.h"
 
 #include <saml/saml2/metadata/Metadata.h>
+#include <xmltooling/security/Credential.h>
 #include <xmltooling/soap/SOAP.h>
 #include <xmltooling/soap/HTTPSOAPTransport.h>
 #include <xmltooling/util/NDC.h>

diff --git a/shibsp/handler/impl/AbstractHandler.cpp b/shibsp/handler/impl/AbstractHandler.cpp
index e42ef5b..b31cb87 100644 (file)
--- a/shibsp/handler/impl/AbstractHandler.cpp
+++ b/shibsp/handler/impl/AbstractHandler.cpp
@@ -47,6 +47,7 @@
 # include <saml/util/SAMLConstants.h>
 # include <saml/SAMLConfig.h>
 # include <saml/binding/SAMLArtifact.h>
+# include <xmltooling/security/Credential.h>
 # include <xmltooling/util/StorageService.h>
 using namespace opensaml::saml2md;
 #else

diff --git a/shibsp/handler/impl/MetadataGenerator.cpp b/shibsp/handler/impl/MetadataGenerator.cpp
index 165f95b..163c4b9 100644 (file)
--- a/shibsp/handler/impl/MetadataGenerator.cpp
+++ b/shibsp/handler/impl/MetadataGenerator.cpp
@@ -30,6 +30,7 @@
 #ifndef SHIBSP_LITE
 # include "metadata/MetadataProviderCriteria.h"
 # include <xmltooling/XMLToolingConfig.h>
+# include <xmltooling/security/Credential.h>
 # include <xmltooling/util/PathResolver.h>
 #endif
 

diff --git a/shibsp/handler/impl/SAML1Consumer.cpp b/shibsp/handler/impl/SAML1Consumer.cpp
index 239d7d2..1f678eb 100644 (file)
--- a/shibsp/handler/impl/SAML1Consumer.cpp
+++ b/shibsp/handler/impl/SAML1Consumer.cpp
@@ -30,6 +30,7 @@
 # include "SessionCache.h"
 # include "attribute/resolver/ResolutionContext.h"
 # include <saml/SAMLConfig.h>
+# include <saml/binding/SecurityPolicy.h>
 # include <saml/saml1/core/Assertions.h>
 # include <saml/saml1/core/Protocols.h>
 # include <saml/saml2/metadata/Metadata.h>

diff --git a/shibsp/handler/impl/SAML2Consumer.cpp b/shibsp/handler/impl/SAML2Consumer.cpp
index 532c0ac..8e676ac 100644 (file)
--- a/shibsp/handler/impl/SAML2Consumer.cpp
+++ b/shibsp/handler/impl/SAML2Consumer.cpp
@@ -34,6 +34,7 @@
 # include <saml/saml2/metadata/Metadata.h>
 # include <saml/saml2/metadata/MetadataCredentialCriteria.h>
 # include <saml/saml2/profile/SAML2AssertionPolicy.h>
+# include <xmltooling/XMLToolingConfig.h>
 using namespace opensaml::saml2;
 using namespace opensaml::saml2p;
 using namespace opensaml::saml2md;

diff --git a/shibsp/handler/impl/SAML2LogoutInitiator.cpp b/shibsp/handler/impl/SAML2LogoutInitiator.cpp
index 249eb8f..2f25f45 100644 (file)
--- a/shibsp/handler/impl/SAML2LogoutInitiator.cpp
+++ b/shibsp/handler/impl/SAML2LogoutInitiator.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.
@@ -36,6 +36,7 @@
 # include <saml/saml2/binding/SAML2SOAPClient.h>
 # include <saml/saml2/metadata/EndpointManager.h>
 # include <saml/saml2/metadata/MetadataCredentialCriteria.h>
+# include <xmltooling/security/Credential.h>
 using namespace opensaml::saml2;
 using namespace opensaml::saml2p;
 using namespace opensaml::saml2md;

diff --git a/shibsp/handler/impl/StatusHandler.cpp b/shibsp/handler/impl/StatusHandler.cpp
index b9e066d..c14e420 100644 (file)
--- a/shibsp/handler/impl/StatusHandler.cpp
+++ b/shibsp/handler/impl/StatusHandler.cpp
@@ -33,6 +33,7 @@ using namespace shibsp;
 # include "SessionCache.h"
 # include "metadata/MetadataProviderCriteria.h"
 # include <saml/version.h>
+# include <xmltooling/security/Credential.h>
 using namespace opensaml::saml2md;
 using namespace opensaml;
 using namespace xmlsignature;

diff --git a/shibsp/impl/StorageServiceSessionCache.cpp b/shibsp/impl/StorageServiceSessionCache.cpp
index 827163f..839c6c1 100644 (file)
--- a/shibsp/impl/StorageServiceSessionCache.cpp
+++ b/shibsp/impl/StorageServiceSessionCache.cpp
@@ -45,6 +45,7 @@
 
 #ifndef SHIBSP_LITE
 # include <saml/SAMLConfig.h>
+# include <xmltooling/XMLToolingConfig.h>
 # include <xmltooling/util/StorageService.h>
 using namespace opensaml::saml2md;
 #else