X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=saml%2Fbinding%2FMessageDecoder.h;h=d797f83ea961f7a1c0c8d2ff8748a7a4bc9a5ec7;hb=6056cca67278d65c4343928e4ceaebd1d6f04920;hp=ef69d6118b3e6b578c0b526a912d414ad50dac42;hpb=1bc8e721db3a50294df852662e1eddcdbdae8f9f;p=shibboleth%2Fcpp-opensaml.git

diff --git a/saml/binding/MessageDecoder.h b/saml/binding/MessageDecoder.h
index ef69d61..d797f83 100644
--- a/saml/binding/MessageDecoder.h
+++ b/saml/binding/MessageDecoder.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2001-2006 Internet2
+ *  Copyright 2001-2007 Internet2
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,7 +30,6 @@
 namespace opensaml {
     
     class SAML_API SAMLArtifact;
-    class SAML_API X509TrustEngine;
     namespace saml1p {
         class SAML_API Response;
     };
@@ -69,25 +68,11 @@ namespace opensaml {
             MAKE_NONCOPYABLE(ArtifactResolver);
         protected:
             ArtifactResolver() {}
-            
-            /** Flag controlling schema validation. */
-            bool m_validate;
 
         public:
             virtual ~ArtifactResolver() {}
 
             /**
-             * Controls schema validation of incoming XML messages.
-             * This is separate from other forms of programmatic validation of objects,
-             * but can detect a much wider range of syntax errors. 
-             * 
-             * @param validate  true iff the resolver should use a validating XML parser
-             */
-            void setValidating(bool validate=true) {
-                m_validate = validate;
-            }
-            
-            /**
              * Resolves one or more SAML 1.x artifacts into a response containing a set of
              * resolved Assertions. The caller is responsible for the resulting Response.
              * The supplied SecurityPolicy is used to access caller-supplied infrastructure
@@ -129,26 +114,11 @@ namespace opensaml {
          * 
          * @param artifactResolver   an ArtifactResolver implementation to use
          */
-        void setArtifactResolver(ArtifactResolver* artifactResolver) {
+        void setArtifactResolver(const ArtifactResolver* artifactResolver) {
             m_artifactResolver = artifactResolver;
-            if (m_artifactResolver)
-                m_artifactResolver->setValidating(m_validate);
         }
         
         /**
-         * Controls schema validation of incoming XML messages.
-         * This is separate from other forms of programmatic validation of objects,
-         * but can detect a much wider range of syntax errors. 
-         * 
-         * @param validate  true iff the decoder should use a validating XML parser
-         */
-        void setValidating(bool validate=true) {
-            m_validate = validate;
-            if (m_artifactResolver)
-                m_artifactResolver->setValidating(m_validate);
-        }
-
-        /**
          * Decodes a transport request into a SAML protocol message, and evaluates it
          * against a supplied SecurityPolicy. If the transport request does not contain
          * the information necessary to decode the request, NULL will be returned.
@@ -169,13 +139,10 @@ namespace opensaml {
             ) const=0;
 
     protected:
-        MessageDecoder() : m_artifactResolver(NULL), m_validate(false) {}
+        MessageDecoder() : m_artifactResolver(NULL) {}
 
         /** Pointer to an ArtifactResolver implementation. */
-        ArtifactResolver* m_artifactResolver;
-        
-        /** Flag controlling schema validation. */
-        bool m_validate;
+        const ArtifactResolver* m_artifactResolver;
     };
 
     /**