From 71590d91c0120aa49e0fb24acd155df66ba214ea Mon Sep 17 00:00:00 2001
From: ltheussl <ltheussl@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 30 Apr 2007 07:41:05 +0000
Subject: [PATCH] Update license headers

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@533617 13f79535-47bb-0310-9956-ffa450edef68
---
 eclipse/plugin.properties                     | 11 +++---
 eclipse/project.properties                    | 11 +++---
 eclipse/project.xml                           | 11 +++---
 .../eclipse/AbstractSourcesDownloader.java    | 11 +++---
 .../plugin/eclipse/JavaSourcesDownloader.java | 11 +++---
 .../plugin/eclipse/JavadocsDownloader.java    | 11 +++---
 .../templates/classpath.jelly                 | 33 ++++++++---------
 .../plugin-resources/templates/launch.jelly   | 11 +++---
 .../org.eclipse.jdt.core.prefs.jelly          | 33 ++++++++---------
 .../plugin-resources/templates/project.jelly  | 11 +++---
 .../templates/wtp/0.7/wtpmodules.jelly        | 33 ++++++++---------
 .../org.eclipse.wst.common.component.jelly    | 33 ++++++++---------
 ...se.wst.common.project.facet.core.xml.jelly | 33 ++++++++---------
 .../duplicatebuilderstest/maven.xml           | 11 +++---
 .../duplicatebuilderstest/project.xml         | 11 +++---
 .../plugin-test/justresourcestest/maven.xml   | 11 +++---
 .../plugin-test/justresourcestest/project.xml | 11 +++---
 eclipse/src/plugin-test/maintest/maven.xml    | 11 +++---
 eclipse/src/plugin-test/maintest/project.xml  | 11 +++---
 eclipse/src/plugin-test/maven.xml             | 11 +++---
 .../src/plugin-test/nosourcetest/maven.xml    | 11 +++---
 .../src/plugin-test/nosourcetest/project.xml  | 11 +++---
 eclipse/src/plugin-test/project.xml           | 11 +++---
 eclipse/src/plugin-test/wtptest/maven.xml     | 11 +++---
 eclipse/src/plugin-test/wtptest/project.xml   | 11 +++---
 eclipse/xdocs/changes.xml                     | 11 +++---
 eclipse/xdocs/faq.fml                         | 35 ++++++++++---------
 eclipse/xdocs/goals.xml                       | 11 +++---
 eclipse/xdocs/index.xml                       | 33 ++++++++---------
 eclipse/xdocs/navigation.xml                  | 35 ++++++++++---------
 eclipse/xdocs/properties.xml                  | 33 ++++++++---------
 ejb/plugin.jelly                              | 11 +++---
 ejb/plugin.properties                         | 11 +++---
 ejb/project.properties                        | 11 +++---
 ejb/project.xml                               | 11 +++---
 .../maven/ejb/EJBArtifactTypeHandler.java     | 11 +++---
 .../maven/ejb/EJBArtifactTypeHandlerTest.java | 11 +++---
 ejb/xdocs/changes.xml                         | 11 +++---
 ejb/xdocs/goals.xml                           | 11 +++---
 ejb/xdocs/index.xml                           | 11 +++---
 ejb/xdocs/navigation.xml                      | 11 +++---
 ejb/xdocs/properties.xml                      | 11 +++---
 nsis/plugin.jelly                             | 11 +++---
 nsis/plugin.properties                        | 11 +++---
 nsis/project.properties                       | 11 +++---
 nsis/project.xml                              | 11 +++---
 .../plugin-resources/templates/project.jelly  | 11 +++---
 .../plugin-resources/templates/setup.jelly    | 11 +++---
 nsis/xdocs/changes.xml                        | 11 +++---
 nsis/xdocs/customizing.xml                    | 11 +++---
 nsis/xdocs/faq.fml                            | 19 +++++++++-
 nsis/xdocs/goals.xml                          | 11 +++---
 nsis/xdocs/index.xml                          | 11 +++---
 nsis/xdocs/navigation.xml                     | 11 +++---
 nsis/xdocs/process.xml                        | 11 +++---
 nsis/xdocs/properties.xml                     | 11 +++---
 test/plugin.jelly                             | 11 +++---
 test/plugin.properties                        | 11 +++---
 test/project.properties                       | 11 +++---
 test/project.xml                              | 11 +++---
 test/xdocs/changes.xml                        | 11 +++---
 test/xdocs/faq.fml                            | 11 +++---
 test/xdocs/goals.xml                          | 11 +++---
 test/xdocs/index.xml                          | 11 +++---
 test/xdocs/navigation.xml                     | 11 +++---
 test/xdocs/properties.xml                     | 11 +++---
 war/plugin.jelly                              | 11 +++---
 war/plugin.properties                         | 11 +++---
 war/project.properties                        | 11 +++---
 war/project.xml                               | 11 +++---
 war/src/plugin-test/maven.xml                 | 11 +++---
 war/src/plugin-test/project.xml               | 11 +++---
 war/src/plugin-test/test01/maven.xml          | 11 +++---
 war/src/plugin-test/test01/project.xml        | 11 +++---
 .../plugin-test/test01/src/webapp/index.html  | 11 +++---
 war/src/plugin-test/test02/maven.xml          | 11 +++---
 war/src/plugin-test/test02/project.xml        | 11 +++---
 .../plugin-test/test02/src/webapp/index.html  | 11 +++---
 war/src/plugin-test/test03/maven.xml          | 11 +++---
 war/src/plugin-test/test03/project.xml        | 11 +++---
 .../plugin-test/test03/src/webapp/index.html  | 11 +++---
 war/src/plugin-test/test04/maven.xml          | 11 +++---
 war/src/plugin-test/test04/project.xml        | 11 +++---
 .../plugin-test/test04/src/webapp/index.html  | 11 +++---
 war/xdocs/changes.xml                         | 11 +++---
 war/xdocs/goals.xml                           | 11 +++---
 war/xdocs/index.xml                           | 11 +++---
 war/xdocs/navigation.xml                      | 11 +++---
 war/xdocs/properties.xml                      | 11 +++---
 89 files changed, 647 insertions(+), 542 deletions(-)

