Merge branch '1.x' of ssh://authdev.it.ohio-state.edu/~scantor/git/cpp-xmltooling...

[shibboleth/cpp-xmltooling.git] / xmltooling / soap / impl / SOAPSchemaValidators.cpp

diff --git a/xmltooling/soap/impl/SOAPSchemaValidators.cpp b/xmltooling/soap/impl/SOAPSchemaValidators.cpp
index 0708fc5..32f58c0 100644 (file)
--- a/xmltooling/soap/impl/SOAPSchemaValidators.cpp
+++ b/xmltooling/soap/impl/SOAPSchemaValidators.cpp
@@ -1,33 +1,39 @@
-/*
-*  Copyright 2001-2006 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
+/**
+ * Licensed to the University Corporation for Advanced Internet
+ * Development, Inc. (UCAID) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
+ *
+ * UCAID licenses this file to you 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
+ * 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.
+ * 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.
  */
 
 /**
  * SOAPSchemaValidators.cpp
  * 
- * Schema validators for SOAP schema
+ * Schema validators for SOAP schema.
  */
 
 #include "internal.h"
 #include "exceptions.h"
 #include "soap/SOAP.h"
+#include "validation/Validator.h"
 #include "validation/ValidatorSuite.h"
 
 using namespace soap11;
 using namespace xmltooling;
 using namespace std;
+using xmlconstants::SOAP11ENV_NS;
 
 namespace {
 
@@ -70,17 +76,17 @@ namespace {
 void soap11::registerSOAPClasses()
 {
     QName q;
-    REGISTER_ELEMENT_NOVAL(XMLConstants::SOAP11ENV_NS,Body);
-    REGISTER_ELEMENT_NOVAL(XMLConstants::SOAP11ENV_NS,Detail);
-    REGISTER_ELEMENT(XMLConstants::SOAP11ENV_NS,Envelope);
-    REGISTER_ELEMENT(XMLConstants::SOAP11ENV_NS,Fault);
-    REGISTER_ELEMENT(XMLConstants::SOAP11ENV_NS,Faultactor);
-    REGISTER_ELEMENT(XMLConstants::SOAP11ENV_NS,Faultcode);
-    REGISTER_ELEMENT(XMLConstants::SOAP11ENV_NS,Faultstring);
-    REGISTER_ELEMENT_NOVAL(XMLConstants::SOAP11ENV_NS,Header);
-    REGISTER_TYPE_NOVAL(XMLConstants::SOAP11ENV_NS,Body);
-    REGISTER_TYPE_NOVAL(XMLConstants::SOAP11ENV_NS,Detail);
-    REGISTER_TYPE(XMLConstants::SOAP11ENV_NS,Envelope);
-    REGISTER_TYPE(XMLConstants::SOAP11ENV_NS,Fault);
-    REGISTER_TYPE_NOVAL(XMLConstants::SOAP11ENV_NS,Header);
+    REGISTER_ELEMENT_NOVAL(SOAP11ENV_NS,Body);
+    REGISTER_ELEMENT_NOVAL(nullptr,Detail);
+    REGISTER_ELEMENT(SOAP11ENV_NS,Envelope);
+    REGISTER_ELEMENT(SOAP11ENV_NS,Fault);
+    REGISTER_ELEMENT(nullptr,Faultactor);
+    REGISTER_ELEMENT(nullptr,Faultcode);
+    REGISTER_ELEMENT(nullptr,Faultstring);
+    REGISTER_ELEMENT_NOVAL(SOAP11ENV_NS,Header);
+    REGISTER_TYPE_NOVAL(SOAP11ENV_NS,Body);
+    REGISTER_TYPE_NOVAL(SOAP11ENV_NS,Detail);
+    REGISTER_TYPE(SOAP11ENV_NS,Envelope);
+    REGISTER_TYPE(SOAP11ENV_NS,Fault);
+    REGISTER_TYPE_NOVAL(SOAP11ENV_NS,Header);
 }