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

[shibboleth/cpp-xmltooling.git] / xmltooling / util / XMLConstants.h

diff --git a/xmltooling/util/XMLConstants.h b/xmltooling/util/XMLConstants.h
index d936092..961f0de 100644 (file)
--- a/xmltooling/util/XMLConstants.h
+++ b/xmltooling/util/XMLConstants.h
@@ -1,29 +1,34 @@
-/*
- *  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.
  */
 
 /**
- * @file XMLConstants.h
+ * @file xmltooling/util/XMLConstants.h
  * 
- * Fundamental XML namespace constants 
+ * Fundamental XML namespace constants.
  */
 
-#if !defined(__xmltooling_xmlconstants_h__)
+#ifndef __xmltooling_xmlconstants_h__
 #define __xmltooling_xmlconstants_h__
 
-#include <xmltooling/unicode.h>
+#include <xmltooling/base.h>
+#include <xercesc/util/XercesDefs.hpp>
 
 /**
  * XML related constants.
@@ -59,6 +64,12 @@ namespace xmlconstants {
     
     /**  XML Signature QName prefix ("ds") */
     extern XMLTOOL_API const XMLCh XMLSIG_PREFIX[];
+
+    /**  XML Signature namespace ("http://www.w3.org/2009/xmldsig11#") */
+    extern XMLTOOL_API const XMLCh XMLSIG11_NS[];
+
+    /**  XML Signature QName prefix ("ds11") */
+    extern XMLTOOL_API const XMLCh XMLSIG11_PREFIX[];
     
     /**  XML Encryption namespace ("http://www.w3.org/2001/04/xmlenc#") */
     extern XMLTOOL_API const XMLCh XMLENC_NS[];