diff --git a/eclipse/plugin.properties b/eclipse/plugin.properties
index e49d1d58..1baa49a5 100644
--- a/eclipse/plugin.properties
+++ b/eclipse/plugin.properties
@@ -1,9 +1,10 @@
 # -------------------------------------------------------------------
-# Copyright 2001-2006 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/eclipse/project.properties b/eclipse/project.properties
index 7883d747..0a760e50 100644
--- a/eclipse/project.properties
+++ b/eclipse/project.properties
@@ -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/eclipse/project.xml b/eclipse/project.xml
index 80c958cc..525c01ed 100644
--- a/eclipse/project.xml
+++ b/eclipse/project.xml
@@ -2,11 +2,12 @@
 
 <!-- 
 /*
- * 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/eclipse/src/main/org/apache/maven/plugin/eclipse/AbstractSourcesDownloader.java b/eclipse/src/main/org/apache/maven/plugin/eclipse/AbstractSourcesDownloader.java
index e8dae13f..a2678730 100644
--- a/eclipse/src/main/org/apache/maven/plugin/eclipse/AbstractSourcesDownloader.java
+++ b/eclipse/src/main/org/apache/maven/plugin/eclipse/AbstractSourcesDownloader.java
@@ -1,11 +1,12 @@
 package org.apache.maven.plugin.eclipse;
 
 /* ====================================================================
- *   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/eclipse/src/main/org/apache/maven/plugin/eclipse/JavaSourcesDownloader.java b/eclipse/src/main/org/apache/maven/plugin/eclipse/JavaSourcesDownloader.java
index 1189f793..12cedfae 100644
--- a/eclipse/src/main/org/apache/maven/plugin/eclipse/JavaSourcesDownloader.java
+++ b/eclipse/src/main/org/apache/maven/plugin/eclipse/JavaSourcesDownloader.java
@@ -1,11 +1,12 @@
 package org.apache.maven.plugin.eclipse;
 
 /* ====================================================================
- *   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/eclipse/src/main/org/apache/maven/plugin/eclipse/JavadocsDownloader.java b/eclipse/src/main/org/apache/maven/plugin/eclipse/JavadocsDownloader.java
index c363f3bb..ede570e0 100644
--- a/eclipse/src/main/org/apache/maven/plugin/eclipse/JavadocsDownloader.java
+++ b/eclipse/src/main/org/apache/maven/plugin/eclipse/JavadocsDownloader.java
@@ -1,11 +1,12 @@
 package org.apache.maven.plugin.eclipse;
 
 /* ====================================================================
- *   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/eclipse/src/plugin-resources/templates/classpath.jelly b/eclipse/src/plugin-resources/templates/classpath.jelly
index bed7180e..cc0fd349 100644
--- a/eclipse/src/plugin-resources/templates/classpath.jelly
+++ b/eclipse/src/plugin-resources/templates/classpath.jelly
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-  /*
-  * 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
-  *
-  *      http://www.apache.org/licenses/LICENSE-2.0
-  *
-  * Unless required by applicable law or agreed to in writing, software
-  * distributed under the License is distributed on an "AS IS" BASIS,
-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  * See the License for the specific language governing permissions and
-  * limitations under the License.
-  */
--->
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
 
 <j:whitespace xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:maven="jelly:maven" xmlns:u="jelly:util"
   xmlns:eclipse="eclipse" xmlns="dummy" trim="true">
