diff --git a/swig/interfaces/Perl/callback.i b/swig/interfaces/Perl/callback.i
index 871924e3b208d355ef9811892f9153289c4d39cd..2f4e6958f9ebf5a444a67fac24f60e047da7cad2 100644
--- a/swig/interfaces/Perl/callback.i
+++ b/swig/interfaces/Perl/callback.i
@@ -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/swig/interfaces/Perl/defines.i b/swig/interfaces/Perl/defines.i
index 467470ac595b0515bc0be13839406118c761284c..23fcc8e799e18b7bcd89c93965bfd2ef0dc97520 100644
--- a/swig/interfaces/Perl/defines.i
+++ b/swig/interfaces/Perl/defines.i
@@ -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/swig/interfaces/Perl/dom-callback.i b/swig/interfaces/Perl/dom-callback.i
index e9e4f749be4ccc90997020c7969d69b8ff638a8f..9ae12931e07d98dea127ac5a4f3d886f5a788ee7 100644
--- a/swig/interfaces/Perl/dom-callback.i
+++ b/swig/interfaces/Perl/dom-callback.i
@@ -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/swig/interfaces/Perl/dom-includes.i b/swig/interfaces/Perl/dom-includes.i
index 5ec5fa7a9009cc04eede2d0bcaf8eb3a812ffb71..998092531d27f280274f546eeb9da182eebc1afc 100644
--- a/swig/interfaces/Perl/dom-includes.i
+++ b/swig/interfaces/Perl/dom-includes.i
@@ -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/swig/interfaces/Perl/dom-shadow.i b/swig/interfaces/Perl/dom-shadow.i
index 83864e778cbf9e7610b24ce7b6664fe1344fdf78..ab40045c9e57c7ca054a11d979e9904d408ffe7d 100644
--- a/swig/interfaces/Perl/dom-shadow.i
+++ b/swig/interfaces/Perl/dom-shadow.i
@@ -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/swig/interfaces/Perl/includes.i b/swig/interfaces/Perl/includes.i
index 662d6707b1dc8d06529a1bf0585aacef36ae319e..b0bb2be2c8b9472c3d3c07610b185c3ee06b4139 100644
--- a/swig/interfaces/Perl/includes.i
+++ b/swig/interfaces/Perl/includes.i
@@ -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/swig/interfaces/Perl/sax-callback.i b/swig/interfaces/Perl/sax-callback.i
index c3d0b20755d1b31f7db12d6f998bd9fa709465f8..66ba763aee025f85910c0bdc40f71f9dde9d1cab 100644
--- a/swig/interfaces/Perl/sax-callback.i
+++ b/swig/interfaces/Perl/sax-callback.i
@@ -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/swig/interfaces/Perl/sax-includes.i b/swig/interfaces/Perl/sax-includes.i
index 4796bf700fb58d7743159b03ae6e07138f5272a7..db36804c9993a983e39ffaa0ed78aa6daa38d955 100644
--- a/swig/interfaces/Perl/sax-includes.i
+++ b/swig/interfaces/Perl/sax-includes.i
@@ -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/swig/interfaces/Perl/sax-shadow.i b/swig/interfaces/Perl/sax-shadow.i
index b28db0b55e0b128872a8786d4d5afc812b9d32b2..17d6ee9b8c2b4010a5fc4acbcd8005008ce2be45 100644
--- a/swig/interfaces/Perl/sax-shadow.i
+++ b/swig/interfaces/Perl/sax-shadow.i
@@ -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/swig/interfaces/Perl/shadow.i b/swig/interfaces/Perl/shadow.i
index c785493a1dd06b62cf62139b5c4e2464fb760f97..23861542b802c5eff896269cdf2f46cbbf498160 100644
--- a/swig/interfaces/Perl/shadow.i
+++ b/swig/interfaces/Perl/shadow.i
@@ -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/swig/interfaces/Perl/typemaps-xmlch.i b/swig/interfaces/Perl/typemaps-xmlch.i
index 046a9565c9323395ec0f7d583ec5937c5f5a51b2..1306c4d2082720a2dda7124e238b9d8a2f09bfdb 100644
--- a/swig/interfaces/Perl/typemaps-xmlch.i
+++ b/swig/interfaces/Perl/typemaps-xmlch.i
@@ -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/swig/interfaces/Xerces.i b/swig/interfaces/Xerces.i
index 057a7ea034fb23c8f896661ebaf2a815b68cfe3e..113ba1765966ab7773ad70e41f0c87712569a052 100644
--- a/swig/interfaces/Xerces.i
+++ b/swig/interfaces/Xerces.i
@@ -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/swig/interfaces/Xerces_DOM.i b/swig/interfaces/Xerces_DOM.i
index b79e72f9a7c2cf78d8b6484f20250b51a9330b03..b1aad293c0d4187d8dc4fbf605b8229331746258 100644
--- a/swig/interfaces/Xerces_DOM.i
+++ b/swig/interfaces/Xerces_DOM.i
@@ -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/swig/interfaces/Xerces_IO.i b/swig/interfaces/Xerces_IO.i
index 2e163a7aff4f3412e7b7a1e2f833892dd6ac6e72..5cc6f80c614f2432e127d7a2f1597080525ac8f5 100644
--- a/swig/interfaces/Xerces_IO.i
+++ b/swig/interfaces/Xerces_IO.i
@@ -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/swig/interfaces/Xerces_SAX.i b/swig/interfaces/Xerces_SAX.i
index e4809877cf42cc2ea16ae6f17525e48a6328b8a6..8854252886cdd9e5e260a2005b111af9c064b0a0 100644
--- a/swig/interfaces/Xerces_SAX.i
+++ b/swig/interfaces/Xerces_SAX.i
@@ -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/swig/interfaces/Xerces_common.i b/swig/interfaces/Xerces_common.i
index 3a3264332a02c47f9d47e17563cc91de145d7c91..24d4a24ae4bf3ac2af7085b49bd819dc03253395 100644
--- a/swig/interfaces/Xerces_common.i
+++ b/swig/interfaces/Xerces_common.i
@@ -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/swig/interfaces/defines.i b/swig/interfaces/defines.i
index 2469e95f5b3cbc608c1dbe56b658bce21aec7fea..351fe17287f4491447b492393df9c353d1a91c38 100644
--- a/swig/interfaces/defines.i
+++ b/swig/interfaces/defines.i
@@ -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/swig/interfaces/dom-includes.i b/swig/interfaces/dom-includes.i
index eaa91a3828076c380e8bb50ec1b08e569c4cdd22..f36d22b7196b94a3e41acd4acbb281ee7d85dd4c 100644
--- a/swig/interfaces/dom-includes.i
+++ b/swig/interfaces/dom-includes.i
@@ -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/swig/interfaces/domxpath-includes.i b/swig/interfaces/domxpath-includes.i
index d29c9aba621328e54a8b7866d64e11df1c803d09..16fc6258fbc740ff9fa7ad7157f982bf8b899bb2 100644
--- a/swig/interfaces/domxpath-includes.i
+++ b/swig/interfaces/domxpath-includes.i
@@ -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/swig/interfaces/includes.i b/swig/interfaces/includes.i
index b5f685b0e779973267d1cb1acc0b9aa24ea4cb76..1135cdc9adf19a1d1222db52c98781d976ad24a5 100644
--- a/swig/interfaces/includes.i
+++ b/swig/interfaces/includes.i
@@ -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/swig/interfaces/init.i b/swig/interfaces/init.i
index ea0b529356bda43b2acf4b79a49bd3a4e53b07fc..b44d1dd27cae5d7f9a621fcf8381984bd04395d4 100644
--- a/swig/interfaces/init.i
+++ b/swig/interfaces/init.i
@@ -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/swig/interfaces/make-xml-exception.i b/swig/interfaces/make-xml-exception.i
index 3bed7509bcd0878da48fba8a3d460e3b15c09a3d..88a82842aa6e32b7638f74ef6bb39e5edfe3c49f 100644
--- a/swig/interfaces/make-xml-exception.i
+++ b/swig/interfaces/make-xml-exception.i
@@ -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/swig/interfaces/sax-includes.i b/swig/interfaces/sax-includes.i
index 8dada9e75ba083fd134698db2e9d42f1290c9965..f9a3685f4f056e1f492013363f780bfa01955d0d 100644
--- a/swig/interfaces/sax-includes.i
+++ b/swig/interfaces/sax-includes.i
@@ -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/swig/interfaces/transcoder.i b/swig/interfaces/transcoder.i
index 7340be0fe18888d89b81c10a5efe685e67989be6..57fb4261f59e296b908fa637239fa49d71ca720d 100644
--- a/swig/interfaces/transcoder.i
+++ b/swig/interfaces/transcoder.i
@@ -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/swig/interfaces/typemaps-dom.i b/swig/interfaces/typemaps-dom.i
index 602c5075102ce136aa428a87e93d51434ec53622..c057941290b0ccdaf23ecd01d7c06386be6f2567 100644
--- a/swig/interfaces/typemaps-dom.i
+++ b/swig/interfaces/typemaps-dom.i
@@ -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/swig/interfaces/typemaps-general.i b/swig/interfaces/typemaps-general.i
index 87396c9c91045625c25515223ca9d04547ccdb5b..2a96ec695cc4a5db36f7868dca989cdce534118c 100644
--- a/swig/interfaces/typemaps-general.i
+++ b/swig/interfaces/typemaps-general.i
@@ -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/swig/interfaces/typemaps-io.i b/swig/interfaces/typemaps-io.i
index 5031053e022d11d2a1f3c9f2fe5bf874d6458c9b..9fdceafe8a9c08923ffcc802240f077800c18d9c 100644
--- a/swig/interfaces/typemaps-io.i
+++ b/swig/interfaces/typemaps-io.i
@@ -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/swig/interfaces/typemaps-sax.i b/swig/interfaces/typemaps-sax.i
index eb8098af8c87b95cf7d561197e3c12897fff8ce4..16e1602e661cc6101162e4990fa6b43f9961b4e9 100644
--- a/swig/interfaces/typemaps-sax.i
+++ b/swig/interfaces/typemaps-sax.i
@@ -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/swig/interfaces/typemaps-xmlch.i b/swig/interfaces/typemaps-xmlch.i
index c623490ced060c7c7693caabaecd1a232de50be5..8cdc00ba63e043754631b8581be117e24cf575cc 100644
--- a/swig/interfaces/typemaps-xmlch.i
+++ b/swig/interfaces/typemaps-xmlch.i
@@ -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/swig/interfaces/typemaps.i b/swig/interfaces/typemaps.i
index 347aec859405b23f5b99bf55d1af2afb19a7aae8..b6b1e252103f18e82280dc2c4c1da32c8eee1386 100644
--- a/swig/interfaces/typemaps.i
+++ b/swig/interfaces/typemaps.i
@@ -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/swig/perl/DOM/DOM.pm b/swig/perl/DOM/DOM.pm
index aa241c3972b132ba79ca14a03472bcea225441ac..3fbcf1e24f650864064cd95734ec7092eaef78be 100644
--- a/swig/perl/DOM/DOM.pm
+++ b/swig/perl/DOM/DOM.pm
@@ -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/swig/perl/DOM/Makefile.PL b/swig/perl/DOM/Makefile.PL
index 1270ef371c252bfdf9d450c27ea797f1d548f100..6f9d2ee6f9f6df79c6b767c3ff49e30897579099 100644
--- a/swig/perl/DOM/Makefile.PL
+++ b/swig/perl/DOM/Makefile.PL
@@ -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/swig/perl/DOM/Xerces_DOM.cpp b/swig/perl/DOM/Xerces_DOM.cpp
index 527bf035576ef5a02d4886fe07ef5f5a5d0b6aa9..45fd754c8d667fd7ae9b866ecb6aa4bee3a7948b 100644
--- a/swig/perl/DOM/Xerces_DOM.cpp
+++ b/swig/perl/DOM/Xerces_DOM.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/swig/perl/Handler/Makefile.PL b/swig/perl/Handler/Makefile.PL
index 952165517d0728439b5807eb8f80e3712f0d5688..17134b34af22a60d74d4f7d28364128d8a879bd3 100644
--- a/swig/perl/Handler/Makefile.PL
+++ b/swig/perl/Handler/Makefile.PL
@@ -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/swig/perl/Handler/PerlCallbackHandler.cpp b/swig/perl/Handler/PerlCallbackHandler.cpp
index 9f8560eb37f663f3dbc6294a2e0b69d695ab0a2f..46e5b403abfd80510c32e0e0c5b62a17318552cb 100644
--- a/swig/perl/Handler/PerlCallbackHandler.cpp
+++ b/swig/perl/Handler/PerlCallbackHandler.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/swig/perl/Handler/PerlCallbackHandler.hpp b/swig/perl/Handler/PerlCallbackHandler.hpp
index 224c1cc032b93d76b54e9f36b5f9f34da9fcb841..d59d0056764036e4cca825f5bff5326453bda1b9 100644
--- a/swig/perl/Handler/PerlCallbackHandler.hpp
+++ b/swig/perl/Handler/PerlCallbackHandler.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/swig/perl/Handler/PerlCallbackHandler.swig.hpp b/swig/perl/Handler/PerlCallbackHandler.swig.hpp
index 3acd7b4e2777bb669aba34f53b5d6fc1a6532508..de2ebc5161388f6f61b956bf77287d84b2591166 100644
--- a/swig/perl/Handler/PerlCallbackHandler.swig.hpp
+++ b/swig/perl/Handler/PerlCallbackHandler.swig.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/swig/perl/Handler/PerlDOMCallbackHandler.cpp b/swig/perl/Handler/PerlDOMCallbackHandler.cpp
index 0f59fcc4fc3ac13c636ac9f63ac0c784c2e9583e..5502dcb76e47c481c50f431ccde5f6f8c8500438 100644
--- a/swig/perl/Handler/PerlDOMCallbackHandler.cpp
+++ b/swig/perl/Handler/PerlDOMCallbackHandler.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/swig/perl/Handler/PerlDOMCallbackHandler.hpp b/swig/perl/Handler/PerlDOMCallbackHandler.hpp
index 0f3efc4c653bcadfb2e2cff23fc6c45a064ae9b6..84046d47e803a404b2ff8568e927de8a809dde7f 100644
--- a/swig/perl/Handler/PerlDOMCallbackHandler.hpp
+++ b/swig/perl/Handler/PerlDOMCallbackHandler.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/swig/perl/Handler/PerlEntityResolverHandler.cpp b/swig/perl/Handler/PerlEntityResolverHandler.cpp
index ac63983d9aa676c90247c534208014b48e8367b1..4240f2481d26a3cfcd58dff2ffd872e4fb411d43 100644
--- a/swig/perl/Handler/PerlEntityResolverHandler.cpp
+++ b/swig/perl/Handler/PerlEntityResolverHandler.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/swig/perl/Handler/PerlEntityResolverHandler.hpp b/swig/perl/Handler/PerlEntityResolverHandler.hpp
index 2319e7098f6d5a98b6b5c33e991540cebdbee3d2..1d18037d85451f5c42e46139b4e1b1db43109098 100644
--- a/swig/perl/Handler/PerlEntityResolverHandler.hpp
+++ b/swig/perl/Handler/PerlEntityResolverHandler.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/swig/perl/Handler/PerlErrorCallbackHandler.cpp b/swig/perl/Handler/PerlErrorCallbackHandler.cpp
index 66bf6ca2037b55eec0dd98c62d9b97fdd49becce..564bf99baeac65f8ab6767c8089453e09c7b1264 100644
--- a/swig/perl/Handler/PerlErrorCallbackHandler.cpp
+++ b/swig/perl/Handler/PerlErrorCallbackHandler.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/swig/perl/Handler/PerlErrorCallbackHandler.hpp b/swig/perl/Handler/PerlErrorCallbackHandler.hpp
index 2d2e7f1f0edc38471d0615776abb6aaec92ca9b3..c0cf26da08bdef0dd130c1affe3eac19722e7b3a 100644
--- a/swig/perl/Handler/PerlErrorCallbackHandler.hpp
+++ b/swig/perl/Handler/PerlErrorCallbackHandler.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/swig/perl/Handler/PerlNodeFilterCallbackHandler.cpp b/swig/perl/Handler/PerlNodeFilterCallbackHandler.cpp
index c39728af130f2881031e0340af022172a8164616..82d9eb6bd1b996d46f9058d60c293ef974fe6237 100644
--- a/swig/perl/Handler/PerlNodeFilterCallbackHandler.cpp
+++ b/swig/perl/Handler/PerlNodeFilterCallbackHandler.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/swig/perl/Handler/PerlNodeFilterCallbackHandler.hpp b/swig/perl/Handler/PerlNodeFilterCallbackHandler.hpp
index 2b1d2e4d9e68b31868275b04744eba5dbbf8a293..21f81713022785527100593da977f61e86e64ac5 100644
--- a/swig/perl/Handler/PerlNodeFilterCallbackHandler.hpp
+++ b/swig/perl/Handler/PerlNodeFilterCallbackHandler.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/swig/perl/Handler/PerlSAXCallbackHandler.cpp b/swig/perl/Handler/PerlSAXCallbackHandler.cpp
index 6e777afbfe163d99ff0855b707bb4037f70349e6..312cda801228d65f5cfcd967c9709e9d4a1ba062 100644
--- a/swig/perl/Handler/PerlSAXCallbackHandler.cpp
+++ b/swig/perl/Handler/PerlSAXCallbackHandler.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/swig/perl/Handler/PerlSAXCallbackHandler.hpp b/swig/perl/Handler/PerlSAXCallbackHandler.hpp
index cc12b41031479bed3dc4d1ed87b7768e03504c19..66a08c070c3bd284d92258a89d036571e6f32aa5 100644
--- a/swig/perl/Handler/PerlSAXCallbackHandler.hpp
+++ b/swig/perl/Handler/PerlSAXCallbackHandler.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/swig/perl/IO/IO.pm b/swig/perl/IO/IO.pm
index ae36874aa13748cffb72e73c9f3f30f431f6fde0..51c627c1bab7548105ca3ce66d99456ed93b068b 100644
--- a/swig/perl/IO/IO.pm
+++ b/swig/perl/IO/IO.pm
@@ -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/swig/perl/IO/Makefile.PL b/swig/perl/IO/Makefile.PL
index 7d68034fbd12a67c853e4d73276d275f36c3921d..38fc1c52889306a7ee7f3c9d042f0a557409a39c 100644
--- a/swig/perl/IO/Makefile.PL
+++ b/swig/perl/IO/Makefile.PL
@@ -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/swig/perl/IO/Xerces_IO.cpp b/swig/perl/IO/Xerces_IO.cpp
index 30bbe81ea9459cea26862e74fe43d4825ed69962..cf40ebab3fe084acc6110de27a9bbea866ea7aca 100644
--- a/swig/perl/IO/Xerces_IO.cpp
+++ b/swig/perl/IO/Xerces_IO.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/swig/perl/Makefile.PL b/swig/perl/Makefile.PL
index 406ac045188c4827393bebb9bb94235557006a23..d491f0219d39fcf37c903615ac469b809e92c34b 100644
--- a/swig/perl/Makefile.PL
+++ b/swig/perl/Makefile.PL
@@ -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/swig/perl/SAX/Makefile.PL b/swig/perl/SAX/Makefile.PL
index b958b483133b425cfc846f3c4daf2d7e7cd56fd6..effe4154256fdf0aeea0137dfaddd594b50b2e0e 100644
--- a/swig/perl/SAX/Makefile.PL
+++ b/swig/perl/SAX/Makefile.PL
@@ -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/swig/perl/SAX/SAX.pm b/swig/perl/SAX/SAX.pm
index 039d6a4a1d53ac14f36c69aea5e00d77619ce143..0ed9cd20ded677fa691ac8d6ab6b2027e193b65e 100644
--- a/swig/perl/SAX/SAX.pm
+++ b/swig/perl/SAX/SAX.pm
@@ -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/swig/perl/SAX/Xerces_SAX.cpp b/swig/perl/SAX/Xerces_SAX.cpp
index c76d6906bd15546646e1938ad56f191b0430bc4a..4c9d6627389f93634d45af6afe14de624a03b767 100644
--- a/swig/perl/SAX/Xerces_SAX.cpp
+++ b/swig/perl/SAX/Xerces_SAX.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/swig/perl/Transcoder/Makefile.PL b/swig/perl/Transcoder/Makefile.PL
index d696b80fd69eb30213f06d8aacacf4446c18e8b5..b754258881c417bac6bbe297a2a5403bc610d89c 100644
--- a/swig/perl/Transcoder/Makefile.PL
+++ b/swig/perl/Transcoder/Makefile.PL
@@ -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/swig/perl/Transcoder/Transcoder.cpp b/swig/perl/Transcoder/Transcoder.cpp
index eff33d4ebddff25737fc4b5cdd1de2184e3c757a..956742606dcc7d5c2eb5ae54e29086b23fa77920 100644
--- a/swig/perl/Transcoder/Transcoder.cpp
+++ b/swig/perl/Transcoder/Transcoder.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/swig/perl/Transcoder/Transcoder.hpp b/swig/perl/Transcoder/Transcoder.hpp
index a4ccca469b30aa9c360d95f5a6cba9fe63114bee..56a66a605e71636c926fbba6c8c6c3afeee98a9a 100644
--- a/swig/perl/Transcoder/Transcoder.hpp
+++ b/swig/perl/Transcoder/Transcoder.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/swig/perl/Transcoder/XMLExceptionHandler.cpp b/swig/perl/Transcoder/XMLExceptionHandler.cpp
index 241f324ffadb67240179373f973c95cebc96a773..13df16e2a89dff4100d283f190f227a5d2317075 100644
--- a/swig/perl/Transcoder/XMLExceptionHandler.cpp
+++ b/swig/perl/Transcoder/XMLExceptionHandler.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/swig/perl/Transcoder/XMLExceptionHandler.hpp b/swig/perl/Transcoder/XMLExceptionHandler.hpp
index 51a21bee1ab5f2b388ce2487731f21d5286c68a0..5d2051acd10d75f5542a96fe7a3aa049e18e6760 100644
--- a/swig/perl/Transcoder/XMLExceptionHandler.hpp
+++ b/swig/perl/Transcoder/XMLExceptionHandler.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/swig/perl/Xerces.cpp b/swig/perl/Xerces.cpp
index 96f80e69b2a14127138173be6402f5e9766e74ad..4fa55838de7eadf5fae00e5f5cd9b8b1e367539a 100644
--- a/swig/perl/Xerces.cpp
+++ b/swig/perl/Xerces.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/swig/perl/Xerces.pm b/swig/perl/Xerces.pm
index d31f88e09c008118bb86d1ecf6a42215e55e02c8..81fcaf7b6c0d1a72a9b50c0338f971231e2892c6 100644
--- a/swig/perl/Xerces.pm
+++ b/swig/perl/Xerces.pm
@@ -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/swig/perl/docs/forrest-docs/forrest.properties b/swig/perl/docs/forrest-docs/forrest.properties
index 2c08d6bfc4688decb68520bc433172a72da98d33..d61644d748edfb606e41199c909e3cc37779e99e 100644
--- a/swig/perl/docs/forrest-docs/forrest.properties
+++ b/swig/perl/docs/forrest-docs/forrest.properties
@@ -1,9 +1,9 @@
-# Copyright 2002-2005 The Apache Software Foundation or its licensors,
-# as applicable.
-#
-# 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/swig/perl/docs/forrest-docs/src/documentation/classes/CatalogManager.properties b/swig/perl/docs/forrest-docs/src/documentation/classes/CatalogManager.properties
index af7b5ab3235c3d6ab4824ef2e1364ec3ea6bee88..6e9436c4b8aa2bd52d1427e463a6d60ba7da6408 100644
--- a/swig/perl/docs/forrest-docs/src/documentation/classes/CatalogManager.properties
+++ b/swig/perl/docs/forrest-docs/src/documentation/classes/CatalogManager.properties
@@ -1,9 +1,9 @@
-# Copyright 2002-2005 The Apache Software Foundation or its licensors,
-# as applicable.
-#
-# 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/swig/perl/docs/forrest-docs/src/documentation/conf/cli.xconf b/swig/perl/docs/forrest-docs/src/documentation/conf/cli.xconf
index 1f5c5d95ac6b4d3200449ad5282cf6064972e409..36cb862c2eff4051fc5c721d8e08aeec0a4747b6 100644
--- a/swig/perl/docs/forrest-docs/src/documentation/conf/cli.xconf
+++ b/swig/perl/docs/forrest-docs/src/documentation/conf/cli.xconf
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 2002-2004 The Apache Software Foundation or its licensors,
-  as applicable.
-
-  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/swig/perl/docs/forrest-docs/src/documentation/content/mirrors.cgi b/swig/perl/docs/forrest-docs/src/documentation/content/mirrors.cgi
index 1032612d34f26b3cba17605e8a95817e97688d6e..53a88ca2a85044c3ee471ef0685b04634aa940b3 100644
--- a/swig/perl/docs/forrest-docs/src/documentation/content/mirrors.cgi
+++ b/swig/perl/docs/forrest-docs/src/documentation/content/mirrors.cgi
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-# Copyright 2002-2004 The Apache Software Foundation or its licensors,
-# as applicable.
-#
-# 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/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/download.xml b/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/download.xml
index f26106e2c51c2510e391bfc4f39ed2968ba23817..9e75eb3bfb15c7c819565d81035e607f0f4cce5d 100644
--- a/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/download.xml
+++ b/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/download.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" standalone="no"?>
 
 <!--
