From 5669b892d7a89b316ac395b81c2b4e0380561377 Mon Sep 17 00:00:00 2001
From: Alberto Massari <amassari@apache.org>
Date: Wed, 1 Nov 2006 20:35:12 +0000
Subject: [PATCH] Update license header as per
 http://www.apache.org/legal/src-headers.html

git-svn-id: https://svn.apache.org/repos/asf/xerces/c/trunk@470088 13f79535-47bb-0310-9956-ffa450edef68
---
 tests/Makefile.am                             | 11 ++++---
 tests/Makefile.in                             | 11 ++++---
 tests/src/DOM/DOMMemTest/DOMMemTest.cpp       | 11 ++++---
 tests/src/DOM/DOMTest/DTest.cpp               | 11 ++++---
 tests/src/DOM/DOMTest/DTest.h                 | 11 ++++---
 tests/src/DOM/Normalizer/Normalizer.cpp       | 11 ++++---
 tests/src/DOM/Normalizer/Normalizer.hpp       | 11 ++++---
 tests/src/DOM/RangeTest/RangeTest.cpp         | 11 ++++---
 tests/src/DOM/Traversal/Traversal.cpp         | 11 ++++---
 tests/src/DOM/TypeInfo/TypeInfo.cpp           | 11 ++++---
 tests/src/DOM/TypeInfo/TypeInfo.hpp           | 11 ++++---
 tests/src/EncodingTest/EncodingTest.cpp       | 11 ++++---
 tests/src/InitTermTest/InitTermTest.cpp       | 11 ++++---
 tests/src/InitTermTest/InitTermTest.hpp       | 11 ++++---
 tests/src/MemHandlerTest/MemoryMonitor.cpp    | 11 ++++---
 tests/src/MemHandlerTest/MemoryMonitor.hpp    | 11 ++++---
 tests/src/MemHandlerTest/SimpleHashPtr.cpp    | 11 ++++---
 tests/src/MemHandlerTest/SimpleHashPtr.hpp    | 11 ++++---
 .../MemHandlerTest/SimpleValueHashTableOf.c   | 11 ++++---
 .../MemHandlerTest/SimpleValueHashTableOf.hpp | 11 ++++---
 tests/src/NetAccessorTest/NetAccessorTest.cpp | 11 ++++---
 tests/src/ParserTest/ParserTest.cpp           | 11 ++++---
 tests/src/ParserTest/ParserTest.hpp           | 11 ++++---
 tests/src/ParserTest/ParserTest_Parser.cpp    | 11 ++++---
 tests/src/ParserTest/ParserTest_Parser.hpp    | 11 ++++---
 tests/src/ThreadTest/ThreadTest.cpp           | 11 ++++---
 tests/src/UtilTests/CoreTests.hpp             | 11 ++++---
 tests/src/UtilTests/CoreTestsMain.cpp         | 11 ++++---
 tests/src/UtilTests/CoreTests_BitSet.cpp      | 11 ++++---
 .../UtilTests/CoreTests_CountedPointer.cpp    | 11 ++++---
 tests/src/UtilTests/CoreTests_RefArray.cpp    | 11 ++++---
 .../src/UtilTests/CoreTests_RefHashTable.cpp  | 11 ++++---
 tests/src/UtilTests/CoreTests_RefStack.cpp    | 11 ++++---
 tests/src/UtilTests/CoreTests_RefVector.cpp   | 11 ++++---
 tests/src/UtilTests/CoreTests_String.cpp      | 11 ++++---
 tests/src/UtilTests/CoreTests_Transcoders.cpp | 11 ++++---
 tests/src/UtilTests/CoreTests_URL.cpp         | 11 ++++---
 tests/src/UtilTests/CoreTests_ValueArray.cpp  | 11 ++++---
 tests/src/UtilTests/CoreTests_ValueStack.cpp  | 11 ++++---
 tests/src/UtilTests/CoreTests_ValueVector.cpp | 11 ++++---
 tests/src/XSTSHarness/XSTSHarness.cpp         | 11 ++++---
 tests/src/XSTSHarness/XSTSHarness.hpp         | 31 ++++++++++---------
 tests/src/XSTSHarness/XSTSHarnessHandlers.cpp | 11 ++++---
 tests/src/XSTSHarness/XSTSHarnessHandlers.hpp | 31 ++++++++++---------
 tests/src/XSValueTest/XSValueTest.cpp         | 11 ++++---
 tests/src/XSValueTest/XSValueTest.hpp         | 11 ++++---
 .../XSerializerTest/XSerializerHandlers.cpp   | 11 ++++---
 .../XSerializerTest/XSerializerHandlers.hpp   | 11 ++++---
 tests/src/XSerializerTest/XSerializerTest.cpp | 11 ++++---
 tests/src/XSerializerTest/XSerializerTest.hpp | 11 ++++---
 50 files changed, 320 insertions(+), 270 deletions(-)

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 56fe1eb2b..e8e23c493 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,9 +1,10 @@
 #