diff --git a/eclipse/src/plugin-resources/templates/launch.jelly b/eclipse/src/plugin-resources/templates/launch.jelly
index 9d8511f6..51fabf2a 100644
--- a/eclipse/src/plugin-resources/templates/launch.jelly
+++ b/eclipse/src/plugin-resources/templates/launch.jelly
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 
 /*
- * 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/eclipse/src/plugin-resources/templates/org.eclipse.jdt.core.prefs.jelly b/eclipse/src/plugin-resources/templates/org.eclipse.jdt.core.prefs.jelly
index d86b2483..1f1d2fd4 100644
--- a/eclipse/src/plugin-resources/templates/org.eclipse.jdt.core.prefs.jelly
+++ b/eclipse/src/plugin-resources/templates/org.eclipse.jdt.core.prefs.jelly
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-  /*
-  * 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
-  *
-  *      http://www.apache.org/licenses/LICENSE-2.0
-  *
-  * Unless required by applicable law or agreed to in writing, software
-  * distributed under the License is distributed on an "AS IS" BASIS,
-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  * See the License for the specific language governing permissions and
-  * limitations under the License.
-  */
--->
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
 <j:whitespace xmlns:j="jelly:core" xmlns="dummy" trim="false">
 <j:set var="target" value="${maven.compile.target}" />
 <j:if test="${target==null}">
diff --git a/eclipse/src/plugin-resources/templates/project.jelly b/eclipse/src/plugin-resources/templates/project.jelly
index 835b8a02..acd54ad5 100644
--- a/eclipse/src/plugin-resources/templates/project.jelly
+++ b/eclipse/src/plugin-resources/templates/project.jelly
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
 /*
- * Copyright 2001-2006 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/eclipse/src/plugin-resources/templates/wtp/0.7/wtpmodules.jelly b/eclipse/src/plugin-resources/templates/wtp/0.7/wtpmodules.jelly
index 5aea20a7..49a659c7 100644
--- a/eclipse/src/plugin-resources/templates/wtp/0.7/wtpmodules.jelly
+++ b/eclipse/src/plugin-resources/templates/wtp/0.7/wtpmodules.jelly
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-    /*
-    * Copyright 2001-2006 The Apache Software Foundation.
-    *
-    * Licensed under the Apache License, Version 2.0 (the "License");
-    * you may not use this file except in compliance with the License.
-    * You may obtain a copy of the License at
-    *
-    *      http://www.apache.org/licenses/LICENSE-2.0
-    *
-    * Unless required by applicable law or agreed to in writing, software
-    * distributed under the License is distributed on an "AS IS" BASIS,
-    * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    * See the License for the specific language governing permissions and
-    * limitations under the License.
-    */
--->
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
 <j:whitespace xmlns:j="jelly:core" xmlns:maven="jelly:maven" xmlns:u="jelly:util" xmlns:eclipse="eclipse" xmlns="dummy" trim="true">
     <project-modules id="moduleCoreId">
         <j:set var="deployDir" value="/" />
diff --git a/eclipse/src/plugin-resources/templates/wtp/1.5/org.eclipse.wst.common.component.jelly b/eclipse/src/plugin-resources/templates/wtp/1.5/org.eclipse.wst.common.component.jelly
index f0a3e4e6..a25dd501 100644
--- a/eclipse/src/plugin-resources/templates/wtp/1.5/org.eclipse.wst.common.component.jelly
+++ b/eclipse/src/plugin-resources/templates/wtp/1.5/org.eclipse.wst.common.component.jelly
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-  /*
-  * Copyright 2001-2006 The Apache Software Foundation.
-  *
-  * Licensed under the Apache License, Version 2.0 (the "License");
-  * you may not use this file except in compliance with the License.
-  * You may obtain a copy of the License at
-  *
-  *      http://www.apache.org/licenses/LICENSE-2.0
-  *
-  * Unless required by applicable law or agreed to in writing, software
-  * distributed under the License is distributed on an "AS IS" BASIS,
-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  * See the License for the specific language governing permissions and
-  * limitations under the License.
-  */
--->
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
 <j:whitespace xmlns:j="jelly:core" xmlns:maven="jelly:maven" xmlns:u="jelly:util" xmlns:eclipse="eclipse" xmlns="dummy"
   trim="true">
   <project-modules id="moduleCoreId" project-version="1.5.0">
diff --git a/eclipse/src/plugin-resources/templates/wtp/1.5/org.eclipse.wst.common.project.facet.core.xml.jelly b/eclipse/src/plugin-resources/templates/wtp/1.5/org.eclipse.wst.common.project.facet.core.xml.jelly
index 2dfab691..6722f7c9 100644
--- a/eclipse/src/plugin-resources/templates/wtp/1.5/org.eclipse.wst.common.project.facet.core.xml.jelly
+++ b/eclipse/src/plugin-resources/templates/wtp/1.5/org.eclipse.wst.common.project.facet.core.xml.jelly
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-  /*
-  * Copyright 2001-2006 The Apache Software Foundation.
-  *
-  * Licensed under the Apache License, Version 2.0 (the "License");
-  * you may not use this file except in compliance with the License.
-  * You may obtain a copy of the License at
-  *
-  *      http://www.apache.org/licenses/LICENSE-2.0
-  *
-  * Unless required by applicable law or agreed to in writing, software
-  * distributed under the License is distributed on an "AS IS" BASIS,
-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  * See the License for the specific language governing permissions and
-  * limitations under the License.
-  */
--->
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
 <j:whitespace xmlns:j="jelly:core" xmlns:maven="jelly:maven" xmlns:u="jelly:util" xmlns:eclipse="eclipse" xmlns="dummy"
   trim="true">
   <faceted-project>