-  Copyright 2002-2004 The Apache Software Foundation or its licensors,
-  as applicable.
-
-  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/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/images/group.svg b/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/images/group.svg
index 584cedb81e7e91b9ccbe88976c5db4a9229a6ef2..93673793e6f9e0f1ad8928304f687548ada8743a 100644
--- a/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/images/group.svg
+++ b/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/images/group.svg
@@ -1,11 +1,11 @@
 <?xml version="1.0" standalone="no"?>
 <!--
-  Copyright 2002-2004 The Apache Software Foundation or its licensors,
-  as applicable.
-
-  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/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/images/project.svg b/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/images/project.svg
index 01abcdbbfbf15bfd2cdb712da5c873bc01e1953d..ac8642e5a0f5484c181266e468c5b1fcd9c0999d 100644
--- a/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/images/project.svg
+++ b/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/images/project.svg
@@ -1,11 +1,11 @@
 <?xml version="1.0" standalone="no"?>
 <!--
-  Copyright 2002-2004 The Apache Software Foundation or its licensors,
-  as applicable.
-
-  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/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/index.xml b/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/index.xml
index 337d53ae85b2d0bd411753eb7ec21f9f8a9f0f4e..1b741d6c3708ee8b99722c70f995d51730826776 100644
--- a/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/index.xml
+++ b/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/index.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2002-2004 The Apache Software Foundation or its licensors,
-  as applicable.
-
-  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/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/mirrors.html b/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/mirrors.html
index fc6c58e9219f73002390b18e7c1cae7070e5a21b..a50aca3b87901af645915fe8e92be81f2daaa51c 100644
--- a/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/mirrors.html
+++ b/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/mirrors.html
@@ -1,10 +1,10 @@
 <!--