-# Copyright 2005 The Apache Software Foundation.
-# 
-# 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 Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF 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
 # 
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 0bb5b9be1..36b714bda 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -15,11 +15,12 @@
 @SET_MAKE@
 
 #
-# Copyright 2005 The Apache Software Foundation.
-# 
-# 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 Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF 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
 # 
diff --git a/tests/src/DOM/DOMMemTest/DOMMemTest.cpp b/tests/src/DOM/DOMMemTest/DOMMemTest.cpp
index 7347462d4..22f8bbd08 100644
--- a/tests/src/DOM/DOMMemTest/DOMMemTest.cpp
+++ b/tests/src/DOM/DOMMemTest/DOMMemTest.cpp
@@ -1,9 +1,10 @@
 /*
- * Copyright 2002,2004 The Apache Software Foundation.
- * 
- * 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 Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF 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
  * 
diff --git a/tests/src/DOM/DOMTest/DTest.cpp b/tests/src/DOM/DOMTest/DTest.cpp
index 2baba31f2..55cce99ca 100644
--- a/tests/src/DOM/DOMTest/DTest.cpp
+++ b/tests/src/DOM/DOMTest/DTest.cpp
@@ -1,9 +1,10 @@
 /*
- * Copyright 2001,2004 The Apache Software Foundation.
- * 
- * 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 Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF 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
  * 
diff --git a/tests/src/DOM/DOMTest/DTest.h b/tests/src/DOM/DOMTest/DTest.h
index d63d5e5cb..181d32e9f 100644
--- a/tests/src/DOM/DOMTest/DTest.h
+++ b/tests/src/DOM/DOMTest/DTest.h
@@ -1,9 +1,10 @@
 /*
- * Copyright 2001,2004 The Apache Software Foundation.
- * 
- * 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 Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF 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
  * 
diff --git a/tests/src/DOM/Normalizer/Normalizer.cpp b/tests/src/DOM/Normalizer/Normalizer.cpp
index 30d405b69..50aab7061 100644
--- a/tests/src/DOM/Normalizer/Normalizer.cpp
+++ b/tests/src/DOM/Normalizer/Normalizer.cpp
@@ -1,9 +1,10 @@
 /*
- * Copyright 2003,2004 The Apache Software Foundation.
- * 
- * 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 Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF 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
  * 
diff --git a/tests/src/DOM/Normalizer/Normalizer.hpp b/tests/src/DOM/Normalizer/Normalizer.hpp
index 487ea98aa..e906f0b98 100644
--- a/tests/src/DOM/Normalizer/Normalizer.hpp
+++ b/tests/src/DOM/Normalizer/Normalizer.hpp
@@ -1,9 +1,10 @@
 /*
- * Copyright 2001,2004 The Apache Software Foundation.
- * 
- * 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 Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF 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
  * 
diff --git a/tests/src/DOM/RangeTest/RangeTest.cpp b/tests/src/DOM/RangeTest/RangeTest.cpp
index d74ce5942..4621f6594 100644
--- a/tests/src/DOM/RangeTest/RangeTest.cpp
+++ b/tests/src/DOM/RangeTest/RangeTest.cpp
@@ -1,9 +1,10 @@
 /*
- * Copyright 2001,2004 The Apache Software Foundation.
- * 
- * 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 Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF 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
  * 
diff --git a/tests/src/DOM/Traversal/Traversal.cpp b/tests/src/DOM/Traversal/Traversal.cpp
index 5e1e7d0a4..2c8fa7074 100644
--- a/tests/src/DOM/Traversal/Traversal.cpp
+++ b/tests/src/DOM/Traversal/Traversal.cpp
@@ -1,9 +1,10 @@
 /*
- * Copyright 2001,2004 The Apache Software Foundation.
- * 
- * 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 Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF 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
  * 
diff --git a/tests/src/DOM/TypeInfo/TypeInfo.cpp b/tests/src/DOM/TypeInfo/TypeInfo.cpp
index 092ada8dc..a56bbee21 100644
--- a/tests/src/DOM/TypeInfo/TypeInfo.cpp
+++ b/tests/src/DOM/TypeInfo/TypeInfo.cpp
@@ -1,9 +1,10 @@
 /*
- * Copyright 2003,2004 The Apache Software Foundation.
- * 
- * 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 Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF 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
  * 
diff --git a/tests/src/DOM/TypeInfo/TypeInfo.hpp b/tests/src/DOM/TypeInfo/TypeInfo.hpp
index 5931b4d55..80078088d 100644
--- a/tests/src/DOM/TypeInfo/TypeInfo.hpp
+++ b/tests/src/DOM/TypeInfo/TypeInfo.hpp
@@ -1,9 +1,10 @@
 /*
- * Copyright 2001,2004 The Apache Software Foundation.
- * 
- * 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 Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF 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
  * 
diff --git a/tests/src/EncodingTest/EncodingTest.cpp b/tests/src/EncodingTest/EncodingTest.cpp
index beea64c94..a9e9a682a 100644
--- a/tests/src/EncodingTest/EncodingTest.cpp
+++ b/tests/src/EncodingTest/EncodingTest.cpp
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2000,2004 The Apache Software Foundation.
- * 
- * 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 Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF 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
  * 
diff --git a/tests/src/InitTermTest/InitTermTest.cpp b/tests/src/InitTermTest/InitTermTest.cpp
index f4db14321..082d3d289 100644
--- a/tests/src/InitTermTest/InitTermTest.cpp
+++ b/tests/src/InitTermTest/InitTermTest.cpp
@@ -1,9 +1,10 @@
 /*
- * Copyright 2001,2004 The Apache Software Foundation.
- * 
- * 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 Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF 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
  * 
diff --git a/tests/src/InitTermTest/InitTermTest.hpp b/tests/src/InitTermTest/InitTermTest.hpp
index 7b177e3b3..bc480c3e9 100644
--- a/tests/src/InitTermTest/InitTermTest.hpp
+++ b/tests/src/InitTermTest/InitTermTest.hpp
@@ -1,9 +1,10 @@
 /*
- * Copyright 2001,2004 The Apache Software Foundation.
- * 
- * 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 Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF 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
  * 
diff --git a/tests/src/MemHandlerTest/MemoryMonitor.cpp b/tests/src/MemHandlerTest/MemoryMonitor.cpp
index 15a53d205..53451368a 100755
--- a/tests/src/MemHandlerTest/MemoryMonitor.cpp
+++ b/tests/src/MemHandlerTest/MemoryMonitor.cpp
@@ -1,9 +1,10 @@
 /*
- * Copyright 2003,2004 The Apache Software Foundation.
- * 
- * 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 Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF 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
  * 
diff --git a/tests/src/MemHandlerTest/MemoryMonitor.hpp b/tests/src/MemHandlerTest/MemoryMonitor.hpp
index 3ae46993b..1999efc40 100755
--- a/tests/src/MemHandlerTest/MemoryMonitor.hpp
+++ b/tests/src/MemHandlerTest/MemoryMonitor.hpp
@@ -1,9 +1,10 @@
 /*
- * Copyright 2003,2004 The Apache Software Foundation.
- * 
- * 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 Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF 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
  * 
diff --git a/tests/src/MemHandlerTest/SimpleHashPtr.cpp b/tests/src/MemHandlerTest/SimpleHashPtr.cpp
index fc23bec0d..04f894975 100644
--- a/tests/src/MemHandlerTest/SimpleHashPtr.cpp
+++ b/tests/src/MemHandlerTest/SimpleHashPtr.cpp
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2000,2004 The Apache Software Foundation.
- * 
- * 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 Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF 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
  * 
diff --git a/tests/src/MemHandlerTest/SimpleHashPtr.hpp b/tests/src/MemHandlerTest/SimpleHashPtr.hpp
index ed71ad222..28e3d7099 100644
--- a/tests/src/MemHandlerTest/SimpleHashPtr.hpp
+++ b/tests/src/MemHandlerTest/SimpleHashPtr.hpp
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2000,2004 The Apache Software Foundation.
- * 
- * 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 Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF 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
  * 
diff --git a/tests/src/MemHandlerTest/SimpleValueHashTableOf.c b/tests/src/MemHandlerTest/SimpleValueHashTableOf.c
index 99d42a3ea..96428d523 100644
--- a/tests/src/MemHandlerTest/SimpleValueHashTableOf.c
+++ b/tests/src/MemHandlerTest/SimpleValueHashTableOf.c
@@ -1,9 +1,10 @@
 /*
- * Copyright 2002,2004 The Apache Software Foundation.
- * 
- * 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 Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF 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
  * 
diff --git a/tests/src/MemHandlerTest/SimpleValueHashTableOf.hpp b/tests/src/MemHandlerTest/SimpleValueHashTableOf.hpp
index 7259e3c40..821cf6947 100644
--- a/tests/src/MemHandlerTest/SimpleValueHashTableOf.hpp
+++ b/tests/src/MemHandlerTest/SimpleValueHashTableOf.hpp
@@ -1,9 +1,10 @@
 /*
- * Copyright 2002,2004 The Apache Software Foundation.
- * 
- * 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 Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF 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
  * 
diff --git a/tests/src/NetAccessorTest/NetAccessorTest.cpp b/tests/src/NetAccessorTest/NetAccessorTest.cpp
index d3991d708..3bb735bd0 100644
--- a/tests/src/NetAccessorTest/NetAccessorTest.cpp
+++ b/tests/src/NetAccessorTest/NetAccessorTest.cpp
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2000,2004 The Apache Software Foundation.
- * 
- * 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 Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF 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
  * 
diff --git a/tests/src/ParserTest/ParserTest.cpp b/tests/src/ParserTest/ParserTest.cpp
index c4a89deed..d88986d64 100644
--- a/tests/src/ParserTest/ParserTest.cpp
+++ b/tests/src/ParserTest/ParserTest.cpp
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2000,2004 The Apache Software Foundation.
- * 
- * 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 Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF 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
  * 
diff --git a/tests/src/ParserTest/ParserTest.hpp b/tests/src/ParserTest/ParserTest.hpp
index 8a9ae2a2b..46e6be152 100644
--- a/tests/src/ParserTest/ParserTest.hpp
+++ b/tests/src/ParserTest/ParserTest.hpp
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2000,2004 The Apache Software Foundation.
- * 
- * 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 Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF 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
  * 
diff --git a/tests/src/ParserTest/ParserTest_Parser.cpp b/tests/src/ParserTest/ParserTest_Parser.cpp
index 3c2983a01..549b6231a 100644
--- a/tests/src/ParserTest/ParserTest_Parser.cpp
+++ b/tests/src/ParserTest/ParserTest_Parser.cpp
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2000,2004 The Apache Software Foundation.
- * 
- * 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 Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF 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
  * 
diff --git a/tests/src/ParserTest/ParserTest_Parser.hpp b/tests/src/ParserTest/ParserTest_Parser.hpp
index cbfeabfaa..e4a380667 100644
--- a/tests/src/ParserTest/ParserTest_Parser.hpp
+++ b/tests/src/ParserTest/ParserTest_Parser.hpp
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2000,2004 The Apache Software Foundation.
- * 
- * 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 Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF 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
  * 
diff --git a/tests/src/ThreadTest/ThreadTest.cpp b/tests/src/ThreadTest/ThreadTest.cpp
index 3f61640a6..c9ca795cc 100644
--- a/tests/src/ThreadTest/ThreadTest.cpp
+++ b/tests/src/ThreadTest/ThreadTest.cpp
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2000,2004 The Apache Software Foundation.
- * 
- * 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 Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF 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
  * 
diff --git a/tests/src/UtilTests/CoreTests.hpp b/tests/src/UtilTests/CoreTests.hpp
index 1198ce573..307176d75 100644
--- a/tests/src/UtilTests/CoreTests.hpp
+++ b/tests/src/UtilTests/CoreTests.hpp
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2000,2004 The Apache Software Foundation.
- * 
- * 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 Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF 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
  * 
diff --git a/tests/src/UtilTests/CoreTestsMain.cpp b/tests/src/UtilTests/CoreTestsMain.cpp
index 3e5fcdcda..36470a9ed 100644
--- a/tests/src/UtilTests/CoreTestsMain.cpp
+++ b/tests/src/UtilTests/CoreTestsMain.cpp
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2000,2004 The Apache Software Foundation.
- * 
- * 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 Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF 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
  * 
diff --git a/tests/src/UtilTests/CoreTests_BitSet.cpp b/tests/src/UtilTests/CoreTests_BitSet.cpp
index 3560fd7cf..d93f93348 100644
--- a/tests/src/UtilTests/CoreTests_BitSet.cpp
+++ b/tests/src/UtilTests/CoreTests_BitSet.cpp
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2000,2004 The Apache Software Foundation.
- * 
- * 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 Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF 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
  * 
diff --git a/tests/src/UtilTests/CoreTests_CountedPointer.cpp b/tests/src/UtilTests/CoreTests_CountedPointer.cpp
index b4f076791..754b64dd3 100644
--- a/tests/src/UtilTests/CoreTests_CountedPointer.cpp
+++ b/tests/src/UtilTests/CoreTests_CountedPointer.cpp
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2000,2004 The Apache Software Foundation.
- * 
- * 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 Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF 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
  * 
diff --git a/tests/src/UtilTests/CoreTests_RefArray.cpp b/tests/src/UtilTests/CoreTests_RefArray.cpp
index 6719e1145..b5613cc38 100644
--- a/tests/src/UtilTests/CoreTests_RefArray.cpp
+++ b/tests/src/UtilTests/CoreTests_RefArray.cpp
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2000,2004 The Apache Software Foundation.
- * 
- * 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 Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF 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
  * 
diff --git a/tests/src/UtilTests/CoreTests_RefHashTable.cpp b/tests/src/UtilTests/CoreTests_RefHashTable.cpp
index b34a7bbbc..8fefa787b 100644
--- a/tests/src/UtilTests/CoreTests_RefHashTable.cpp
+++ b/tests/src/UtilTests/CoreTests_RefHashTable.cpp
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2000,2004 The Apache Software Foundation.
- * 
- * 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 Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF 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
  * 
diff --git a/tests/src/UtilTests/CoreTests_RefStack.cpp b/tests/src/UtilTests/CoreTests_RefStack.cpp
index 58b2e29ff..d5a483f6d 100644
--- a/tests/src/UtilTests/CoreTests_RefStack.cpp
+++ b/tests/src/UtilTests/CoreTests_RefStack.cpp
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2000,2004 The Apache Software Foundation.
- * 
- * 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 Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF 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
  * 
diff --git a/tests/src/UtilTests/CoreTests_RefVector.cpp b/tests/src/UtilTests/CoreTests_RefVector.cpp
index 677de1b69..4067d261b 100644
--- a/tests/src/UtilTests/CoreTests_RefVector.cpp
+++ b/tests/src/UtilTests/CoreTests_RefVector.cpp
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2000,2004 The Apache Software Foundation.
- * 
- * 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 Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF 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
  * 
diff --git a/tests/src/UtilTests/CoreTests_String.cpp b/tests/src/UtilTests/CoreTests_String.cpp
index 1c32b71b8..002be00bb 100644
--- a/tests/src/UtilTests/CoreTests_String.cpp
+++ b/tests/src/UtilTests/CoreTests_String.cpp
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2000,2004 The Apache Software Foundation.
- * 
- * 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 Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF 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
  * 
diff --git a/tests/src/UtilTests/CoreTests_Transcoders.cpp b/tests/src/UtilTests/CoreTests_Transcoders.cpp
index 39ef8f266..a6949ae8a 100644
--- a/tests/src/UtilTests/CoreTests_Transcoders.cpp
+++ b/tests/src/UtilTests/CoreTests_Transcoders.cpp
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2000,2004 The Apache Software Foundation.
- * 
- * 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 Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF 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
  * 
diff --git a/tests/src/UtilTests/CoreTests_URL.cpp b/tests/src/UtilTests/CoreTests_URL.cpp
index 1c81ddf8d..fe0de3c31 100644
--- a/tests/src/UtilTests/CoreTests_URL.cpp
+++ b/tests/src/UtilTests/CoreTests_URL.cpp
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2000,2004 The Apache Software Foundation.
- * 
- * 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 Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF 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
  * 
diff --git a/tests/src/UtilTests/CoreTests_ValueArray.cpp b/tests/src/UtilTests/CoreTests_ValueArray.cpp
index a2ff55241..589e107d0 100644
--- a/tests/src/UtilTests/CoreTests_ValueArray.cpp
+++ b/tests/src/UtilTests/CoreTests_ValueArray.cpp
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2000,2004 The Apache Software Foundation.
- * 
- * 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 Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF 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
  * 
diff --git a/tests/src/UtilTests/CoreTests_ValueStack.cpp b/tests/src/UtilTests/CoreTests_ValueStack.cpp
index fe822069b..4c3247c24 100644
--- a/tests/src/UtilTests/CoreTests_ValueStack.cpp
+++ b/tests/src/UtilTests/CoreTests_ValueStack.cpp
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2000,2004 The Apache Software Foundation.
- * 
- * 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 Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF 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
  * 
diff --git a/tests/src/UtilTests/CoreTests_ValueVector.cpp b/tests/src/UtilTests/CoreTests_ValueVector.cpp
index 968e7679f..5f015ff4f 100644
--- a/tests/src/UtilTests/CoreTests_ValueVector.cpp
+++ b/tests/src/UtilTests/CoreTests_ValueVector.cpp
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2000,2004 The Apache Software Foundation.
- * 
- * 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 Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF 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
  * 
diff --git a/tests/src/XSTSHarness/XSTSHarness.cpp b/tests/src/XSTSHarness/XSTSHarness.cpp
index f086bd3b4..4109083c0 100644
--- a/tests/src/XSTSHarness/XSTSHarness.cpp
+++ b/tests/src/XSTSHarness/XSTSHarness.cpp
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2001,2004 The Apache Software Foundation.
- * 
- * 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 Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF 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
  * 
diff --git a/tests/src/XSTSHarness/XSTSHarness.hpp b/tests/src/XSTSHarness/XSTSHarness.hpp
index 08c06123e..3a2179f74 100644
--- a/tests/src/XSTSHarness/XSTSHarness.hpp
+++ b/tests/src/XSTSHarness/XSTSHarness.hpp
@@ -1,18 +1,19 @@
-/*
- * Copyright 1999-2000,2004 The Apache Software Foundation.
- * 
- * 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
- * 
- *      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.
- */
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF 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
+ * 
+ * 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.
+ */
 
 /*
  * $Id: SAX2Count.hpp 191045 2005-06-17 01:29:55Z jberry $
diff --git a/tests/src/XSTSHarness/XSTSHarnessHandlers.cpp b/tests/src/XSTSHarness/XSTSHarnessHandlers.cpp
index 8eda5e5b1..e4baa0f85 100644
--- a/tests/src/XSTSHarness/XSTSHarnessHandlers.cpp
+++ b/tests/src/XSTSHarness/XSTSHarnessHandlers.cpp
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2000,2004 The Apache Software Foundation.
- * 
- * 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 Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF 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
  * 
diff --git a/tests/src/XSTSHarness/XSTSHarnessHandlers.hpp b/tests/src/XSTSHarness/XSTSHarnessHandlers.hpp
index 621bfb9e3..2fc0355b4 100644
--- a/tests/src/XSTSHarness/XSTSHarnessHandlers.hpp
+++ b/tests/src/XSTSHarness/XSTSHarnessHandlers.hpp
@@ -1,18 +1,19 @@
-/*
- * Copyright 1999-2000,2004 The Apache Software Foundation.
- * 
- * 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
- * 
- *      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.
- */
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF 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
+ * 
+ * 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.
+ */
 
 /*
  * $Id: XSTSHarnessHandlers.hpp 314887 2005-10-12 13:18:24Z cargilld $
diff --git a/tests/src/XSValueTest/XSValueTest.cpp b/tests/src/XSValueTest/XSValueTest.cpp
index b037c4775..71d245803 100644
--- a/tests/src/XSValueTest/XSValueTest.cpp
+++ b/tests/src/XSValueTest/XSValueTest.cpp
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * 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 Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF 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
  * 
diff --git a/tests/src/XSValueTest/XSValueTest.hpp b/tests/src/XSValueTest/XSValueTest.hpp
index d921e125f..cdf46b5f2 100644
--- a/tests/src/XSValueTest/XSValueTest.hpp
+++ b/tests/src/XSValueTest/XSValueTest.hpp
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * 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 Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF 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
  * 
diff --git a/tests/src/XSerializerTest/XSerializerHandlers.cpp b/tests/src/XSerializerTest/XSerializerHandlers.cpp
index 8dacd7d5d..20b34644e 100644
--- a/tests/src/XSerializerTest/XSerializerHandlers.cpp
+++ b/tests/src/XSerializerTest/XSerializerHandlers.cpp
@@ -1,9 +1,10 @@
 /*
- * Copyright 2003,2004 The Apache Software Foundation.
- * 
- * 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 Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF 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
  * 
diff --git a/tests/src/XSerializerTest/XSerializerHandlers.hpp b/tests/src/XSerializerTest/XSerializerHandlers.hpp
index 30d93588e..d9f452ce5 100644
--- a/tests/src/XSerializerTest/XSerializerHandlers.hpp
+++ b/tests/src/XSerializerTest/XSerializerHandlers.hpp
@@ -1,9 +1,10 @@
 /*
- * Copyright 2003,2004 The Apache Software Foundation.
- * 
- * 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 Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF 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
  * 
diff --git a/tests/src/XSerializerTest/XSerializerTest.cpp b/tests/src/XSerializerTest/XSerializerTest.cpp
index ab239e75e..52dc25f81 100644
--- a/tests/src/XSerializerTest/XSerializerTest.cpp
+++ b/tests/src/XSerializerTest/XSerializerTest.cpp
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * 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 Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF 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
  * 
diff --git a/tests/src/XSerializerTest/XSerializerTest.hpp b/tests/src/XSerializerTest/XSerializerTest.hpp
index 203a47d51..db339381b 100644
--- a/tests/src/XSerializerTest/XSerializerTest.hpp
+++ b/tests/src/XSerializerTest/XSerializerTest.hpp
@@ -1,9 +1,10 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * 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 Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF 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
  * 
-- 
GitLab