diff --git a/eclipse/src/plugin-test/duplicatebuilderstest/maven.xml b/eclipse/src/plugin-test/duplicatebuilderstest/maven.xml
index e0fecb70..46e7d4c1 100644
--- a/eclipse/src/plugin-test/duplicatebuilderstest/maven.xml
+++ b/eclipse/src/plugin-test/duplicatebuilderstest/maven.xml
@@ -1,10 +1,11 @@
 <!--
 /*
- * 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/eclipse/src/plugin-test/duplicatebuilderstest/project.xml b/eclipse/src/plugin-test/duplicatebuilderstest/project.xml
index feaab4c0..31e2d84f 100644
--- a/eclipse/src/plugin-test/duplicatebuilderstest/project.xml
+++ b/eclipse/src/plugin-test/duplicatebuilderstest/project.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
- * 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/eclipse/src/plugin-test/justresourcestest/maven.xml b/eclipse/src/plugin-test/justresourcestest/maven.xml
index fe506efc..83f5f20e 100644
--- a/eclipse/src/plugin-test/justresourcestest/maven.xml
+++ b/eclipse/src/plugin-test/justresourcestest/maven.xml
@@ -1,10 +1,11 @@
 <!--
 /*
- * 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/eclipse/src/plugin-test/justresourcestest/project.xml b/eclipse/src/plugin-test/justresourcestest/project.xml
index 3186719e..83194205 100644
--- a/eclipse/src/plugin-test/justresourcestest/project.xml
+++ b/eclipse/src/plugin-test/justresourcestest/project.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
- * 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/eclipse/src/plugin-test/maintest/maven.xml b/eclipse/src/plugin-test/maintest/maven.xml
index 52ba381d..cdf51283 100644
--- a/eclipse/src/plugin-test/maintest/maven.xml
+++ b/eclipse/src/plugin-test/maintest/maven.xml
@@ -1,10 +1,11 @@
 <!--
 /*
- * 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/eclipse/src/plugin-test/maintest/project.xml b/eclipse/src/plugin-test/maintest/project.xml
index 34a5607d..1f26df88 100644
--- a/eclipse/src/plugin-test/maintest/project.xml
+++ b/eclipse/src/plugin-test/maintest/project.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
- * 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/eclipse/src/plugin-test/maven.xml b/eclipse/src/plugin-test/maven.xml
index 7b9a8bad..ae974095 100644
--- a/eclipse/src/plugin-test/maven.xml
+++ b/eclipse/src/plugin-test/maven.xml
@@ -1,10 +1,11 @@
 <!-- 
 /*
- * 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/eclipse/src/plugin-test/nosourcetest/maven.xml b/eclipse/src/plugin-test/nosourcetest/maven.xml
index dd91a8ce..91259e7d 100644
--- a/eclipse/src/plugin-test/nosourcetest/maven.xml
+++ b/eclipse/src/plugin-test/nosourcetest/maven.xml
@@ -1,10 +1,11 @@
 <!--
 /*
- * 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/eclipse/src/plugin-test/nosourcetest/project.xml b/eclipse/src/plugin-test/nosourcetest/project.xml
index 286c1dfc..4a18e2e7 100644
--- a/eclipse/src/plugin-test/nosourcetest/project.xml
+++ b/eclipse/src/plugin-test/nosourcetest/project.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
- * 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/eclipse/src/plugin-test/project.xml b/eclipse/src/plugin-test/project.xml
index 732c0ad5..8b43e857 100644
--- a/eclipse/src/plugin-test/project.xml
+++ b/eclipse/src/plugin-test/project.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 
 /*
- * 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/eclipse/src/plugin-test/wtptest/maven.xml b/eclipse/src/plugin-test/wtptest/maven.xml
index 65b5b71a..33926990 100644
--- a/eclipse/src/plugin-test/wtptest/maven.xml
+++ b/eclipse/src/plugin-test/wtptest/maven.xml
@@ -1,10 +1,11 @@
 <!--
 /*
- * Copyright 2001-2006 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/eclipse/src/plugin-test/wtptest/project.xml b/eclipse/src/plugin-test/wtptest/project.xml
index 1b5bfbb0..e5699ea8 100644
--- a/eclipse/src/plugin-test/wtptest/project.xml
+++ b/eclipse/src/plugin-test/wtptest/project.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
- * 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/eclipse/xdocs/changes.xml b/eclipse/xdocs/changes.xml
index dc820f8d..06839b3c 100644
--- a/eclipse/xdocs/changes.xml
+++ b/eclipse/xdocs/changes.xml
@@ -2,11 +2,12 @@
 
 <!--
 /*
- * Copyright 2001-2006 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/eclipse/xdocs/faq.fml b/eclipse/xdocs/faq.fml
index cbfc0741..0ef1f2ef 100644
--- a/eclipse/xdocs/faq.fml
+++ b/eclipse/xdocs/faq.fml
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  /*
-  * Copyright 2001-2006 The Apache Software Foundation.
-  * 
-  * Licensed under the Apache License, Version 2.0 (the "License");
-  * you may not use this file except in compliance with the License.
-  * You may obtain a copy of the License at
-  * 
-  *      http://www.apache.org/licenses/LICENSE-2.0
-  * 
-  * Unless required by applicable law or agreed to in writing, software
-  * distributed under the License is distributed on an "AS IS" BASIS,
-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  * See the License for the specific language governing permissions and
-  * limitations under the License.
-  */
--->
+<!--
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
 
 <faqs title="FAQs">
 