-  Copyright 2001-2005 The Apache Software Foundation or its licensors,
-  as applicable.
-
-  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/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/samples/dom2hash.xml b/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/samples/dom2hash.xml
index cd8ae3530c1c700d028bceff2a44cdd0ccffb586..f05523a85e32a04844a1a9b1551007b421cc0bc0 100644
--- a/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/samples/dom2hash.xml
+++ b/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/samples/dom2hash.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" standalone="no"?>
 <!--
- * Copyright 1999-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/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/samples/domcount.xml b/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/samples/domcount.xml
index 4ac4864d66713e992545a9d25a53ebdd33396513..1a6d2bd2cf512efc9d9e75688a6a951e4b091ae1 100644
--- a/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/samples/domcount.xml
+++ b/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/samples/domcount.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" standalone="no"?>
 <!--
- * Copyright 1999-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/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/samples/domcreate.xml b/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/samples/domcreate.xml
index 46c73d30c7370021588c4ac8248da4fd97b46957..d7650d8b27c8c449ebd58f28b2574c4819b2b49a 100644
--- a/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/samples/domcreate.xml
+++ b/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/samples/domcreate.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" standalone="no"?>
 <!--
- * Copyright 1999-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/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/samples/domprint.xml b/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/samples/domprint.xml
index 9d607c42d74f3f66991f6e32ebfdaa783db03894..3d39694fac838de82bb1fb345e4b6982f9016525 100644
--- a/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/samples/domprint.xml
+++ b/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/samples/domprint.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" standalone="no"?>
 <!--
