From 81206e575f211ae10383d9ce8fcf2e53830145b7 Mon Sep 17 00:00:00 2001
From: Scott Cantor <cantor.2@osu.edu>
Date: Fri, 2 Oct 2009 23:15:38 +0000
Subject: [PATCH] Reducing header overuse, non-inlining selected methods
 (CPPOST-35).

---
 saml/Makefile.am                                   |  1 +
 saml/saml.vcproj                                   |  4 +++
 saml/saml2/metadata/MetadataCredentialContext.h    |  8 +++---
 .../metadata/impl/MetadataCredentialContext.cpp    | 32 ++++++++++++++++++++++
 .../metadata/impl/MetadataCredentialCriteria.cpp   |  1 +
 5 files changed, 42 insertions(+), 4 deletions(-)
 create mode 100644 saml/saml2/metadata/impl/MetadataCredentialContext.cpp

diff --git a/saml/Makefile.am b/saml/Makefile.am
index d9135fc..820dce1 100644
--- a/saml/Makefile.am
+++ b/saml/Makefile.am
@@ -144,6 +144,7 @@ libsaml_la_SOURCES = \
 	saml2/metadata/impl/ChainingMetadataProvider.cpp \
 	saml2/metadata/impl/DynamicMetadataProvider.cpp \
 	saml2/metadata/impl/EntityRoleMetadataFilter.cpp \
+	saml2/metadata/impl/MetadataCredentialContext.cpp \
     saml2/metadata/impl/MetadataCredentialCriteria.cpp \
 	saml2/metadata/impl/MetadataImpl.cpp \
 	saml2/metadata/impl/MetadataProvider.cpp \
diff --git a/saml/saml.vcproj b/saml/saml.vcproj
index f943fb5..dcd0ab5 100644
--- a/saml/saml.vcproj
+++ b/saml/saml.vcproj
@@ -524,6 +524,10 @@
 							>
 						</File>
 						<File
+							RelativePath=".\saml2\metadata\impl\MetadataCredentialContext.cpp"
+							>
+						</File>
+						<File
 							RelativePath=".\saml2\metadata\impl\MetadataCredentialCriteria.cpp"
 							>
 						</File>
diff --git a/saml/saml2/metadata/MetadataCredentialContext.h b/saml/saml2/metadata/MetadataCredentialContext.h
index 65ca20e..c3e08f4 100644
--- a/saml/saml2/metadata/MetadataCredentialContext.h
+++ b/saml/saml2/metadata/MetadataCredentialContext.h
@@ -23,12 +23,14 @@
 #ifndef __saml_metacredctx_h__
 #define __saml_metacredctx_h__
 
-#include <saml/saml2/metadata/Metadata.h>
+#include <saml/base.h>
 #include <xmltooling/security/KeyInfoCredentialContext.h>
 
 namespace opensaml {
     namespace saml2md {
         
+        class SAML_API KeyDescriptor;
+
         /**
          * Metadata-based CredentialContext subclass.
          */
@@ -40,9 +42,7 @@ namespace opensaml {
              *
              * @param descriptor    source of metadata-supplied credential
              */
-            MetadataCredentialContext(const KeyDescriptor& descriptor)
-                : KeyInfoCredentialContext(descriptor.getKeyInfo()), m_descriptor(descriptor) {
-            }
+            MetadataCredentialContext(const KeyDescriptor& descriptor);
     
             virtual ~MetadataCredentialContext() {}
             
diff --git a/saml/saml2/metadata/impl/MetadataCredentialContext.cpp b/saml/saml2/metadata/impl/MetadataCredentialContext.cpp
new file mode 100644
index 0000000..7b7dae7
--- /dev/null
+++ b/saml/saml2/metadata/impl/MetadataCredentialContext.cpp
@@ -0,0 +1,32 @@
+/*
+ *  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.
+ * You may obtain a copy of the License at
+ *
+ *     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.
+ */
+
+/**
+ * MetadataCredentialContext.cpp
+ * 
+ * Metadata-based CredentialContext subclass.
+ */
+
+#include "internal.h"
+#include "saml2/metadata/Metadata.h"
+#include "saml2/metadata/MetadataCredentialContext.h"
+
+using namespace opensaml::saml2md;
+
+MetadataCredentialContext::MetadataCredentialContext(const KeyDescriptor& descriptor)
+    : KeyInfoCredentialContext(descriptor.getKeyInfo()), m_descriptor(descriptor)
+{
+}
diff --git a/saml/saml2/metadata/impl/MetadataCredentialCriteria.cpp b/saml/saml2/metadata/impl/MetadataCredentialCriteria.cpp
index 90b9cf3..b42d5c1 100644
--- a/saml/saml2/metadata/impl/MetadataCredentialCriteria.cpp
+++ b/saml/saml2/metadata/impl/MetadataCredentialCriteria.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "internal.h"
+#include "saml2/metadata/Metadata.h"
 #include "saml2/metadata/MetadataCredentialContext.h"
 #include "saml2/metadata/MetadataCredentialCriteria.h"
 
-- 
2.1.4