diff --git a/eclipse/xdocs/goals.xml b/eclipse/xdocs/goals.xml
index 0e83dc7a..2541900d 100644
--- a/eclipse/xdocs/goals.xml
+++ b/eclipse/xdocs/goals.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
 /*
- * Copyright 2001-2006 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/eclipse/xdocs/index.xml b/eclipse/xdocs/index.xml
index f66b20c4..8a6a1983 100644
--- a/eclipse/xdocs/index.xml
+++ b/eclipse/xdocs/index.xml
@@ -1,21 +1,22 @@
 <?xml version="1.0"?>
 <!--
-  /*
-  * Copyright 2001-2006 The Apache Software Foundation.
-  *
-  * Licensed under the Apache License, Version 2.0 (the "License");
-  * you may not use this file except in compliance with the License.
-  * You may obtain a copy of the License at
-  *
-  *      http://www.apache.org/licenses/LICENSE-2.0
-  *
-  * Unless required by applicable law or agreed to in writing, software
-  * distributed under the License is distributed on an "AS IS" BASIS,
-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  * See the License for the specific language governing permissions and
-  * limitations under the License.
-  */
--->
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
 
 <document>
 
diff --git a/eclipse/xdocs/navigation.xml b/eclipse/xdocs/navigation.xml
index 8a1211fc..e73ea6b1 100644
--- a/eclipse/xdocs/navigation.xml
+++ b/eclipse/xdocs/navigation.xml
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- 
-  /*
-  * Copyright 2001-2006 The Apache Software Foundation.
-  * 
-  * Licensed under the Apache License, Version 2.0 (the "License");
-  * you may not use this file except in compliance with the License.
-  * You may obtain a copy of the License at
-  * 
-  *      http://www.apache.org/licenses/LICENSE-2.0
-  * 
-  * Unless required by applicable law or agreed to in writing, software
-  * distributed under the License is distributed on an "AS IS" BASIS,
-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  * See the License for the specific language governing permissions and
-  * limitations under the License.
-  */
--->
+<!--
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
 <project name="Maven Eclipse Plugin">
   <title>Maven Eclipse Plugin</title>
   <body>
diff --git a/eclipse/xdocs/properties.xml b/eclipse/xdocs/properties.xml
index c050501b..4687204e 100644
--- a/eclipse/xdocs/properties.xml
+++ b/eclipse/xdocs/properties.xml
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-  /*
-  * Copyright 2001-2006 The Apache Software Foundation.
-  *
-  * Licensed under the Apache License, Version 2.0 (the "License");
-  * you may not use this file except in compliance with the License.
-  * You may obtain a copy of the License at
-  *
-  *      http://www.apache.org/licenses/LICENSE-2.0
-  *
-  * Unless required by applicable law or agreed to in writing, software
-  * distributed under the License is distributed on an "AS IS" BASIS,
-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  * See the License for the specific language governing permissions and
-  * limitations under the License.
-  */
--->
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
 
 <document>
 