- * Copyright 1999-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/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/samples/enumval.xml b/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/samples/enumval.xml
index 1ffbf35788413e013fee100236900ede49891e2f..d7e03bc2624b60458461442be02ec251588dd8b4 100644
--- a/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/samples/enumval.xml
+++ b/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/samples/enumval.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" standalone="no"?>
 <!--
- * Copyright 1999-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/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/samples/index.xml b/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/samples/index.xml
index 0b250551ffb26ed7dc9052fa3c9589e4f796263c..f09d6cd8d1e783e25e676ec1d0406295681bb56c 100644
--- a/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/samples/index.xml
+++ b/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/samples/index.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" standalone="no"?>
 <!--
-  Copyright 2002-2004 The Apache Software Foundation or its licensors,
-  as applicable.
-
-  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/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/samples/sax2count.xml b/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/samples/sax2count.xml
index b6994151c6a2d87e6cb99ea33416bb5a02477f54..446cbc153aac3f5d21e25eccf2db4d6dcd1a635e 100644
--- a/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/samples/sax2count.xml
+++ b/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/samples/sax2count.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" standalone="no"?>
 <!--
- * Copyright 1999-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/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/samples/saxcount.xml b/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/samples/saxcount.xml
index 3310ee52c9c604857ea88fb308528329222c7c11..a52df0475f4a326816e25069a6b6a9f4a94c033c 100644
--- a/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/samples/saxcount.xml
+++ b/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/samples/saxcount.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" standalone="no"?>
 <!--
