Removed ChildlessElement class references, ensure ComplexElement gets copied during...

[shibboleth/cpp-opensaml.git] / saml / saml2 / core / impl / Assertions20SchemaValidators.cpp

diff --git a/saml/saml2/core/impl/Assertions20SchemaValidators.cpp b/saml/saml2/core/impl/Assertions20SchemaValidators.cpp
index 455ad72..fac134c 100644 (file)
--- a/saml/saml2/core/impl/Assertions20SchemaValidators.cpp
+++ b/saml/saml2/core/impl/Assertions20SchemaValidators.cpp
@@ -24,6 +24,8 @@
 #include "exceptions.h"
 #include "saml2/core/Assertions.h"
 
+#include <xmltooling/validation/ValidatorSuite.h>
+
 using namespace opensaml::saml2;
 using namespace opensaml;
 using namespace xmltooling;
@@ -65,7 +67,7 @@ namespace opensaml {
 
         BEGIN_XMLOBJECTVALIDATOR(SAML_DLLLOCAL,ProxyRestriction);
             if (ptr->getAudiences().empty()) {
-                XMLOBJECTVALIDATOR_REQUIRE(ProxyRestriction,Count);
+                XMLOBJECTVALIDATOR_REQUIRE_INTEGER(ProxyRestriction,Count);
             }
         END_XMLOBJECTVALIDATOR;
 
@@ -177,12 +179,12 @@ namespace opensaml {
 #define REGISTER_ELEMENT(cname) \
     q=QName(SAMLConstants::SAML20_NS,cname::LOCAL_NAME); \
     XMLObjectBuilder::registerBuilder(q,new cname##Builder()); \
-    AssertionSchemaValidators.registerValidator(q,new cname##SchemaValidator())
+    SchemaValidators.registerValidator(q,new cname##SchemaValidator())
     
 #define REGISTER_TYPE(cname) \
     q=QName(SAMLConstants::SAML20_NS,cname::TYPE_NAME); \
     XMLObjectBuilder::registerBuilder(q,new cname##Builder()); \
-    AssertionSchemaValidators.registerValidator(q,new cname##SchemaValidator())
+    SchemaValidators.registerValidator(q,new cname##SchemaValidator())
 
 #define REGISTER_ELEMENT_NOVAL(cname) \
     q=QName(SAMLConstants::SAML20_NS,cname::LOCAL_NAME); \
@@ -192,8 +194,6 @@ namespace opensaml {
     q=QName(SAMLConstants::SAML20_NS,cname::TYPE_NAME); \
     XMLObjectBuilder::registerBuilder(q,new cname##Builder());
 
-ValidatorSuite opensaml::saml2::AssertionSchemaValidators("AssertionSchemaValidators");
-
 void opensaml::saml2::registerAssertionClasses() {
     QName q;
     REGISTER_ELEMENT(Action);