diff --git a/ejb/plugin.jelly b/ejb/plugin.jelly
index 29eefca0..1c2338e9 100644
--- a/ejb/plugin.jelly
+++ b/ejb/plugin.jelly
@@ -2,11 +2,12 @@
 
 <!-- 
 /*
- * Copyright 2001-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/ejb/plugin.properties b/ejb/plugin.properties
index 7d2e51e8..46dd6270 100644
--- a/ejb/plugin.properties
+++ b/ejb/plugin.properties
@@ -1,9 +1,10 @@
 # -------------------------------------------------------------------
-# Copyright 2001-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/ejb/project.properties b/ejb/project.properties
index 33f8877d..6d62e178 100644
--- a/ejb/project.properties
+++ b/ejb/project.properties
@@ -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/ejb/project.xml b/ejb/project.xml
index 8179e073..b8b916c2 100644
--- a/ejb/project.xml
+++ b/ejb/project.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 
 /*
- * Copyright 2001-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/ejb/src/main/org/apache/maven/ejb/EJBArtifactTypeHandler.java b/ejb/src/main/org/apache/maven/ejb/EJBArtifactTypeHandler.java
index 740c7242..0f4494ef 100644
--- a/ejb/src/main/org/apache/maven/ejb/EJBArtifactTypeHandler.java
+++ b/ejb/src/main/org/apache/maven/ejb/EJBArtifactTypeHandler.java
@@ -1,11 +1,12 @@
 package org.apache.maven.ejb;
 
 /* ====================================================================
- *   Copyright 2001-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/ejb/src/test/org/apache/maven/ejb/EJBArtifactTypeHandlerTest.java b/ejb/src/test/org/apache/maven/ejb/EJBArtifactTypeHandlerTest.java
index abcb7261..a0e7e161 100644
--- a/ejb/src/test/org/apache/maven/ejb/EJBArtifactTypeHandlerTest.java
+++ b/ejb/src/test/org/apache/maven/ejb/EJBArtifactTypeHandlerTest.java
@@ -1,11 +1,12 @@
 package org.apache.maven.ejb;
 
 /* ====================================================================
- *   Copyright 2001-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/ejb/xdocs/changes.xml b/ejb/xdocs/changes.xml
index 20a3a895..d7c24e33 100644
--- a/ejb/xdocs/changes.xml
+++ b/ejb/xdocs/changes.xml
@@ -2,11 +2,12 @@
 
 <!-- 
 /*
- * Copyright 2001-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/ejb/xdocs/goals.xml b/ejb/xdocs/goals.xml
index e9c4f186..9de2efbf 100644
--- a/ejb/xdocs/goals.xml
+++ b/ejb/xdocs/goals.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0"?>
 <!-- 
 /*
- * Copyright 2001-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/ejb/xdocs/index.xml b/ejb/xdocs/index.xml
index c1bca434..0bbe3c48 100644
--- a/ejb/xdocs/index.xml
+++ b/ejb/xdocs/index.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0"?>
 <!-- 
 /*
- * Copyright 2001-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/ejb/xdocs/navigation.xml b/ejb/xdocs/navigation.xml
index ae97e878..e3b6f0e7 100644
--- a/ejb/xdocs/navigation.xml
+++ b/ejb/xdocs/navigation.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!-- 
 /*
- * 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/ejb/xdocs/properties.xml b/ejb/xdocs/properties.xml
index 87e3e573..869b7cea 100644
--- a/ejb/xdocs/properties.xml
+++ b/ejb/xdocs/properties.xml
@@ -2,11 +2,12 @@
 
 <!-- 
 /*
- * Copyright 2001-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/nsis/plugin.jelly b/nsis/plugin.jelly
index d991997f..ccf42a99 100644
--- a/nsis/plugin.jelly
+++ b/nsis/plugin.jelly
@@ -1,11 +1,12 @@
 <?xml version="1.0"?>
 <!-- 
 /*
- * 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/nsis/plugin.properties b/nsis/plugin.properties
index 46f0bc66..cbfab821 100644
--- a/nsis/plugin.properties
+++ b/nsis/plugin.properties
@@ -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/nsis/project.properties b/nsis/project.properties
index d66f96c3..0636971f 100644
--- a/nsis/project.properties
+++ b/nsis/project.properties
@@ -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/nsis/project.xml b/nsis/project.xml
index 1e3067b0..78ed63c0 100644
--- a/nsis/project.xml
+++ b/nsis/project.xml
@@ -2,11 +2,12 @@
 
 <!--
 /*
- * 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/nsis/src/plugin-resources/templates/project.jelly b/nsis/src/plugin-resources/templates/project.jelly
index dda4fddb..92a64508 100644
--- a/nsis/src/plugin-resources/templates/project.jelly
+++ b/nsis/src/plugin-resources/templates/project.jelly
@@ -1,10 +1,11 @@
 <!-- 
 /*
- * 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/nsis/src/plugin-resources/templates/setup.jelly b/nsis/src/plugin-resources/templates/setup.jelly
index c1e9859f..7a87a8d6 100644
--- a/nsis/src/plugin-resources/templates/setup.jelly
+++ b/nsis/src/plugin-resources/templates/setup.jelly
@@ -1,10 +1,11 @@
 <!-- 
 /*
- * 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/nsis/xdocs/changes.xml b/nsis/xdocs/changes.xml
index 3ad9d81f..5bf76b5c 100644
--- a/nsis/xdocs/changes.xml
+++ b/nsis/xdocs/changes.xml
@@ -2,11 +2,12 @@
 
 <!-- 
 /*
- * 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/nsis/xdocs/customizing.xml b/nsis/xdocs/customizing.xml
index b20628fe..c171a0b2 100644
--- a/nsis/xdocs/customizing.xml
+++ b/nsis/xdocs/customizing.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0"?>
 <!-- 
 /*
- * 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/nsis/xdocs/faq.fml b/nsis/xdocs/faq.fml
index a4611944..4fa22b41 100644
--- a/nsis/xdocs/faq.fml
+++ b/nsis/xdocs/faq.fml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
+<!-- 
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
 <faqs title="Frequently Asked Questions">
 
   <part id="installing">
diff --git a/nsis/xdocs/goals.xml b/nsis/xdocs/goals.xml
index 1c837d1c..7cd807c7 100644
--- a/nsis/xdocs/goals.xml
+++ b/nsis/xdocs/goals.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 
 /*
- * 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/nsis/xdocs/index.xml b/nsis/xdocs/index.xml
index a5e850ad..05dc8429 100644
--- a/nsis/xdocs/index.xml
+++ b/nsis/xdocs/index.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0"?>
 <!-- 
 /*
- * 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/nsis/xdocs/navigation.xml b/nsis/xdocs/navigation.xml
index d939c4a0..2ae829f8 100644
--- a/nsis/xdocs/navigation.xml
+++ b/nsis/xdocs/navigation.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 
 /*
- * 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/nsis/xdocs/process.xml b/nsis/xdocs/process.xml
index e951967f..71bc28b1 100644
--- a/nsis/xdocs/process.xml
+++ b/nsis/xdocs/process.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0"?>
 <!-- 
 /*
- * 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/nsis/xdocs/properties.xml b/nsis/xdocs/properties.xml
index d5da9584..6a009461 100644
--- a/nsis/xdocs/properties.xml
+++ b/nsis/xdocs/properties.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 
 /*
- * 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/test/plugin.jelly b/test/plugin.jelly
index 9a9a43d8..1349820d 100644
--- a/test/plugin.jelly
+++ b/test/plugin.jelly
@@ -1,11 +1,12 @@
 <?xml version="1.0"?>
 <!-- 
 /*
- * 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/test/plugin.properties b/test/plugin.properties
index 08019b4c..de175a06 100644
--- a/test/plugin.properties
+++ b/test/plugin.properties
@@ -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/test/project.properties b/test/project.properties
index d66f96c3..0636971f 100644
--- a/test/project.properties
+++ b/test/project.properties
@@ -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/test/project.xml b/test/project.xml
index 1710b18d..fd214faa 100644
--- a/test/project.xml
+++ b/test/project.xml
@@ -2,11 +2,12 @@
 
 <!-- 
 /*
- * 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/test/xdocs/changes.xml b/test/xdocs/changes.xml
index c5acbf4d..cb1ce347 100644
--- a/test/xdocs/changes.xml
+++ b/test/xdocs/changes.xml
@@ -2,11 +2,12 @@
 
 <!-- 
 /*
- * 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/test/xdocs/faq.fml b/test/xdocs/faq.fml
index 206e800f..080c2427 100644
--- a/test/xdocs/faq.fml
+++ b/test/xdocs/faq.fml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 
 /*
- * Copyright 2001-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/test/xdocs/goals.xml b/test/xdocs/goals.xml
index 66811fd0..d6f25951 100644
--- a/test/xdocs/goals.xml
+++ b/test/xdocs/goals.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 
 /*
- * 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/test/xdocs/index.xml b/test/xdocs/index.xml
index 73f972bf..e948dde8 100644
--- a/test/xdocs/index.xml
+++ b/test/xdocs/index.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0"?>
 <!-- 
 /*
- * 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/test/xdocs/navigation.xml b/test/xdocs/navigation.xml
index fa47c6b9..b2880df3 100644
--- a/test/xdocs/navigation.xml
+++ b/test/xdocs/navigation.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!-- 
 /*
- * 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/test/xdocs/properties.xml b/test/xdocs/properties.xml
index 18b21c5b..d80a7fdc 100644
--- a/test/xdocs/properties.xml
+++ b/test/xdocs/properties.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!-- 
 /*
- * 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/war/plugin.jelly b/war/plugin.jelly
index 670dfdc4..464c838d 100644
--- a/war/plugin.jelly
+++ b/war/plugin.jelly
@@ -1,11 +1,12 @@
 <?xml version="1.0"?>
 <!-- 
 /*
- * 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/war/plugin.properties b/war/plugin.properties
index 9fe253e9..4decc600 100644
--- a/war/plugin.properties
+++ b/war/plugin.properties
@@ -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/war/project.properties b/war/project.properties
index d66f96c3..0636971f 100644
--- a/war/project.properties
+++ b/war/project.properties
@@ -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/war/project.xml b/war/project.xml
index 7d289d58..95925eec 100644
--- a/war/project.xml
+++ b/war/project.xml
@@ -2,11 +2,12 @@
 
 <!-- 
 /*
- * 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/war/src/plugin-test/maven.xml b/war/src/plugin-test/maven.xml
index 339f04bd..6c64f8b6 100644
--- a/war/src/plugin-test/maven.xml
+++ b/war/src/plugin-test/maven.xml
@@ -1,10 +1,11 @@
 <!-- 
 /*
- * 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/war/src/plugin-test/project.xml b/war/src/plugin-test/project.xml
index 1932014e..a514eb7f 100644
--- a/war/src/plugin-test/project.xml
+++ b/war/src/plugin-test/project.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 
 /*
- * 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/war/src/plugin-test/test01/maven.xml b/war/src/plugin-test/test01/maven.xml
index f586db5e..772dea23 100644
--- a/war/src/plugin-test/test01/maven.xml
+++ b/war/src/plugin-test/test01/maven.xml
@@ -1,10 +1,11 @@
 <!-- 
 /*
- * 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/war/src/plugin-test/test01/project.xml b/war/src/plugin-test/test01/project.xml
index 2623e819..5fa41eed 100644
--- a/war/src/plugin-test/test01/project.xml
+++ b/war/src/plugin-test/test01/project.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 
 /*
- * 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/war/src/plugin-test/test01/src/webapp/index.html b/war/src/plugin-test/test01/src/webapp/index.html
index 71af9dd6..55ca1ced 100644
--- a/war/src/plugin-test/test01/src/webapp/index.html
+++ b/war/src/plugin-test/test01/src/webapp/index.html
@@ -1,10 +1,11 @@
 <!-- 
 /*
- * 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/war/src/plugin-test/test02/maven.xml b/war/src/plugin-test/test02/maven.xml
index 2ae6a407..0dbea9e0 100644
--- a/war/src/plugin-test/test02/maven.xml
+++ b/war/src/plugin-test/test02/maven.xml
@@ -1,10 +1,11 @@
 <!-- 
 /*
- * 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/war/src/plugin-test/test02/project.xml b/war/src/plugin-test/test02/project.xml
index ec628ede..d00ae615 100644
--- a/war/src/plugin-test/test02/project.xml
+++ b/war/src/plugin-test/test02/project.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 
 /*
- * 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/war/src/plugin-test/test02/src/webapp/index.html b/war/src/plugin-test/test02/src/webapp/index.html
index 71af9dd6..55ca1ced 100644
--- a/war/src/plugin-test/test02/src/webapp/index.html
+++ b/war/src/plugin-test/test02/src/webapp/index.html
@@ -1,10 +1,11 @@
 <!-- 
 /*
- * 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/war/src/plugin-test/test03/maven.xml b/war/src/plugin-test/test03/maven.xml
index 24b63560..594aad6e 100644
--- a/war/src/plugin-test/test03/maven.xml
+++ b/war/src/plugin-test/test03/maven.xml
@@ -1,10 +1,11 @@
 <!-- 
 /*
- * 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/war/src/plugin-test/test03/project.xml b/war/src/plugin-test/test03/project.xml
index 321787a7..0a9e73e2 100644
--- a/war/src/plugin-test/test03/project.xml
+++ b/war/src/plugin-test/test03/project.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
- * 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/war/src/plugin-test/test03/src/webapp/index.html b/war/src/plugin-test/test03/src/webapp/index.html
index 421072b7..f3b9f248 100644
--- a/war/src/plugin-test/test03/src/webapp/index.html
+++ b/war/src/plugin-test/test03/src/webapp/index.html
@@ -1,10 +1,11 @@
 <!-- 
 /*
- * 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/war/src/plugin-test/test04/maven.xml b/war/src/plugin-test/test04/maven.xml
index ed777934..e7cd45f4 100644
--- a/war/src/plugin-test/test04/maven.xml
+++ b/war/src/plugin-test/test04/maven.xml
@@ -1,10 +1,11 @@
 <!-- 
 /*
- * 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/war/src/plugin-test/test04/project.xml b/war/src/plugin-test/test04/project.xml
index 02c19b06..632823a7 100644
--- a/war/src/plugin-test/test04/project.xml
+++ b/war/src/plugin-test/test04/project.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
- * 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/war/src/plugin-test/test04/src/webapp/index.html b/war/src/plugin-test/test04/src/webapp/index.html
index 63e8ace9..a57c1fc5 100644
--- a/war/src/plugin-test/test04/src/webapp/index.html
+++ b/war/src/plugin-test/test04/src/webapp/index.html
@@ -1,10 +1,11 @@
 <!-- 
 /*
- * 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/war/xdocs/changes.xml b/war/xdocs/changes.xml
index 3b2218a4..b76c53a7 100644
--- a/war/xdocs/changes.xml
+++ b/war/xdocs/changes.xml
@@ -2,11 +2,12 @@
 
 <!-- 
 /*
- * 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/war/xdocs/goals.xml b/war/xdocs/goals.xml
index 05970ef4..95fedc29 100644
--- a/war/xdocs/goals.xml
+++ b/war/xdocs/goals.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 
 /*
- * 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/war/xdocs/index.xml b/war/xdocs/index.xml
index b044159d..0d69d2c7 100644
--- a/war/xdocs/index.xml
+++ b/war/xdocs/index.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0"?>
 <!-- 
 /*
- * 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/war/xdocs/navigation.xml b/war/xdocs/navigation.xml
index 3cd05539..c6bc6ef4 100644
--- a/war/xdocs/navigation.xml
+++ b/war/xdocs/navigation.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!-- 
 /*
- * 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/war/xdocs/properties.xml b/war/xdocs/properties.xml
index 90b7af09..4eb20ba8 100644
--- a/war/xdocs/properties.xml
+++ b/war/xdocs/properties.xml
@@ -2,11 +2,12 @@
 
 <!-- 
 /*
- * 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
  *