- * Copyright 1999-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/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/samples/senumval.xml b/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/samples/senumval.xml
index 30d5aa755188f8d75b94eba0da383994cad07c38..579e45a84921080a5122425ee7c959027a98f041 100644
--- a/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/samples/senumval.xml
+++ b/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/samples/senumval.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" standalone="no"?>
 <!--
- * Copyright 1999-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/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/samples/validator-dom.xml b/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/samples/validator-dom.xml
index fed706305ab9c3619de5ff3edfb4d5b74cc1d134..332d6c49b25019d887a759337026bc1b1b1fc076 100644
--- a/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/samples/validator-dom.xml
+++ b/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/samples/validator-dom.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" standalone="no"?>
 <!--
- * Copyright 1999-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/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/samples/validator.xml b/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/samples/validator.xml
index 2e404ae027439306427630ad6087d52c0f338246..0cf36636ea1a0313637c1bd58e9ac72370b50efc 100644
--- a/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/samples/validator.xml
+++ b/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/samples/validator.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" standalone="no"?>
 <!--
- * Copyright 1999-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/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/site.xml b/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/site.xml
index 3caa04687d3f9113c063988a80bbdb9b146a0f77..237391e53400c0606fb9b820a921a3ca5f2e686a 100644
--- a/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/site.xml
+++ b/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/site.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2002-2004 The Apache Software Foundation or its licensors,
-  as applicable.
-
-  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/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/tabs.xml b/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/tabs.xml
index 29057dbb778b86ae845551d31015ec3add2586f3..20a655660fbefd71e7e005381d8df92be5040a1c 100644
--- a/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/tabs.xml
+++ b/swig/perl/docs/forrest-docs/src/documentation/content/xdocs/tabs.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2002-2004 The Apache Software Foundation or its licensors,
-  as applicable.
-
-  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/swig/perl/docs/forrest-docs/src/documentation/mirrors.cgi b/swig/perl/docs/forrest-docs/src/documentation/mirrors.cgi
index 1032612d34f26b3cba17605e8a95817e97688d6e..53a88ca2a85044c3ee471ef0685b04634aa940b3 100644
--- a/swig/perl/docs/forrest-docs/src/documentation/mirrors.cgi
+++ b/swig/perl/docs/forrest-docs/src/documentation/mirrors.cgi
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-# Copyright 2002-2004 The Apache Software Foundation or its licensors,
-# as applicable.
-#
-# 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/swig/perl/docs/forrest-docs/src/documentation/resources/schema/catalog.xcat b/swig/perl/docs/forrest-docs/src/documentation/resources/schema/catalog.xcat
index 8cdf17b5125214d413e587bfa48bcb34b799562f..1dd8ebd1f34238d37f42fc1eaf1f3a29e24e13f6 100644
--- a/swig/perl/docs/forrest-docs/src/documentation/resources/schema/catalog.xcat
+++ b/swig/perl/docs/forrest-docs/src/documentation/resources/schema/catalog.xcat
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 2002-2004 The Apache Software Foundation or its licensors,
-  as applicable.
-
-  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/swig/perl/docs/forrest-docs/src/documentation/sitemap.xmap b/swig/perl/docs/forrest-docs/src/documentation/sitemap.xmap
index f32221a4be4421ea4338cb9f9df79309f77ce5a1..5f94ef3b62569bbeee411f662ba24f782385b625 100644
--- a/swig/perl/docs/forrest-docs/src/documentation/sitemap.xmap
+++ b/swig/perl/docs/forrest-docs/src/documentation/sitemap.xmap
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 2002-2005 The Apache Software Foundation or its licensors,
-  as applicable.
-
-  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/swig/perl/docs/forrest-docs/src/documentation/skinconf.xml b/swig/perl/docs/forrest-docs/src/documentation/skinconf.xml
index 7cdf0f90fa8424c2529e38c667f66c591d1ee726..ab11c56f19b8015426461542381d29750ddab44e 100644
--- a/swig/perl/docs/forrest-docs/src/documentation/skinconf.xml
+++ b/swig/perl/docs/forrest-docs/src/documentation/skinconf.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 2002-2005 The Apache Software Foundation or its licensors,
-  as applicable.
-
-  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/swig/perl/samples/DOM2hash.pl b/swig/perl/samples/DOM2hash.pl
index 8bb99354238c0f8f4c2a60695955aafefd941c60..bfb62cd7f566ac5028db3ce511296d3b8be7f3e8 100644
--- a/swig/perl/samples/DOM2hash.pl
+++ b/swig/perl/samples/DOM2hash.pl
@@ -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/swig/perl/samples/DOMCount.pl b/swig/perl/samples/DOMCount.pl
index 87a9ea9b6fb6629ab5d46b1112eac8ff3e592df1..198d4702973422d0cfb8ab602c7c168ae640e118 100644
--- a/swig/perl/samples/DOMCount.pl
+++ b/swig/perl/samples/DOMCount.pl
@@ -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/swig/perl/samples/DOMCreate.pl b/swig/perl/samples/DOMCreate.pl
index 3f3ee5c53dae167f63de5b53760045d07d585310..4366719b454bb4891d0d604747feea0f98a1dd27 100644
--- a/swig/perl/samples/DOMCreate.pl
+++ b/swig/perl/samples/DOMCreate.pl
@@ -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/swig/perl/samples/EnumVal.pl b/swig/perl/samples/EnumVal.pl
index b778ab03acc49cfe4def1c3030e4a159464ebc9e..8c64e30cb6f470f84c14409874f3ed215911e829 100644
--- a/swig/perl/samples/EnumVal.pl
+++ b/swig/perl/samples/EnumVal.pl
@@ -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/swig/perl/samples/PSVIWriter.pl b/swig/perl/samples/PSVIWriter.pl
index 004fe54e28e342107aa1bcbbfc9772dca77b2f47..a7a1eb2f7b24ea58e973c2699d022e7f5ad25838 100644
--- a/swig/perl/samples/PSVIWriter.pl
+++ b/swig/perl/samples/PSVIWriter.pl
@@ -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/swig/perl/samples/SAX2Count.pl b/swig/perl/samples/SAX2Count.pl
index 670325787d874fcdbf28b707374fe0a227d2042c..f64f5ddf1b6698ad01a33915eecbcfac289a21c5 100644
--- a/swig/perl/samples/SAX2Count.pl
+++ b/swig/perl/samples/SAX2Count.pl
@@ -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/swig/perl/samples/SAXCount.pl b/swig/perl/samples/SAXCount.pl
index 6e82dad7ad6ac156cf708b06d96bbbf71965e9b6..e2a687c9f6627094cefc40860beb5bcd1bc6ae7c 100644
--- a/swig/perl/samples/SAXCount.pl
+++ b/swig/perl/samples/SAXCount.pl
@@ -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/swig/perl/samples/SEnumVal.pl b/swig/perl/samples/SEnumVal.pl
index f8d8441e2154a99c0bd4e2c9c4291d5b19d9edd3..88ef59dd93f90c099ec5f96369af2950cab0c8bf 100644
--- a/swig/perl/samples/SEnumVal.pl
+++ b/swig/perl/samples/SEnumVal.pl
@@ -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/swig/perl/samples/XMLSimple.pm b/swig/perl/samples/XMLSimple.pm
index b9fbe6de7ccd3f3b0b1e1d56d6d1615a187782ac..ead16bdff3bd31024a31d3f68cef2917eeea86f9 100644
--- a/swig/perl/samples/XMLSimple.pm
+++ b/swig/perl/samples/XMLSimple.pm
@@ -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/swig/scripts/postModule.pl b/swig/scripts/postModule.pl
index f52bd3a2180308cd75b945177da772cfeed0b66e..290cda0712a4bcdcb0a880125dc423a18ae3cfa4 100644
--- a/swig/scripts/postModule.pl
+++ b/swig/scripts/postModule.pl
@@ -30,11 +30,12 @@ my ($temp_fh, $temp_filename) = tempfile();
 
 my $LICENSE = <<LICENSE;
  #
- # 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/swig/scripts/postSource.pl b/swig/scripts/postSource.pl
index bbef25601bbb56891f74762501a331d468b1c8f2..bf35bbe756230de75d44b737c375097f2a1a1e21 100644
--- a/swig/scripts/postSource.pl
+++ b/swig/scripts/postSource.pl
@@ -34,11 +34,12 @@ my ($temp_fh, $temp_filename) = tempfile();
 
 my $LICENSE = <<LICENSE;
 /*
- * 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
  *