More comments, header fixes.

git-svn-id: https://svn.middleware.georgetown.edu/cpp-xmltooling/trunk@286 de75baf8-a10c-0410-a50a-987c0e22f00f

diff --git a/xmltooling/security/CredentialCriteria.h b/xmltooling/security/CredentialCriteria.h
index 44e9f4d..d331c89 100644 (file)
--- a/xmltooling/security/CredentialCriteria.h
+++ b/xmltooling/security/CredentialCriteria.h
@@ -57,6 +57,9 @@ namespace xmltooling {
          */
         virtual bool matches(const Credential& credential) const;
 
+        /**
+         * Enumeration of use cases for credentials. 
+         */
         enum UsageType {
             UNSPECIFIED_CREDENTIAL,
             SIGNING_CREDENTIAL,
@@ -197,6 +200,10 @@ namespace xmltooling {
             m_key = key;
         }
 
+        /**
+         * Bitmask constants controlling the kinds of criteria set automatically
+         * based on a KeyInfo object.
+         */
         enum keyinfo_extraction_t {
             KEYINFO_EXTRACTION_KEY = 1,
             KEYINFO_EXTRACTION_KEYNAMES = 2,

diff --git a/xmltooling/security/KeyInfoResolver.h b/xmltooling/security/KeyInfoResolver.h
index e1af10d..56ade75 100644 (file)
--- a/xmltooling/security/KeyInfoResolver.h
+++ b/xmltooling/security/KeyInfoResolver.h
@@ -23,19 +23,14 @@
 #if !defined(__xmltooling_keyres_h__) && !defined(XMLTOOLING_NO_XMLSEC)
 #define __xmltooling_keyres_h__
 
-#include <xsec/dsig/DSIGKeyInfoList.hpp>
+#include <xmltooling/security/Credential.h>
+#include <xmltooling/security/CredentialCriteria.h>
+#include <xmltooling/security/KeyInfoCredentialContext.h>
 
-namespace xmlsignature {
-    class XMLTOOL_API KeyInfo;
-    class XMLTOOL_API Signature;
-};
+#include <xsec/dsig/DSIGKeyInfoList.hpp>
 
 namespace xmltooling {
 
-    class XMLTOOL_API Credential;
-    class XMLTOOL_API CredentialCriteria;
-    class XMLTOOL_API KeyInfoCredentialContext;
-
     /**
      * Resolves credentials from KeyInfo information.
      *