Merge schema validators into one suite.

[shibboleth/cpp-xmltooling.git] / xmltooling / encryption / impl / EncryptionSchemaValidators.cpp

diff --git a/xmltooling/encryption/impl/EncryptionSchemaValidators.cpp b/xmltooling/encryption/impl/EncryptionSchemaValidators.cpp
index 1abf065..0ee9467 100644 (file)
--- a/xmltooling/encryption/impl/EncryptionSchemaValidators.cpp
+++ b/xmltooling/encryption/impl/EncryptionSchemaValidators.cpp
@@ -111,14 +111,12 @@ namespace xmlencryption {
 #define REGISTER_ELEMENT(namespaceURI,cname) \
     q=QName(namespaceURI,cname::LOCAL_NAME); \
     XMLObjectBuilder::registerBuilder(q,new cname##Builder()); \
-    EncryptionSchemaValidators.registerValidator(q,new cname##SchemaValidator())
+    SchemaValidators.registerValidator(q,new cname##SchemaValidator())
     
 #define REGISTER_TYPE(namespaceURI,cname) \
     q=QName(namespaceURI,cname::TYPE_NAME); \
     XMLObjectBuilder::registerBuilder(q,new cname##Builder()); \
-    EncryptionSchemaValidators.registerValidator(q,new cname##SchemaValidator())
-
-ValidatorSuite xmlencryption::EncryptionSchemaValidators("EncryptionSchemaValidators");
+    SchemaValidators.registerValidator(q,new cname##SchemaValidator())
 
 void xmlencryption::registerEncryptionClasses()
 {